Changeset 10878

Timestamp:

Nov 27, 2015, 6:49:54 PM (9 years ago)

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15

Files:

• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsAssff2.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsCollateral.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsFPS.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsFS15.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsGhost.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsH2.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsHXY.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsHeartAttack.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsImmTest.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsPirate.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsRing.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsSwallow.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsTransporter.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsTurret.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsTurret1.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsbigship.oxi (modified) (1 diff)
• src/modules/overlays/hud/HUDEnemyShieldBar.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDWeaponMode.cc (modified) (1 diff)
• src/modules/weapons/munitions/FusionMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/GravityBombMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/IceMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/LaserMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/LightningMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/RocketMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/SplitMunition.cc (modified) (1 diff)
• src/orxonox/controllers/HumanController.cc (modified) (1 diff)
• src/orxonox/weaponsystem/Munition.cc (modified) (24 diffs)
• src/orxonox/weaponsystem/Munition.h (modified) (3 diffs)
• src/orxonox/weaponsystem/ReplenishingMunition.cc (modified) (2 diffs)
• src/orxonox/weaponsystem/ReplenishingMunition.h (modified) (1 diff)

code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi

@@ -45 +45 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=2 replenishinterval=7.5/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi

@@ -43 +43 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <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 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi

@@ -47 +47 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <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 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsEscort.oxi

@@ -27 +27 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     </munition>      

code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS.oxi

@@ -51 +51 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
     </munition>    

code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi

@@ -51 +51 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
     </munition>      

code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi

@@ -51 +51 @@
 </weaponpacks>
 <munition>
-  <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+  <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 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi

@@ -37 +37 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <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 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsH2.oxi

@@ -44 +44 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     </munition>
 

code/branches/fabienHS15/data/levels/includes/weaponSettingsHXY.oxi

@@ -26 +26 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     </munition> 

code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi

@@ -42 +42 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=0.25/>
+      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=6.0/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=1 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi

@@ -45 +45 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
+      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=5.0/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi

@@ -47 +47 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
+      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.0/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi

@@ -57 +57 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
+      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.0/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsPirate.oxi

@@ -24 +24 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
+      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.0/>
     </munition>

code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi

@@ -30 +30 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
+      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
       <GravityBombMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=1 />
       <IceMunition initialmagazines=16 maxmagazines=16 munitionpermagazine=1 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi

@@ -89 +89 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=0.2/>
+      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />

code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi

@@ -25 +25 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
       <SplitMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     </munition>

code/branches/fabienHS15/data/levels/includes/weaponSettingsTransporter.oxi

@@ -26 +26 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     </munition>

code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret.oxi

@@ -22 +22 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     </munition>

code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret1.oxi

@@ -22 +22 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     </munition>

code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi

@@ -48 +48 @@
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.4/>
+      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
       <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
       <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />

code/branches/fabienHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc

@@ -71 +71 @@
                 target = target->getParent();
             pawn = orxonox_cast<Pawn*>(target);
-            // Don't show the HealthBar if the pawn is invisible
+            // Don't show the EnemyShieldBar if the pawn is invisible
             if (pawn && !pawn->isVisible())
                 pawn = NULL;
         }
-        // Set the pawn as owner of the HealthBar
+        // Set the pawn as owner of the EnemyShieldBar
         this->setShieldBarOwner(pawn);
         this->setVisible(pawn != NULL);

code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc

@@ -160 +160 @@
                     ReplenishingMunition* replenishingMunition = dynamic_cast<ReplenishingMunition*>(munition);
 
