Changeset 11650

Timestamp:

Dec 11, 2017, 2:14:15 PM (7 years ago)

Author:

varxth

Message:

better than evver

Location:

code/branches/SOBv2_HS17

Files:

• SOB.oxw (modified) (1 diff)
• data/levels/SOB.oxw (modified) (1 diff)
• src/modules/superorxobros/SOBFigure.cc (modified) (1 diff)
• src/modules/superorxobros/SOBFlagstone.h (modified) (1 diff)
• src/modules/superorxobros/SOBGumba.cc (modified) (1 diff)
• src/modules/superorxobros/SOBGumbaBoss.cc (modified) (9 diffs)
• src/modules/superorxobros/SOBGumbaBoss.h (modified) (1 diff)

code/branches/SOBv2_HS17/SOB.oxw

@@ -13 +13 @@
         include("overlays/SOBHUD.oxo")
         ?>
-
-                                        <!--THEO-->
-
 
         <Template name=mushroom defaults=0>

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

@@ -80 +80 @@
 
         <Template name=gumbaShootable>
-                <SOBGumbaBoss collisionType="dynamic" speed=40>
+                <SOBGumbaBoss collisionType="dynamic" speed=60>
                         <attached>
                                 <Model mesh="Goomba.mesh" position="0,0,1" scale=3 pitch=90/>                           

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

@@ -115 +115 @@
         SOBMushroom*    mush        = orxonox_cast<SOBMushroom*>    (otherObject);
         SOBGumba*       gumba       = orxonox_cast<SOBGumba*>       (otherObject);
-        SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>       (otherObject);
+        SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>   (otherObject);
         SOBFlagstone*   flagstone   = orxonox_cast<SOBFlagstone*>   (otherObject);
         SOBCastlestone* castlestone = orxonox_cast<SOBCastlestone*> (otherObject);

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

@@ -29 +29 @@
 /**
     @file SOBFlagstone.h
-    @brief Declaration of the SOBFlagstone class. This class is used for the flag - for everz 10x10x10 stone we added a flagstone with different points. The higher you touch the flag, the more points you get.
+    @brief Declaration of the SOBFlagstone class. 
+            This class is used for the flag - for every 10x10x10 stone we added a flagstone with different points. The higher you touch the flag, the more points you get.
     @ingroup SOB
 */

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

@@ -124 +124 @@
 
         Vector3 velocity = getVelocity();
+        if(velocity.z > -1 && velocity.z < 1)
+        {
+            velocity.x = dir*speed_;
+        }      
+
         velocity.z -= gravityAcceleration_*dt;
-        velocity.x = dir*speed_;
         setVelocity(velocity);
 

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

@@ -31 +31 @@
     @file SOBGumbaBoss.cc
     @brief A Boss Gumba, which shoots small Gumbas
-*/
+**/
 
 #include "SOB.h"
@@ -54 +54 @@
         RegisterObject(SOBGumbaBoss);
 
-        gumbaMaxTime_ = 1;
-        gumbaTime_ = 0;
-        maxGumbas = 2; //Max Gumbas spawnable by a Boss
+        gumbaMaxTime_   = 1;
+        gumbaTime_      = 0;
+        maxGumbas_      = 10; //Max Gumbas spawnable by a Boss
+        jumpTime_       = 0;
+        jumpTimeMax_    = 5;
         
     }
@@ -63 +65 @@
     bool SOBGumbaBoss::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
 
+        SOBGumba*       gumba       = orxonox_cast<SOBGumba*>(otherObject);
+        SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>(otherObject);
+
+        if (gumba != nullptr && gumbaBoss == nullptr && !(gumba->hasCollided_)) {
+            gumba->destroyLater();
+            gumba->hasCollided_ = true;
+        }
+
+
         //Every object with mass -1 does not change the direction of the GumbaBoss. For example the ground floor! The other objects switch the direction of the GumbaBoss.
-        if (changeAllowed_ && otherObject->getMass() != -1) {
+        else if (changeAllowed_ && otherObject->getMass() != -1) {
             goesRight_ = !goesRight_;
             changeAllowed_ = false;
@@ -78 +89 @@
     {
         SUPER(SOBGumbaBoss, tick, dt);
+        gumbaTime_ += dt;
+        jumpTime_  += dt; 
 
         if (!changeAllowed_) {
@@ -89 +102 @@
         }
     
-        gumbaTime_ += dt;
 
         if(gumbaTime_ > gumbaMaxTime_){ //Spawn Gumba
@@ -103 +115 @@
 
 
-            if(gumbaCounter<maxGumbas){    //only maxGumbas are allowed at one time per Gumbaboss
+            if(gumbaCounter<maxGumbas_){    //only maxGumbas are allowed at one time per Gumbaboss
                 spawnGumba();
                 gumbaTime_ = 0;
@@ -114 +126 @@
 
         Vector3 velocity = getVelocity();
-        velocity.z -= gravityAcceleration_*dt;
+        if(jumpTime_ > jumpTimeMax_){
+            velocity.z = speed_*15;
+            jumpTime_ = 0;
+        }
+        else{
+            velocity.z -= gravityAcceleration_*dt;
+        }
+
         velocity.x = dir*speed_;
         setVelocity(velocity);
@@ -132 +151 @@
         {
             gumba->addTemplate("gumbaShootable");
-            bool direction = ((this->getWorldOrientation().getRoll().valueRadians())>-1.6&&(this->getWorldOrientation().getRoll().valueRadians()<1.6));
-            gumba->setDirection(direction);
-            if(direction)
+            gumba->setDirection(goesRight_);
+            if(goesRight_)
             {
                 spawnpos.x+=20;
@@ -148 +166 @@
 
         Vector3 velocity = gumba->getVelocity();
-        velocity.z -= 100;
+        velocity.x += (2*goesRight_ -1) * 100;
+        velocity.z += 200;
         gumba->setVelocity(velocity);
      }

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

@@ -56 +56 @@
             float gumbaTime_;
             float gumbaMaxTime_;
-            int maxGumbas;
+            float jumpTimeMax_;
+            float jumpTime_;
+            int maxGumbas_;
+