Changeset 5803 in orxonox.OLD for branches

Timestamp:

Nov 28, 2005, 2:26:28 AM (19 years ago)

Author:

bensch

Message:

orxonox/we: new sounds for all the weapons

Location:

branches/world_entities/src

Files:

• lib/coord/p_node.cc (modified) (2 diffs)
• world_entities/weapons/cannon.cc (modified) (1 diff)
• world_entities/weapons/rocket.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)

branches/world_entities/src/lib/coord/p_node.cc

@@ -334 +334 @@
   }
   this->relDirection = relDir;
+
   this->bRelCoorChanged = true;
 }
@@ -363 +364 @@
   *this->toDirection = relDirSoft;
   this->bias = bias;
+  this->bRelDirChanged = true;
 }
 

branches/world_entities/src/world_entities/weapons/cannon.cc

@@ -87 +87 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+  this->setActionSound(WA_SHOOT, "sound/explo.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/cannon.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);

branches/world_entities/src/world_entities/weapons/rocket.cc

@@ -46 +46 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->lifeSpan = 2;
+  this->lifeSpan = 5;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);

branches/world_entities/src/world_entities/weapons/test_gun.cc

@@ -131 +131 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+  this->setActionSound(WA_SHOOT, "sound/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
+
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);

branches/world_entities/src/world_entities/weapons/turret.cc

@@ -136 +136 @@
     return;
 
-    pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
+  pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 /*+ VECTOR_RAND(13) */
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());