-                    if (replenishingMunition->canAddMunition(1))
+                    if (replenishingMunition->canAddMagazines(1))
                     {
                         float progress = 1.0f - replenishingMunition->getProgress();

code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc

@@ -46 +46 @@
         this->maxMunitionPerMagazine_ = 10;
         this->maxMagazines_ = 10;
-        this->magazines_ = 10;
+        this->unassignedMagazines_ = 10;
 
         this->deployment_ = MunitionDeployment::Separate;

code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc

@@ -18 +18 @@
         this->maxMunitionPerMagazine_ = 1;
         this->maxMagazines_ = 30;
-        this->magazines_ = 15;
+        this->unassignedMagazines_ = 15;
 
         this->deployment_ = MunitionDeployment::Stack;

code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc

@@ -46 +46 @@
         this->maxMunitionPerMagazine_ = 1;
         this->maxMagazines_ = 50;
-        this->magazines_ = 25;
+        this->unassignedMagazines_ = 25;
 
         this->deployment_ = MunitionDeployment::Stack;

code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc

@@ -46 +46 @@
         this->maxMunitionPerMagazine_ = 20;
         this->maxMagazines_ = 10;
-        this->magazines_ = 10;
+        this->unassignedMagazines_ = 10;
 
         this->deployment_ = MunitionDeployment::Separate;
@@ -53 +53 @@
         this->bAllowMultiMunitionRemovementUnderflow_ = true;
 
-        this->replenishInterval_ = 0.5f;
+        this->replenishInterval_ = 7.0f;
         this->replenishAmount_ = 1;
 

code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc

@@ -46 +46 @@
         this->maxMunitionPerMagazine_ = 20;
         this->maxMagazines_ = 1;
-        this->magazines_ = 1;
+        this->unassignedMagazines_ = 1;
 
         this->deployment_ = MunitionDeployment::Share;

code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc

@@ -46 +46 @@
         this->maxMunitionPerMagazine_ = 1;
         this->maxMagazines_ = 30;
-        this->magazines_ = 10;
+        this->unassignedMagazines_ = 10;
 
         this->deployment_ = MunitionDeployment::Stack;

code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc

@@ -46 +46 @@
         this->maxMunitionPerMagazine_ = 5;
         this->maxMagazines_ = 10;
-        this->magazines_ = 5;
+        this->unassignedMagazines_ = 5;
 
         this->deployment_ = MunitionDeployment::Share;

code/branches/fabienHS15/src/orxonox/controllers/HumanController.cc

@@ -199 +199 @@
     @brief
         Starts the boosting mode.
-        Resets the boosting timeout and ells the ControllableEntity to boost (or not boost anymore).
+        Resets the boosting timeout and tells the ControllableEntity to boost (or not boost anymore).
     */
     void HumanController::startBoosting(void)

code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc

@@ -44 +44 @@
         this->maxMunitionPerMagazine_ = 10;
         this->maxMagazines_ = 10;
-        this->magazines_ = 10;
+        this->unassignedMagazines_ = 10;
 
         this->deployment_ = MunitionDeployment::Stack;
@@ -57 +57 @@
     Munition::~Munition()
     {
-        for (std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.begin(); it != this->currentMagazines_.end(); ++it)
+        for (std::map<WeaponMode*, Magazine*>::iterator it = this->assignedMagazines_.begin(); it != this->assignedMagazines_.end(); ++it)
             delete it->second;
     }
@@ -79 +79 @@
 
             // Use the map to get the magazine assigned to the given user
-            std::map<WeaponMode*, Magazine*>::const_iterator it = this->currentMagazines_.find(user);
-            if (it != this->currentMagazines_.end())
+            std::map<WeaponMode*, Magazine*>::const_iterator it = this->assignedMagazines_.find(user);
+            if (it != this->assignedMagazines_.end())
                 return it->second;
         }
@@ -86 +86 @@
         {
             // We don't use separate magazines for each user, so just take the first magazine
-            if (this->currentMagazines_.size() > 0)
-                return this->currentMagazines_.begin()->second;
+            if (this->assignedMagazines_.size() > 0)
+                return this->assignedMagazines_.begin()->second;
         }
 
@@ -100 +100 @@
             if (deployment_ == MunitionDeployment::Stack)
                 // With stacked munition every magazine contributes to the total amount
-                return this->maxMunitionPerMagazine_ * this->magazines_ + magazine->munition_;
+                return this->maxMunitionPerMagazine_ * this->unassignedMagazines_ + magazine->munition_;
             else
                 // Wihtout stacked munition we just consider the current magazine
@@ -125 +125 @@
             Magazine* magazine = this->getMagazine(0);
             if (magazine && magazine->munition_ == this->maxMunitionPerMagazine_)
-                return this->magazines_ + 1;
-        }
-
-        return this->magazines_;
+                return this->unassignedMagazines_ + 1;
+        }
+
+        return this->unassignedMagazines_;
     }
 
     void Munition::setNumMagazines(unsigned int numMagazines)
     {
-        this->magazines_ = numMagazines;
+        this->unassignedMagazines_ = numMagazines;
     }
 
@@ -154 +154 @@
             if (deployment_ == MunitionDeployment::Stack)
             {
-                munition += this->maxMunitionPerMagazine_ * this->magazines_;
+                munition += this->maxMunitionPerMagazine_ * this->unassignedMagazines_;
             }
 
@@ -200 +200 @@
                     magazine->munition_ = 0;
 
-                    if (this->reload(0))
+                    if (this->reload(NULL))
                         // Successfully reloaded, continue recursively
                         return this->takeMunition(amount, 0);
@@ -224 +224 @@
     {
         // As long as we have enough magazines (and don't stack munition) we can reload
-        return (this->magazines_ > 0 && deployment_ != MunitionDeployment::Stack);
+        return (this->unassignedMagazines_ > 0 && deployment_ != MunitionDeployment::Stack);
     }
 
