Changeset 10516 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Jan 30, 2007, 9:17:21 PM (18 years ago)

Author:

patrick

Message:

merged playability back to trunk

Location:

trunk/src/world_entities/space_ships

Files:

• human_scout.cc (copied) (copied from branches/playability/src/world_entities/space_ships/human_scout.cc)
• human_scout.h (copied) (copied from branches/playability/src/world_entities/space_ships/human_scout.h)
• space_ship.cc (modified) (7 diffs)
• space_ship.h (modified) (1 diff)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -174 +174 @@
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-
+/*
   Weapon* spike = new SpikeThrower();
   spike->setName( "SpikeThrower" );
@@ -183 +183 @@
 
   Weapon* acid1 = new AcidLauncher();
-  acid1->setName( "AcidSplasher" );
+  acid1->setName( "AcidSplasher" );*/
 
 
@@ -194 +194 @@
   this->weaponMan.addWeapon( wpLeft3, 2, 4);
   this->weaponMan.addWeapon( wpRight3, 2, 5);
-/*
+
   this->weaponMan.addWeapon( wpLeft1, 3, 0);
   this->weaponMan.addWeapon( wpRight1, 3, 1);
@@ -203 +203 @@
   this->weaponMan.addWeapon( wpLeft3, 3, 4);
   this->weaponMan.addWeapon( wpRight3, 3, 5);
-*/
-
-  this->weaponMan.addWeapon( acid0, 3, 0);
-  this->weaponMan.addWeapon( acid1, 3, 1);
+
+
+//   this->weaponMan.addWeapon( acid0, 3, 0);
+//   this->weaponMan.addWeapon( acid1, 3, 1);
 
 
   this->secWeaponMan.addWeapon( cannon, 0, 2);
-  this->secWeaponMan.addWeapon( spike, 1, 3);
+//   this->secWeaponMan.addWeapon( spike, 1, 3);
 //   this->secWeaponMan.addWeapon( acid0, 2, 2);
 //   this->secWeaponMan.addWeapon( acid1, 2, 3);
 
 
-  this->weaponMan.changeWeaponConfig(3);
-  this->secWeaponMan.changeWeaponConfig(1);
+  this->weaponMan.changeWeaponConfig(0);
+  this->secWeaponMan.changeWeaponConfig(0);
+
 
   curWeaponPrimary    = 0;
-  curWeaponSecondary  = 1;
+  curWeaponSecondary  = 0;
 
   Playable::weaponConfigChanged();
@@ -226 +227 @@
 
   weaponEnergyRegen = 10;       // 10 einheiten pro Sekunde
-  engineSpeedBase   = 5;
+  engineSpeedBase   = 15;
   shieldRegen       = 2;
 
@@ -246 +247 @@
 
 
-/*  this->loadModel("models/ships/mantawing.obj");*/
+ this->loadModel("models/spaceships/human_spaceship_fighter.obj", .25);
   //this->setVisibiliy(false);
 
@@ -1087 +1088 @@
 void SpaceShip::previousWeaponConfig()
 {
+  /*
   this->curWeaponPrimary    = (this->curWeaponPrimary + 1) % 3;
   this->weaponMan.changeWeaponConfig(this->curWeaponPrimary);
+  */
+  this->weaponMan.previousWeaponConfig();
   Playable::weaponConfigChanged();
 }

trunk/src/world_entities/space_ships/space_ship.h

@@ -82 +82 @@
     void setPlaymodeXML(const std::string& playmode); //recieves the playmode from a string (useful for script implementation)
     void setActionWidthPercentage(int i);
+    void setTravelSpeed(float f);
     void updateTravelDistance();
     virtual void movement (float dt);