Changeset 10659 in orxonox.OLD for branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

Timestamp:

May 23, 2007, 7:31:23 PM (17 years ago)

Author:

nicolasc

Message:

initial modularisation in spaceship config

File:

• branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc (modified) (4 diffs)

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -218 +218 @@
 
 
-//   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( acid0, 2, 2);
-//   this->secWeaponMan.addWeapon( acid1, 2, 3);
-
 
   this->weaponMan.changeWeaponConfig(3);
@@ -232 +224 @@
 
 
-//   curWeaponPrimary    = 3;
-//   curWeaponSecondary  = 0;
-
   Playable::weaponConfigChanged();
 
-  reactorOutput     = 10;
-
-  weaponEnergyRegen = 10;       // 10 einheiten pro Sekunde
-  engineSpeedBase   = 15;
-  shieldRegen       = 2;
-
+//   reactorOutput     = 10;
+  setReactor(10);
+//   weaponEnergyRegen = 10;       // 10 einheiten pro Sekunde
+  setWeapon(10);
+//   engineSpeedBase   = 15;
+  setEngine(15);
+//   shieldRegen       = 2;
+/*
   shieldEnergyShare = 0.3;
   weaponEnergyShare = 0.3;
-  engineEnergyShare = 0.4;
-
+  engineEnergyShare = 0.4;*/
+  setEnergyShare(.3,.3,.4);
+/*
   shieldCur         = 100;
   shieldMax         = 100;
-  shieldTH          = .2 * shieldMax;   // shield power must be 20% before shield kicks in again
-
+  shieldTH          = .2 * shieldMax;   // shield power must be 20% before shield kicks in again*/
+  setShield(100, 100, .2, 2);
+/*
   this->setHealth( 100);
-  this->setHealthMax( 100);
-
+  this->setHealthMax( 100);*/
+  setArmor(100, 100);
+/*
   electronicCur = 50;
   electronicMax = 50;
   electronicRegen   = 3;
-  electronicTH      = .7 * electronicMax; // 30% of eDamage can be handled by the ship
-
-
-  this->loadModel("models/spaceships/fighter_redesign9.obj");
+  electronicTH      = .7 * electronicMax; // 30% of eDamage can be handled by the ship*/
+  setElectronic(50, 50, .7, 3.0);
+
+//   this->loadModel("models/spaceships/fighter_redesign9.obj");
   //this->setVisibiliy(false);
 
   bForward = bBackward = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = bFire = bSecFire = false;
 
-  this->setHealthMax(shieldMax);
-  this->setHealth(shieldCur);
+//   this->setHealthMax(shieldMax);
+//   this->setHealth(shieldCur);
 
   this->travelNode = new PNode();
@@ -405 +399 @@
 //   this->trailL->setTexture( "textures/engine.png");
 //
-//   this->trailR = new Trail( 5, 10, .2, this);
+//   this->trailR = new ( 5, 10, .2, this);
 //   this->trailR->setTexture( "textures/engine.png");
 
@@ -437 +431 @@
 
   State::getCamera()->setViewMode(Camera::ViewTop);
+
+  LoadParam(root, "reactor", this, SpaceShip, setReactor);
+  LoadParam(root, "shield", this, SpaceShip, setShield);
+  LoadParam(root, "armor", this, SpaceShip, setArmor);
+  LoadParam(root, "electronic", this, SpaceShip, setElectronic);
+  LoadParam(root, "engine", this, SpaceShip, setEngine);
+  LoadParam(root, "energyshare", this, SpaceShip, setEnergyShare);
+  LoadParam(root, "weapon", this, SpaceShip, setWeapon);
+
 }