Changeset 10627

Timestamp:

Oct 6, 2015, 9:37:11 PM (9 years ago)

Author:

fvultier

Message:

Minor improvements. Use of the Munition class.

Location:

code/branches/towerdefenseFabien

Files:

• data/levels/towerDefense.oxw (modified) (1 diff)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/munitions/IceMunition.cc (added)
• src/modules/weapons/munitions/IceMunition.h (added)
• src/modules/weapons/munitions/SplitMunition.cc (added)
• src/modules/weapons/munitions/SplitMunition.h (added)
• src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) (4 diffs)
• src/modules/weapons/projectiles/SplitGunProjectile.h (modified) (2 diffs)
• src/modules/weapons/weaponmodes/IceGun.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/SplitGun.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/SplitGun.h (modified) (2 diffs)

code/branches/towerdefenseFabien/data/levels/towerDefense.oxw

@@ -143 +143 @@
         </links>
         <Weapon>
-          <SplitGun mode=0 munitionpershot=0 damage=9.3 muzzleoffset=" 1.6, 1.3, -2.0" splittime=0.2 numberofsplits=2 numberofchilds=5 spread=0.1 />
+          <SplitGun mode=0 munitionpershot=0 damage=9.3 muzzleoffset=" 1.6, 1.3, -2.0" splittime=0.2 numberofsplits=2 numberofchilds=5 spread=0.1 damagereduction=3.0 />
         </Weapon>
       </WeaponPack>

code/branches/towerdefenseFabien/src/modules/weapons/munitions/CMakeLists.txt

@@ -4 +4 @@
   FusionMunition.cc
   RocketMunition.cc
+  SplitMunition.cc
+  IceMunition.cc
 )

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.cc

@@ -49 +49 @@
         this->numberOfSplits_ = 0;
         this->numberOfChilds_ = 0;
-        this->splitTime_ = 1.0;     
-        this->spread_ = 0.2;
+        this->splitTime_ = 1.0f;
+        this->spread_ = 0.2f;
+        this->damageReduction_ = 1.0f;
     }
 
@@ -96 +97 @@
     void SplitGunProjectile::setSpread(float spread)
     {
-        spread_ = spread;
+        this->spread_ = spread;
+    }
+
+    /**
+    @brief
+        This is the setter function for the damageReduction_ variable. The value of the variable is bounded between 0 and 1.
+    */
+    void SplitGunProjectile::setDamageReduction(float damageReduction)
+    {
+        this->damageReduction_ = (damageReduction >= 0.0f ? damageReduction : 1.0f);
     }
 
@@ -109 +119 @@
             -- numberOfSplits_;
 
-            // Reduce damage of this projectile by the number of childs plus one. This way the total amount of possible damage contained in the original projectile and its childs is unchanged after s aplit.
-            this->setDamage(this->getDamage()/(numberOfChilds_+1));
+            // Reduce damage of this projectile
+            this->setDamage(this->getDamage() * this->damageReduction_ / (this->numberOfChilds_+1));
 
             // Calculate a normalized vector (velocityOffset) that is perpendicluar to the velocity of this projectile. Since there are infinitly many perpendicular vectors a random one is chosen.
@@ -138 +148 @@
                 projectile->setSplitTime(this->splitTime_);
                 projectile->setSpread(this->spread_);
+                projectile->setDamageReduction(this->damageReduction_);
 
                 projectile->setShooter(this->getShooter());

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/SplitGunProjectile.h

@@ -61 +61 @@
             virtual void setSplitTime(float splitTime);
             virtual void setSpread(float spread);
+            virtual void setDamageReduction(float damageReduction);
 
         private:            
@@ -67 +68 @@
             float splitTime_;
             float spread_;
+            float damageReduction_; //The damage of a child projectile is reduced by this factor
             Timer splitTimer_;
 

code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/IceGun.cc

@@ -54 +54 @@
         this->reloadTime_ = 1.0f;
         this->damage_ = 0.0f;
-        this->speed_ = 750.0f;
+        this->speed_ = 1200.0f;
 
         this->setFreezeTime(3.0);

code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.cc

@@ -56 +56 @@
         this->numberOfSplits_ = 2;
         this->numberOfChilds_ = 3;
-        this->splitTime_ = 0.3;
-        this->spread_ = 0.1;
+        this->splitTime_ = 0.3f;
+        this->spread_ = 0.1f;
+        this->damageReduction_ = 1.0f;
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("SplitMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
     }
@@ -79 +80 @@
         XMLPortParam(SplitGun, "splittime", setSplitTime, getSplitTime, xmlelement, mode);
         XMLPortParam(SplitGun, "spread", setSpread, getSpread, xmlelement, mode);
+        XMLPortParam(SplitGun, "damagereduction", setDamageReduction, getDamageReduction, xmlelement, mode);
     }
 
@@ -95 +97 @@
         projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
 
-        // Pass important information to the projectile: Number of splits, Number of childs, split time, spread
+        // Pass important information to the projectile: Number of splits, Number of childs, split time, spread and the damage reduction
         projectile->setNumberOfSplits(getNumberOfSplits());
         projectile->setNumberOfChilds(getNumberOfChilds());
         projectile->setSplitTime(getSplitTime());
         projectile->setSpread(getSpread());
+        projectile->setDamageReduction(getDamageReduction());
 
         projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/SplitGun.h

@@ -73 +73 @@
             inline float getSpread() const
                 { return this->spread_; }
+            inline void setDamageReduction(float damageReduction)
+                { this->damageReduction_ = (damageReduction >= 0.0f ? damageReduction : 1.0f); }
+            inline float getDamageReduction() const
+                { return this->damageReduction_; }
 
        private:
@@ -80 +84 @@
             float splitTime_; //The time between creation of the projectile and the split of the projectile
             float spread_; //Low spread means that the child projectiles are concentrated in a small area
+            float damageReduction_; //The damage of a child projectile is reduced by this factor
     };
 }