Changeset 9099 for code/branches/pickup2012/src

Timestamp:

Apr 20, 2012, 4:06:09 PM (13 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/src

Files:

• modules/pickup/PickupPrereqs.h (modified) (1 diff)
• modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

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_;