Changeset 9953 in orxonox.OLD

Timestamp:

Nov 24, 2006, 9:10:24 AM (18 years ago)

Author:

nicolasc

Message:

renamed shield() to regen as Regenration Handler, defined damage in projectile

Location:

branches/playability/src/world_entities

Files:

• projectiles/projectile.cc (modified) (1 diff)
• projectiles/projectile.h (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (2 diffs)
• space_ships/space_ship.h (modified) (2 diffs)

branches/playability/src/world_entities/projectiles/projectile.cc

@@ -145 +145 @@
 }
 
+
+
+int Projectile::getPhysDamage () { return this->physDamage; }
+
+int Projectile::getElecDamage () { return this->elecDamage; }

branches/playability/src/world_entities/projectiles/projectile.h

@@ -50 +50 @@
     inline bool tickLifeCycle(float dt ) { this->lifeCycle += dt/this->lifeSpan;  return(unlikely(this->lifeCycle >= 1)); }
 
+    virtual int getPhysDamage();
+    virtual int getElecDamage();
 
   protected:
@@ -69 +71 @@
     OrxSound::SoundBuffer  explosionBuffer;
     OrxSound::SoundBuffer  engineBuffer;
+
+    int                     physDamage;               //!< damage to shield and armor
+    int                     elecDamage;               //!< damage to elctronic
 };
 

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

@@ -540 +540 @@
       pDamage = pDamage - this->shieldCur;
       if( !this->shieldActive) {
-        this->armorCur = this->armorCur -  pDamage / 2; // remaining damages hits armor at half rate
-        this->electronicCur = this->electronicCur - eDamage;
+        this->armorCur = pDamage / 2; // remaining damages hits armor at half rate
+        this->electronicCur -= eDamage;
       }
     }
@@ -552 +552 @@
 }
 
-void SpaceShip::shield(){
+void SpaceShip::regen(){
   int time = 1; // FIXME implement tick time calculation
-  if( this->shieldCur + this->shieldRegen * time > shieldMax)
-    this->shield = this->shieldMax;
-  else
-    this-shieldCur = this->shieldCur + this->shieldRegen * time;
-
-  if( this->shieldCur > shieldTH)
-    this->shieldActive = true;
-}
-
+  if (this->shieldCur == this->shieldMax){}
+  else {
+    if( this->shieldCur + this->shieldRegen * time > shieldMax)
+      this->shieldCur = this->shieldMax;
+    else
+      this->shieldCur += this->shieldRegen * time;
+    if( this->shieldCur > shieldTH)
+      this->shieldActive = true;
+  }
+  if (this->electronicCur == this->electronicMax){}
+  else{
+    if (this->electronicCur + this->electronicRegen * time > electronicMax)
+      this->electronicCur = this->electronicMax;
+    else
+      this->electronicCur += this->electronicRegen * time;
+  }
+}
+

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

@@ -65 +65 @@
     void calculateVelocity(float time);
 
-    void shield();  //!< shield handeler
+    void regen();  //!< handler for shield and electronic regeneration
 
     //ship atributes
@@ -80 +80 @@
     int         electronicCur;      //!< current electronic
     int         electronicMax;      //!< maximum electronic
+    int         electronicRegen;    //!< electronic regenration rate
 
     int         engineSpeedCur;     //!< speed output