Changeset 11108

Timestamp:

Feb 4, 2016, 11:54:04 PM (9 years ago)

Author:

fvultier

Message:

A few modifications in the weapon system: WeaponModes may play a reload sound now. Fireing Sounds of WeaponModes may overlap now. New weapon: FlameGun, a flame thrower for close combat (e.g. for the FPS player)

Location:

code/trunk

Files:

• data/levels/includes/weaponSettingsFPS.oxi (modified) (2 diffs)
• data/levels/includes/weaponSettingsGhost.oxi (modified) (4 diffs)
• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (1 diff)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/munitions/FlameMunition.cc (added)
• src/modules/weapons/munitions/FlameMunition.h (added)
• src/modules/weapons/munitions/LaserMunition.cc (modified) (1 diff)
• src/modules/weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/BasicProjectile.h (modified) (2 diffs)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/FlameGunProjectile.cc (added)
• src/modules/weapons/projectiles/FlameGunProjectile.h (added)
• src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) (1 diff)
• src/modules/weapons/projectiles/ParticleProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/ParticleProjectile.h (modified) (2 diffs)
• src/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/SplitGunProjectile.h (modified) (5 diffs)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/EnergyDrink.h (modified) (2 diffs)
• src/modules/weapons/weaponmodes/FlameGun.cc (added)
• src/modules/weapons/weaponmodes/FlameGun.h (added)
• 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) (2 diffs)
• src/modules/weapons/weaponmodes/IceGun.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/LaserFire.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/MineGun.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/SplitGun.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (7 diffs)
• src/orxonox/weaponsystem/WeaponMode.h (modified) (4 diffs)

code/trunk/data/levels/includes/weaponSettingsFPS.oxi

@@ -10 +10 @@
       <WeaponSet firemode=0 />
       <WeaponSet firemode=1 />
+      <WeaponSet firemode=2 />
     </weaponsets>
     <weaponpacks>
@@ -19 +20 @@
         </links>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0.0 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.7, -0.3, -3" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20/>
+          <HsW01 mode=0 munitionpershot=0 delay=0.0 damage=2.5 material="Flares/point_lensflare" muzzleoffset="0.7,-0.3,-3" />
+          <FlameGun mode=1 munitionpershot=1 damage=0.5 muzzleoffset="0.7,-0.3,-3"/>
+          <LightningGun mode=2 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20/>
         </Weapon>
-        <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1000"
-            unlimitedMunition=true
-        />
-        <!--LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1250"
-            unlimitedMunition=true
-        />
-      </WeaponPack>
-      <WeaponPack firemode=1>
-        <Fusion
-            position="0,0,0"
-            munitionType="FusionMunition"
-            bulletLoadingTime="0.3"
-            magazineLoadingTime="3"
-            speed="600"
-            unlimitedMunition=true
-        /-->
       </WeaponPack>
     </weaponpacks>
     <munition>
       <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
+      <FlameMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=20/>
       <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
     </munition>

code/trunk/data/levels/includes/weaponSettingsGhost.oxi

@@ -2 +2 @@
       <WeaponSlot position=" 1.3,4.66,-20" />
       <WeaponSlot position="-1.3,4.66,-20" />
-      <WeaponSlot position="13.7,4.66,-20" />
-      <WeaponSlot position="-16.3,4.66,-20" />
+      <WeaponSlot position="0,4.66,-20" />
     </weaponslots>
     <weaponsets>
@@ -9 +8 @@
       <WeaponSet firemode=1 />
       <WeaponSet firemode=2 />
-      <WeaponSet firemode=2 />
+      <WeaponSet firemode=3 />
     </weaponsets>
     <weaponpacks>
@@ -17 +16 @@
           <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
           <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
+          <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
         </links>
         <Weapon>
           <HsW01 mode=0 munitionpershot=1 healthdamage=3.14159 delay=0 material="Flares/point_lensflare" />
           <HsW01 mode=0 munitionpershot=1 healthdamage=3.14159 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=30 shielddamage=10 />
+          <FusionFire mode=1 muzzleoffset="0,0,0" damage=30 shielddamage=10 />
         </Weapon>
         <Weapon>
           <HsW01 mode=0 munitionpershot=1 damage=3.14159 delay=0  material="Flares/point_lensflare" />
           <HsW01 mode=0 munitionpershot=1 damage=3.14159 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=30 shielddamage=10 />
