Changeset 11491 for code/branches/SOBv2_HS17/src

Timestamp:

Oct 16, 2017, 4:03:17 PM (7 years ago)

Author:

varxth

Message:

improved power up of player

File:

• code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) (1 diff)

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

@@ -110 +110 @@
             mush->hasCollided_ = true; // needed because of destroyLater takes some time and player should receive points only once
 
+            Vector3 scale = {1.2, 1.2, 1.2};
+            this->setScale3D(scale);
+            /*if (this->hasPhysics() && this->collisionShape_ != nullptr)
+            {
+             this->collisionShape_->setScale3D(scale);
+            }*/
+
+        }
         //Check if otherObject is a Gumba (that walking enemies)
-        } else if (gumba != nullptr && !(gumba->hasCollided_)) {
-
-            //If player jumps on its head, kill it, else, kill the player
+
+         else if (gumba != nullptr && !(gumba->hasCollided_)) {
+
+            //If player doesn't jump on its head, kill it, else, kill the player
             if (getVelocity().z >= -20) {
-              Vector3 vel = getVelocity();
-              vel.y = -80;
-              vel.z = 200;
-              setVelocity(vel);
-              predead_=true; 
-              SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
-              SOBGame->setDone(true);
+                // If player hasn't a power up, he dies. Else he shrinks and the gumba dies.
+                if(!gotPowerUp_){
+                    Vector3 vel = getVelocity();
+                    vel.y = -80;
+                    vel.z = 200;
+                    setVelocity(vel);
+                    predead_=true; 
+                    SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+                    SOBGame->setDone(true);
+                } else{
+                    gotPowerUp_ = false;
+                    
+                    Vector3 scale = {1, 1, 1};
+                    this->setScale3D(scale);
+                    /*if (this->hasPhysics() && this->collisionShape_ != nullptr)
+                    {
+                     this->collisionShape_->setScale3D(scale);
+                    }*/
+
+                    gumba->destroyLater();
+                    gumba->hasCollided_ = true;
+                }
 
           } else {