Changeset 10961 for code/branches/presentationHS15/src/modules/weapons/projectiles

Timestamp:

Dec 9, 2015, 2:45:58 PM (10 years ago)

Author:

maxima

Message:

Merged presentation and fabiens branch. Had to modify hoverHUD and invaderHUD, because the text of the healthbar wasn't correctly displayed and the weapon settings of the hovership.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/GravityBombField.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (5 diffs)
• src/modules/weapons/projectiles/Rocket.h (modified) (1 diff)
• src/modules/weapons/projectiles/SimpleRocket.cc (modified) (1 diff)

code/branches/presentationHS15/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -68 +68 @@
     @brief
         The function called when a projectile hits another thing.
-        Calls the hit-function, starts the reload countdown, displays visual hit effects defined in Pawn.
+        Calls the hit-function, starts the shield recharge countdown, displays visual hit effects defined in Pawn.
         Needs to be called in the collidesAgainst() function by every Class directly inheriting from BasicProjectile.
     @param otherObject
@@ -97 +97 @@
             {
                 victim->hit(this->getShooter(), contactPoint, cs, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
-                victim->startReloadCountdown();
+                victim->startShieldRechargeCountdown();
             }
 

code/branches/presentationHS15/src/modules/weapons/projectiles/GravityBombField.cc

@@ -164 +164 @@
         if (lifetime_ <= -4)
         {
-            orxout(debug_output) << "Timeout. Destroying field." << endl;
             this->destroy();
         }

code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.cc

@@ -66 +66 @@
 
         this->localAngularVelocity_ = 0;
-        this->lifetime_ = 100.0f;
+        this->lifetime_ = 20.0f;
 
         if (GameMode::isMaster())
@@ -76 +76 @@
             Model* model = new Model(this->getContext());
             model->setMeshSource("rocket.mesh");
-            model->scale(0.7f);
+            model->scale(1.0f);
             this->attach(model);
 
@@ -100 +100 @@
             this->attachCollisionShape(collisionShape);
 
-            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
-
             // Add sound
             this->defSndWpnEngine_ = new WorldSound(this->getContext());
@@ -114 +112 @@
             this->defSndWpnLaunch_->setVolume(1.0f);
             this->attach(defSndWpnLaunch_);
+
+            this->setHudTemplate("rockethud");
         }
         else
@@ -320 +320 @@
     }
 
+    float Rocket::getFuel() const
+    {
+        return this->destroyTimer_.getRemainingTime();
+    }
+
+    void Rocket::setMaxFuel(float fuel)
+    {
+        this->lifetime_ = fuel;
+        this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
+    }
 }

code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.h

@@ -118 +118 @@
             virtual void fired(unsigned int firemode);
 
+            /**
+            @brief Set the maximum lifetime of the rocket.
+            */
+            virtual void setMaxFuel(float fuel);
+            /**
+            @brief Get the maximum lifetime of the rocket.
+            */
+            inline float getMaxFuel() const
+                { return lifetime_; }
+            virtual float getFuel() const;
+
         private:
             Vector3 localAngularVelocity_; //!< Variable to temporarily store accumulated steering command input.

code/branches/presentationHS15/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -76 +76 @@
             Model* model = new Model(this->getContext());
             model->setMeshSource("rocket.mesh");
-            model->scale(0.7f);
+            model->scale(1.0f);
             this->attach(model);