+          <FusionFire mode=1 muzzleoffset="0,0,0" damage=30 shielddamage=10 />
         </Weapon>
         <Weapon>
-          <SimpleRocketFire mode=2 munitionpershot=1 muzzleoffset="0,0,0" damage=50 />
-        </Weapon>
-        <Weapon>
-          <SimpleRocketFire mode=2 munitionpershot=1 muzzleoffset="0,0,0" damage=50 delay=0.1 />
+          <FlameGun mode=2 munitionpershot=1 damage=0.5 muzzleoffset="0,0,0"/>
+          <SplitGun mode=3 munitionpershot=1 damage=6.0 muzzleoffset="0.5,0.6,1.7" splittime=0.2 numberofsplits=2 numberofchilds=3 spread=0.1 damagereduction=2.0 />
         </Weapon>
       </WeaponPack>
@@ -38 +36 @@
     <munition>
       <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
-      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
-      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
+      <FusionMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
+      <FlameMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=20/>
+      <SplitMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5/>
     </munition>

code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt

@@ -360 +360 @@
         <MunitionContainer munitiontype="RocketMunition" munitionamount=0 magazinesamount=10 />
         <MunitionContainer munitiontype="IceMunition" munitionamount=0 magazinesamount=10 />
+        <MunitionContainer munitiontype="FlameMunition" munitionamount=0 magazinesamount=10 />
         <MunitionContainer munitiontype="GravityBombMunition" munitionamount=0 magazinesamount=10 />
         <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=10 />

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

@@ -6 +6 @@
   GravityBombMunition.cc
   IceMunition.cc
+  FlameMunition.cc
   SplitMunition.cc
   MineMunition.cc

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

@@ -55 +55 @@
         this->replenishAmount_ = 1;
 
-        this->reloadTime_ = 0.5f;
+        this->reloadTime_ = 0.6f;
     }
 }

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

@@ -54 +54 @@
         this->bDestroy_ = false;
 
+        // Default is destroying the projectile after collision
+        this->destroyAfterCollision_ = true;
+
         // Default damage must be zero, otherwise it would be above zero if no settings are made in the weaponsettings xml file.
         // same thing for all weaponmodes files
@@ -87 +90 @@
                 return false;
 
-            this->bDestroy_ = true; // If something is hit, the object is destroyed and can't hit something else.
-                                    // The projectile is destroyed by its tick()-function (in the following tick).
+            if (getDestroyAfterCollision())
+            {
+                this->bDestroy_ = true; // If something is hit, the object is destroyed and can't hit something else.
+                                        // The projectile is destroyed by its tick()-function (in the following tick).
+                                        // TODO: Use destroyLater() for this
+            }
 
             Pawn* victim = orxonox_cast<Pawn*>(otherObject); // If otherObject isn't a Pawn, then victim is nullptr

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

@@ -119 +119 @@
             bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
             void destroyCheck(void);
+            inline void setDestroyAfterCollision(bool destroyAfterCollision)
+                { destroyAfterCollision_ = destroyAfterCollision; }
+            inline bool getDestroyAfterCollision() const
+                { return destroyAfterCollision_; }
 
         private:
@@ -130 +134 @@
 
             bool bDestroy_; //!< Boolean, to check whether a projectile should be destroyed.
+            bool destroyAfterCollision_; //!< Boolean, defines whether the projectile gets detroyed after a collision.
     };
 }

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

@@ -7 +7 @@
   SplitGunProjectile.cc
   IceGunProjectile.cc
+  FlameGunProjectile.cc
   Rocket.cc
   RocketOld.cc

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

@@ -47 +47 @@
 
         this->textureIndex_ = 1;
-        this->setMass(2);
+        this->setMass(0.1f);
         this->setCollisionType(CollisionType::Dynamic);
         this->maxTextureIndex_ = 8;

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

@@ -43 +43 @@
     RegisterClass(ParticleProjectile);
 
