Changeset 8187

Timestamp:

Apr 4, 2011, 3:45:09 PM (14 years ago)

Author:

simonmie

Message:

Added initialShieldHealth and minor changes

Location:

code/branches/gameimmersion

Files:

• data/levels/test-immersion-shield-01.oxw (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/gameimmersion/data/levels/test-immersion-shield-01.oxw

@@ -36 +36 @@
         angularDamping=         "0.7"
 
-        health=                 200
+        health=                 100
         maxhealth=              150
-        inithealth=             100
+        inithealth=             200
 
-        shieldhealth=           200
+        shieldhealth=           100
+        initialshieldhealth=    200
+        maxshieldhealth=        250
+
         shieldabsorption=       1
-        maxshieldhealth=        250
 
         reloadrate=             "10"

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

@@ -129 +129 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+
         XMLPortParam(Pawn, "maxshieldhealth", setMaxShieldHealth, getMaxShieldHealth, xmlelement, mode).defaultValues(100);
+        XMLPortParam(Pawn, "initialshieldhealth", setInitialShieldHealth, getInitialShieldHealth, xmlelement, mode).defaultValues(0);
 
 /////// end me
@@ -227 +229 @@
     void Pawn::setHealth(float health)
     {
-        this->health_ = std::min(health, this->maxHealth_);
+        this->health_ = std::min(health, this->maxHealth_); //Health can't be set to a value bigger than maxHealth, otherwise it will be reduced at first hit
     }
 

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

@@ -80 +80 @@
             inline float getMaxShieldHealth() const
                 { return this->maxShieldHealth_; }
+
+            inline void setInitialShieldHealth(float initialshieldhealth)
+                { this->initialShieldHealth_ = initialshieldhealth; this->setShieldHealth(initialshieldhealth); }
+            inline float getInitialShieldHealth() const
+                { return this->initialShieldHealth_; }
+
+            inline void restoreInitialShieldHealth()
+                { this->setShieldHealth(this->initialShieldHealth_); }
+            inline void restoreMaxShieldHealth()
+                { this->setShieldHealth(this->maxShieldHealth_); }
+
 
 ///////////////////////////////// end me
@@ -186 +197 @@
 
             float maxShieldHealth_;
+            float initialShieldHealth_;
 
 ////////////////////////// end me