Changeset 11599 for code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc

Timestamp:

Nov 27, 2017, 3:28:41 PM (7 years ago)

Author:

varxth

Message:

fireball with particle spawner

File:

• code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc (modified) (4 diffs)

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

@@ -23 +23 @@
  *      Julien Kindle
  *   Co-authors:
+ *      Noah Zarro
+ *      Theo von Arx
  *      
  *
@@ -160 +162 @@
 
         else if (fireball != nullptr && !(fireball->hasCollided_)){
+            if(PowerUpCounter_ == 0){
+                    this->die();
+                } 
             PowerUpCounter_--;
             this->changeClothes();
@@ -232 +237 @@
             particlespawner_ = object;
         }
-    }
+
+    }
+    
 
 
@@ -300 +307 @@
         else
             particlespawner_->setVisible(false); 
-
+        
 
         //If player hits space and collides against an object under him then jump
         if (inputAllowed && firePressed_ && isColliding_ && (collDisZ_ >= 0 && collDisZ_ <+ 10)) {
-            gravityAcceleration_ = 100.0;
-            velocity.z = 110; 
+            gravityAcceleration_ = 350;
+            velocity.z = 175; 
         }