Changeset 11629 for code/branches/SOBv2_HS17/src

Timestamp:

Dec 4, 2017, 3:36:20 PM (7 years ago)

Author:

zarron

Message:

Boss now working

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOBGumba.cc (modified) (2 diffs)
• SOBGumba.h (modified) (2 diffs)
• SOBGumbaBoss.cc (modified) (3 diffs)
• SOBGumbaBoss.h (modified) (2 diffs)

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

@@ -60 +60 @@
         changeAllowed_ = true;
         changedOn_ = 0.0;
+        creator_ = nullptr;
         
     }
@@ -91 +92 @@
     }
 
-
+    void SOBGumba::setDirection(const bool direction)
+    {
+        if(direction)
+        {
+            goesRight_=true;
+        }
+        else
+        {
+            goesRight_=false;
+        }
+    }
 
     void SOBGumba::tick(float dt)

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

@@ -51 +51 @@
             virtual void tick(float dt) override;
 
+            void setDirection(const bool direction);
           
             bool attachedToFigure_;
@@ -68 +69 @@
             bool changeAllowed_;
             float changedOn_;
+            SOBGumbaBoss* creator_;
            
     };

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

@@ -54 +54 @@
         RegisterObject(SOBGumbaBoss);
 
-        gumbaMaxTime_ = 5;
+        gumbaMaxTime_ = 4;
         gumbaTime_ = 0;
+        maxGumbas = 10; //Max Gumbas spawnable by a Boss
         
     }
-
-
 
     
@@ -93 +92 @@
 
         if(gumbaTime_ > gumbaMaxTime_){
-            spawnFireball();
+            spawnGumba();
             gumbaTime_ = 0;
         }
@@ -109 +108 @@
 
     }
-    void SOBGumbaBoss::spawnFireball() {
+    void SOBGumbaBoss::spawnGumba() {
         SOBCenterpoint* center_ = ((SOB*)getGametype())->center_;
 
-         SOBFireball* ball = new SOBFireball(center_->getContext());
+         SOBGumba* gumba = new SOBGumba(center_->getContext());
          Vector3 spawnpos = this->getWorldPosition();
          spawnpos.z += 0;
 
-        if (ball != nullptr && center_ != nullptr)
+        if (gumba != nullptr && center_ != nullptr)
         {
-            ball->addTemplate("fireball");
+            gumba->addTemplate("gumbaShootable");
             bool direction = ((this->getWorldOrientation().getRoll().valueRadians())>-1.6&&(this->getWorldOrientation().getRoll().valueRadians()<1.6));
-            ball->setDirection(direction);
+            gumba->setDirection(direction);
             if(direction)
             {
-                spawnpos.x+=10;
+                spawnpos.x+=20;
             }
             else
             {
-                spawnpos.x-=10;
+                spawnpos.x-=20;
             }
-            ball->setPosition(spawnpos);
+            spawnpos.z+=15;
+            gumba->setPosition(spawnpos);
 
         }
 
-        Vector3 velocity = ball->getVelocity();
+        Vector3 velocity = gumba->getVelocity();
         velocity.z -= 100;
-        ball->setVelocity(velocity);
+        gumba->setVelocity(velocity);
      }
 }

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

@@ -50 +50 @@
             virtual void tick(float dt) override;
 
-            void spawnFireball();
+            void spawnGumba();
 
 
@@ -56 +56 @@
             float gumbaTime_;
             float gumbaMaxTime_;
+            int maxGumbas;
+
            
     };