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

Timestamp:

Nov 9, 2015, 5:55:42 PM (9 years ago)

Author:

fvultier

Message:

Munition may and must now be defined for each pawn separately. This way a heavy cruiser may carry more munition than a drone.

Location:

code/branches/fabienHS15/src/modules

Files:

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

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

@@ -73 +73 @@
         this->textOverlayLeft_ = new OverlayText(this->getContext());
         assert(this->textOverlayLeft_.get());
-        this->textOverlayLeft_->setCaption("???");
+        this->textOverlayLeft_->setCaption("?");
         textOverlayLeft_->setPickPoint(Vector2(0.0f,0.0f));
         textOverlayLeft_->setVisible(true);
@@ -83 +83 @@
         
         this->textOverlayRight_ = new OverlayText(this->getContext());
-        assert(this->textOverlayLeft_.get());
-        this->textOverlayRight_->setCaption("???");
+        assert(this->textOverlayRight_.get());
+        this->textOverlayRight_->setCaption("?");
         textOverlayRight_->setPickPoint(Vector2(0.0f,0.0f));
         textOverlayRight_->setVisible(true);
@@ -93 +93 @@
         textOverlayRight_->setZOrder(600);
 
-        materialNameState_ = "Orxonox/WSHUD_Reloading";
+        materialNameState_ = "Orxonox/WSHUD_Empty";
 
         overlayElementReplenish_->setMaterialName("Orxonox/WSHUD_Replenish");
@@ -155 +155 @@
                     materialNameState_ = "Orxonox/WSHUD_Empty";
                 }
-            }
-
-            if (munition->isA(Class(ReplenishingMunition)))
-            {
-                ReplenishingMunition* replenishingMunition = dynamic_cast<ReplenishingMunition*>(munition);
-
-                if (replenishingMunition->canAddMunition(1))
-                {
-                    float progress = 1.0f - replenishingMunition->getProgress();
-                    overlayElementReplenish_->setDimensions(1.0f,progress);                    
-                }
-                else
-                {
-                    overlayElementReplenish_->setDimensions(1.0f,1.0f);
+
+                if (munition->isA(Class(ReplenishingMunition)))
+                {
+                    ReplenishingMunition* replenishingMunition = dynamic_cast<ReplenishingMunition*>(munition);
+
+                    if (replenishingMunition->canAddMunition(1))
+                    {
+                        float progress = 1.0f - replenishingMunition->getProgress();
+                        overlayElementReplenish_->setDimensions(1.0f,progress);                    
+                    }
+                    else
+                    {
+                        overlayElementReplenish_->setDimensions(1.0f,1.0f);
+                    }
                 }
             }

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

@@ -34 +34 @@
 #include "FusionMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -56 +57 @@
         this->reloadTime_ = 0.5f;
     }
+
+    void FusionMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(FusionMunition, XMLPort, xmlelement, mode);
+    }
 }

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

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

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

@@ -7 +7 @@
 #include "GravityBombMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -27 +28 @@
     }
 
+    void GravityBombMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(GravityBombMunition, XMLPort, xmlelement, mode);
+    }
 }
 

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

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

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

@@ -34 +34 @@
 #include "IceMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -54 +55 @@
         this->reloadTime_ = 0.5f;
     }
+
+    void IceMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(IceMunition, XMLPort, xmlelement, mode);
+    }
 }

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

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

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

@@ -34 +34 @@
 #include "LaserMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -53 +54 @@
 
         this->replenishInterval_ = 0.5f;
-        this->replenishMunitionAmount_ = 1;
+        this->replenishAmount_ = 1;
 
         this->reloadTime_ = 0.5f;
     }
+
+    void LaserMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(LaserMunition, XMLPort, xmlelement, mode);
+    }
 }

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

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

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

@@ -34 +34 @@
 #include "LightningMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -54 +55 @@
         this->reloadTime_ = 0.5f;    
     }
+
+    void LightningMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(LightningMunition, XMLPort, xmlelement, mode);
+    }
 }

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

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

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

@@ -34 +34 @@
 #include "RocketMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -54 +55 @@
         this->reloadTime_ = 0.5f;
     }
+
+    void RocketMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(RocketMunition, XMLPort, xmlelement, mode);
+    }
 }

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

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

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

@@ -34 +34 @@
 #include "SplitMunition.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -54 +55 @@
         this->reloadTime_ = 0.5f;
     }
+
+    void SplitMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(SplitMunition, XMLPort, xmlelement, mode);
+    }
 }

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

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