[Orxonox-commit 6156] r10814 - in code/branches/fabienHS15: data/levels data/levels/includes data/levels/templates data/overlays src/modules/overlays src/modules/overlays/hud src/modules/weapons src/modules/weapons/projectiles src/modules/weapons/weaponmodes src/orxonox src/orxonox/infos src/orxonox/worldentities/pawns
fvultier at orxonox.net
fvultier at orxonox.net
Tue Nov 17 22:30:25 CET 2015
Author: fvultier
Date: 2015-11-17 22:30:24 +0100 (Tue, 17 Nov 2015)
New Revision: 10814
Added:
code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc
code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.h
Modified:
code/branches/fabienHS15/data/levels/FPS_Level_HS14.oxw
code/branches/fabienHS15/data/levels/iJohnVane_TriptoArea51.oxw
code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi
code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi
code/branches/fabienHS15/data/levels/missionOne.oxw
code/branches/fabienHS15/data/levels/presentationHS13.oxw
code/branches/fabienHS15/data/levels/shieldTest.oxw
code/branches/fabienHS15/data/levels/templates/HeavyCruiser.oxt
code/branches/fabienHS15/data/levels/templates/HeavyCruiserBody.oxt
code/branches/fabienHS15/data/levels/templates/ModularSpaceShipTest.oxt
code/branches/fabienHS15/data/levels/templates/bigship.oxt
code/branches/fabienHS15/data/levels/templates/enemyInvader.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipAssff.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipAssff2.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipCollateralDamage.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipDodgeRace.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipEscort.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipFS15.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipGhost.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipHeartAttack.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipInvader.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipPirate.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipRace.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipRing.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipSpacecruiser.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipSwallow.oxt
code/branches/fabienHS15/data/levels/templates/spaceshipTurret.oxt
code/branches/fabienHS15/data/levels/templates/towerdefensetower.oxt
code/branches/fabienHS15/data/levels/towerDefense.oxw
code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo
code/branches/fabienHS15/src/modules/overlays/CMakeLists.txt
code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h
code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt
code/branches/fabienHS15/src/modules/weapons/WeaponsPrereqs.h
code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc
code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.h
code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc
code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.h
code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc
code/branches/fabienHS15/src/orxonox/OrxonoxPrereqs.h
code/branches/fabienHS15/src/orxonox/infos/PlayerInfo.cc
code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc
code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h
Log:
Modified: code/branches/fabienHS15/data/levels/FPS_Level_HS14.oxw
===================================================================
--- code/branches/fabienHS15/data/levels/FPS_Level_HS14.oxw 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/FPS_Level_HS14.oxw 2015-11-17 21:30:24 UTC (rev 10814)
@@ -66,8 +66,8 @@
initialshieldhealth = "50"
maxshieldhealth = "50"
shieldabsorption = "0.8"
- reloadrate = "100"
- reloadwaittime = "0.1"
+ shieldrechargerate = "100"
+ shieldrechargewaittime = "0.1"
name = "Tanis1"
radarname = "Light Destroyer" >
<attached>
@@ -196,8 +196,8 @@
initialshieldhealth = "200"
maxshieldhealth = "200"
shieldabsorption = "0.8"
- reloadrate = "1"
- reloadwaittime = "1"
+ shieldrechargerate = "1"
+ shieldrechargewaittime = "1"
name = "Tanis0"
radarname = "Tanis big ship" >
</SpaceShip>
@@ -215,8 +215,8 @@
initialshieldhealth = "50"
maxshieldhealth = "50"
shieldabsorption = "0.8"
- reloadrate = "1"
- reloadwaittime = "1"
+ shieldrechargerate = "1"
+ shieldrechargewaittime = "1"
name = "Tanis0"
radarname = "Pirate1" >
@@ -238,8 +238,8 @@
initialshieldhealth = "50"
maxshieldhealth = "50"
shieldabsorption = "0.8"
- reloadrate = "1"
- reloadwaittime = "1"
+ shieldrechargerate = "1"
+ shieldrechargewaittime = "1"
name = "Tanis0"
radarname = "Pirate2" >
Modified: code/branches/fabienHS15/data/levels/iJohnVane_TriptoArea51.oxw
===================================================================
--- code/branches/fabienHS15/data/levels/iJohnVane_TriptoArea51.oxw 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/iJohnVane_TriptoArea51.oxw 2015-11-17 21:30:24 UTC (rev 10814)
@@ -168,8 +168,8 @@
initialshieldhealth = "80"
maxshieldhealth = "120"
shieldabsorption = "0.8"
- reloadrate = "1"
- reloadwaittime = "1"
+ shieldrechargerate = "1"
+ shieldrechargewaittime = "1"
name = "cruiser"
radarname = "Spacecruiser" >
<attached>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -39,7 +39,7 @@
</Weapon>
<Weapon>
<SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=8 />
</Weapon>
</WeaponPack>
</weaponpacks>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -37,7 +37,7 @@
</Weapon>
<Weapon>
<SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 fuel=10 />
</Weapon>
</WeaponPack>
</weaponpacks>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -41,7 +41,7 @@
</Weapon>
<Weapon>
<SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
</Weapon>
</WeaponPack>
</weaponpacks>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -37,7 +37,7 @@
<LaserFire mode=1 munitionpershot=0 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
<GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
<RocketFireOld mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
- <RocketFire mode=4 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=4 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
</Weapon>
</WeaponPack>
<WeaponPack>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -33,7 +33,7 @@
<Weapon>
<LaserFire mode=1 munitionpershot=1 muzzleoffset="2.2,6,16" damage=30 shielddamage=20 />
<LaserFire mode=1 munitionpershot=1 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
<GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
</Weapon>
<Weapon>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -39,7 +39,7 @@
</Weapon>
<Weapon>
<SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
</Weapon>
</WeaponPack>
</weaponpacks>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -33,7 +33,7 @@
</Weapon>
<Weapon>
<SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
</Weapon>
</WeaponPack>
<WeaponPack>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -43,7 +43,7 @@
</Weapon>
<Weapon>
<SimpleRocketFire mode=2 muzzleoffset="0,0,0" shielddamage=50 />
- <RocketFire mode=3 muzzleoffset="0,0,0" healthdamage=80 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" healthdamage=80 shielddamage=20 fuel=10 />
</Weapon>
</WeaponPack>
<WeaponPack>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -43,7 +43,7 @@
</Weapon>
<Weapon>
<SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
</Weapon>
<Weapon>
<attached>
Modified: code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi
===================================================================
--- code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi 2015-11-17 21:30:24 UTC (rev 10814)
@@ -34,7 +34,7 @@
</Weapon>
<Weapon>
<SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
</Weapon>
</WeaponPack>
<WeaponPack>
Modified: code/branches/fabienHS15/data/levels/missionOne.oxw
===================================================================
--- code/branches/fabienHS15/data/levels/missionOne.oxw 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/missionOne.oxw 2015-11-17 21:30:24 UTC (rev 10814)
@@ -1079,8 +1079,8 @@
initialshieldhealth = "80"
maxshieldhealth = "120"
shieldabsorption = "0.8"
- reloadrate = "1"
- reloadwaittime = "1"
+ shieldrechargerate = "1"
+ shieldrechargewaittime = "1"
name = "cruiser"
radarname = "Spacecruiser" >
<attached>
Modified: code/branches/fabienHS15/data/levels/presentationHS13.oxw
===================================================================
--- code/branches/fabienHS15/data/levels/presentationHS13.oxw 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/presentationHS13.oxw 2015-11-17 21:30:24 UTC (rev 10814)
@@ -161,8 +161,8 @@
initialshieldhealth = "80"
maxshieldhealth = "120"
shieldabsorption = "0.8"
- reloadrate = "1"
- reloadwaittime = "1"
+ shieldrechargerate = "1"
+ shieldrechargewaittime = "1"
name = "Tanis1"
radarname = "Tanis Cruiser" >
<attached>
Modified: code/branches/fabienHS15/data/levels/shieldTest.oxw
===================================================================
--- code/branches/fabienHS15/data/levels/shieldTest.oxw 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/shieldTest.oxw 2015-11-17 21:30:24 UTC (rev 10814)
@@ -42,8 +42,8 @@
shieldabsorption= 1
- reloadrate= "10"
- reloadwaittime= 1
+ shieldrechargerate = "10"
+ shieldrechargewaittime = 1
>
<attached>
Modified: code/branches/fabienHS15/data/levels/templates/HeavyCruiser.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/HeavyCruiser.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/HeavyCruiser.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -18,8 +18,8 @@
initialshieldhealth = 30
maxshieldhealth = 50
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 300
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/HeavyCruiserBody.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/HeavyCruiserBody.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/HeavyCruiserBody.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -16,8 +16,8 @@
initialshieldhealth = 300
maxshieldhealth = 500
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 300
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/ModularSpaceShipTest.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/ModularSpaceShipTest.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/ModularSpaceShipTest.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 30
maxshieldhealth = 50
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 100
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/bigship.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/bigship.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/bigship.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 30
maxshieldhealth = 50
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 30
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/enemyInvader.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/enemyInvader.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/enemyInvader.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 10
maxshieldhealth = 10
shieldabsorption = 0.9
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 150
auxilaryThrust = 30
@@ -76,8 +76,8 @@
initialshieldhealth = 20
maxshieldhealth = 20
shieldabsorption = 0.9
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 150
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipAssff.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipAssff.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipAssff.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 30
maxshieldhealth = 50
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 100
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipAssff2.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipAssff2.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipAssff2.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 130
maxshieldhealth = 150
shieldabsorption = 0.95
- reloadrate = 5
- reloadwaittime = 0.5
+ shieldrechargerate = 5
+ shieldrechargewaittime = 0.5
primaryThrust = 100
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipCollateralDamage.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipCollateralDamage.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipCollateralDamage.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -15,8 +15,8 @@
initialshieldhealth = 30
maxshieldhealth = 50
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 100
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipDodgeRace.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipDodgeRace.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipDodgeRace.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 20
maxshieldhealth = 20
shieldabsorption = 0.1
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 150
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipEscort.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipEscort.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipEscort.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 35
maxshieldhealth = 60
shieldabsorption = 0.9
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 150
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipFS15.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipFS15.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipFS15.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 50
maxshieldhealth = 800
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 40
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipGhost.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipGhost.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipGhost.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 100
maxshieldhealth = 150
shieldabsorption = 0.9
- reloadrate = 3
- reloadwaittime = 0.0
+ shieldrechargerate = 3
+ shieldrechargewaittime = 0.0
primaryThrust = 600
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipHeartAttack.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipHeartAttack.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipHeartAttack.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 50
maxshieldhealth = 800
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 40
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipInvader.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipInvader.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipInvader.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 35
maxshieldhealth = 60
shieldabsorption = 0.9
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 150
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipPirate.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipPirate.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipPirate.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 25
maxshieldhealth = 40
shieldabsorption = 0.6
- reloadrate = 2
- reloadwaittime = 0.5
+ shieldrechargerate = 2
+ shieldrechargewaittime = 0.5
primaryThrust = 100
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipRace.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipRace.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipRace.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 30
maxshieldhealth = 50
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 100
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipRing.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipRing.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipRing.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 35
maxshieldhealth = 60
shieldabsorption = 0.9
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 150
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipSpacecruiser.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipSpacecruiser.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipSpacecruiser.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 75
maxshieldhealth = 90
shieldabsorption = 0.9
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 90
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipSwallow.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipSwallow.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipSwallow.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 60
maxshieldhealth = 80
shieldabsorption = 0.75
- reloadrate = 1.5
- reloadwaittime = 0.2
+ shieldrechargerate = 1.5
+ shieldrechargewaittime = 0.2
primaryThrust = 600;
auxilaryThrust = 30;
Modified: code/branches/fabienHS15/data/levels/templates/spaceshipTurret.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/spaceshipTurret.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/spaceshipTurret.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -14,8 +14,8 @@
initialshieldhealth = 30
maxshieldhealth = 50
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 100
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/levels/templates/towerdefensetower.oxt
===================================================================
--- code/branches/fabienHS15/data/levels/templates/towerdefensetower.oxt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/templates/towerdefensetower.oxt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -3,8 +3,8 @@
explosionchunks = 6
- reloadrate=10
- reloadwaittime=5
+ shieldrechargerate=10
+ shieldrechargewaittime=5
collisionType="none"
pitch="0"
yaw="0"
Modified: code/branches/fabienHS15/data/levels/towerDefense.oxw
===================================================================
--- code/branches/fabienHS15/data/levels/towerDefense.oxw 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/levels/towerDefense.oxw 2015-11-17 21:30:24 UTC (rev 10814)
@@ -38,8 +38,8 @@
<Template name=tower1template>
<TowerDefenseTower
explosionchunks=6
- reloadrate=10
- reloadwaittime=5
+ shieldrechargerate=10
+ shieldrechargewaittime=5
collisionType="none"
pitch="0"
yaw="0"
@@ -78,8 +78,8 @@
<Template name=tower2template>
<TowerDefenseTower
explosionchunks=6
- reloadrate=10
- reloadwaittime=5
+ shieldrechargerate=10
+ shieldrechargewaittime=5
collisionType="none"
pitch="0"
yaw="0"
@@ -121,8 +121,8 @@
<Template name=tower3template>
<TowerDefenseTower
explosionchunks=6
- reloadrate=10
- reloadwaittime=5
+ shieldrechargerate=10
+ shieldrechargewaittime=5
collisionType="none"
pitch="0"
yaw="0"
@@ -161,8 +161,8 @@
<Template name=tower4template>
<TowerDefenseTower
explosionchunks=6
- reloadrate=10
- reloadwaittime=5
+ shieldrechargerate=10
+ shieldrechargewaittime=5
collisionType="none"
pitch="0"
yaw="0"
@@ -188,7 +188,7 @@
<DefaultWeaponmodeLink firemode=0 weaponmode=0 />
</links>
<Weapon>
- <RocketFire mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 />
+ <RocketFire mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 fuel=10/>
</Weapon>
</WeaponPack>
</weaponpacks>
@@ -204,8 +204,8 @@
<Template name=tower5template>
<TowerDefenseTower
explosionchunks=6
- reloadrate=10
- reloadwaittime=5
+ shieldrechargerate=10
+ shieldrechargewaittime=5
collisionType="none"
pitch="0"
yaw="0"
@@ -257,8 +257,8 @@
initialshieldhealth = 15
maxshieldhealth = 15
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 1000
auxilaryThrust = 30
@@ -322,8 +322,8 @@
initialshieldhealth = 0
maxshieldhealth = 0
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 100
auxilaryThrust = 30
@@ -395,8 +395,8 @@
initialshieldhealth = 5
maxshieldhealth = 5
shieldabsorption = 0.8
- reloadrate = 1
- reloadwaittime = 1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
primaryThrust = 100
auxilaryThrust = 30
Modified: code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo 2015-11-17 21:30:24 UTC (rev 10814)
@@ -26,6 +26,24 @@
</OverlayGroup>
</Template>
+<Template name="rockethud">
+ <OverlayGroup name = "rockethud" scale = "1, 1">
+ <HUDRocketFuelBar
+ name = "RocketFuelBar1"
+ background = "Orxonox/BarBackground"
+ size = "0.40, 0.04"
+ position = "0.0 , 1.0 "
+ pickpoint = "0, 1"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconFuel"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDRocketFuelBar>
+ </OverlayGroup>
+</Template>
+
<Template name="spaceshiphud">
<OverlayGroup name = "spaceshiphud" scale = "1, 1">
<Map />
Modified: code/branches/fabienHS15/src/modules/overlays/CMakeLists.txt
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/CMakeLists.txt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/overlays/CMakeLists.txt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -15,5 +15,6 @@
OverlaysPrecompiledHeaders.h
LINK_LIBRARIES
orxonox
+ weapons
SOURCE_FILES ${OVERLAYS_SRC_FILES}
)
Modified: code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/overlays/OverlaysPrereqs.h 2015-11-17 21:30:24 UTC (rev 10814)
@@ -89,7 +89,9 @@
class HUDNavigation;
class HUDRadar;
class HUDSpeedBar;
+ class HUDShieldBar;
class HUDBoostBar;
+ class HUDRocketFuelBar;
class HUDTimer;
class HUDAimAssistant;
class KillMessage;
Modified: code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt 2015-11-17 21:30:24 UTC (rev 10814)
@@ -6,6 +6,7 @@
HUDBoostBar.cc
HUDShieldBar.cc
HUDHealthBar.cc
+ HUDRocketFuelBar.cc
HUDTimer.cc
HUDEnemyHealthBar.cc
HUDWeaponMode.cc
Added: code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc (rev 0)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc 2015-11-17 21:30:24 UTC (rev 10814)
@@ -0,0 +1,73 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2src/libraries/core/class/Identifier.h
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabien Vultier
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "HUDRocketFuelBar.h"
+
+#include "core/CoreIncludes.h"
+#include "weapons/projectiles/Rocket.h"
+
+namespace orxonox
+{
+ RegisterClass(HUDRocketFuelBar);
+
+ HUDRocketFuelBar::HUDRocketFuelBar(Context* context) : HUDBar(context)
+ {
+ RegisterObject(HUDRocketFuelBar);
+
+ this->owner_ = NULL;
+ }
+
+ HUDRocketFuelBar::~HUDRocketFuelBar()
+ {
+ }
+
+ void HUDRocketFuelBar::tick(float dt)
+ {
+ SUPER(HUDRocketFuelBar, tick, dt);
+
+ if (this->owner_)
+ {
+ float maxFuel = this->owner_->getMaxFuel();
+ if (maxFuel > 0.0)
+ {
+ this->setValue(this->owner_->getFuel()/maxFuel);
+ }
+ else
+ {
+ this->setValue(0.0);
+ }
+ }
+ }
+
+ void HUDRocketFuelBar::changedOwner()
+ {
+ SUPER(HUDRocketFuelBar, changedOwner);
+
+ this->owner_ = orxonox_cast<Rocket*>(this->getOwner());
+ }
+}
Added: code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.h
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.h (rev 0)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDRocketFuelBar.h 2015-11-17 21:30:24 UTC (rev 10814)
@@ -0,0 +1,58 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabien Vultier
+ * Co-authors:
+ * ...
+ *
+ */
+
+ /**
+ @file HUDRocketFuelBar.h
+ @brief Definition of the HUDRocketFuelBar class. This HUDBar displays the the amount of fuel that a rocket has.
+*/
+
+#ifndef _HUDRocketFuelBar_H__
+#define _HUDRocketFuelBar_H__
+
+#include "overlays/OverlaysPrereqs.h"
+
+#include "tools/interfaces/Tickable.h"
+#include "weapons/projectiles/Rocket.h"
+#include "HUDBar.h"
+
+namespace orxonox
+{
+ class _OverlaysExport HUDRocketFuelBar : public HUDBar, public Tickable
+ {
+ public:
+ HUDRocketFuelBar(Context* context);
+ virtual ~HUDRocketFuelBar();
+
+ virtual void tick(float dt);
+ virtual void changedOwner();
+
+ private:
+ Rocket* owner_;
+ };
+}
+#endif /* _HUDRocketFuelBar_H__ */
Modified: code/branches/fabienHS15/src/modules/weapons/WeaponsPrereqs.h
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/WeaponsPrereqs.h 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/weapons/WeaponsPrereqs.h 2015-11-17 21:30:24 UTC (rev 10814)
@@ -68,19 +68,26 @@
namespace orxonox
{
class MuzzleFlash;
+ class IceGunFreezer;
+ class RocketController;
// munitions
class FusionMunition;
class LaserMunition;
- class ReplenishingMunition;
class RocketMunition;
class GravityBombMuntion;
+ class IceMunition;
+ class LightningMunition;
+ class SplitMunition;
// projectiles
class BillboardProjectile;
class LightningGunProjectile;
class ParticleProjectile;
+ class IceProjectile;
+ class SplitProjectile;
class Projectile;
+ class BasicProjectile;
class Rocket;
class RocketOld;
class SimpleRocket;
@@ -90,6 +97,8 @@
class EnergyDrink;
class FusionFire;
class HsW01;
+ class IceGun;
+ class SplitGun;
class LaserFire;
class LightningGun;
class RocketFire;
Modified: code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc 2015-11-17 21:30:24 UTC (rev 10814)
@@ -65,7 +65,7 @@
RegisterObject(Rocket);// Register the Rocket class to the core
this->localAngularVelocity_ = 0;
- this->lifetime_ = 100.0f;
+ this->lifetime_ = 20.0f;
if (GameMode::isMaster())
{
@@ -99,8 +99,6 @@
collisionShape->setHeight(500);
this->attachCollisionShape(collisionShape);
- this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
-
// Add sound
this->defSndWpnEngine_ = new WorldSound(this->getContext());
this->defSndWpnEngine_->setLooping(true);
@@ -113,6 +111,8 @@
this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
this->defSndWpnLaunch_->setVolume(1.0f);
this->attach(defSndWpnLaunch_);
+
+ this->setHudTemplate("rockethud");
}
else
{
@@ -319,4 +319,14 @@
this->localAngularVelocity_.z += value.x;
}
+ float Rocket::getFuel() const
+ {
+ return this->destroyTimer_.getRemainingTime();
+ }
+
+ void Rocket::setMaxFuel(float fuel)
+ {
+ this->lifetime_ = fuel;
+ this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
+ }
}
Modified: code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.h 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.h 2015-11-17 21:30:24 UTC (rev 10814)
@@ -117,6 +117,17 @@
virtual void fired(unsigned int firemode);
+ /**
+ @brief Set the maximum lifetime of the rocket.
+ */
+ virtual void setMaxFuel(float fuel);
+ /**
+ @brief Get the maximum lifetime of the rocket.
+ */
+ inline float getMaxFuel() const
+ { return lifetime_; }
+ virtual float getFuel() const;
+
private:
Vector3 localAngularVelocity_; //!< Variable to temporarily store accumulated steering command input.
Modified: code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc 2015-11-17 21:30:24 UTC (rev 10814)
@@ -40,7 +40,7 @@
#include "weaponsystem/WeaponPack.h"
#include "weaponsystem/WeaponSystem.h"
#include "worldentities/pawns/Pawn.h"
-
+#include "core/XMLPort.h"
#include "weapons/projectiles/Rocket.h"
namespace orxonox
@@ -55,6 +55,7 @@
this->bParallelReload_ = false;
this->damage_ = 0.0f;
this->speed_ = 500.0f;
+ this->fuel_ = 10.0f;
this->setMunitionName("RocketMunition");
// The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
@@ -68,6 +69,17 @@
/**
@brief
+ XMLPort for the RocketFire. You can define the maximum lifetime of the rockets
+ */
+ void RocketFire::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(RocketFire, XMLPort, xmlelement, mode);
+
+ XMLPortParam(RocketFire, "fuel", setFuel, getFuel, xmlelement, mode);
+ }
+
+ /**
+ @brief
Fires the weapon. Creates the Rocket and fires it.
*/
void RocketFire::fire()
@@ -84,5 +96,6 @@
rocket->setDamage(this->getDamage());
rocket->setShieldDamage(this->getShieldDamage());
rocket->setHealthDamage(this->getHealthDamage());
+ rocket->setMaxFuel(this->fuel_);
}
}
Modified: code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.h
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.h 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.h 2015-11-17 21:30:24 UTC (rev 10814)
@@ -53,10 +53,17 @@
RocketFire(Context* context);
virtual ~RocketFire();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
virtual void fire();
+ inline void setFuel(float fuel)
+ { this->fuel_ = fuel; }
+ inline float getFuel() const
+ { return this->fuel_; }
private:
float speed_; //!< The speed of the Rocket.
+ float fuel_; //!< The maximum lifetime of the rocket
};
}
Modified: code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc 2015-11-17 21:30:24 UTC (rev 10814)
@@ -34,7 +34,7 @@
#include "SplitGun.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
+#include "core/XMLPort.h"
#include "weaponsystem/Weapon.h"
#include "weaponsystem/WeaponPack.h"
#include "weaponsystem/WeaponSystem.h"
Modified: code/branches/fabienHS15/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/fabienHS15/src/orxonox/OrxonoxPrereqs.h 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/orxonox/OrxonoxPrereqs.h 2015-11-17 21:30:24 UTC (rev 10814)
@@ -166,6 +166,7 @@
// weaponsystem
class DefaultWeaponmodeLink;
class Munition;
+ class ReplenishingMunition;
class Weapon;
class WeaponMode;
class WeaponPack;
Modified: code/branches/fabienHS15/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/fabienHS15/src/orxonox/infos/PlayerInfo.cc 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/orxonox/infos/PlayerInfo.cc 2015-11-17 21:30:24 UTC (rev 10814)
@@ -201,6 +201,10 @@
this->controller_->setControllableEntity(entity);
this->changedControllableEntity();
+
+ // HACK-ish
+ if(this->isHumanPlayer())
+ entity->createHud();
}
void PlayerInfo::stopControl()
@@ -252,6 +256,8 @@
if( !entity || this->previousControllableEntity_.size() == 0 )
return;
+ entity->destroyHud(); // HACK-ish
+
this->controllableEntity_->setController(0);
if(this->isHumanPlayer()) // TODO: Multiplayer?
this->controllableEntity_->destroyHud(); // HACK-ish
Modified: code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc 2015-11-17 21:30:24 UTC (rev 10814)
@@ -142,8 +142,8 @@
XMLPortObject(Pawn, WeaponPack, "weaponpacks", addWeaponPackXML, getWeaponPack, xmlelement, mode);
XMLPortObject(Pawn, Munition, "munition", addMunitionXML, getMunitionXML, xmlelement, mode);
- XMLPortParam(Pawn, "reloadrate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
- XMLPortParam(Pawn, "reloadwaittime", setShieldRechargeWaitTime, getShieldRechargeWaitTime, xmlelement, mode).defaultValues(1.0f);
+ XMLPortParam(Pawn, "shieldrechargerate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
+ XMLPortParam(Pawn, "shieldrechargewaittime", setShieldRechargeWaitTime, getShieldRechargeWaitTime, xmlelement, mode).defaultValues(1.0f);
XMLPortParam(Pawn, "explosionSound", setExplosionSound, getExplosionSound, xmlelement, mode);
Modified: code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h 2015-11-17 17:28:25 UTC (rev 10813)
+++ code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h 2015-11-17 21:30:24 UTC (rev 10814)
@@ -45,7 +45,7 @@
its initial health. In every call of the Pawns tick function the game checks whether the pawns health is at
or below zero. If it is, the pawn gets killed.
- Pawns can carry pickups and fire weapons. The can also have shields.
+ Pawns can carry pickups and fire weapons. They can also have shields.
Notice that every Pawn is a ControllableEntity.
*/
More information about the Orxonox-commit
mailing list