Changeset 11185 for code/branches/sagerjFS16

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

Files:

• data/levels/includes/weaponSettingsEscort.oxi (modified) (2 diffs)
• data/levels/missionOne.oxw (modified) (2 diffs)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDChargeBar.cc (added)
• src/modules/overlays/hud/HUDChargeBar.h (added)
• src/modules/weapons/weaponmodes/Discharger.cc (modified) (4 diffs)
• src/modules/weapons/weaponmodes/Discharger.h (modified) (2 diffs)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (3 diffs)
• src/orxonox/weaponsystem/WeaponMode.h (modified) (2 diffs)

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

@@ -24 +24 @@
             munitionpershot=1
             delay=0
-            damage=9.3
+            damage=0.5
             material="Flares/point_lensflare"
             muzzleoffset=" 1.6, 1.3, -2.0"
@@ -36 +36 @@
     <munition>
       <LaserMunition
-        initialmagazines=8
-        maxmagazines=8
+        initialmagazines=2
+        maxmagazines=2
         munitionpermagazine=10
         replenishamount=1
-        replenishinterval=7.5
+        replenishinterval=2
       />
     </munition>

code/branches/sagerjFS16/data/levels/missionOne.oxw

@@ -12 +12 @@
   include("templates/lodInformation.oxt")
   include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipEscort.oxt")
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipSpacecruiser.oxt")
@@ -57 +58 @@
         <events>
             <trigger>
-                <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff>
+                <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort>
                   <EventTrigger invert=true>
                     <events>

code/branches/sagerjFS16/data/overlays/HUDTemplates3.oxo

@@ -184 +184 @@
      weaponModeHUDSize      = "0.09, 0.03"
     />
+
+    <HUDChargeBar
+     name                   = "ChargeBar"
+     background    = "Orxonox/BarBackground"
+     size          = "0.40, 0.04"
+     position      = "0.0 , 0.5 "
+     pickpoint     = "0, 1"
+     correctaspect = true
+     iconmaterial  = "Orxonox/BarIconSpeed"
+    >
+      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
+      <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
+    </HUDChargeBar>
     
     <HUDTimer

code/branches/sagerjFS16/src/modules/overlays/hud/CMakeLists.txt

@@ -14 +14 @@
   HUDWeapon.cc
   HUDWeaponSystem.cc
+  HUDChargeBar.cc
   ChatOverlay.cc
   AnnounceMessage.cc

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.
+            
     }; 
 }

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc

@@ -64 +64 @@
         this->bParallelReload_ = true;
         this->chargeable_ = false;
+        this->charges_ = 0;
+        this->maxCharges_ = 100;
 
         this->reloadTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&WeaponMode::reloaded, this)));
@@ -172 +174 @@
     bool WeaponMode::push(float* reloadTime)
     {
-        orxout() << "push " << chargeable_ << endl;
+
         if( this->chargeable_)
         {
-            // setting up a timer for knowing how long the weapon was charged 
-            // and passes the value to this->cTime_
-            orxout() << "if " << endl;
+            if(this->charges_ < this->maxCharges_){
+                this->charges_ += 1;
+            }
             return false;
         } else {
-            orxout() << "else " << endl;
             return fire(reloadTime);
         }
@@ -187 +188 @@
     bool WeaponMode::release(float* reloadTime)
     {
-        orxout() << "release " << endl;
         if( this->chargeable_)
         { 
-            orxout() << "if " << endl;
             return fire(reloadTime);
         }else{
-            orxout() << "else " << endl;
             return false;
         }

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h

@@ -110 +110 @@
 
             // Fire
+            inline unsigned int getMaxCharges()
+                { return this->maxCharges_;}
+            inline unsigned int getCharges()
+                { return this->charges_;}
+            inline bool isChargeable()
+                { return this->chargeable_;}
             inline void setDamage(float damage)
                 { this->damage_ = damage;}
@@ -170 +176 @@
             unsigned int initialMagazines_;
             unsigned int munitionPerShot_;
+            unsigned int charges_;
+            unsigned int maxCharges_;
 
             float reloadTime_;