Changeset 11052 for code/trunk/src/modules/weapons

Timestamp:

Jan 9, 2016, 6:26:20 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationHS15 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/IceGunFreezer.cc (modified) (1 prop)
• src/modules/weapons/IceGunFreezer.h (modified) (1 prop)
• src/modules/weapons/WeaponsPrereqs.h (modified) (3 diffs)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (2 diffs)
• src/modules/weapons/munitions/FusionMunition.cc (modified) (3 diffs)
• src/modules/weapons/munitions/FusionMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/GravityBombMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/GravityBombMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/IceMunition.cc (modified) (3 diffs, 1 prop)
• src/modules/weapons/munitions/IceMunition.h (modified) (1 diff, 1 prop)
• src/modules/weapons/munitions/LaserMunition.cc (modified) (3 diffs)
• src/modules/weapons/munitions/LaserMunition.h (modified) (2 diffs)
• src/modules/weapons/munitions/LightningMunition.cc (copied) (copied from code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.cc)
• src/modules/weapons/munitions/LightningMunition.h (copied) (copied from code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.h)
• src/modules/weapons/munitions/MineMunition.cc (copied) (copied from code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.cc)
• src/modules/weapons/munitions/MineMunition.h (copied) (copied from code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.h)
• src/modules/weapons/munitions/ReplenishingMunition.cc (deleted)
• src/modules/weapons/munitions/ReplenishingMunition.h (deleted)
• src/modules/weapons/munitions/RocketMunition.cc (modified) (3 diffs)
• src/modules/weapons/munitions/RocketMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/SplitMunition.cc (modified) (3 diffs, 1 prop)
• src/modules/weapons/munitions/SplitMunition.h (modified) (1 diff, 1 prop)
• src/modules/weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/GravityBombField.cc (modified) (1 diff)
• src/modules/weapons/projectiles/IceGunProjectile.cc (modified) (2 diffs, 1 prop)
• src/modules/weapons/projectiles/IceGunProjectile.h (modified) (2 diffs, 1 prop)
• src/modules/weapons/projectiles/MineProjectile.cc (copied) (copied from code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.cc)
• src/modules/weapons/projectiles/MineProjectile.h (copied) (copied from code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.h)
• src/modules/weapons/projectiles/Projectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (5 diffs)
• src/modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• src/modules/weapons/projectiles/SimpleRocket.cc (modified) (1 diff)
• src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) (1 prop)
• src/modules/weapons/projectiles/SplitGunProjectile.h (modified) (1 prop)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/IceGun.cc (modified) (1 diff, 1 prop)
• src/modules/weapons/weaponmodes/IceGun.h (modified) (1 prop)
• src/modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/MineGun.cc (copied) (copied from code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc)
• src/modules/weapons/weaponmodes/MineGun.h (copied) (copied from code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.h)
• src/modules/weapons/weaponmodes/RocketFire.cc (modified) (4 diffs)
• src/modules/weapons/weaponmodes/RocketFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/SplitGun.cc (modified) (2 diffs, 1 prop)
• src/modules/weapons/weaponmodes/SplitGun.h (modified) (1 prop)

code/trunk/src/modules/weapons/WeaponsPrereqs.h

@@ -69 +69 @@
 {
     class MuzzleFlash;
+    class IceGunFreezer;
+    class RocketController;
 
     // munitions
     class FusionMunition;
     class LaserMunition;
-    class ReplenishingMunition;
     class RocketMunition;
     class GravityBombMuntion;
+    class IceMunition;
+    class LightningMunition;
+    class SplitMunition;
 
     // projectiles
@@ -81 +85 @@
     class LightningGunProjectile;
     class ParticleProjectile;
+    class IceProjectile;
+    class SplitProjectile;
     class Projectile;
+    class BasicProjectile;
     class Rocket;
     class RocketOld;
@@ -91 +98 @@
     class FusionFire;
     class HsW01;
+    class IceGun;
+    class SplitGun;
     class LaserFire;
     class LightningGun;
+    class MineGun;
     class RocketFire;
     class RocketFireOld;

code/trunk/src/modules/weapons/munitions/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(WEAPONS_SRC_FILES
-  ReplenishingMunition.cc
   LaserMunition.cc
+  LightningMunition.cc
   FusionMunition.cc
   RocketMunition.cc
@@ -7 +7 @@
   IceMunition.cc
   SplitMunition.cc
+  MineMunition.cc
 )

code/trunk/src/modules/weapons/munitions/FusionMunition.cc

@@ -28 +28 @@
 
 /**
-    @file FusionMunition.h
+    @file FusionMunition.cc
     @brief Implementation of the FusionMunition class.
 */
@@ -34 +34 @@
 #include "FusionMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -45 +46 @@
         this->maxMunitionPerMagazine_ = 10;
         this->maxMagazines_ = 10;
-        this->magazines_ = 10;
+        this->unassignedMagazines_ = 10;
 
-        this->bUseSeparateMagazines_ = true;
-        this->bStackMunition_ = false;
+        this->deployment_ = MunitionDeployment::Separate;
+
         this->reloadTime_ = 1.0f;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = true;
+
+        this->reloadTime_ = 0.5f;
+    }
+
+    void FusionMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(FusionMunition, XMLPort, xmlelement, mode);
     }
 }

