Changeset 10020 in orxonox.OLD for branches

Timestamp:

Dec 6, 2006, 1:11:02 PM (18 years ago)

Author:

nicolasc

Message:

 

Location:

branches/playability/src/world_entities

Files:

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

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

@@ -192 +192 @@
 void Projectile::tick (float dt)
 {
-  float tti;  //!< time to impact
+  float tti = 0;  //!< time to impact
   Vector estTargetDir = (this->target->getRelCoor() + this->target->getVelocity());
   this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * dt ) * this->velocity.len();

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

@@ -51 +51 @@
 
 #include "util/loading/load_param.h"
+#include "time.h"
 
 
@@ -198 +199 @@
   shieldCur         = 20;
   shieldMax         = 100;
+  shieldTH          = .2* shieldMax;   // shield power must be 20% before shield kicks in again
+
+  electronicCur     = 10;
+  electronicMax     = 50;
+  electronicRegen   = 3;
+  electronicTH      = .7 * electronicMax; // 30% of eDamage can be handled by the ship
 
   /*
@@ -372 +379 @@
   //this->airFriction = 0.0f;
 
+  srand(time(0));  //initaialize RNG
+
   this->travelNode->debugDraw();
 }
@@ -492 +501 @@
   this->weaponMan.tick(time);
   this->secWeaponMan.tick(time);
+
+  if( this->systemFailure() )
+    bFire = bSecFire = false;
 
   if( this->bFire)
@@ -755 +767 @@
 
 
+bool SpaceShip::systemFailure() 
+{
+   return (this->electronicCur < /*this->rand() */ this->electronicTH); //TODO cleanup
+}
+
+
 void SpaceShip::enterPlaymode(Playable::Playmode playmode)
 {
@@ -856 +874 @@
   if (this->getRelCoor().z < this->travelDistanceMinus.y) this->setRelCoor(oldCoor.x, oldCoor.y, this->travelDistanceMinus.y);
 
+  if( this->systemFailure() )
+    bForward = bBackward = bLeft = bRight = false;
+
+
   if( this->bForward )
   {

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

@@ -83 +83 @@
     void weaponRegen(float time);   //!< weapon energy regeneration
 
+    inline bool systemFailure();
+
     //WeaponManager         weaponMan;      //!< the primary weapon manager: managing a list of energy weapons to wepaon-slot mapping
     WeaponManager         secWeaponMan;       //!< the secondary weapon manager: managing a list of special weapons to weapon-slot mapping
@@ -104 +106 @@
     float       electronicMax;      //!< maximum electronic
     float       electronicRegen;    //!< electronic regenration rate per tick
+    float       electronicTH;       //!< Threshhold for electronic failure
 
     float       engineSpeedCur;     //!< speed output for movement = speed base + energy share part