Changeset 9099

Timestamp:

Apr 20, 2012, 4:06:09 PM (12 years ago)

Author:

lkevin

Message:

Found a way to implement damage modifiers by
adding a flag to the pawn and then using this
flag in pawn::damage().

More compilation errors to be fixed though, a tick
function seems to be missing.

Location:

code/branches/pickup2012

Files:

• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (1 diff)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

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

@@ -214 +214 @@
         </spawner-representation>
     </PickupRepresentation>
+</Template>
+
+<!-- DamageBoost pickups -->
+
+<Template name=normaldamageboostpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.5>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="asterisk" scale=0.5 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=smallspeedpickup>
+  <SpeedPickup
+    duration = 10.0
+    damageBoost = damageBoost*2
+    activationType = "immediate"
+    durationType = "continuous"
+  />
 </Template>
 

code/branches/pickup2012/src/modules/pickup/PickupPrereqs.h

@@ -86 +86 @@
     class ShieldPickup;
     class ShrinkPickup;
-
+    class DamageBoostPickup;
 }
 

code/branches/pickup2012/src/modules/pickup/items/CMakeLists.txt

@@ -7 +7 @@
   ShieldPickup.cc
   ShrinkPickup.cc
+  DamageBoostPickup.cc
 )

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

@@ -75 +75 @@
         this->lastHitOriginator_ = 0;
 
+        // set damage multiplier to default value 1, meaning nominal damage
+        this->damageMultiplier_ = 1;
+
         this->spawnparticleduration_ = 3.0f;
 
@@ -228 +231 @@
     void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
+        // apply multiplier
+        damage *= originator->getDamageMultiplier();
+
+        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
             if (shielddamage >= this->getShieldHealth())

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

@@ -162 +162 @@
                 { return this->numexplosionchunks_; }
 
+            // not that beautiful yet
+            inline void setDamageMultiplier(float multiplier)
+                { this->damageMultiplier_ = multiplier; }
+            inline float getDamageMultiplier()
+                { return this->damageMultiplier_; }
+
+
             virtual void startLocalHumanControl();
 
@@ -208 +215 @@
             float reloadWaitCountdown_;
 
+            // modifiers
+            float damageMultiplier_;
+
             WeakPtr<Pawn> lastHitOriginator_;