Changeset 9184 for code/branches/pickup2012

Timestamp:

May 18, 2012, 12:47:54 PM (13 years ago)

Author:

lkevin

Message:

Finished DamageBoost Pickup and the XML inclusions are working now.

Location:

code/branches/pickup2012

Files:

• data/levels/includes/pickups.oxi (modified) (1 diff)
• data/levels/pickups.oxw (modified) (1 diff)
• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (2 diffs)
• src/modules/pickup/items/DamageBoostPickup.cc (modified) (5 diffs)
• src/modules/pickup/items/DamageBoostPickup.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/pickup2012/data/levels/includes/pickups.oxi

@@ -213 +213 @@
 
 <PickupRepresentation
-    pickupName = "DamageBoost Pickup"
-    pickupDescription = "Multiplies the ship damage."
-    spawnerTemplate = "damageboostpickupRepresentation"
->
-    <pickup>
-        <DamageBoostPickup template=damageboostpickup />
+    pickupName = "Small DamageBoost Pickup"
+    pickupDescription = "Multiplies the ship damage with 2."
+    spawnerTemplate = "smalldamageboostpickupRepresentation"
+    inventoryRepresentation = "SmallDamageBoost"
+>
+    <pickup>
+        <DamageBoostPickup template=smalldamageboostpickup />
+    </pickup>
+</PickupRepresentation>
+
+<PickupRepresentation
+    pickupName = "Medium DamageBoost Pickup"
+    pickupDescription = "Multiplies the ship damage with 5."
+    spawnerTemplate = "mediumdamageboostpickupRepresentation"
+    inventoryRepresentation = "MediumDamageBoost"
+>
+    <pickup>
+        <DamageBoostPickup template=mediumdamageboostpickup />
+    </pickup>
+</PickupRepresentation>
+
+<PickupRepresentation
+    pickupName = "Large DamageBoost Pickup"
+    pickupDescription = "Multiplies the ship damage with 7."
+    spawnerTemplate = "largedamageboostpickupRepresentation"
+    inventoryRepresentation = "LargeDamageBoost"
+>
+    <pickup>
+        <DamageBoostPickup template=largedamageboostpickup />
     </pickup>
 </PickupRepresentation>

code/branches/pickup2012/data/levels/pickups.oxw

@@ -173 +173 @@
     <PickupSpawner position="-50,75,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
       <pickup>
-        <DamageBoostPickup template=damageboostpickup />
+        <DamageBoostPickup template=smalldamageboostpickup />
+      </pickup>
+    </PickupSpawner>
+    
+      <PickupSpawner position="-50,100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+      <pickup>
+        <DamageBoostPickup template=mediumdamageboostpickup />
+      </pickup>
+    </PickupSpawner>
+    
+      <PickupSpawner position="-50,125,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+      <pickup>
+        <DamageBoostPickup template=largedamageboostpickup />
       </pickup>
     </PickupSpawner>

code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt

@@ -218 +218 @@
 <!-- DamageBoost pickups -->
 
-<Template name=damageboostpickupRepresentation>
+<Template name=smalldamageboostpickupRepresentation>
     <PickupRepresentation>
         <spawner-representation>
@@ -225 +225 @@
                     <Billboard position="0,0,0" colour="0.10,0.20,0.30" material="Sphere2" scale=0.1 >
                         <attached>
-                            <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damage" scale=0.7 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=damageboostpickup>
+                            <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageSmall" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=smalldamageboostpickup>
   <DamageBoostPickup
     duration = 10.0
-    damageMultiplier = 20.0
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
+    damageMultiplier = 2.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<Template name=mediumdamageboostpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.10,0.20,0.30" material="Sphere2" scale=0.1 >
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageMedium" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=mediumdamageboostpickup>
+  <DamageBoostPickup
+    duration = 10.0
+    damageMultiplier = 5.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<Template name=largedamageboostpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.10,0.20,0.30" material="Sphere2" scale=0.1 >
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageLarge" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=largedamageboostpickup>
+  <DamageBoostPickup
+    duration = 10.0
+    damageMultiplier = 7.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
 
 <!-- Speed pickups -->

code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc

@@ -70 +70 @@
     void DamageBoostPickup::initialize(void)
     {
-        this->duration_ = 0.0f;
-        this->damageMultiplier_ = 1.0f; //The default damage multiplier.
+        this->duration_ = 0.0f;
+        this->damageMultiplier_ = 1.0f; //The default damage multiplier.
         //Defines who is allowed to pick up the pickup.
         this->addTarget(ClassIdentifier<SpaceShip>::getIdentifier());
@@ -89 +89 @@
 
         stream.clear();
-        stream << this->damageMultiplier_;
+        stream << this->getDamageMultiplier();
         std::string type2 = "damageMultiplier";
         std::string val2 = stream.str();
@@ -116 +116 @@
         {
             this->damageMultiplier_ = damageMultiplier;
-            orxout() << "Set Damage " << damageMultiplier << endl;
-        }
-    }
-
-
-    /**
-    @brief
-        Is called when the pickup has transited from used to unused or the other way around.
+        }
+    }
+
+
+    /**
+    @brief
+        Is called when the pickup has transisted from used to unused or the other way around.
     */
     void DamageBoostPickup::changedUsed(void)
@@ -151 +150 @@
 
             // Saves the old default Damage that is needed to restore the original damage
-            this->olddamageMultiplier_ = ship->getDamageMultiplier();
-            // Sets the new Damage with the damage multiplier.
-            ship->setDamageMultiplier( this->damageMultiplier_ );
+            this->olddamageMultiplier_ = 1.0f;
+            // Sets the new Damage with the damage multiplier
+            ship->setDamageMultiplier(this->getDamageMultiplier());
         }
         else
@@ -206 +205 @@
         DamageBoostPickup* pickup = dynamic_cast<DamageBoostPickup*>(item);
         pickup->setDuration(this->getDuration());
-        
-
+        pickup->setDamageMultiplier(this->getDamageMultiplier());
         pickup->initializeIdentifier();
     }

code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h

@@ -63 +63 @@
             inline float getDuration(void) const
                 { return this->duration_; }
+
             inline void setDuration( float duration );
 
@@ -79 +80 @@
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
-            void setDamageMultiplier(float damageMultiplier);
+            void setDamageMultiplier(float damageMultiplier); //!< Sets the DamageMultiplier according to the XML.
 
 

code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc

@@ -231 +231 @@
     void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
-        // apply multiplier
+        //Applies multiplier given by the DamageBoost Pickup.
         Pawn *test = dynamic_cast<Pawn *>(originator);
         if( test != NULL )
-        { orxout() << "Test " << damage << endl;
+        {
           damage *= originator->getDamageMultiplier();
         }

code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.h

@@ -162 +162 @@
                 { return this->numexplosionchunks_; }
 
-            // not that beautiful yet
+            // These are used with the Damage Boost Pickup to use the damage multiplier.
             inline void setDamageMultiplier(float multiplier)
                 { this->damageMultiplier_ = multiplier; }
@@ -215 +215 @@
             float reloadWaitCountdown_;
 
-            // modifiers
-            float damageMultiplier_;
+            // Modifier
+            float damageMultiplier_; // Used by the Damage Boost Pickup.
 
             WeakPtr<Pawn> lastHitOriginator_;