Changeset 9223 in orxonox.OLD

Timestamp:

Jul 5, 2006, 1:24:51 PM (18 years ago)

Author:

bensch

Message:

better ship, shoots

Location:

branches/presentation/src/world_entities

Files:

• projectiles/boomerang_projectile.cc (modified) (1 diff)
• space_ships/spacecraft_2d.cc (modified) (2 diffs)

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

@@ -42 +42 @@
   this->setMinEnergy(1);
   this->setHealthMax(10);
-  this->lifeSpan = 4.0;
+  this->lifeSpan = 2.0;
   this->agility = 3.5;
-  this->maxVelocity = 75;
+  this->maxVelocity = 150;
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);

branches/presentation/src/world_entities/space_ships/spacecraft_2d.cc

@@ -90 +90 @@
   wpLeft->setName("Cannon_Left");
 
-  Weapon* turretLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
+  Weapon* turretLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_BOOMERANG_GUN));
   wpRight->setName("Turret_Left");
-  Weapon* turretRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
+  Weapon* turretRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_BOOMERANG_GUN));
   wpLeft->setName("Turret_Right");
 
@@ -200 +200 @@
   this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager().setSlotPosition(2, Vector(-1.63, .809, -.003));
-  this->getWeaponManager().setSlotCapability(2, WTYPE_HEAVY);
-
   /// TODO: THESE ARE TOO MUCH
-  this->getWeaponManager().setSlotPosition(3, Vector(-0.351, -.238, 1.406) * 5.0);
-  this->getWeaponManager().setSlotDirection(3, Quaternion(-122/180 * M_PI, Vector(0,1,0)));
-
-  this->getWeaponManager().setSlotPosition(4, Vector(-0.351, -.238, -1.406) * 5.0);
-  this->getWeaponManager().setSlotDirection(4, Quaternion(122/180 * M_PI, Vector(0,1,0)));
+  this->getWeaponManager().setSlotPosition(2, Vector(-0.351, -.238, 1.406) * 5.0);
+  this->getWeaponManager().setSlotDirection(2, Quaternion(-1.7, Vector(0,1,0)));
+
+  this->getWeaponManager().setSlotPosition(3, Vector(-0.351, -.238, -1.406) * 5.0);
+  this->getWeaponManager().setSlotDirection(3, Quaternion(1.7, Vector(0,1,0)));
 
   this->cameraNode.setRelCoor(1,5,0);