[Orxonox-commit 7034] r11653 - code/branches/SOBv2_HS17/src/modules/superorxobros

[zarron at orxonox.net]

Author: zarron
Date: 2017-12-11 15:03:56 +0100 (Mon, 11 Dec 2017)
New Revision: 11653

Modified:
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.h
Log:
Boss spawned Gumbas have now max lifetime 2

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc	2017-12-11 13:33:45 UTC (rev 11652)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc	2017-12-11 14:03:56 UTC (rev 11653)
@@ -109,7 +109,7 @@
         SOBGumba*       gumba       = orxonox_cast<SOBGumba*>       (otherObject);
         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();
             this->hasCollided_ = true;

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc	2017-12-11 13:33:45 UTC (rev 11652)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc	2017-12-11 14:03:56 UTC (rev 11653)
@@ -124,12 +124,12 @@
         if (!goesRight_)
             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;
         }
 

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.h
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.h	2017-12-11 13:33:45 UTC (rev 11652)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.h	2017-12-11 14:03:56 UTC (rev 11653)
@@ -60,6 +60,7 @@
             int maxGumbas_;
 
 
+
            
     };
 }