-    ParticleProjectile::ParticleProjectile(Context* context) : BillboardProjectile(context)
+    ParticleProjectile::ParticleProjectile(Context* context) : Projectile(context)
     {
         RegisterObject(ParticleProjectile);
 
-        if (GameMode::showsGraphics())
-        {
-            // Create the particles.
-            this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot3_small", LODParticle::Normal);
-            this->attachOgreObject(this->particles_->getParticleSystem());
-            this->particles_->setKeepParticlesInLocalSpace(0);
+        this->particles_ = nullptr;
 
-            for (unsigned int i = 0; i < this->particles_->getNumEmitters(); ++i)
-                this->particles_->getEmitter(i)->setDirection(-WorldEntity::FRONT);
-        }
-        else
-            this->particles_ = nullptr;
+        //setEffect("Orxonox/sparks2");
     }
 
@@ -82 +73 @@
             this->particles_->setEnabled(this->isVisible());
     }
+
+    void ParticleProjectile::setEffect(const std::string& effect)
+    {
+        // If we already have a particle interface, delete it
+        if (this->particles_)
+        {
+            this->detachOgreObject(this->particles_->getParticleSystem());
+            delete this->particles_;
+            this->particles_ = nullptr;
+        }
+
+        if (GameMode::showsGraphics())
+        {
+            // Create the particles.
+            this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), effect, LODParticle::Normal);
+            this->attachOgreObject(this->particles_->getParticleSystem());
+            this->particles_->setKeepParticlesInLocalSpace(0);
+
+            for (unsigned int i = 0; i < this->particles_->getNumEmitters(); ++i)
+                this->particles_->getEmitter(i)->setDirection(-WorldEntity::FRONT);
+        }
+        else
+        {
+            this->particles_ = nullptr;
+        }
+    }
 }

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

@@ -48 +48 @@
     @ingroup WeaponsProjectiles
     */
-    class _WeaponsExport ParticleProjectile : public BillboardProjectile
+    class _WeaponsExport ParticleProjectile : public Projectile
     {
         public:
@@ -54 +54 @@
             virtual ~ParticleProjectile();
             virtual void changedVisibility() override;
+            virtual void setEffect(const std::string& effect);
 
         private:

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

@@ -54 +54 @@
         if (GameMode::isMaster())
         {
-            this->setMass(1.0f);
+            this->setMass(0.1f);
             this->enableCollisionCallback();
             this->setCollisionResponse(false);

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

@@ -52 +52 @@
         this->spread_ = 0.2f;
         this->damageReduction_ = 1.0f;
+        this->splitSound_ = nullptr;
+
+        this->setSplitSound("sounds/Weapon_SplitGun.ogg", 0.8);
+    }
+
+    SplitGunProjectile::~SplitGunProjectile()
+    {
+        if (this->isInitialized())
+        {
+            if (splitSound_)
+            {
+                splitSound_->destroy();
+            }
+        }
     }
 
@@ -158 +172 @@
 
             numberOfSplits_ = 0;
+
+            if (splitSound_)
+            {
+                splitSound_->play();
+            }
         }
     }
+
+    void SplitGunProjectile::setSplitSound(const std::string& soundPath, const float soundVolume)
+    {
+        if (!splitSound_)
+        {
+            this->splitSound_ = new WorldSound(this->getContext());
+            this->splitSound_->setLooping(false);
+            this->attach(splitSound_);
+        }
+
+        this->splitSound_->setSource(soundPath);
+        this->splitSound_->setVolume(soundVolume);
+    }
 }

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

@@ -28 +28 @@
 
 /**
-    @file IceGunProjectile.h
+    @file SplitGunProjectile.h
     @brief Definition of the SplitGunProjectile class.
 */
@@ -40 +40 @@
 #include "tools/Timer.h"
 #include "BillboardProjectile.h"
+#include "sound/WorldSound.h"
 
 namespace orxonox
@@ -55 +56 @@
         public:
             SplitGunProjectile(Context* context);
-            virtual ~SplitGunProjectile() {}
+            virtual ~SplitGunProjectile();
 
             virtual void setNumberOfSplits(int numberOfSplits);
@@ -62 +63 @@
             virtual void setSpread(float spread);
             virtual void setDamageReduction(float damageReduction);
