Changeset 10539 in orxonox.OLD for trunk

Timestamp:

Jan 31, 2007, 4:27:32 AM (18 years ago)

Author:

marcscha

Message:

Fixes for weapon systems

Location:

trunk/src/world_entities

Files:

• npcs/npc.cc (modified) (1 diff)
• npcs/npc.h (modified) (1 diff)
• projectiles/swarm_projectile.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (3 diffs)
• weapons/acid_launcher.cc (modified) (2 diffs)
• weapons/heavy_blaster.cc (modified) (1 diff)
• weapons/light_blaster.cc (modified) (1 diff)
• weapons/medium_blaster.cc (modified) (1 diff)
• weapons/swarm_launcher.cc (modified) (3 diffs)
• weapons/weapon_manager.cc (modified) (2 diffs)

trunk/src/world_entities/npcs/npc.cc

@@ -411 +411 @@
  WorldEntity::draw();
 }
+
+// HACK just to make sure they explode as nice as possible :)
+void NPC::hit( float damage, WorldEntity* killer)
+{
+  this->setDamage(killer->getDamage());
+}

trunk/src/world_entities/npcs/npc.h

@@ -37 +37 @@
   void destroy( /*WorldEntity* killer*/ );
 
+  void hit( float damage, WorldEntity* killer);
+
 private:
   inline void setTeamNumber(int number) { teamNumber=number; }

trunk/src/world_entities/projectiles/swarm_projectile.cc

@@ -226 +226 @@
   if( this->target != NULL && (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
   {
-    dynamic_cast<WorldEntity*>(target)->hit(this->getDamage(), this);
-    this->deactivate();
-  }
+    dynamic_cast<WorldEntity*>(target)->destroy(this); //hit(this->getDamage(), this);
+    this->deactivate();
+    PRINTF(0)("Target was hit by Swarm Missile!\n");
+  }
+  else if( this->target == NULL)
+    this->deactivate();
 }
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -190 +190 @@
   this->weaponMan.addWeapon( wpRight1, 0, 1);
 
-  this->weaponMan.addWeapon( wpLeft2, 1, 2);
-  this->weaponMan.addWeapon( wpRight2, 1, 3);
-
-  this->weaponMan.addWeapon( wpLeft3, 2, 4);
-  this->weaponMan.addWeapon( wpRight3, 2, 5);
+  this->weaponMan.addWeapon( wpLeft2, 1, 0);
+  this->weaponMan.addWeapon( wpRight2, 1, 1);
+
+  this->weaponMan.addWeapon( wpLeft3, 2, 0);
+  this->weaponMan.addWeapon( wpRight3, 2, 1);
 
   this->weaponMan.addWeapon( wpLeft1, 3, 0);
@@ -235 +235 @@
   engineEnergyShare = 0.4;
 
-  shieldCur         = 20;
+  shieldCur         = 100;
   shieldMax         = 100;
   shieldTH          = .2 * shieldMax;   // shield power must be 20% before shield kicks in again
 
-  this->setHealth( 20);
+  this->setHealth( 100);
   this->setHealthMax( 100);
 
@@ -507 +507 @@
   glMultMatrixf((float*)matrix);
   //glScalef(2.0, 2.0, 2.0);  // no double rescale
-        // FIXME
 
 

trunk/src/world_entities/weapons/acid_launcher.cc

@@ -124 +124 @@
 void AcidLauncher::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
   {
@@ -130 +132 @@
   }
 
-  if (!Weapon::tickW(dt))
-    return;
+
   /*
   Quaternion quat;

trunk/src/world_entities/weapons/heavy_blaster.cc

@@ -272 +272 @@
 void HeavyBlaster::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
   {

trunk/src/world_entities/weapons/light_blaster.cc

@@ -179 +179 @@
 void LightBlaster::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
   {

trunk/src/world_entities/weapons/medium_blaster.cc

@@ -178 +178 @@
 void MediumBlaster::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
   {

trunk/src/world_entities/weapons/swarm_launcher.cc

@@ -22 +22 @@
 
 #include "model.h"
+#include "world_entities/npcs/npc.h"
 
 #include "state.h"
@@ -157 +158 @@
   PRINTF(0)("fire\n");
   Projectile* pj = NULL;
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
   {
-    if( ((*eIterator)->getOMListNumber() != (this->getOMListNumber() -1)) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
+    if( ((*eIterator)->getOMListNumber() != (this->getOMListNumber())) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
     {
       pj  = this->getProjectile();
@@ -172 +173 @@
       pj->setAbsDir(this->getAbsDir());
       dynamic_cast<SwarmProjectile*>(pj)->setTarget( (PNode*)(*eIterator) );
-      //pj->toList(OM_GROUP_01_PROJ);
       pj->activate();
     }

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -442 +442 @@
     {
       if( firingWeapon->getCurrentState() == WS_SHOOTING) continue;
-
       firingWeapon->requestAction(WA_SHOOT);
     }
@@ -454 +453 @@
 
 /**
- * triggers fire of all weapons in the current weaponconfig
+ * triggers release fire of all weapons in the current weaponconfig
  */
 void WeaponManager::releaseFire()