Changeset 10044 in orxonox.OLD

Timestamp:

Dec 12, 2006, 8:52:37 PM (17 years ago)

Author:

nicolasc

Message:

moved bolt.* to lbolt.* for maning consistency, plz rebuild
messing around in lbolt, something serious
updated lbolt model + texture

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• projectiles/bolt.cc (deleted)
• projectiles/bolt.h (deleted)
• projectiles/lbolt.cc (added)
• projectiles/lbolt.h (added)
• weapons/heavy_blaster.cc (modified) (1 diff)
• weapons/light_blaster.cc (modified) (2 diffs)

branches/playability/src/world_entities/WorldEntities.am

@@ -42 +42 @@
                 world_entities/weapons/swarm_launcher.cc \
                 \
-                world_entities/projectiles/bolt.cc \
+                world_entities/projectiles/lbolt.cc \
                 world_entities/projectiles/mbolt.cc \
                 world_entities/projectiles/hbolt.cc \
@@ -154 +154 @@
                 weapons/swarm_launcher.h \
                 \
-                projectiles/bolt.h \
+                projectiles/lbolt.h \
                 projectiles/mbolt.h \
                 projectiles/hbolt.h \

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -95 +95 @@
   pj->setParent(PNode::getNullParent());
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
 
   pj->setAbsCoor(this->getEmissionPoint());

branches/playability/src/world_entities/weapons/light_blaster.cc

@@ -63 +63 @@
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
   //this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
-  this->setProjectileTypeC("Bolt");   // Working; FIXME: add textures
+  this->setProjectileTypeC("LBolt");   // Working; FIXME: add textures
   this->prepareProjectiles(100);
 
@@ -93 +93 @@
   pj->setParent(PNode::getNullParent());
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*80);
 
   pj->setAbsCoor(this->getEmissionPoint());