Changeset 9213 in orxonox.OLD

Timestamp:

Jul 5, 2006, 12:13:06 PM (18 years ago)

Author:

patrick

Message:

weapon tuned for good

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (3 diffs)
• projectiles/laser.cc (modified) (2 diffs)
• weapons/fps_sniper_rifle.cc (modified) (1 diff)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -169 +169 @@
 
   this->initWeapon = false;
+  toList( OM_PLAYERS );
 }
 
@@ -366 +367 @@
     velocity -= Vector(0.0, 1.0, 0.0) * this->fallVelocity;
 
-    PRINTF(0)("vel %f\n", this->fallVelocity);
+//     PRINTF(0)("vel %f\n", this->fallVelocity);
   }
   else
@@ -463 +464 @@
 }
 
+
 void FPSPlayer::destroy( WorldEntity* killer )
 {

branches/presentation/src/world_entities/projectiles/laser.cc

@@ -42 +42 @@
 
   this->setMinEnergy(10);
-  this->setHealthMax(10);
+  this->setHealthMax(0);
   this->lifeSpan = 5.0;
 
@@ -88 +88 @@
   }
 
-  this->setHealth(10);
+  this->setDamage(0);
+  this->setHealth(0);
 }
 

branches/presentation/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -145 +145 @@
     return;
 
-  pj->setParent(PNode::getNullParent());
+  pj->setParent(this);
+  pj->setParentMode(PNODE_ROTATE_AND_MOVE);
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*550 + VECTOR_RAND(5) );
 
-  pj->setAbsCoor(this->getEmissionPoint());
+  pj->setAbsCoor(this->getEmissionPoint() + this->getAbsDirX() * 25.0f);
   pj->setAbsDir(this->getAbsDir());
   pj->activate();