Changeset 9963 in orxonox.OLD

Timestamp:

Nov 28, 2006, 2:46:25 PM (17 years ago)

Author:

nicolasc

Message:

Add armorRegen for bioships (—> Zergs for starcraft); updated regen function to check if *regen is available

Location:

branches/playability/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (2 diffs)
• space_ship.h (modified) (1 diff)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -616 +616 @@
 void SpaceShip::regen(float time){
   float tmp;
-  if (this->shieldCur != this->shieldMax){
+  if (this->armorCur != this->armorMax || this->armorRegen != 0){
+    tmp = this->armorCur + this->armorRegen * time;
+    if ( tmp > electronicMax)
+      this->armorCur = this->armorMax;
+    else
+      this->armorCur = tmp;
+  }
+  if (this->shieldCur != this->shieldMax || this->shieldRegen != 0){
     tmp =  this->shieldCur + this->shieldRegen * time;
     if( tmp > shieldMax)
@@ -624 +631 @@
     this->shieldActive = ( this->shieldActive || this->shieldCur > shieldTH);
   }
-  if (this->electronicCur != this->electronicMax){
+  if (this->electronicCur != this->electronicMax || this->electronicRegen != 0){
     tmp = this->electronicCur + this->electronicRegen * time;
     if ( tmp > electronicMax)

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -85 +85 @@
     float       armorCur;           //!< current armor
     float       armorMax;           //!< maximum armor
+    float       armorRegen;         //!< armor regeneration per tick (usable on bioships?)
 
     float       electronicCur;      //!< current electronic