Changeset 9996 in orxonox.OLD

Timestamp:

Dec 3, 2006, 6:34:43 PM (17 years ago)

Author:

nicolasc

Message:

updated spaceship to use all 3 blasters, set timing in medium blaster

Location:

branches/playability/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (2 diffs)
• weapons/medium_blaster.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -133 +133 @@
 
   //weapons:
-  Weapon* wpRight = new HeavyBlaster ();
-  wpRight->setName("Blaster Right");
-  Weapon* wpLeft = new HeavyBlaster ();
-  wpLeft->setName("Blaster Left");
+  Weapon* wpRight1 = new LightBlaster ();
+  wpRight1->setName("Light Blaster Right");
+  Weapon* wpLeft1 = new LightBlaster ();
+  wpLeft1->setName("Medium Blaster Left");
+
+  Weapon* wpRight2 = new MediumBlaster ();
+  wpRight2->setName("Light Blaster Right");
+  Weapon* wpLeft2 = new MediumBlaster ();
+  wpLeft2->setName("Medium Blaster Left");
+
+  Weapon* wpRight3 = new HeavyBlaster ();
+  wpRight3->setName("Heavy Blaster Right");
+  Weapon* wpLeft3 = new HeavyBlaster ();
+  wpLeft3->setName("Heavy Blaster Left");
 
   Weapon* cannon = new BoomerangGun();//Cannon();
@@ -142 +152 @@
 
 
-  this->weaponMan.addWeapon( wpLeft, 0, 0);
-  this->weaponMan.addWeapon( wpRight, 0, 1);
+  this->weaponMan.addWeapon( wpLeft1, 0, 0);
+  this->weaponMan.addWeapon( wpRight1, 0, 1);
+  this->weaponMan.addWeapon( wpLeft2, 0, 2);
+  this->weaponMan.addWeapon( wpRight2, 0, 3);
+  this->weaponMan.addWeapon( wpLeft3, 0, 4);
+  this->weaponMan.addWeapon( wpRight3, 0, 5);
   this->secWeaponMan.addWeapon( cannon, 0, 0);
 
   this->weaponMan.changeWeaponConfig(0);
 
-  wpRight->requestAction(WA_ACTIVATE);
-  wpLeft->requestAction(WA_ACTIVATE);
+  wpRight1->requestAction(WA_ACTIVATE);
+  wpLeft1->requestAction(WA_ACTIVATE);
+  wpRight2->requestAction(WA_ACTIVATE);
+  wpLeft2->requestAction(WA_ACTIVATE);
+  wpRight3->requestAction(WA_ACTIVATE);
+  wpLeft3->requestAction(WA_ACTIVATE);
   cannon->requestAction(WA_ACTIVATE);
 

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

@@ -51 +51 @@
   
 
-  this->setStateDuration(WS_SHOOTING, 0.05);
+  this->setStateDuration(WS_SHOOTING, 0.2);
   this->setStateDuration(WS_RELOADING, 0);
   this->setStateDuration(WS_ACTIVATING, .5);

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

@@ -103 +103 @@
 
   this->currentConfigID = 0;
-  this->slotCount = 2;
+  this->slotCount = 6;
   //this->weaponChange;