Changeset 7072 in orxonox.OLD

Timestamp:

Feb 7, 2006, 3:06:34 PM (18 years ago)

Author:

bensch

Message:

collision stuff

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (3 diffs)
• playable.h (modified) (1 diff)
• projectiles/guided_missile.cc (modified) (2 diffs)
• space_ships/hover.cc (modified) (1 diff)
• space_ships/hover.h (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (2 diffs)
• weapons/targeting_turret.cc (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -125 +125 @@
 void Playable::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_PROJECTILE) && !State::isOnline() )
-  {
-    this->decreaseHealth(entity->getHealth());
+  if (entity == collider)
+    return;
+  collider = entity;
+
+  if (entity->isA(CL_PROJECTILE))
+  {
+    this->decreaseHealth(entity->getHealth() *(float)rand()/(float)RAND_MAX);
     // EXTREME HACK
-    if (this->getHealth() == 0.0f)
+    if (this->getHealth() <= 0.0f)
     {
       this->die();
@@ -157 +161 @@
   PRINTF(0)("Playable dies\n");
   // only if this is the spaceship of the player
+  if (State::isOnline())
+  {
   if( this == State::getPlayer()->getPlayable())
     State::getGameRules()->onPlayerDeath();
@@ -168 +174 @@
   this->setAbsCoor(0, 0, 0);
   this->emitter->setSystem(NULL);
+  }
 }
 

trunk/src/world_entities/playable.h

@@ -88 +88 @@
     DotEmitter*           emitter;
     SpriteParticles*      explosionParticles;
+
+    WorldEntity* collider;
 };
 

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -43 +43 @@
   this->setHealthMax(10);
   this->lifeSpan = 10.0;
-  this->agility = 10;
+  this->agility = 1;
   this->maxVelocity = 75;
 
@@ -117 +117 @@
   this->emitter->setEmissionRate(45.0);
   this->emitter->setEmissionVelocity(0.0);
+
+  this->setHealth(10.0* (float)rand()/(float)RAND_MAX);
 }
 

trunk/src/world_entities/space_ships/hover.cc

@@ -226 +226 @@
  */
 void Hover::collidesWith(WorldEntity* entity, const Vector& location)
-{}
+{
+  Playable::collidesWith(entity, location);
+}
 
 

trunk/src/world_entities/space_ships/hover.h

@@ -67 +67 @@
     float                 airViscosity;
 
+    WorldEntity* hitEntity;
 };
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -116 +116 @@
   this->acceleration = 10.0f;
   this->airFriction = 2.0f;
+
+  this->setHealthMax(100);
+  this->setHealth(100);
+
 
   // camera - issue
@@ -256 +260 @@
  */
 void TurbineHover::collidesWith(WorldEntity* entity, const Vector& location)
-{}
+{
+  Playable::collidesWith(entity, location);
+}
 
 

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -76 +76 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setStateDuration(WS_SHOOTING, .1);
-  this->setStateDuration(WS_RELOADING, .1);
+  this->setStateDuration(WS_SHOOTING, .5);
+  this->setStateDuration(WS_RELOADING, 1.0);
   this->setStateDuration(WS_ACTIVATING, .4);
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setEnergyMax(10000);
-  this->increaseEnergy(100000);
+  this->setEnergyMax(100);
+  this->increaseEnergy(100);
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);