Changeset 11573

Timestamp:

Nov 20, 2017, 3:11:07 PM (7 years ago)

Author:

zarron

Message:

fireing Fireballs enabled

Location:

code/branches/SOBv2_HS17

Files:

• data/levels/SOB.oxw (modified) (2 diffs)
• src/modules/superorxobros/SOBFigure.cc (modified) (5 diffs)
• src/modules/superorxobros/SOBFigure.h (modified) (3 diffs)
• src/modules/superorxobros/SOBFireball.cc (modified) (2 diffs)
• src/modules/superorxobros/SOBFireball.h (modified) (1 diff)

code/branches/SOBv2_HS17/data/levels/SOB.oxw

@@ -64 +64 @@
         </Template> 
 
-
-
+                                        <!--Test Fireball-->
+
+
+        <Template name=fireball>
+                <SOBFireball collisionType="dynamic" speed=80>
+                        <attached>
+                                <Model mesh="planets/sol.mesh" position="0,0,0" scale=3 pitch=90/> 
+                                
+                        </attached>
+                        <collisionShapes>
+                                <SphereCollisionShape position="0,0,0" halfExtents="5,5,5" />                   
+                        </collisionShapes>
+                </SOBFireball>
+        </Template>
 
 
@@ -99 +111 @@
                         </MovableEntity>
 
-                                        <!--Test Fireball-->
-
-
-
-                                        <SOBFireball collisionType="dynamic" speed=80 position = "10,0,40">
-                                                <attached>
-                                                        <Model mesh="planets/sol.mesh" position="0,0,0" scale=3 pitch=90/> 
-                                                        
-                                                </attached>
-                                                <collisionShapes>
-                                                        <SphereCollisionShape position="0,0,0" halfExtents="5,5,5" />                   
-                                                </collisionShapes>
-                                        </SOBFireball>
 
 

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

@@ -45 +45 @@
 #include "SOBFlagstone.h"
 #include "SOBCastlestone.h"
+#include "SOBFireball.h"
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
@@ -83 +84 @@
         reachedLvlEndState_ = 0;
 
+        //Properties of fireing Fireballs, NOTE! fireballs are fired with the moveUP Key, not with the fire key
+        fireallowed_=true;
+        firecooldown_=0;
+
         
         setAngularFactor(0.0); //Means player doesn't turn on collision, so he doesn't fall over while walking over the ground
@@ -110 +115 @@
             SOBGame->addMushroom(); // Tell the gametype to increase points
             mush->hasCollided_ = true; // needed because of destroyLater takes some time and player should receive points only once
-
 
             // now, change the clothes of the Figure to red
@@ -180 +184 @@
 }
 
+//Function to spawn the Fireball
+void SOBFigure::spawnFireball() {
+        SOBCenterpoint* center_ = ((SOB*)getGametype())->center_;
+
+         SOBFireball* ball = new SOBFireball(center_->getContext());
+         Vector3 spawnpos = this->getWorldPosition();
+         spawnpos.z += 0;
+
+        if (ball != nullptr && center_ != nullptr)
+        {
+            ball->addTemplate("fireball");
+            ball->setPosition(spawnpos);
+            
+        }
+     }
+
 //For those of you who don't have an idea: the tick function is called about 50 times/sec
 void SOBFigure::tick(float dt)
@@ -295 +315 @@
         }
 
+        //If moveUp pressed, fire a fireball
+        if(moveUpPressed_ && gotPowerUp_ && fireallowed_)
+        {
+            spawnFireball();
+            fireallowed_=false;
+            firecooldown_=0;
+        }
+
+        //Increase the firecooldown
+        if(firecooldown_>0.5)
+        {
+            fireallowed_=true;
+        }
+        if(!fireallowed_)
+        {
+            firecooldown_+=dt;
+        }
 
         //Again another EndOfLevel behavior

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

@@ -47 +47 @@
             virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             void changeClothes(std::string& name);
+            void spawnFireball();
 
             bool dead_;
@@ -55 +56 @@
 
             //Soooo many declarations
+            bool fireallowed_;
             bool gotPowerUp_;
             bool moveUpPressed_;
@@ -64 +66 @@
             float timeSinceLastFire_;
             float lastSpeed_z;
+            float firecooldown_;
             SOBCenterpoint* sobcenterpoint;
             float pitch_;

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

@@ -67 +67 @@
         collDisX_ = 0;
         collDisZ_ = 0;
-        hitCounter_ = 0;
 
       orxout() << "fireball existed" << endl;
@@ -121 +120 @@
         }
 
-        hitCounter_++;
-
         
         return true;

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

@@ -64 +64 @@
             bool hasCollided_;
         protected:
-            int hitCounter_; //counts how many times the floor was hit, ball gets deleted if has hit the floor 3 times 
             float gravityAcceleration_;
             float speed_;