Changeset 11653 for code/branches

Timestamp:

Dec 11, 2017, 3:03:56 PM (7 years ago)

Author:

zarron

Message:

Boss spawned Gumbas have now max lifetime 2

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOBFireball.cc (modified) (1 diff)
• SOBGumbaBoss.cc (modified) (1 diff)
• SOBGumbaBoss.h (modified) (1 diff)

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc

@@ -110 +110 @@
         SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>   (otherObject);
 
-        if(gumbaBoss != nullptr && !(gumba->hasCollided_))
+        if(gumbaBoss != nullptr && !(gumba->hasCollided_))  //Fireballs can't destroy GumbaBosses, they get destroyed themselves instead
         {
             this->destroyLater();

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc

@@ -125 +125 @@
             dir = -1;
 
-        Vector3 velocity = getVelocity();
+        Vector3 velocity = getVelocity(); //Jump
         if(jumpTime_ > jumpTimeMax_){
             velocity.z = speed_*15;
             jumpTime_ = 0;
         }
-        else{
+        else{       //Gravity
             velocity.z -= gravityAcceleration_*dt;
         }

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.h

@@ -61 +61 @@
 
 
+
            
     };