+            virtual void setSplitSound(const std::string& soundPath, const float soundVolume = 1.0);
 
         private:            
@@ -70 +72 @@
             float damageReduction_; //The damage of a child projectile is reduced by this factor
             Timer splitTimer_;
+            WorldSound* splitSound_; //Sound played if the projectile splits
 
             virtual void split();            

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

@@ -7 +7 @@
   SplitGun.cc
   IceGun.cc
+  FlameGun.cc
   RocketFire.cc
   RocketFireOld.cc

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

@@ -59 +59 @@
         this->speed_ = 750.0f;
         this->delay_ = 0.0f;
+        this->timerStarted_ = false;
         this->setMunitionName("FusionMunition");
+        this->setFireSound("sounds/Weapon_EnergyDrink.ogg");
 
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&EnergyDrink::shot, this)));
@@ -93 +95 @@
     void EnergyDrink::fire()
     {
-        this->delayTimer_.startTimer();
+        if (!timerStarted_)
+        {
+            this->delayTimer_.startTimer();
+            this->timerStarted_ = true;
+        }
+    }
+
+    bool EnergyDrink::fire(float* reloadTime)
+    {
+        if (!timerStarted_)
+        {
+            return WeaponMode::fire(reloadTime);
+        }
+
+        return false;
     }
 
@@ -102 +118 @@
     void EnergyDrink::shot()
     {
+        this->timerStarted_ = false;
+
         // Create the projectile
         Projectile* projectile = new Projectile(this->getContext());

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

@@ -57 +57 @@
             virtual ~EnergyDrink() {}
 
+            virtual bool fire(float* reloadTime) override;
             virtual void fire() override;
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -89 +90 @@
             float delay_; //!< The firing delay.
             Timer delayTimer_; //!< The timer to delay the firing.
+            bool timerStarted_;
     };
 }

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

@@ -58 +58 @@
 
         this->setMunitionName("FusionMunition");
+        this->setFireSound("sounds/Weapon_FusionFire.ogg");
 
         hudImageString_ = "Orxonox/WSHUD_WM_FusionFire";

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

@@ -30 +30 @@
 
         this->setMunitionName("GravityBombMunition");
-        this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.8);    ///< sets sound of the bomb as it is fired.
+        this->setFireSound("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

@@ -62 +62 @@
         this->setMunitionName("LaserMunition");
         this->mesh_ = "laserbeam.mesh";
-        this->sound_ = "sounds/Weapon_HsW01.ogg";
 
 
@@ -68 +67 @@
         this->delayTimer_.stopTimer();
 
-        this->setDefaultSound(this->sound_);
+        this->setFireSound("sounds/Weapon_HsW01.ogg");
+        this->setReloadSound("sounds/Reload_HsW01.ogg", 0.5);
 
         hudImageString_ = "Orxonox/WSHUD_WM_HsW01";

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

@@ -60 +60 @@
 
         this->setMunitionName("IceMunition");
-        this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+        this->setFireSound("sounds/Weapon_LightningGun.ogg");
+        this->setReloadSound("sounds/Reload_IceGun.ogg", 0.4);
 
         hudImageString_ = "Orxonox/WSHUD_WM_IceGun";

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

@@ -41 +41 @@
 #include "worldentities/pawns/Pawn.h"
 
-#include "weapons/projectiles/ParticleProjectile.h"
+#include "weapons/projectiles/BillboardProjectile.h"
 
 namespace orxonox
@@ -56 +56 @@
 
         this->setMunitionName("LaserMunition");
+        this->setFireSound("sounds/Weapon_LaserFire.ogg");
+        this->setReloadSound("sounds/Reload_LaserFire.ogg", 0.8);
 
         hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
@@ -66 +68 @@
     void LaserFire::fire()
     {
-        ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
+        BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());

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

@@ -55 +55 @@
 
         this->setMunitionName("LightningMunition");
-        this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+        this->setFireSound("sounds/Weapon_LightningGun.ogg");
 
         hudImageString_ = "Orxonox/WSHUD_WM_LightningGun";

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

@@ -57 +57 @@
 
         this->setMunitionName("MineMunition");
-        this->setDefaultSound("sounds/mineactivate.ogg");
+        this->setFireSound("sounds/mineactivate.ogg");
 
         hudImageString_ = "Orxonox/WSHUD_WM_MineGun";

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

@@ -62 +62 @@
 
         this->setMunitionName("RocketMunition");
-        this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
+        this->setFireSound("sounds/Rocket_launch.ogg",0.4f);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
 

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

@@ -61 +61 @@
 
         this->setMunitionName("SplitMunition");
-        this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+        this->setFireSound("sounds/Weapon_SplitGun.ogg", 0.5);
+        this->setReloadSound("sounds/Reload_SplitGun.ogg", 0.8);
 
         hudImageString_ = "Orxonox/WSHUD_WM_SplitGun";

code/trunk/src/orxonox/weaponsystem/WeaponMode.cc

@@ -77 +77 @@
         hudImageString_ = "Orxonox/WSHUD_WM_Unknown";
 
-        if( GameMode::isMaster() )
-        {
-            this->defSndWpnFire_ = new WorldSound(this->getContext());
-            this->defSndWpnFire_->setLooping(false);
-            this->defSndWpnFire_->setVolume(0.8f);
-            this->bSoundAttached_ = false;
-        }
-        else
-            this->defSndWpnFire_ = 0;
+        this->fireSoundPath_ = BLANKSTRING;
+        this->fireSoundVolume_ = 1.0;
+        this->fireSounds_.clear();
+
+        this->reloadSoundPath_ = BLANKSTRING;
+        this->reloadSoundVolume_ = 1.0;
+        this->reloadSound_ = nullptr;
     }
 