code/trunk/src/modules/weapons/munitions/FusionMunition.h

@@ -53 +53 @@
             FusionMunition(Context* context);
             virtual ~FusionMunition() {}
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     };
 }

code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc

@@ -7 +7 @@
 #include "GravityBombMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -17 +18 @@
         this->maxMunitionPerMagazine_ = 1;
         this->maxMagazines_ = 30;
-        this->magazines_ = 15;
+        this->unassignedMagazines_ = 15;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = MunitionDeployment::Stack;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.0f;
     }
 
+    void GravityBombMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(GravityBombMunition, XMLPort, xmlelement, mode);
+    }
 }
 

code/trunk/src/modules/weapons/munitions/GravityBombMunition.h

@@ -28 +28 @@
             GravityBombMunition(Context* context);
             virtual ~GravityBombMunition() {}
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     };
 

code/trunk/src/modules/weapons/munitions/IceMunition.cc

@@ -28 +28 @@
 
 /**
-    @file IceMunition.h
+    @file IceMunition.cc
     @brief Implementation of the IceMunition class.
 */
@@ -34 +34 @@
 #include "IceMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -45 +46 @@
         this->maxMunitionPerMagazine_ = 1;
         this->maxMagazines_ = 50;
-        this->magazines_ = 25;
+        this->unassignedMagazines_ = 25;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = MunitionDeployment::Stack;
 
-        this->bAllowMunitionRefilling_ = false;
+        this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.5f;
+    }
+
+    void IceMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(IceMunition, XMLPort, xmlelement, mode);
     }
 }

code/trunk/src/modules/weapons/munitions/IceMunition.h

@@ -53 +53 @@
             IceMunition(Context* context);
             virtual ~IceMunition() {}
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     };
 }

code/trunk/src/modules/weapons/munitions/LaserMunition.cc

@@ -28 +28 @@
 
 /**
-    @file LaserMunition.h
+    @file LaserMunition.cc
     @brief Implementation of the LaserMunition class.
 */
@@ -34 +34 @@
 #include "LaserMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -44 +45 @@
 
         this->maxMunitionPerMagazine_ = 20;
-        this->maxMagazines_ = 1;
-        this->magazines_ = 1;
+        this->maxMagazines_ = 10;
+        this->unassignedMagazines_ = 10;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = MunitionDeployment::Separate;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = true;
 
-        this->replenishInterval_ = 0.5f;
-        this->replenishMunitionAmount_ = 1;
+        this->replenishInterval_ = 7.0f;
+        this->replenishAmount_ = 1;
+
+        this->reloadTime_ = 0.5f;
+    }
+
+    void LaserMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(LaserMunition, XMLPort, xmlelement, mode);
     }
 }

code/trunk/src/modules/weapons/munitions/LaserMunition.h

@@ -36 +36 @@
 
 #include "weapons/WeaponsPrereqs.h"
-#include "ReplenishingMunition.h"
+#include "weaponsystem/ReplenishingMunition.h"
 
 namespace orxonox
@@ -53 +53 @@
             LaserMunition(Context* context);
             virtual ~LaserMunition() {}
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     };
 }

code/trunk/src/modules/weapons/munitions/RocketMunition.cc

@@ -28 +28 @@
 
 /**
-    @file RocketMunition.h
+    @file RocketMunition.cc
     @brief Implementation of the RocketMunition class.
 */
@@ -34 +34 @@
 #include "RocketMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -45 +46 @@
         this->maxMunitionPerMagazine_ = 1;
         this->maxMagazines_ = 30;
-        this->magazines_ = 10;
+        this->unassignedMagazines_ = 10;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = MunitionDeployment::Stack;
 
-        this->bAllowMunitionRefilling_ = false;
+        this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.5f;
+    }
+
+    void RocketMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(RocketMunition, XMLPort, xmlelement, mode);
     }
 }

code/trunk/src/modules/weapons/munitions/RocketMunition.h

@@ -53 +53 @@
             RocketMunition(Context* context);
             virtual ~RocketMunition() {}
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     };
 }

