[Orxonox-commit 3875] r8549 - in code/branches/gameimmersion: data/levels/includes src/modules/weapons/weaponmodes src/orxonox/worldentities/pawns
simonmie at orxonox.net
simonmie at orxonox.net
Mon May 23 17:46:47 CEST 2011
Author: simonmie
Date: 2011-05-23 17:46:47 +0200 (Mon, 23 May 2011)
New Revision: 8549
Modified:
code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi
code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc
code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc
code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc
code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc
code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc
code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc
code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc
Log:
some more comments, fixed initial damage missetting
Modified: code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi
===================================================================
--- code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi 2011-05-23 15:46:47 UTC (rev 8549)
@@ -29,7 +29,7 @@
</attached>
<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>
<attached>
@@ -39,11 +39,11 @@
</attached>
<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>
<WeaponPack>
Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc 2011-05-23 15:46:47 UTC (rev 8549)
@@ -49,7 +49,7 @@
RegisterObject(EnergyDrink);
this->reloadTime_ = 0.25;
- this->damage_ = 15;
+ this->damage_ = 0; //default 15
this->speed_ = 2500;
this->delay_ = 0;
this->setMunitionName("FusionMunition");
Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc 2011-05-23 15:46:47 UTC (rev 8549)
@@ -47,7 +47,7 @@
this->reloadTime_ = 1.0;
this->bParallelReload_ = false;
- this->damage_ = 40;
+ this->damage_ = 0; //default 40
this->speed_ = 1250;
this->setMunitionName("FusionMunition");
Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc 2011-05-23 15:46:47 UTC (rev 8549)
@@ -50,7 +50,7 @@
RegisterObject(HsW01);
this->reloadTime_ = 0.25;
- this->damage_ = 15;
+ this->damage_ = 0; //default 15
this->speed_ = 2500;
this->delay_ = 0;
this->setMunitionName("LaserMunition");
Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc 2011-05-23 15:46:47 UTC (rev 8549)
@@ -44,7 +44,7 @@
RegisterObject(LaserFire);
this->reloadTime_ = 0.25;
- this->damage_ = 15;
+ this->damage_ = 0; //default 15
this->speed_ = 1250;
this->setMunitionName("LaserMunition");
Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc 2011-05-23 15:46:47 UTC (rev 8549)
@@ -44,7 +44,7 @@
RegisterObject(LightningGun);
this->reloadTime_ = 1;
- this->damage_ = 100;
+ this->damage_ = 0; //default 100
this->speed_ = 150;
this->setMunitionName("LaserMunition");
Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc 2011-05-23 15:46:47 UTC (rev 8549)
@@ -47,7 +47,7 @@
this->reloadTime_ = 0.20f;
this->bParallelReload_ = false;
- this->damage_ = 100;
+ this->damage_ = 0;
this->speed_ = 500;
this->setMunitionName("RocketMunition");
Modified: code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc 2011-05-23 15:46:47 UTC (rev 8549)
@@ -49,7 +49,7 @@
this->reloadTime_ = 1;
this->bParallelReload_ = false;
- this->damage_ = 100;
+ this->damage_ = 0;
this->speed_ = 500;
this->setMunitionName("RocketMunition");
Modified: code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc 2011-05-23 15:20:40 UTC (rev 8548)
+++ code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc 2011-05-23 15:46:47 UTC (rev 8549)
@@ -234,6 +234,7 @@
//////////////////me edit
void Pawn::damage(float damage, Pawn* originator)
{
+ COUT(3) << "### alte damage-funktion ###" << endl;
if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
{
//share the dealt damage to the shield and the Pawn.
@@ -245,7 +246,6 @@
{
healthdamage += shielddamage-this->getShieldHealth();
this->setShieldHealth(0);
- COUT(3) << "### SHIELD KAPUTT ###" << endl;
}
// else { COUT(3) << "## SHIELD : " << this->getShieldHealth() << endl; }
More information about the Orxonox-commit
mailing list