Changeset 8184 for code/branches/gameimmersion

Timestamp:

Apr 4, 2011, 2:53:53 PM (14 years ago)

Author:

simonmie

Message:

Added maxShieldHealth

Location:

code/branches/gameimmersion

Files:

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

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

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

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

@@ -72 +72 @@
         this->reloadWaitTime_ = 1.0f;
         this->reloadWaitCountdown_ = 0;
+
+        this->maxShieldHealth_ = 0;
 ////////////////////////end me
 
@@ -127 +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);
 
 /////// end me
-
+        //TODO: DEFINES fuer defaultwerte (hier und weiter oben dieselben)
     }
 
@@ -160 +163 @@
         }
 
-        // TODO max. shield hinzufuegen
 ////////end me
         if (GameMode::isMaster())
@@ -211 +213 @@
     }
 
+    void Pawn::setMaxShieldHealth(float maxshieldhealth)
+    {
+        this->maxShieldHealth_ = maxshieldhealth;
+    }
+
+    void Pawn::setShieldHealth(float shieldHealth)
+    {
+        this->shieldHealth_ = std::min(shieldHealth, this->maxShieldHealth_);
+    }
 
 ///////////////end me
@@ -219 +230 @@
     }
 
+//////////////////me edit
     void Pawn::damage(float damage, Pawn* originator)
     {
@@ -249 +261 @@
         }
     }
+////////////////////end edit
 
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage)

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

@@ -76 +76 @@
 
             virtual void decreaseReloadCountdownTime(float dt);
+
+            virtual void setMaxShieldHealth(float maxshieldhealth);
+            inline float getMaxShieldHealth() const
+                { return this->maxShieldHealth_; }
 
 ///////////////////////////////// end me
@@ -97 +101 @@
                 { return this->initialHealth_; }
 
-            inline void setShieldHealth(float shieldHealth)
-            { this->shieldHealth_ = shieldHealth; }
+            virtual void setShieldHealth(float shieldHealth);
+
             inline float getShieldHealth()
             { return this->shieldHealth_; }
@@ -181 +185 @@
             float reloadWaitCountdown_;
 
+            float maxShieldHealth_;
+
 ////////////////////////// end me