code/trunk/src/modules/weapons/munitions/SplitMunition.cc

@@ -28 +28 @@
 
 /**
-    @file SplitMunition.h
+    @file SplitMunition.cc
     @brief Implementation of the SplitMunition class.
 */
@@ -34 +34 @@
 #include "SplitMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -43 +44 @@
         RegisterObject(SplitMunition);
 
-        this->maxMunitionPerMagazine_ = 1;
-        this->maxMagazines_ = 100;
-        this->magazines_ = 25;
+        this->maxMunitionPerMagazine_ = 5;
+        this->maxMagazines_ = 10;
+        this->unassignedMagazines_ = 5;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = MunitionDeployment::Share;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.5f;
+    }
+
+    void SplitMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(SplitMunition, XMLPort, xmlelement, mode);
     }
 }

code/trunk/src/modules/weapons/munitions/SplitMunition.h

@@ -53 +53 @@
             SplitMunition(Context* context);
             virtual ~SplitMunition() {}
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     };
 }

code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -68 +68 @@
     @brief
         The function called when a projectile hits another thing.
-        Calls the hit-function, starts the reload countdown, displays visual hit effects defined in Pawn.
+        Calls the hit-function, starts the shield recharge countdown, displays visual hit effects defined in Pawn.
         Needs to be called in the collidesAgainst() function by every Class directly inheriting from BasicProjectile.
     @param otherObject
@@ -97 +97 @@
             {
                 victim->hit(this->getShooter(), contactPoint, cs, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
-                victim->startReloadCountdown();
+                victim->startShieldRechargeCountdown();
             }
 

code/trunk/src/modules/weapons/projectiles/CMakeLists.txt

@@ -12 +12 @@
   GravityBomb.cc
   GravityBombField.cc
+  MineProjectile.cc
 )

code/trunk/src/modules/weapons/projectiles/GravityBombField.cc

@@ -164 +164 @@
         if (lifetime_ <= -4)
         {
-            orxout(debug_output) << "Timeout. Destroying field." << endl;
             this->destroy();
         }

code/trunk/src/modules/weapons/projectiles/IceGunProjectile.cc

@@ -34 +34 @@
 #include "IceGunProjectile.h"
 
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+
 #include "core/CoreIncludes.h"
 #include "graphics/Model.h"
+#include "graphics/ParticleSpawner.h"
+#include "Scene.h"
+#include "core/command/Executor.h"
+#include "tools/ParticleInterface.h"
 
 namespace orxonox
 {
     RegisterClass(IceGunProjectile);
+
+    const float IceGunProjectile::particleDestructionDelay_ = 15.0f;
 
     IceGunProjectile::IceGunProjectile(Context* context) : Projectile(context)
@@ -55 +64 @@
         this->attach(model);
         model->setPosition(Vector3(0,0,0));
+
+        // Add effect.
+        spawner_ = new ParticleSpawner(this->getContext());
+        this->attach(spawner_);
+        spawner_->setOrientation(this->getOrientation());
+        spawner_->setSource("Orxonox/ice");
+        spawner_->setDeleteWithParent(false);
+        spawner_->setDestroydelay(particleDestructionDelay_);
+    }
+
+    IceGunProjectile::~IceGunProjectile()
+    {
+        if (this->isInitialized())
+        {
+            const Vector3& pos = spawner_->getWorldPosition();
+            const Quaternion& rot = spawner_->getWorldOrientation();
+            this->detach(spawner_);
+            spawner_->setPosition(pos);
+            spawner_->setOrientation(rot);
+            this->getScene()->getRootSceneNode()->addChild(const_cast<Ogre::SceneNode*>(spawner_->getNode()));
+            this->spawner_->stop(true);
+        }
     }
 

code/trunk/src/modules/weapons/projectiles/IceGunProjectile.h

@@ -56 +56 @@
         public:
             IceGunProjectile(Context* context);
-            virtual ~IceGunProjectile() {}
+            virtual ~IceGunProjectile();
 
             virtual void setFreezeTime(float freezeTime);
@@ -63 +63 @@
         protected:
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-        private:         
+            static const float particleDestructionDelay_;
+        private:
+            ParticleSpawner* spawner_;
             float freezeTime_; //The duration of the freezing effect on a target
             float freezeFactor_; //The strength of the freezing effect

code/trunk/src/modules/weapons/projectiles/Projectile.h

@@ -69 +69 @@
         protected:
             virtual void setCollisionShapeRadius(float radius);
+            float lifetime_; //!< The time the projectile exists.
 
         private:
