Changeset 3583 in orxonox.OLD for orxonox/trunk/src/world_entities/character_attributes.cc

Timestamp:

Mar 16, 2005, 11:08:33 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: some changes in the character_attributes, projectile and weapon.

File:

• orxonox/trunk/src/world_entities/character_attributes.cc (modified) (23 diffs)

orxonox/trunk/src/world_entities/character_attributes.cc

@@ -49 +49 @@
  */
 void CharacterAttributes::setHealth(int health)
-{}
+{
+  this->health = health;
+}
 
 /**
    \brief adds health to the charater
    \param health
-   \returns health that couldnt be added due to healt limit
+   \returns health that couldnt be added due to healt limit, 0 if everything worked as normal
  */
 int CharacterAttributes::addHealth(int health)
-{}
+{
+  this->health += health;
+  int rest = this->healthMax - this->health;
+  if( rest < 0)
+    {
+      this->health = this->healthMax;
+      return 0;
+    }
+  return rest;
+}
 
 /**
@@ -65 +76 @@
  */
 bool CharacterAttributes::substractHealth(int health)
-{}
+{
+  this->health -= health;
+  if( this->health < 0)
+    {
+      this->health = 0;
+      return false;
+    }
+  return true;
+}
 
 /**
@@ -72 +91 @@
  */
 int CharacterAttributes::getHealth()
-{}
+{
+  return this->health;
+}
 
 
@@ -82 +103 @@
  */
 void CharacterAttributes::setHealthMax(int healthMax)
-{}
+{
+  this->healthMax = healthMax;
+}
 
 /**
@@ -89 +112 @@
  */
 int CharacterAttributes::getHealthMax()
-{}
+{
+  return this->healthMax;
+}
 
 
@@ -98 +123 @@
  */
 void CharacterAttributes::setShieldStrength(int shieldStrength)
-{}
+{
+  this->shieldStrength = shieldStrength;
+}
 
 /**
    \brief adds shield strength
    \param strength
+   
+   there is currently no limit to shieldstrength
  */
 void CharacterAttributes::addShieldStrength(int shiledStrength)
-{}
+{
+  this->shieldStrength += shieldStrength;
+}
 
 /**
    \brief substracts shield strength
    \param strength
-   \returns amount of shield strength below zero after substraction. Magic: Troumble
+   \returns amount of shield strength below zero after substraction. Magic: Troumble. if everything works allright, it returns 0
  */
 int CharacterAttributes::substractShieldStrength(int shieldStrength)
-{}
+{
+  int rest = this->shieldStrength -= shieldStrength;
+  if( rest < 0)
+    {
+      this->shieldStrength = 0;
+      return -rest;
+    }
+  return 0;
+}
 
 /**
@@ -120 +159 @@
  */
 int CharacterAttributes::getShieldStrength()
-{}
+{
+  return this->shieldStrength;
+}
 
 
@@ -127 +168 @@
    \brief sets the amount of base damage dealt to all aircrafts
    \param damage
+
+   There can be a difference between arms that hit a ground/air craft. Eg.
+   a tank will react differently to explosives than something in the air
+   (think about physics)
  */
 void CharacterAttributes::setDamageToAirCraft(int damage)
-{}
+{
+  this->damageToAirCraft = damage;
+}
 
 /**
    \brief gets the amount of base damage
    \returns base damage to aircrafts
+
+   There can be a difference between arms that hit a ground/air craft. Eg.
+   a tank will react differently to explosives than something in the air
+   (think about physics)
  */
 int CharacterAttributes::getDamageToAirCraft()
-{}
+{
+  return this->damageToAirCraft;
+}
 
 
@@ -142 +195 @@
    \brief sets the amount of base damage dealt to all groundcrafts
    \param damage
+
+   There can be a difference between arms that hit a ground/air craft. Eg.
+   a tank will react differently to explosives than something in the air
+   (think about physics)
  */
 void CharacterAttributes::setDamageToGroundCraft(int damage)
-{}
+{
+  this->damageToGroundCraft = damage;
+}
 
 /**
    \briefgets the amount of base damage
    \returns base damage to groundcrafts
+
+   There can be a difference between arms that hit a ground/air craft. Eg.
+   a tank will react differently to explosives than something in the air
+   (think about physics)
  */
 int CharacterAttributes::getDamageToGroundCraft()
-{}
+{
+  return this->damageToGroundCraft;
+}
 
 
@@ -161 +226 @@
  */
 void CharacterAttributes::setDamageLaserModifier(float modifier)
-{}
+{
+  this->damageLaserModifier = modifier;
+}
 
 /**
@@ -170 +237 @@
  */
 float CharacterAttributes::getDamageLaserModifier()
-{}
+{
+  return this->damageLaserModifier;
+}
 
 
@@ -180 +249 @@
  */
 void CharacterAttributes::setDamagePlasmaModifier(float modifier)
-{}
+{
+  this->damagePlasmaModifier = modifier;
+}
 
 /**
@@ -189 +260 @@
  */
 float CharacterAttributes::getDamagePlasmaModifier()
-{}
+{
+  return this->damagePlasmaModifier;
+}
 
 
@@ -199 +272 @@
  */
 void CharacterAttributes::setDamageExplosiveModifier(float modifier)
-{}
+{
+  this->damageExplosiveModifier = modifier;
+}
 
 /**
@@ -208 +283 @@
  */
 float CharacterAttributes::getDamageExplosiveModifier()
-{}
+{
+  return this->damageExplosiveModifier;
+}
 
 
@@ -217 +294 @@
  */
 void CharacterAttributes::setEnergy(int energy)
-{}
+{
+  this->energy = energy;
+}
 
 /**
@@ -225 +304 @@
  */
 int CharacterAttributes::addEnergy(int addEnergy)
-{}
+{
+  this->energy += addEnergy;
+  int rest = this->energyMax - this->energy;
+  if(rest < 0)
+    {
+      this->energy = 0;
+      return rest;
+    }
+  return 0;
+}
 
 /**
@@ -233 +321 @@
  */
 bool CharacterAttributes::substractEnergy(int subEnergy)
-{}
+{
+  this->energy -= subEnergy;
+  if(this->energy < 0)
+    {
+      this->energy = 0;
+      return false;
+    }
+  return true;
+}
 
 /**
@@ -240 +336 @@
  */
 int CharacterAttributes::getEnergy()
-{}
+{
+  return this->energy;
+}
 
 
@@ -247 +345 @@
    \param amount of energy
 */
-void setEnergyConsumption(int energy)
-{}
+void CharacterAttributes::setEnergyConsumption(int energy)
+{
+  this->energyConsumption = energy;
+}
 
 /**
@@ -254 +354 @@
    \returns amount of energy
 */
-int getEnergyConsumption()
-{}
+int CharacterAttributes::getEnergyConsumption()
+{
+  return this->energyConsumption;
+}
   
 
@@ -262 +364 @@
    \param amount of energy
 */
-void setEnergyMax(int energy)
-{}
+void CharacterAttributes::setEnergyMax(int energy)
+{
+  this->energyMax = energy;
+}
 
 /**
@@ -269 +373 @@
    \returns amount of energy
 */
-int getEnergyMax()
-{}
+int CharacterAttributes::getEnergyMax()
+{
+  return this->energyMax;
+}