Changeset 7076 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 3:46:43 PM (19 years ago)

Author:

bensch

Message:

weaponAdjustment

Location:

trunk/src

Files:

• lib/coord/p_node.h (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (2 diffs)
• world_entities/npcs/ground_turret.cc (modified) (6 diffs)
• world_entities/npcs/ground_turret.h (modified) (1 diff)
• world_entities/npcs/npc.cc (modified) (1 diff)
• world_entities/projectiles/hyperblast.cc (modified) (2 diffs)
• world_entities/skysphere.h (modified) (1 diff)
• world_entities/weapons/hyperblaster.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

trunk/src/lib/coord/p_node.h

@@ -185 +185 @@
   static const char* parentingModeToChar(int parentingMode);
   static PARENT_MODE charToParentingMode(const char* parentingMode);
+  float distance(const PNode* node) const { return (this->getAbsCoor() - node->getAbsCoor()).len(); };
 
   int       writeState(const byte* data, int length, int sender);

trunk/src/story_entities/game_world_data.cc

@@ -230 +230 @@
   // Create a Player
   this->localPlayer = new Player();
+  State::setPlayer(this->localPlayer);
 
   Playable* playable;
@@ -251 +252 @@
   FastFactory::flushAll(true);
   GraphicsEngine::getInstance()->displayFPS(false);
-
+  State::setPlayer(NULL);
   // erease everything that is left.
   // delete PNode::getNullParent(); // not needed as this is also done in the next step (and also much cleaner)

trunk/src/world_entities/npcs/ground_turret.cc

@@ -18 +18 @@
 #include "world_entities/weapons/turret.h"
 
+#include "state.h"
+#include "playable.h"
+#include "player.h"
+
+
 #include "factory.h"
 #include "network_game_manager.h"
@@ -58 +63 @@
   this->left = NULL;
   this->right = NULL;
+
+  this->setHealthMax(300);
+  this->setHealth(300);
 
   /*  left = new Turret();
@@ -113 +121 @@
 void GroundTurret::tick(float dt)
 {
+  if(this->getHealth() > 0.0f && State::getPlayer() &&
+     State::getPlayer()->getPlayable() &&
+     State::getPlayer()->getPlayable()->distance(this) < 150) // HACK
+  {
   if (likely(this->left != NULL))
   {
@@ -123 +135 @@
     this->right->requestAction(WA_SHOOT);
   }
-
+  }
 }
 
@@ -140 +152 @@
 
 
-/**
- *
- *
- */
-void GroundTurret::collidesWith (WorldEntity* entity, const Vector& location)
-{
-  if (entity->isA(CL_PROJECTILE))
-    this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);
-}
 
 /**
@@ -166 +169 @@
 {
 
+}
+
+void GroundTurret::destroy()
+{
+  this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);
 }
 

trunk/src/world_entities/npcs/ground_turret.h

@@ -25 +25 @@
   virtual void leftWorld ();
 
+  virtual void destroy();
 
   virtual void draw() const;
   virtual void tick(float time);
-  virtual void collidesWith (WorldEntity* entity, const Vector& location);
 
   virtual int writeBytes(const byte* data, int length, int sender);

trunk/src/world_entities/npcs/npc.cc

@@ -41 +41 @@
 void NPC::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_PROJECTILE) && entity != this->collider)
+
+  if (entity == collider)
+    return;
+  collider = entity;
+
+  if (entity->isA(CL_PROJECTILE))
   {
-//    PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
-//    this->applyForce(Vector(0,0,0)-location*1000);
-    if ((float)rand()/RAND_MAX < .3)
+    this->decreaseHealth(entity->getHealth() *(float)rand()/(float)RAND_MAX);
+    // EXTREME HACK
+    if (this->getHealth() <= 0.0f)
     {
-      WorldEntity* powerUp = new TurretPowerUp();
-      powerUp->setAbsCoor(this->getAbsCoor());
-//      powerUp->toList(OM_COMMON);
+      this->destroy();
     }
-    else if ((float)rand()/RAND_MAX < .3)
-    {
-      WorldEntity* powerUp = new LaserPowerUp();
-      powerUp->setAbsCoor(this->getAbsCoor());
-      powerUp->toList(OM_COMMON);
-    }
-    this->toList(OM_DEAD);
-    this->removeNode();
+  }
 
-      this->collider = entity;
-  }
-  //  else if (entity->isA(CL_PLAYER))
-  //    this->applyForce(Vector(0,0,0)-location*100);
-  else if (entity->isA(CL_NPC))
-  {
-    this->setVisibiliy(false);
-    this->toList(OM_DEAD);
-    this->removeNode();
-  }
+
+// //    PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
+// //    this->applyForce(Vector(0,0,0)-location*1000);
+//     if ((float)rand()/RAND_MAX < .3)
+//     {
+//       WorldEntity* powerUp = new TurretPowerUp();
+//       powerUp->setAbsCoor(this->getAbsCoor());
+// //      powerUp->toList(OM_COMMON);
+//     }
+//     else if ((float)rand()/RAND_MAX < .3)
+//     {
+//       WorldEntity* powerUp = new LaserPowerUp();
+//       powerUp->setAbsCoor(this->getAbsCoor());
+//       powerUp->toList(OM_COMMON);
+//     }
+//     this->toList(OM_DEAD);
+//     this->removeNode();
+//
+//       this->collider = entity;
+//   }
+//   //  else if (entity->isA(CL_PLAYER))
+//   //    this->applyForce(Vector(0,0,0)-location*100);
+//   else if (entity->isA(CL_NPC))
+//   {
+//     this->setVisibiliy(false);
+//     this->toList(OM_DEAD);
+//     this->removeNode();
+//   }
 }

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -41 +41 @@
   this->loadModel("models/projectiles/hyperblast.obj", 5);
 
-  this->setMinEnergy(1);
-  this->setHealthMax(10);
+  this->setMinEnergy(50);
+  this->setHealthMax(1000);
   this->lifeSpan = 1;
   this->size = 4.0;
@@ -91 +91 @@
   this->emitter->setEmissionRate(5000.0);
   this->emitter->setEmissionVelocity(50.0);
+
+  this->setHealth(200);
 }
 

trunk/src/world_entities/skysphere.h

@@ -28 +28 @@
   Skysphere(char* fileName = NULL);
   virtual ~Skysphere();
-  void destroy();
 
   void setRadius(float radius);

trunk/src/world_entities/weapons/hyperblaster.cc

@@ -69 +69 @@
   this->setStateDuration(WS_DEACTIVATING, .8);
 
-  this->setEnergyMax(10);
-  this->increaseEnergy(10);
+  this->setEnergyMax(5000);
+  this->increaseEnergy(5000);
   //this->minCharge = 2;
 

trunk/src/world_entities/world_entity.h

@@ -55 +55 @@
   virtual void postSpawn ();
   virtual void leaveWorld ();
+  virtual void destroy() {};
 
   virtual void tick (float time);