Changeset 11628

Timestamp:

Dec 4, 2017, 3:29:13 PM (7 years ago)

Author:

varxth

Message:

more improvements

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOB.h (modified) (1 diff)
• SOBFigure.cc (modified) (5 diffs)
• SOBGumbaBoss.cc (modified) (2 diffs)

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

@@ -76 +76 @@
                 points_+=100;
             }
+            void addGumbaBoss() {
+                points_+=5000;
+            }
             void addPoints(int poi) {
                 points_+=poi;

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

@@ -45 +45 @@
 #include "SOBMushroom.h"
 #include "SOBGumba.h"
+#include "SOBGumbaBoss.h"
 #include "SOBFireball.h"
 #include "SOB.h"
@@ -114 +115 @@
         SOBMushroom*    mush        = orxonox_cast<SOBMushroom*>    (otherObject);
         SOBGumba*       gumba       = orxonox_cast<SOBGumba*>       (otherObject);
+        SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>       (otherObject);
         SOBFlagstone*   flagstone   = orxonox_cast<SOBFlagstone*>   (otherObject);
         SOBCastlestone* castlestone = orxonox_cast<SOBCastlestone*> (otherObject);
-        SOBFireball* fireball       = orxonox_cast<SOBFireball*>    (otherObject);
+        SOBFireball*    fireball    = orxonox_cast<SOBFireball*>    (otherObject);
         SOB* SOBGame                = orxonox_cast<SOB*>            (getGametype()); 
 
@@ -133 +135 @@
             
         }
+
         
 
         //Check if otherObject is a Gumba (that walking enemies)
 
-         else if (gumba != nullptr && !(gumba->hasCollided_)) {
+         else if (gumba != nullptr && gumbaBoss == nullptr && !(gumba->hasCollided_)) {
 
             //If player jumps on its head, kill the Gumba, else, kill the player
@@ -159 +162 @@
 
 
-        }
-    }
-
+            }
+        }
+        else if (gumbaBoss != nullptr && !(gumbaBoss->hasCollided_)) {
+            if (getVelocity().z >= -20) {
+                // If player hasn't a power up, he dies. Else he dies directly.
+                this->die(); 
+            }
+
+            else {
+                gumbaBoss->destroyLater();
+                gumbaBoss->hasCollided_ = true;
+                SOBGame->addGumbaBoss();
+                }
+        }
         else if (fireball != nullptr && !(fireball->hasCollided_)){
             if(PowerUpCounter_ == 0){
@@ -168 +182 @@
             PowerUpCounter_--;
             this->changeClothes();
+            fireball->destroyLater();
         }
 

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

@@ -54 +54 @@
         RegisterObject(SOBGumbaBoss);
 
-        gumbaMaxTime_ = 10;
+        gumbaMaxTime_ = 5;
         gumbaTime_ = 0;
         
@@ -91 +91 @@
     
         gumbaTime_ += dt;
-        orxout() << "gumbaTime_ = " << gumbaTime_ << endl;
 
         if(gumbaTime_ > gumbaMaxTime_){
             spawnFireball();
-            orxout() << "shoot" << endl;
             gumbaTime_ = 0;
         }