@@ -92 +90 @@
         if (this->isInitialized())
         {
-            if (this->defSndWpnFire_)
-                this->defSndWpnFire_->destroy();
+            for (auto sound : fireSounds_)
+            {
+                sound->destroy();
+            }
         }
     }
@@ -121 +121 @@
     {
         (*reloadTime) = this->reloadTime_;
-        if( !this->bSoundAttached_ && GameMode::isMaster() )
-        {
-            assert(this->getWeapon());
-            this->getWeapon()->attach(this->defSndWpnFire_);
-            this->bSoundAttached_ = true;
-        }
         
         // Fireing is only possible if this weapon mode is not reloading and there is enough munition
@@ -147 +141 @@
                         // The time needed to reload is the sum of the reload time of the weapon mode and the magazine.
                         tempReloadtime = this->reloadTime_ + this->munition_->getReloadTime();
-                    }                        
+                    }
+                    playReloadSound();
                 }
+            }
+
+            // For stacked munition, a reload sound is played after every fired projectile
+            if (this->munition_->getMunitionDeployment() == MunitionDeployment::Stack)
+            {
+                playReloadSound();
             }
 
@@ -156 +157 @@
             this->reloadTimer_.startTimer();
 
-            if( this->defSndWpnFire_ && !(this->defSndWpnFire_->isPlaying()))
-            {
-                this->defSndWpnFire_->play();
-            }
-
+            // Play the fire sound and fire the weapon mode
+            this->playFireSound();
             this->fire();
 
@@ -250 +248 @@
     void WeaponMode::reloaded()
     {
-        if( this->defSndWpnFire_ && this->defSndWpnFire_->isPlaying())
-        {
-            this->defSndWpnFire_->stop();
-        }
         this->bReloading_ = false;
     }
@@ -282 +276 @@
     }
 
