Changeset 11654 for code/branches/SOBv2_HS17/src

Timestamp:

Dec 11, 2017, 3:17:02 PM (7 years ago)

Author:

varxth

Message:

better than evverevver

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOBGumba.cc (modified) (2 diffs)
• SOBGumba.h (modified) (1 diff)
• SOBGumbaBoss.cc (modified) (6 diffs)

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

@@ -106 +106 @@
     }
 
+    void SOBGumba::die(){
+        Vector3 velocity = this->getVelocity();
+        velocity.y = speed_;
+        this->setVelocity(velocity);
+    }
+
     void SOBGumba::tick(float dt)
     {
@@ -141 +147 @@
             if(lifetime_>maxLifetime_)
             {
-                this->destroyLater();
+                
             }
         }
 
+        if(abs(this->getPosition().z) > 1000) delete this;
+
     }
 }

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

@@ -52 +52 @@
 
             void setDirection(const bool direction);
+            void die();
           
             bool attachedToFigure_;

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

@@ -54 +54 @@
         RegisterObject(SOBGumbaBoss);
 
-        gumbaMaxTime_   = 1;
-        gumbaTime_      = 0;
-        maxGumbas_      = 10; //Max Gumbas spawnable by a Boss
-        jumpTime_       = 0;
-        jumpTimeMax_    = 5;
+        gumbaMaxTime_   = 1;  // time after which a Gumba is shot
+        gumbaTime_      = 0;  // time since last gumba was shot
+        maxGumbas_      = 50; // Max Gumbas spawnable by a Boss
+        jumpTimeMax_    = 5;  // time after which the gumba boss jumps
+        jumpTime_       = 0;  // time since last jump of gumba boss
         
     }
 
-    
+    // PRE: otherObject collides with this.
+    // POST: collision is handled: velocity changed, small gumbas murdered
     bool SOBGumbaBoss::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
 
@@ -68 +69 @@
         SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>(otherObject);
 
+        // if boss collides with small gumbas, destroy them.
         if (gumba != nullptr && gumbaBoss == nullptr && !(gumba->hasCollided_)) {
-            gumba->destroyLater();
-            gumba->hasCollided_ = true;
+            gumba->die();
         }
 
@@ -85 +86 @@
 
 
-
+    // POST: done what was to do in a time dt
     void SOBGumbaBoss::tick(float dt)
     {
         SUPER(SOBGumbaBoss, tick, dt);
+
+        // increase timers:
         gumbaTime_ += dt;
         jumpTime_  += dt; 
+
+        // set y-component of position of gumba boss to 0, so he doesn't fall in to the nothing
+        Vector3 position = getPosition();
+        position.y = 0;
+        setPosition(position);
+
 
         if (!changeAllowed_) {
@@ -125 +134 @@
             dir = -1;
 
-        Vector3 velocity = getVelocity(); //Jump
-        if(jumpTime_ > jumpTimeMax_){
+        // 
+        if(getPosition().x < 1640)
+            dir = 1;
+        else if (getPosition().x > 1750)
+            dir = -1;
+
+        //change velocity
+        Vector3 velocity = getVelocity();
+        if(jumpTime_ > jumpTimeMax_){ // jump if the time has come.
             velocity.z = speed_*15;
             jumpTime_ = 0;
         }
-        else{       //Gravity
+        else{
             velocity.z -= gravityAcceleration_*dt;
         }
-
         velocity.x = dir*speed_;
         setVelocity(velocity);
@@ -140 +155 @@
 
     }
+
+    // spawn gumbas
     void SOBGumbaBoss::spawnGumba() {
         SOBCenterpoint* center_ = ((SOB*)getGametype())->center_;
@@ -145 +162 @@
          SOBGumba* gumba = new SOBGumba(center_->getContext());
          Vector3 spawnpos = this->getWorldPosition();
-         spawnpos.z += 0;
          gumba->creator_=this;
 
+         // we can shoot a gumba!
         if (gumba != nullptr && center_ != nullptr)
         {