-            float lifetime_; //!< The time the projectile exists.
             Timer destroyTimer_; //!< Timer to destroy the projectile after its lifetime has run out.
-            WeakPtr<SphereCollisionShape> collisionShape_; // The collision shape of the projectile.            
+            WeakPtr<SphereCollisionShape> collisionShape_; // The collision shape of the projectile.
     };
 }

code/trunk/src/modules/weapons/projectiles/Rocket.cc

@@ -66 +66 @@
 
         this->localAngularVelocity_ = 0;
-        this->lifetime_ = 100.0f;
+        this->lifetime_ = 20.0f;
 
         if (GameMode::isMaster())
@@ -76 +76 @@
             Model* model = new Model(this->getContext());
             model->setMeshSource("rocket.mesh");
-            model->scale(0.7f);
+            model->scale(1.0f);
             this->attach(model);
 
@@ -100 +100 @@
             this->attachCollisionShape(collisionShape);
 
-            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
-
             // Add sound
             this->defSndWpnEngine_ = new WorldSound(this->getContext());
@@ -114 +112 @@
             this->defSndWpnLaunch_->setVolume(1.0f);
             this->attach(defSndWpnLaunch_);
+
+            this->setHudTemplate("rockethud");
         }
         else
@@ -320 +320 @@
     }
 
+    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)));
+    }
 }

code/trunk/src/modules/weapons/projectiles/Rocket.h

@@ -118 +118 @@
             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.

code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -76 +76 @@
             Model* model = new Model(this->getContext());
             model->setMeshSource("rocket.mesh");
-            model->scale(0.7f);
+            model->scale(1.0f);
             this->attach(model);
 

code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -11 +11 @@
   SimpleRocketFire.cc
   GravityBombFire.cc
+  MineGun.cc
 )

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -63 +63 @@
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&EnergyDrink::shot, this)));
         this->delayTimer_.stopTimer();
+
+        hudImageString_ = "Orxonox/WSHUD_WM_EnergyDrink";
     }
 

code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -58 +58 @@
 
         this->setMunitionName("FusionMunition");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_FusionFire";
     }
 

code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc

@@ -31 +31 @@
         this->setMunitionName("GravityBombMunition");
         this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.8);    ///< sets sound of the bomb as it is fired.
+
+        hudImageString_ = "Orxonox/WSHUD_WM_GravityBombFire";
     }
 

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

@@ -69 +69 @@
 
         this->setDefaultSound(this->sound_);
+
+        hudImageString_ = "Orxonox/WSHUD_WM_HsW01";
     }
 

code/trunk/src/modules/weapons/weaponmodes/IceGun.cc

@@ -59 +59 @@
         this->setFreezeFactor(0.5);
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("IceMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_IceGun";
     }
 

code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -56 +56 @@
 
         this->setMunitionName("LaserMunition");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
     }
 

code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -54 +54 @@
         this->speed_ = 750.0f;
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("LightningMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_LightningGun";
     }
 

code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -41 +41 @@
 #include "weaponsystem/WeaponSystem.h"
 #include "worldentities/pawns/Pawn.h"
-
+#include "core/XMLPort.h"
 #include "weapons/projectiles/Rocket.h"
 
@@ -56 +56 @@
         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)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_RocketFire";
     }
 
     RocketFire::~RocketFire()
     {
+    }
+
+    /**
+    @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);
     }
 
@@ -77 +91 @@
         rocket->setPosition(this->getMuzzlePosition());
         rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
-        rocket->scale(2);
+        rocket->scale(1.0f);
 
         rocket->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
@@ -83 +97 @@
         rocket->setShieldDamage(this->getShieldDamage());
         rocket->setHealthDamage(this->getHealthDamage());
+        rocket->setMaxFuel(this->fuel_);
     }
 }

code/trunk/src/modules/weapons/weaponmodes/RocketFire.h

@@ -54 +54 @@
             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
     };
 }

code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.cc

@@ -59 +59 @@
         this->setMunitionName("RocketMunition");
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SimpleRocketFire";
     }
 

code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -64 +64 @@
         this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SimpleRocketFire";
     }
 
@@ -83 +85 @@
         rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
         rocket->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        rocket->scale(1.0f);
 
         rocket->setDamage(this->damage_);
@@ -89 +92 @@
 
         WorldEntity* pawn = static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
-        if (pawn) controller->setTarget(pawn);
+        if (pawn)
+            controller->setTarget(pawn);
     }
 }

code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"    
+#include "core/XMLPort.h"
 #include "weaponsystem/Weapon.h"
 #include "weaponsystem/WeaponPack.h"
@@ -62 +62 @@
         this->setMunitionName("SplitMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SplitGun";
     }