Changeset 11170 for code/branches/sagerjFS16/src/modules/weapons

Timestamp:

Apr 21, 2016, 3:33:48 PM (9 years ago)

Author:

sagerj

Message:

running backup

Location:

code/branches/sagerjFS16/src/modules/weapons/weaponmodes

Files:

• Discharger.cc (modified) (2 diffs)
• Discharger.h (modified) (1 diff)

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

@@ -51 +51 @@
         RegisterObject(Discharger);
 
+        this->reloadTime_ = 0.23f;
+        this->damage_ = 90.01f;
+        this->speed_ = 90.01f;
+        this->charges_ = 0;
+
         this->setMunitionName("LaserMunition");
+        this->setFireSound("sounds/Weapon_LaserFire.ogg");
+        this->setReloadSound("sounds/Reload_LaserFire.ogg", 0.8);
 
         hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
@@ -58 +65 @@
     void Discharger::fire()
     {
-        orxout() << "fire dis " << endl;
+        charges_ += 1;
+        orxout() << "c = " << charges_ << endl;
     }
     
-    bool Discharger::fire(float* reloadTime)
+    void Discharger::release()
     {
-        orxout() << "fire Discharger " << endl;
-        return false;
-    }
-    bool Discharger::release(float* reloadTime)
-    {
-        orxout() << "release Discharger " << endl;
-        return false;
+        orxout() << "release c = " << charges_ << endl;
+        BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
+
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+        projectile->setOrientation(this->getMuzzleOrientation());
+        projectile->setPosition(this->getMuzzlePosition());
+        projectile->setVelocity(this->getMuzzleDirection() * this->speed_ * charges_);
+
+        projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        projectile->setDamage(this->getDamage() * charges_);
+        projectile->setShieldDamage(this->getShieldDamage() * charges_);
+        projectile->setHealthDamage(this->getHealthDamage() * charges_);
+        this->charges_ = 0;
     }
 }

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

@@ -55 +55 @@
 
             virtual void fire() override;
-            virtual bool fire(float* reloadTime) override;
-            virtual bool release(float* reloadTime) override;
+            virtual void release() override;
 
         private:
+            float speed_; // The speed of the fired projectile.
+            unsigned int charges_; // An indicator of how much you charged up.
     };
 }