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

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/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/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";
     }