Changeset 6811 in orxonox.OLD for trunk/src/world_entities/weapons/hyperblaster.cc

Timestamp:

Jan 28, 2006, 4:02:06 PM (18 years ago)

Author:

bensch

Message:

More stuff in Cannon and Hyperblast

File:

• trunk/src/world_entities/weapons/hyperblaster.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/hyperblaster.cc

@@ -66 +66 @@
   this->setStateDuration(WS_SHOOTING, 2.0);
   this->setStateDuration(WS_RELOADING, 5.0);
-  this->setStateDuration(WS_ACTIVATING, .1);
-  this->setStateDuration(WS_DEACTIVATING, .4);
+  this->setStateDuration(WS_ACTIVATING, .8);
+  this->setStateDuration(WS_DEACTIVATING, .8);
 
   this->setEnergyMax(10);
@@ -97 +97 @@
 //     animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
 
-  animation2->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animation2->addKeyFrame(Vector(1.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
 
-  animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animation3->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animation2->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
+  animation3->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
 }