Changeset 10036 in orxonox.OLD

Timestamp:

Dec 10, 2006, 1:08:50 PM (17 years ago)

Author:

nicolasc

Message:

equalized energy usage of all blasters
solved the fire echo problem, by implementing the releaseFire()
other spaceships need update

Location:

branches/playability/src/world_entities

Files:

• projectiles/hbolt.cc (modified) (1 diff)
• projectiles/mbolt.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• weapons/medium_blaster.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (3 diffs)
• weapons/weapon_manager.h (modified) (2 diffs)

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

@@ -41 +41 @@
   this->loadModel("models/projectiles/hbolt.obj");
 
-  this->setMinEnergy(20);
+  this->setMinEnergy(10);
   this->setHealthMax(0);
   this->lifeSpan = 5.0;

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

@@ -42 +42 @@
   this->loadModel("models/projectiles/laser.obj");
 
-  this->setMinEnergy(10);
+  this->setMinEnergy(4);
   this->setHealthMax(0);
   this->lifeSpan = 5.0;

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

@@ -512 +512 @@
 
   if( this->bFire)
-  {
     this->weaponMan.fire();
-  }
+  else
+    this->weaponMan.releaseFire();
+
   if( this->bSecFire)
-  {
     this->secWeaponMan.fire();
-    this->bSecFire = !this->bSecFire;   // FIXME This currently is needed to prevent "echo fires" of a second rocket after its cooldown has passed
-  }
+  else
+    this->secWeaponMan.releaseFire();
 
 

branches/playability/src/world_entities/weapons/medium_blaster.cc

@@ -51 +51 @@
   
 
-  this->setStateDuration(WS_SHOOTING, 0.1);   // 10 Schuss pro Sekunde
+  this->setStateDuration(WS_SHOOTING, 0.2);   // 5 Schuss pro Sekunde
 
   this->setStateDuration(WS_RELOADING, 0);

branches/playability/src/world_entities/weapons/weapon.cc

@@ -352 +352 @@
   if (likely(this->isActive()))
   {
-    if (this->requestedAction != WA_NONE)
-      return;
+    //if (this->requestedAction != WA_NONE)
+    //  return;
     PRINTF(5)("next action will be %s in %f seconds\n", actionToChar(action), this->stateDuration);
     this->requestedAction = action;

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -116 +116 @@
 
   this->hideCrosshair();
+
+  this->bFire = false;
 }
 
@@ -441 +443 @@
 }
 
+/**
+ * triggers fire of all weapons in the current weaponconfig
+ */
+void WeaponManager::releaseFire()
+{
+  Weapon* firingWeapon;
+  for(int i = 0; i < this->slotCount; i++)
+  {
+    firingWeapon = this->currentSlotConfig[i].currentWeapon;
+    if( firingWeapon != NULL) firingWeapon->requestAction(WA_NONE);
+  }
+
+  /*
+  this->crosshair->setRotationSpeed(500);
+  this->crossHairSizeAnim->replay();
+  */
+}
 
 /**
@@ -449 +468 @@
 {
   Weapon* tickWeapon;
+
 
   for(int i = 0; i < this->slotCount; i++)

branches/playability/src/world_entities/weapons/weapon_manager.h

@@ -103 +103 @@
     //! @TODO: implement this function (maybe also in Weapon itself)
     void releaseFire();
+    //inline void setFire() { this->bFire = true; };
 
     void tick(float dt);
@@ -131 +132 @@
 
     std::vector<CountPointer<AmmoContainer> > ammo;                   //!< Containers
+
+    bool                    bFire;
 };