Changeset 8549

Timestamp:

May 23, 2011, 5:46:47 PM (13 years ago)

Author:

simonmie

Message:

some more comments, fixed initial damage missetting

Location:

code/branches/gameimmersion

Files:

• data/levels/includes/weaponSettingsImmTest.oxi (modified) (2 diffs)
• src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi

@@ -30 +30 @@
           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=0 shielddamage=5 healthdamage=200 />
+          <LightningGun mode=1 muzzleoffset="0,0,0" shielddamage=5 />
         </Weapon>
         <Weapon>
@@ -40 +40 @@
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=0 shielddamage=5 healthdamage=200 />
+          <LightningGun mode=1 muzzleoffset="0,0,0" healthdamage=0 shielddamage=500 />
         </Weapon>
         <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 />
-          <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 />
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" shielddamage=50 />
+          <RocketFire mode=3 muzzleoffset="0,0,0" healthdamage=80 shielddamage=20 />
         </Weapon>
       </WeaponPack>

code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -50 +50 @@
 
         this->reloadTime_ = 0.25;
-        this->damage_ = 15;
+        this->damage_ = 0; //default 15
         this->speed_ = 2500;
         this->delay_ = 0;

code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -48 +48 @@
         this->reloadTime_ = 1.0;
         this->bParallelReload_ = false;
-        this->damage_ = 40;
+        this->damage_ = 0; //default 40
         this->speed_ = 1250;
 

code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc

@@ -51 +51 @@
 
         this->reloadTime_ = 0.25;
-        this->damage_ = 15;
+        this->damage_ = 0; //default 15
         this->speed_ = 2500;
         this->delay_ = 0;

code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -45 +45 @@
 
         this->reloadTime_ = 0.25;
-        this->damage_ = 15;
+        this->damage_ = 0; //default 15
         this->speed_ = 1250;
 

code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -45 +45 @@
 
         this->reloadTime_ = 1;
-        this->damage_ = 100;
+        this->damage_ = 0; //default 100
         this->speed_ = 150;
 

code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -48 +48 @@
         this->reloadTime_ = 0.20f;
         this->bParallelReload_ = false;
-        this->damage_ = 100;
+        this->damage_ = 0;
         this->speed_ = 500;
 

code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -50 +50 @@
         this->reloadTime_ = 1;
         this->bParallelReload_ = false;
-        this->damage_ = 100;
+        this->damage_ = 0;
         this->speed_ = 500;
 

code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc

@@ -235 +235 @@
     void Pawn::damage(float damage, Pawn* originator)
     {
+                COUT(3) << "### alte damage-funktion ###" << endl;
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
@@ -246 +247 @@
                 healthdamage += shielddamage-this->getShieldHealth();
                 this->setShieldHealth(0);
-                COUT(3) << "### SHIELD KAPUTT ###" << endl;
             }