@@ -252 +252 @@
 
         // Check if we actually can reload
-        if (this->magazines_ == 0)
+        if (this->unassignedMagazines_ == 0)
             return false;
 
@@ -266 +266 @@
 
         // Remove the current magazine for the given user
-        std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.find(user);
-        if (it != this->currentMagazines_.end())
+        std::map<WeaponMode*, Magazine*>::iterator it = this->assignedMagazines_.find(user);
+        if (it != this->assignedMagazines_.end())
         {
             if (it->first == lastFilledWeaponMode_)
@@ -274 +274 @@
             }            
             delete it->second;
-            this->currentMagazines_.erase(it);
+            this->assignedMagazines_.erase(it);
         }
 
         // Load a new magazine
-        this->currentMagazines_[user] = new Magazine(this, bUseReloadTime);
-        this->magazines_--;
+        this->assignedMagazines_[user] = new Magazine(this, bUseReloadTime);
+        this->unassignedMagazines_--;
 
         return true;
@@ -299 +299 @@
         {
             // Return true if any of the current magazines is not full (loading counts as full although it returns 0 munition)
-            for (std::map<WeaponMode*, Magazine*>::const_iterator it = this->currentMagazines_.begin(); it != this->currentMagazines_.end(); ++it)
+            for (std::map<WeaponMode*, Magazine*>::const_iterator it = this->assignedMagazines_.begin(); it != this->assignedMagazines_.end(); ++it)
                 if (it->second->munition_ < this->maxMunitionPerMagazine_ && it->second->bLoaded_)
                     return true;
@@ -325 +325 @@
                 {
                     magazine->munition_ -= this->maxMunitionPerMagazine_;
-                    this->magazines_++;
+                    this->unassignedMagazines_++;
                 }
 
                 // If we reached the limit, reduce both magazines and munition to the maximum
-                if (this->magazines_ >= this->maxMagazines_)
-                {
-                    this->magazines_ = this->maxMagazines_;
+                if (this->unassignedMagazines_ >= this->maxMagazines_)
+                {
+                    this->unassignedMagazines_ = this->maxMagazines_;
                     magazine->munition_ = this->maxMunitionPerMagazine_;
                 }
@@ -349 +349 @@
             if (lastFilledWeaponMode_ == NULL)
             {
-                it = this->currentMagazines_.begin();
+                it = this->assignedMagazines_.begin();
             }
             else
             {
-                it = this->currentMagazines_.find(lastFilledWeaponMode_);
+                it = this->assignedMagazines_.find(lastFilledWeaponMode_);
                 ++ it;
             }
@@ -362 +362 @@
             {
                 bool change = false;
-                while (it != this->currentMagazines_.end())
+                while (it != this->assignedMagazines_.end())
                 {
                     // Add munition if the magazine isn't full (but only to loaded magazines)
@@ -383 +383 @@
                 }                    
 
-                it = this->currentMagazines_.begin();
+                it = this->assignedMagazines_.begin();
                 firstLoop = false;
             }
@@ -400 +400 @@
         else
             // If we don't stack munition, we're more limited
-            return ((this->currentMagazines_.size() + this->magazines_) < this->maxMagazines_);
-    }
-
-    bool Munition::addMagazines(unsigned int amount)
-    {
+            return ((this->assignedMagazines_.size() + this->unassignedMagazines_) < this->maxMagazines_);
+    }
+
+    unsigned int Munition::addMagazines(unsigned int amount)
+    {
+        unsigned int addedMagazines = 0;
+
         if (!this->canAddMagazines(amount))
-            return false;
+            return 0;
 
         // Calculate how many magazines are needed
-        int needed_magazines = this->maxMagazines_ - this->magazines_ - this->currentMagazines_.size();
+        int needed_magazines = this->maxMagazines_ - this->unassignedMagazines_ - this->assignedMagazines_.size();
 
         // If zero or less magazines are needed, we definitively don't need more magazines (unless we stack munition - then a magazine contributes directly to the munition)
         if (needed_magazines <= 0 && deployment_ != MunitionDeployment::Stack)
-            return false;
+            return 0;
 
         if (amount <= static_cast<unsigned int>(needed_magazines))
         {
             // We need more magazines than we get, so just add them
-            this->magazines_ += amount;
+            this->unassignedMagazines_ += amount;
+            addedMagazines = amount;
         }
         else
         {
             // We get more magazines than we need, so just add the needed amount
-            this->magazines_ += needed_magazines;
+            this->unassignedMagazines_ += needed_magazines;
+            addedMagazines = needed_magazines;
             if (deployment_ == MunitionDeployment::Stack)
             {
@@ -433 +437 @@
         }
 
-        return true;
+        // Reload as many empty magazines as possible
+        // Double loop and break is needed because the reload function changes the assigned magazines. This may confuse the iterator.
+        for (unsigned int i = 0; i < addedMagazines; ++i)
+        {
+            for (std::map<WeaponMode*, Magazine*>::iterator it = this->assignedMagazines_.begin(); it != this->assignedMagazines_.end(); ++it)
+            {
+                if (needReload(it->first))
+                {
+                    reload(it->first);
+                    break;
+                }
+            }
+        }
+
+        return addedMagazines;
     }
 
@@ -440 +458 @@
         if (deployment_ == MunitionDeployment::Stack)
         {
-            if (this->magazines_ >= amount)
+            if (this->unassignedMagazines_ >= amount)
             {
                 // We have enough magazines
                 return true;
             }
-            else if (this->magazines_ == amount - 1)
+            else if (this->unassignedMagazines_ == amount - 1)
             {
                 // We lack one magazine, check if the current magazine is still full, if yes we're fine
@@ -461 +479 @@
         {
             // In case we're not stacking munition, just check the number of magazines
-            return (this->magazines_ >= amount);
+            return (this->unassignedMagazines_ >= amount);
         }
 
@@ -472 +490 @@
             return false;
 
-        if (this->magazines_ >= amount)
+        if (this->unassignedMagazines_ >= amount)
         {
             // We have enough magazines, just remove the amount
-            this->magazines_ -= amount;
+            this->unassignedMagazines_ -= amount;
         }
         else if (deployment_ == MunitionDeployment::Stack)
         {
             // We don't have enough magazines, but we're stacking munition, so additionally remove the bullets from the current magazine
-            this->magazines_ = 0;
+            this->unassignedMagazines_ = 0;
             Magazine* magazine = this->getMagazine(0);
             if (magazine)
@@ -500 +518 @@
 
         // Remove the current magazine for the given user
-        std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.find(user);
-        if (it != this->currentMagazines_.end())
+        std::map<WeaponMode*, Magazine*>::iterator it = this->assignedMagazines_.find(user);
+        if (it != this->assignedMagazines_.end())
         {
             if (it->first == lastFilledWeaponMode_)
@@ -508 +526 @@
             }
             delete it->second;
-            this->currentMagazines_.erase(it);           
+            this->assignedMagazines_.erase(it);           
             return true;
         }

code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h

@@ -97 +97 @@
 
             bool canAddMagazines(unsigned int amount) const;
-            bool addMagazines(unsigned int amount);
+            /**
+            @brief Try to add magazines.
+            @param amount The amount of magazines tried to add.
+            @return The amount of magazines sucessfully added.
+            */
+            unsigned int addMagazines(unsigned int amount);
 
             bool canRemoveMagazines(unsigned int amount) const;
@@ -107 +112 @@
             unsigned int maxMunitionPerMagazine_;
             unsigned int maxMagazines_;
-            unsigned int magazines_;
-            std::map<WeaponMode*, Magazine*> currentMagazines_; // Maps weapon modes to magazines that are currently used.
+            unsigned int unassignedMagazines_; // Number of magazines that are not assigned to a weapon mode. These are alway treated as full.
+            std::map<WeaponMode*, Magazine*> assignedMagazines_; // Maps weapon modes to magazines that are currently used.
 
             MunitionDeployment::Value deployment_; // Defines the behaviour how munition and magazines are distributed to the consuming weapon modes.
@@ -115 +120 @@
             bool bAllowMultiMunitionRemovementUnderflow_;
 
-            float reloadTime_;
+            float reloadTime_; // The time needed to replace a magazine by a new one.
             WeaponMode* lastFilledWeaponMode_; // Pointer to the weapon mode that got the last munition during the last call of addMunition.
 

code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc

@@ -76 +76 @@
     void ReplenishingMunition::replenish()
     {
-        if (this->canAddMunition(this->replenishAmount_))
+        if (this->canAddMagazines(this->replenishAmount_))
         {
             // Make a temporary copy of bAllowMunitionRefilling_, because this might be disallowed in every
@@ -84 +84 @@
 
             // Replenish munition
-            this->addMunition(this->replenishAmount_);
+            this->addMagazines(this->replenishAmount_);
 
             // Write back the temporary value

code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.h

@@ -64 +64 @@
         protected:                          
             float replenishInterval_; //!< The interval in which the munition is replenished.
-            unsigned int replenishAmount_; //!< The amount by which it is replenished.
+            unsigned int replenishAmount_; //!< The amount of magazines by which it is replenished.
 
         private:
-            void replenish();
+            void replenish(); //!< Every call of this function replenishes the munition. This function is called by the timer.
             void initializeTimer();