Changeset 10758 in orxonox.OLD

Timestamp:

Jun 21, 2007, 1:37:21 AM (17 years ago)

Author:

nicolasc

Message:

added shield functionality, reverted paeddae's MP patch - does not work

Location:

branches/presentation/src

Files:

• lib/graphics/importer/static_model.cc (modified) (1 diff)
• util/hud.h (modified) (1 diff)
• world_entities/npcs/actionbox_enemy.cc (modified) (2 diffs)
• world_entities/projectiles/hbolt.cc (modified) (2 diffs)
• world_entities/projectiles/nadion_blast.cc (modified) (1 diff)
• world_entities/projectiles/plasma_pulse.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (5 diffs)

branches/presentation/src/lib/graphics/importer/static_model.cc

@@ -82 +82 @@
 void StaticModel::finalize()
 {
-  this->extractMountPoints();
+//   this->extractMountPoints();
   data->finalize();
   this->updateBase();

branches/presentation/src/util/hud.h

@@ -101 +101 @@
 
 private:
-  unsigned int             resX;
-  unsigned int             resY;
+  unsigned int              resX;
+  unsigned int              resY;
 
-  float                 hitBarCount;
+  float                     hitBarCount;
   
-  Hud::Playmode                         playmode; 
+  Hud::Playmode             playmode; 
 
-  float                    travelZoneWidth; //the percentage of the screen, the player has got for his movements. should always be a value between 0 and 1;
+  float                     travelZoneWidth; //the percentage of the screen, the player has got for his movements. should always be a value between 0 and 1;
 
-  OrxGui::GLGuiWidget*     energyWidget;
-  OrxGui::GLGuiWidget*     shieldWidget;
-  OrxGui::GLGuiWidget*     healthWidget;
-  OrxGui::GLGuiWidget*     implantWidget;
+  OrxGui::GLGuiWidget*      energyWidget;
+  OrxGui::GLGuiWidget*      shieldWidget;
+  OrxGui::GLGuiWidget*      healthWidget;
+  OrxGui::GLGuiWidget*      implantWidget;
 
-  OrxGui::GLGuiNotifier*   notifier;
-  OrxGui::GLGuiInputLine*  inputLine;
-  OrxGui::GLGuiRadar*      _radar;
-  PNode*                   radarCenterNode;
+  OrxGui::GLGuiNotifier*    notifier;
+  OrxGui::GLGuiInputLine*   inputLine;
+  OrxGui::GLGuiRadar*       _radar;
+  PNode*                    radarCenterNode;
 
   bool                  ifinit;

branches/presentation/src/world_entities/npcs/actionbox_enemy.cc

@@ -283 +283 @@
   fw.normalize();
   fw = fw * 100;
-  
+
   Vector mp = this->getAbsCoor();
   Vector op = mp + fw;
-  
+
   Vector targetPos = State::getPlayer()->getPlayable()->getAbsCoor();
   Vector dv = targetPos - this->getAbsCoor();
@@ -292 +292 @@
   dv *= 100;
   dv += mp;
-  
+
   Vector spUp = this->getAbsDir().inverse().apply( this->getAbsDir().apply( Vector( 0, 1, 0 ) ) );
   spUp.normalize();
   spUp *= 100;
   spUp += mp;
-  
+
   Vector up = fw.cross( dv );
   up += mp;
-  
+
   //PRINTF(0)("DEBUG\n");
   //mp.debug();
   //op.debug();
-  
+
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();

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

@@ -51 +51 @@
   this->setHealthMax(0);
   this->lifeSpan = 3.0;
-
+  this->setDamage(10);
   this->angle = 0;
 //   this->rotationSpeed = 600;
@@ -135 +135 @@
   if (this->hitEntity != entity/* && entity->isA(NPC::staticClassID())*/ && entity->isA(ActionboxEnemy::staticClassID()) || entity == this->target)
     this->destroy( entity );
-  this->hitEntity = entity;
+//   this->hitEntity = entity;
  // dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
   this->deactivate();

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

@@ -59 +59 @@
   this->angle     = 0;
 
+  this->setDamage(5);
+  
   //this->emitter = new DotEmitter(1000, 0, 0);
   this->emitter = new DotEmitter(50, 0, 0);

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

@@ -42 +42 @@
   this->setMinEnergy(2);
   this->setHealthMax(0);
+  this->setDamage(2);
   this->lifeSpan = 2.0;
   this->grid = new Billboard();

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

@@ -428 +428 @@
 void SpaceShip::tick (float time)
 {
+  
+  printf("Ship Status: %f, %f\n", this->getHealth(), this->getShield());
+  
   if(caminit)
   {
@@ -1081 +1084 @@
 void SpaceShip::hit( float damage, WorldEntity * killer )
 {
-  PRINTF(4)("SS HIT: %f\n", this->getHealth() );
+  printf("SS HIT: %f, %f \n", this->getHealth() , this->getShield());
   Playable::hit( damage, killer );
-  PRINTF(4)("SS HIT: %f\n", this->getHealth() );  
+  PRINTF(4)("SS HIT: %f\n", this->getHealth());
 }
 

branches/presentation/src/world_entities/world_entity.cc

@@ -354 +354 @@
   // extract the mount points
   // Patrick: they get extracted automaticaly now within the model finalization process
-  /*
+  
 
   if(model != NULL)
@@ -362 +362 @@
     PRINTF(0)("Worldentity %s has no mount points", (this->getName()).c_str());
     return;
-  }*/
+  }
 
   // first get all mount points from the model
@@ -823 +823 @@
  * @returns the shield left (this->shieldMax - shiled + this->shield)
  */
-float WorldEntity::increaseShield(float shiled)
+float WorldEntity::increaseShield(float shield)
 {
   this->shield += shield;
@@ -1007 +1007 @@
   if ( !damageable )
     return;
-  
-  this->decreaseHealth(damage);
+
+  if (this->getShieldActive())
+    damage = this->decreaseShield(damage*2);
+  this->decreaseHealth(damage/2);
 
   if( this->getHealth() > 0)
@@ -1187 +1189 @@
 
 void WorldEntity::regen(float time){
-  static float tmp;
-  increaseHealth(time * this->healthRegen);
-  increaseShield(time * this->shieldRegen);
+  
+  printf("regen: %f, %f, %f ****************** ", time, this->healthRegen, this->shieldRegen);
+  float tmp;
+  this->increaseHealth(time * this->healthRegen);
+  this->increaseShield(time * this->shieldRegen);