Changeset 11185 for code/branches/sagerjFS16/src/modules/weapons/weaponmodes

Timestamp:

May 12, 2016, 4:03:47 PM (9 years ago)

Author:

sagerj

Message:

fix the charging during reloadtime, the hudchargebar working so far…

Location:

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

Files:

• Discharger.cc (modified) (4 diffs)
• Discharger.h (modified) (2 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *      Martin Polak
+ *      God of everything
  *   Co-authors:
- *      simonmie
+ *    
  *
  */
@@ -51 +51 @@
         RegisterObject(Discharger);
 
-        this->reloadTime_ = 0.23f;
-        this->damage_ = 90.01f;
-        this->speed_ = 90.01f;
+        this->reloadTime_ = 3.14159f;
+        this->damage_ = 0.0f;
+        this->speed_ = 100.0f;
         this->chargeable_ = true;
 
@@ -65 +65 @@
     void Discharger::fire()
     {
-        // orxout() << "release" << cTime_ << endl;
         BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
 
@@ -71 +70 @@
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
+        projectile->setVelocity(this->getMuzzleDirection() * this->speed_ * this->charges_ / 5);
 
         projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        projectile->setDamage(this->getDamage() * charges_);
-        projectile->setShieldDamage(this->getShieldDamage());
-        projectile->setHealthDamage(this->getHealthDamage());
-        //  this->charges_ = 0;
+        projectile->setDamage(this->getDamage() * this->charges_);
+        projectile->setShieldDamage(this->getShieldDamage() * this->charges_);
+        projectile->setHealthDamage(this->getHealthDamage() * this->charges_);
+        this->charges_ = 0;
     }
 }

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

@@ -21 +21 @@
  *
  *   Author:
- *      Martin Polak
+ *       God of everything
  *   Co-authors:
- *      ...
+ *      
  *
  */
@@ -58 +58 @@
 
         private:
-            //bool chargeable_;     // An indicator that this weapon type is chargeable.
-            int charges_;
             float speed_;                  // The speed of the fired projectile.
-            float ctime_;                  // time the weapon has charged.
+            
     }; 
 }