Changeset 11205 for code/branches

Timestamp:

May 26, 2016, 3:58:37 PM (8 years ago)

Author:

sagerj

Message:

zusammengemerged mit florin project

Location:

code/branches/sagerjFS16

Files:

• data/levels/florin_johnny_presentation.oxw (added)
• data/levels/includes/weaponSettingsEscortDischarger.oxi (modified) (2 diffs)
• data/levels/includes/weaponSettingsFx112.oxi (added)
• data/levels/templates/spaceshipFx112.oxt (added)
• src/modules/overlays/hud/HUDChargeBar.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/Discharger.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/Discharger.h (modified) (1 diff)

code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi

@@ -1 +1 @@
     <weaponslots>
-      <WeaponSlot position="-9.2,2,-13" />
-      <WeaponSlot position=" 9.2,2,-13" />
+      <WeaponSlot position="-10,0,0" />
+      <WeaponSlot position=" 10,0,0" />
     </weaponslots>
     <weaponsets>
@@ -25 +25 @@
         <Weapon>
           <Discharger
-            mode=0
+            mode=1
             munitionpershot=1
             delay=0

code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc

@@ -60 +60 @@
                 
                 if(this->correspondingMode_->getCharges() > 0)                                                      // The HUDBar should only be visible when we are charging up
+                {
                     this->setVisible(true);
                 }

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc

@@ -67 +67 @@
         BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
+        if(this->charges_ < this->thresholdOne_)
+        {
+            projectile->setMaterial("Flares/lensflare");
+        }
+        else
+        {
+            if(this->charges_ < this->thresholdTwo_)
+            {
+                projectile->setMaterial("Flares/ringflare");
+            }
+            else
+            {
+                projectile->setMaterial("Flares/ringflare2");  
+            }
+        }
+
+        projectile->setScale(1+this->charges_/10);
+
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());

code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h

@@ -53 +53 @@
         public:
             Discharger(Context* context);
-            virtual ~Discharger() {}
+            virtual ~Discharger() {}                    // declaration for the constructor
 
-            virtual void fire() override;
+            virtual void fire() override;               // declaration of specific fire function of each weapon
 
         private:
-            float speed_;                  // The speed of the fired projectile.
-            
+            float speed_;                               // The speed of the fired projectile.
+            const unsigned int thresholdOne_ = 50;      // Threshold amount of charges where the projectile changes the first time
+            const unsigned int thresholdTwo_ = 100;     // Threshold amount of charges where the projectile changes the second time        
     }; 
 }