Changeset 10878 for code/branches/fabienHS15/src/modules

Timestamp:

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

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15/src/modules

Files:

• overlays/hud/HUDEnemyShieldBar.cc (modified) (1 diff)
• overlays/hud/HUDWeaponMode.cc (modified) (1 diff)
• weapons/munitions/FusionMunition.cc (modified) (1 diff)
• weapons/munitions/GravityBombMunition.cc (modified) (1 diff)
• weapons/munitions/IceMunition.cc (modified) (1 diff)
• weapons/munitions/LaserMunition.cc (modified) (2 diffs)
• weapons/munitions/LightningMunition.cc (modified) (1 diff)
• weapons/munitions/RocketMunition.cc (modified) (1 diff)
• weapons/munitions/SplitMunition.cc (modified) (1 diff)

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;