Changeset 9957 in orxonox.OLD

Timestamp:

Nov 24, 2006, 11:58:23 PM (17 years ago)

Author:

nicolasc

Message:

updated damage() to use tick
added collidesWith() to Projectile

Location:

branches/playability/src/world_entities

Files:

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

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

@@ -122 +122 @@
 
 
+
+void Projectile::collidesWith (WorldEntity* entity, const Vector& location)
+{
+  //if (entity->isA(CL_SPACE_SHIP)) /* FIXME make sure that entity is a spaceship*/
+  //  entity->damage(this->physDamage, this->elecDamage); /* and do some damage*/
+  this->destroy(entity);
+}
+
 /**
  * signal tick, time dependent things will be handled here
@@ -145 +153 @@
 }
 
-
-
 int Projectile::getPhysDamage () { return this->physDamage; }
 

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

@@ -44 +44 @@
     virtual void destroy (WorldEntity* killer);
 
+    virtual void collidesWith (WorldEntity* entity, const Vector& location);   //!< collision handler as used in diverse weapons
+
     virtual void tick (float dt);
     /** @brief convenience function

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

@@ -521 +521 @@
 
 
-int SpaceShip::getShieldCur () { return this->shieldCur; }
-int SpaceShip::getShieldMax () { return this->shieldMax; }
-
-int SpaceShip::getArmorCur () { return this->armorCur; }
-int SpaceShip::getArmorMax () { return this->armorMax; }
-
-int SpaceShip::getElectronicCur () { return this->electronicCur; }
-int SpaceShip::getElectronicMax () { return this->electronicMax; }
-
-void SpaceShip::damage(int pDamage, int eDamage){
+void SpaceShip::damage(float pDamage, float eDamage){
 if( this->shieldActive) {
     if( this->shieldCur > pDamage) {
@@ -540 +531 @@
       pDamage = pDamage - this->shieldCur;
       if( !this->shieldActive) {
-        this->armorCur = pDamage / 2; // remaining damages hits armor at half rate
+        this->armorCur -= pDamage / 2; // remaining damages hits armor at half rate
         this->electronicCur -= eDamage;
       }
@@ -552 +543 @@
 }
 
-void SpaceShip::regen(){
-  int time = 1; // FIXME implement tick time calculation
-  if (this->shieldCur == this->shieldMax){}
-  else {
-    if( this->shieldCur + this->shieldRegen * time > shieldMax)
+void SpaceShip::regen(float time){
+  float tmp;
+  if (this->shieldCur != this->shieldMax){
+    tmp =  this->shieldCur + this->shieldRegen * time;
+    if( tmp > 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->shieldCur = tmp;
+    this->shieldActive = ( this->shieldActive || this->shieldCur > shieldTH);
+  }
+  if (this->electronicCur != this->electronicMax){
+    tmp = this->electronicCur + this->electronicRegen * time;
+    if ( tmp > electronicMax)
       this->electronicCur = this->electronicMax;
     else
-      this->electronicCur += this->electronicRegen * time;
-  }
-}
-
+      this->electronicCur = tmp;
+  }
+}

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

@@ -48 +48 @@
 
     //Functions for GUI
-    virtual int getShieldCur();     //!< returns current shield value
-    virtual int getShieldMax();     //!< returns maximum shield value
+    inline float getShieldCur() { return this->shieldCur; };        //!< returns current shield value
+    inline float getShieldMax() { return this->shieldMax; };        //!< returns maximum shield value
 
-    virtual int getArmorCur();      //!< returns current armor value
-    virtual int getArmorMax();      //!< returns current armor value
+    inline float getArmorCur() { return this->armorCur; };          //!< returns current armor value
+    inline float getArmorMax() { return this->armorMax; };          //!< returns current armor value
 
-    virtual int getElectronicCur(); //!< returns current electronic value
-    virtual int getElectronicMax(); //!< returns current electronic value
+    inline float getElectronicCur() { return this->electronicCur; }; //!< returns current electronic value
+    inline float getElectronicMax() { return this->electronicMax; }; //!< returns current electronic value
 
     //damage handler
-    virtual void damage(int pDamage, int eDamage);  //!< pDamage physical damage, eDamage electronic damage
+    virtual void damage(float pDamage, float eDamage);  //!< pDamage physical damage, eDamage electronic damage
 
   private:
@@ -65 +65 @@
     void calculateVelocity(float time);
 
-    void regen();  //!< handler for shield and electronic regeneration
+    void regen(float time);  //!< handler for shield and electronic regeneration
 
     //ship atributes
-    int         shieldCur;          //!< current shield
-    int         shieldMax;          //!< maximum shield
+    float       shieldCur;          //!< current shield
+    float       shieldMax;          //!< maximum shield
     float       shieldEnergyShare;  //!< percentage of reactor output
-    int         shieldRegen;        //!< shield regeneration rate
-    int         shieldTH;           //!< shield threshhold for reactivation
+    float       shieldRegen;        //!< shield regeneration rate per tick
+    float       shieldTH;           //!< shield threshhold for reactivation
     bool        shieldActive;       //!< wheather the shield is working
 
-    int         armorCur;           //!< current armor
-    int         armorMax;           //!< maximum armor
+    float       armorCur;           //!< current armor
+    float       armorMax;           //!< maximum armor
 
-    int         electronicCur;      //!< current electronic
-    int         electronicMax;      //!< maximum electronic
-    int         electronicRegen;    //!< electronic regenration rate
+    float       electronicCur;      //!< current electronic
+    float       electronicMax;      //!< maximum electronic
+    float       electronicRegen;    //!< electronic regenration rate per tick
 
     int         engineSpeedCur;     //!< speed output