Index: /code/branches/sagerjFS16/data/levels/florin_johnny_presentation.oxw
===================================================================
--- /code/branches/sagerjFS16/data/levels/florin_johnny_presentation.oxw (revision 11205)
+++ /code/branches/sagerjFS16/data/levels/florin_johnny_presentation.oxw (revision 11205)
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi
===================================================================
--- /code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (revision 11204)
+++ /code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi (revision 11205)
@@ -1,5 +1,5 @@
-
-
+
+
@@ -25,5 +25,5 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /code/branches/sagerjFS16/data/levels/templates/spaceshipFx112.oxt
===================================================================
--- /code/branches/sagerjFS16/data/levels/templates/spaceshipFx112.oxt (revision 11205)
+++ /code/branches/sagerjFS16/data/levels/templates/spaceshipFx112.oxt (revision 11205)
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc
===================================================================
--- /code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (revision 11204)
+++ /code/branches/sagerjFS16/src/modules/overlays/hud/HUDChargeBar.cc (revision 11205)
@@ -60,4 +60,5 @@
if(this->correspondingMode_->getCharges() > 0) // The HUDBar should only be visible when we are charging up
+ {
this->setVisible(true);
}
Index: /code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc
===================================================================
--- /code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (revision 11204)
+++ /code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc (revision 11205)
@@ -67,4 +67,22 @@
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());
Index: /code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h
===================================================================
--- /code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (revision 11204)
+++ /code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h (revision 11205)
@@ -53,11 +53,12 @@
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
};
}