-    void WeaponMode::setDefaultSound(const std::string& soundPath)
-    {
-        if( this->defSndWpnFire_ )
-            this->defSndWpnFire_->setSource(soundPath);
-    }
-
-    const std::string& WeaponMode::getDefaultSound()
-    {
-        if( this->defSndWpnFire_ )
-            return this->defSndWpnFire_->getSource();
-        else
-            return BLANKSTRING;
-    }
-
-    void WeaponMode::setDefaultSoundWithVolume(const std::string& soundPath, const float soundVolume)
-    {
-        if (this->defSndWpnFire_)
-        {
-            this->defSndWpnFire_->setSource(soundPath);
-            this->defSndWpnFire_->setVolume(soundVolume);
-        }
-    }
-
+    void WeaponMode::setFireSound(const std::string& soundPath, const float soundVolume)
+    {
+        fireSoundPath_ = soundPath;
+        fireSoundVolume_ = soundVolume;
+    }
+
+    const std::string& WeaponMode::getFireSound()
+    {
+        return fireSoundPath_;
+    }
+
+    void WeaponMode::setReloadSound(const std::string& soundPath, const float soundVolume)
+    {
+        reloadSoundPath_ = soundPath;
+        reloadSoundVolume_ = soundVolume;
+    }
+
+    const std::string& WeaponMode::getReloadSound()
+    {
+        return reloadSoundPath_;
+    }
+
+    void WeaponMode::playFireSound()
+    {
+        WorldSound* unusedSound = nullptr;
+
+        if (!GameMode::isMaster())
+        {
+            return;
+        }
+
+        // If no sound path or no weapon was specified, then no sound is played.
+        if (fireSoundPath_ == BLANKSTRING || !this->getWeapon())
+        {
+            return;
+        }
+
+        // Search in the sound list for a WorldSound that may be used. It must be an idle WorldSound instance (i.e. it is not playing a sound now)
+        for (auto sound : fireSounds_)
+        {
+            if( sound && !(sound->isPlaying()))
+            {
+                // Unused sound found
+                unusedSound = sound;
+                break;
+            }
+        }
+
+        // If no unused sound was found, create a new one and add it to the list
+        if (!unusedSound)
+        {
+            unusedSound = new WorldSound(this->getContext());
+            fireSounds_.push_back(unusedSound);
+            unusedSound->setLooping(false);
+            unusedSound->setSource(fireSoundPath_);
+            unusedSound->setVolume(fireSoundVolume_);
+            this->getWeapon()->attach(unusedSound);
+        }
+
+        // Play the fire sound
+        unusedSound->play();
+    }
+
+    void WeaponMode::playReloadSound()
+    {
+        if (!GameMode::isMaster())
+        {
+            return;
+        }
+
+        // If no sound path or no weapon was specified, then no sound is played.
+        if (reloadSoundPath_ == BLANKSTRING || !this->getWeapon())
+        {
+            return;
+        }
+
+        // Create a reload WorldSound if not done yet
+        if (!reloadSound_)
+        {
+            reloadSound_ = new WorldSound(this->getContext());
+            reloadSound_->setSource(reloadSoundPath_);
+            reloadSound_->setVolume(reloadSoundVolume_);
+            this->getWeapon()->attach(reloadSound_);
+        }
+
+        // Play the reload sound
+        reloadSound_->play();
+    }
 }

code/trunk/src/orxonox/weaponsystem/WeaponMode.h

@@ -34 +34 @@
 
 #include <string>
+#include <vector>
 #include "util/Math.h"
 #include "core/BaseObject.h"
@@ -54 +55 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            bool fire(float* reloadTime);
+            virtual bool fire(float* reloadTime);
             bool reload();
-
-            // Interacting with the default Firing sound
-            void setDefaultSound(const std::string& soundPath);
-            const std::string& getDefaultSound();
-            void setDefaultSoundWithVolume(const std::string& soundPath, const float soundVolume);
 
             // Munition
@@ -155 +151 @@
             void updateMunition();
         protected:
+            // Interacting with the firing sound
+            void setFireSound(const std::string& soundPath, const float soundVolume = 1.0);
+            const std::string& getFireSound();
+            void playFireSound();
+
+            // Interacting with the reloading sound
+            void setReloadSound(const std::string& soundPath, const float soundVolume = 1.0);
+            const std::string& getReloadSound();
+            void playReloadSound();
+
             virtual void fire() = 0;
 
@@ -188 +194 @@
             Quaternion muzzleOrientation_;
 
-            WorldSound* defSndWpnFire_;
-            bool bSoundAttached_;
+            std::string fireSoundPath_; // The path of the sound played when fireing
+            float fireSoundVolume_; // The volume of the sound played when fireing
+            std::vector<WorldSound*> fireSounds_; // List of sounds used by the weapon mode. Because multiple sounds may overlap, we need mor than one WorldSound instance.
+            std::string reloadSoundPath_; // The path of the sound played when reloading
+            float reloadSoundVolume_; // The volume of the sound played when reloading
+            WorldSound* reloadSound_;
     };
 }