Changeset 11783 for code/trunk/src/modules

Timestamp:

Feb 20, 2018, 12:14:40 AM (7 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/CMakeLists.txt (modified) (2 diffs)
• src/modules/asteroidmining (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/asteroidmining)
• src/modules/asteroids2D (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/asteroids2D)
• src/modules/dialog (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/dialog)
• src/modules/dialogue (deleted)
• src/modules/dodgerace/DodgeRace.cc (modified) (6 diffs)
• src/modules/dodgerace/DodgeRace.h (modified) (1 diff)
• src/modules/flappyorx (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/flappyorx)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDPickupSystem.cc (modified) (1 prop)
• src/modules/overlays/hud/HUDPickupSystem.h (modified) (1 prop)
• src/modules/overlays/hud/StoryModeHUD.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc)
• src/modules/overlays/hud/StoryModeHUD.h (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/PickupSpawner.cc (modified) (1 diff)
• src/modules/pickup/PickupSpawner.h (modified) (5 diffs)
• src/modules/superorxobros/CMakeLists.txt (modified) (1 diff, 1 prop)
• src/modules/superorxobros/Orxo.cc (deleted)
• src/modules/superorxobros/Orxo.h (deleted)
• src/modules/superorxobros/SOB.cc (modified) (9 diffs, 1 prop)
• src/modules/superorxobros/SOB.h (modified) (2 diffs, 1 prop)
• src/modules/superorxobros/SOBCastlestone.cc (modified) (1 prop)
• src/modules/superorxobros/SOBCastlestone.h (modified) (1 prop)
• src/modules/superorxobros/SOBCenterpoint.cc (modified) (1 prop)
• src/modules/superorxobros/SOBCenterpoint.h (modified) (1 prop)
• src/modules/superorxobros/SOBCoin.cc (modified) (2 diffs, 1 prop)
• src/modules/superorxobros/SOBCoin.h (modified) (1 diff, 1 prop)
• src/modules/superorxobros/SOBFigure.cc (modified) (17 diffs, 1 prop)
• src/modules/superorxobros/SOBFigure.h (modified) (3 diffs, 1 prop)
• src/modules/superorxobros/SOBFireball.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc)
• src/modules/superorxobros/SOBFireball.h (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h)
• src/modules/superorxobros/SOBFlagstone.cc (modified) (1 diff, 1 prop)
• src/modules/superorxobros/SOBFlagstone.h (modified) (1 diff, 1 prop)
• src/modules/superorxobros/SOBGumba.cc (modified) (6 diffs, 1 prop)
• src/modules/superorxobros/SOBGumba.h (modified) (2 diffs, 1 prop)
• src/modules/superorxobros/SOBGumbaBoss.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc)
• src/modules/superorxobros/SOBGumbaBoss.h (copied) (copied from code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h)
• src/modules/superorxobros/SOBHUDInfo.cc (modified) (1 prop)
• src/modules/superorxobros/SOBHUDInfo.h (modified) (1 prop)
• src/modules/superorxobros/SOBItem.cc (modified) (1 prop)
• src/modules/superorxobros/SOBItem.h (modified) (1 prop)
• src/modules/superorxobros/SOBMushroom.cc (modified) (5 diffs, 1 prop)
• src/modules/superorxobros/SOBMushroom.h (modified) (2 diffs, 1 prop)
• src/modules/superorxobros/SOBPrereqs.h (modified) (1 diff, 1 prop)
• src/modules/superorxobros/SOBQBlock.cc (modified) (2 diffs, 1 prop)
• src/modules/superorxobros/SOBQBlock.h (modified) (1 prop)
• src/modules/weapons/munitions/FlameMunition.cc (modified) (1 prop)
• src/modules/weapons/munitions/FlameMunition.h (modified) (1 prop)
• src/modules/weapons/projectiles/FlameGunProjectile.cc (modified) (1 prop)
• src/modules/weapons/projectiles/FlameGunProjectile.h (modified) (1 prop)
• src/modules/weapons/weaponmodes/FlameGun.cc (modified) (1 prop)
• src/modules/weapons/weaponmodes/FlameGun.h (modified) (1 prop)

code/trunk/src/modules/CMakeLists.txt

@@ -26 +26 @@
 ################ Sub Directories ################
 
-ADD_SUBDIRECTORY(dialogue)
+ADD_SUBDIRECTORY(asteroidmining)
+ADD_SUBDIRECTORY(dialog)
 ADD_SUBDIRECTORY(designtools)
 ADD_SUBDIRECTORY(gametypes)
@@ -46 +47 @@
 ADD_SUBDIRECTORY(hover)
 ADD_SUBDIRECTORY(superorxobros)
+ADD_SUBDIRECTORY(asteroids2D)
+ADD_SUBDIRECTORY(flappyorx)

code/trunk/src/modules/dodgerace/DodgeRace.cc

@@ -37 +37 @@
 #include "core/CoreIncludes.h"
 #include "Highscore.h"
+#include "infos/PlayerInfo.h"
 
 namespace orxonox
@@ -90 +91 @@
     void DodgeRace::tick(float dt)
     {
-        if (getPlayer() != nullptr)
-        {
-            currentPosition = getPlayer()->getWorldPosition().x;
+        DodgeRaceShip* player = this->getPlayer();
+        if (player != nullptr)
+        {
+            currentPosition = player->getWorldPosition().x;
             counter = counter + (currentPosition - lastPosition);
             lastPosition = currentPosition;
             point = (int) currentPosition;
-            getPlayer()->speed = 830.0f - (point / 1000);
+            player->speed = 830.0f - (point / 1000);
 
             for(unsigned int i=0; i < cubeList.size();i++)
@@ -123 +125 @@
                     }
 
-                    cube->setPosition(getPlayer()->getWorldPosition() + Vector3(5000.0f, 0.0f, -3600.0f + (i*1200)));
+                    cube->setPosition(player->getWorldPosition() + Vector3(5000.0f, 0.0f, -3600.0f + (i*1200)));
                     //stEntity->setScale3D(50,50,50);
                 }
@@ -139 +141 @@
     DodgeRaceShip* DodgeRace::getPlayer()
     {
-        if (player == nullptr)
-        {
-            for (DodgeRaceShip* ship : ObjectList<DodgeRaceShip>())
-            {
-                player = ship;
-            }
-        }
-        return player;
+        for (DodgeRaceShip* ship : ObjectList<DodgeRaceShip>())
+        {
+            return ship;
+        }
+        return nullptr;
     }
 
@@ -190 +189 @@
     void DodgeRace::playerPreSpawn(PlayerInfo* player)
     {
+        this->playerInfo_ = player;
         if(lives <= 0)
         {
@@ -228 +228 @@
         {
             int score = this->getPoints();
-            Highscore::getInstance().storeScore("Dodge Race", score, this->getPlayer()->getPlayer());
+            Highscore::getInstance().storeScore("Dodge Race", score, this->playerInfo_);
         }
         GSLevel::startMainMenu();

code/trunk/src/modules/dodgerace/DodgeRace.h

@@ -103 +103 @@
 
             DodgeRaceShip* getPlayer();
-            WeakPtr<DodgeRaceShip> player;
+            WeakPtr<PlayerInfo> playerInfo_;
             std::vector<DodgeRaceCube*> cubeList;
             void toggleShowLevel(){bShowLevel = !bShowLevel;}

code/trunk/src/modules/overlays/hud/CMakeLists.txt

@@ -26 +26 @@
   LastTeamStandingInfos.cc
   CountDown.cc
+  StoryModeHUD.cc
 )

code/trunk/src/modules/pickup/PickupPrereqs.h

@@ -72 +72 @@
     class Pickup;
     class PickupCollection;
-    class PickupInventoryContainer;
+    struct PickupInventoryContainer;
     class PickupManager;
     class PickupRepresentation;

code/trunk/src/modules/pickup/PickupSpawner.cc

@@ -158 +158 @@
             for(Pawn* pawn : ObjectList<Pawn>())
             {
+                if(!(pawn->doesAcceptPickups())){continue;} // skip those pawns, e.g. AsteroidMinables. 
+
                 Vector3 distance = pawn->getWorldPosition() - this->getWorldPosition();
                 PickupCarrier* carrier = static_cast<PickupCarrier*>(pawn);

code/trunk/src/modules/pickup/PickupSpawner.h

@@ -92 +92 @@
                 { return this->triggerDistance_; }
             /**
+            @brief Set the distance in which to trigger.
+            @param value The new distance in which to trigger.
+            */
+            inline void setTriggerDistance(float value)
+                { this->triggerDistance_ = value; }
+            /**
             @brief Get the time to respawn.
             @returns Returns the time after which this gets re-actived.
@@ -98 +104 @@
                 { return this->respawnTime_; }
             /**
+            @brief Set the time to respawn.
+            @param time New time after which this gets re-actived.
+            */
+            inline void setRespawnTime(float time)
+                { this->respawnTime_ = time; }
+            /**
             @brief Get the maximum number of items that will be spawned by this PickupSpawner.
             @return Returns the maximum number of items spawned by this PickupSpawner.
@@ -103 +115 @@
             inline int getMaxSpawnedItems(void) const
                 { return this->maxSpawnedItems_; }
+            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
+
             /**
             @brief Returns the name of the template which is used to create a pickup for this spawner.
@@ -113 +127 @@
             inline Template* getPickupTemplate() const
                 {return this->pickupTemplate_; }
+
+            void setPickupTemplateName(const std::string& name);
+            void setPickupTemplate(Template* temp);
 
         private:
@@ -130 +147 @@
             void block(PickupCarrier* carrier, unsigned int time = DEFAULT_BLOCKED_TIME)
                 { this->blocked_.insert(std::pair<PickupCarrier*, std::time_t>(carrier, std::time(0)+time)); }
-
-            /**
-            @brief Set the distance in which to trigger.
-            @param value The new distance in which to trigger.
-            */
-            inline void setTriggerDistance(float value)
-                { this->triggerDistance_ = value; }
-            /**
-            @brief Set the time to respawn.
-            @param time New time after which this gets re-actived.
-            */
-            inline void setRespawnTime(float time)
-                { this->respawnTime_ = time; }
-
-            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
-
-            void setPickupTemplateName(const std::string& name);
-            void setPickupTemplate(Template* temp);
 
             Pickupable* createPickup(void); //!< Creates a new Pickupable.

code/trunk/src/modules/superorxobros/CMakeLists.txt

@@ -9 +9 @@
   SOBHUDInfo.cc
   SOBGumba.cc
+  SOBFireball.cc
   SOBFlagstone.cc
   SOBCastlestone.cc
   SOBCoin.cc
+  SOBGumbaBoss.cc
 
 )

code/trunk/src/modules/superorxobros/SOB.cc

@@ -44 +44 @@
 #include "SOBFigure.h"
 #include "graphics/Camera.h"
+#include "Highscore.h"
 
 
@@ -49 +50 @@
 namespace orxonox
 {
-
+    bool newHighscore=0;
     RegisterUnloadableClass(SOB);
 
@@ -59 +60 @@
     {
         RegisterObject(SOB);
-        camera = nullptr;
 
         this->center_ = nullptr;
@@ -68 +68 @@
         timeLeft_=400.0;
         done_ = true;
+        newHighscore = false;
         lvl_ = 1;
 
@@ -78 +79 @@
     SOB::~SOB()
     {
-        if (this->isInitialized())
-            this->cleanup();
     }
-
-    void SOB::cleanup()
-    {
-        camera = nullptr;
-    }
-
-
 
     void SOB::start()
@@ -99 +91 @@
             }
 
-            center_->attach(figure_);
             figure_->setPosition(0, 0, 0);
         }
@@ -112 +103 @@
         Gametype::start();
 
-        if (figure_ != nullptr)
-        {
-            camera = figure_->getCamera();
-        }
-
     }
 
     void SOB::end()
     {
-        cleanup();
         GSLevel::startMainMenu();
         Deathmatch::end();
-    }
+}
 
     void SOB::restart() {
-        cleanup();
-
         // HACK - only method I found to simply reload the level
         Game::getInstance().popState();
@@ -167 +150 @@
         if (this->figure_ != nullptr && figure_->lvlEnded_) {
             std::stringstream a;
-            a << "Nice! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            if(!newHighscore){
+                a << "Nice! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            }
+            else{
+                a << "Congrats, new Highscore! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            }
             info_ =a.str();
 
@@ -181 +169 @@
         //The time on the HUD
         if (!done_)
-            timeLeft_-=dt*2.5;
+            timeLeft_-=dt*2.5f;
     }
 

code/trunk/src/modules/superorxobros/SOB.h

@@ -76 +76 @@
                 points_+=100;
             }
+            void addGumbaBoss() {
+                points_+=5000;
+            }
             void addPoints(int poi) {
                 points_+=poi;
             }
             int getTimeLeft() {
-                return timeLeft_;
+                return (int) timeLeft_;
             }
             std::string getInfoText() {
@@ -103 +106 @@
 
             WeakPtr<SOBCenterpoint> center_;
+            bool newHighscore;
 
         protected:
 
 
-            void cleanup(); //!< Cleans up the Gametype 
             WeakPtr<SOBFigure> figure_;
-            WeakPtr<Camera> camera;
             int points_;
             int coins_;

code/trunk/src/modules/superorxobros/SOBCoin.cc

@@ -49 +49 @@
         setAngularFactor(0.0);
 
+        speed_ = 0;
+        lifetime_ = 0;
     }
 
@@ -67 +69 @@
         lifetime_-=dt;
 
-        if (lifetime_ <+ 0) {
+        if (lifetime_ < 0) {
             destroyLater();
         }

code/trunk/src/modules/superorxobros/SOBCoin.h

@@ -50 +50 @@
 
 
-        bool attachedToFigure_;
-
         void setLifetime(const float lt)
         { this->lifetime_ = lt; }

code/trunk/src/modules/superorxobros/SOBFigure.cc

@@ -23 +23 @@
  *      Julien Kindle
  *   Co-authors:
+ *      Noah Zarro
+ *      Theo von Arx
  *      
  *
@@ -39 +41 @@
 #include "graphics/Camera.h"
 #include "graphics/ParticleSpawner.h"
+#include <OgreMath.h>
 
 #include "SOBMushroom.h"
 #include "SOBGumba.h"
+#include "SOBGumbaBoss.h"
+#include "SOBFireball.h"
 #include "SOB.h"
 #include "SOBFlagstone.h"
 #include "SOBCastlestone.h"
+#include "SOBFireball.h"
+#include "Highscore.h"
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
@@ -59 +66 @@
 
         //Vars for movement of player
-        moveUpPressed_ = false;
-        moveDownPressed_ = false;
-        moveLeftPressed_ = false;
-        moveDownPressed_ = false;
-        firePressed_ = false;
-        collDisZ_ = 0;
+        moveUpPressed_      = false;
+        moveDownPressed_    = false;
+        moveLeftPressed_    = false;
+        moveRightPressed_    = false;
+        firePressed_        = false;
+        collDisZ_           = 0;
+
         //Times and turning
-        timeSinceLastFire_ = 0.0;
-        lastSpeed_z = 0.0;
-        pitch_ = 0.0;
-        timeCounter_ = 0;
+        timeSinceLastFire_  = 0.0;
+        lastSpeed_z         = 0.0;
+        timeCounter_        = 0;
 
         //Properties of player
-        gotPowerUp_ = false;
-        isColliding_ = true;
-        particlespawner_ = NULL;
+
+        isColliding_        = true;
+        particlespawner_    = NULL;
 
         //Properties of players life
-        predead_ = false;
-        dead_ = false;
-        lvlEnded_ = false;
+        predead_            = false;
+        dead_               = false;
+        lvlEnded_           = false;
         reachedLvlEndState_ = 0;
+
+        // Properties concerning PowerUps and items
+        PowerUpCounter_     = 0;
+        maxPowerUp_         = 2;
+        FireballPower       = 2;
+        //Properties of fireing Fireballs, NOTE! fireballs are fired with the moveUP Key, not with the fire key
+        fireallowed_        = true;
+        firecooldown_       = 0;
 
         
@@ -97 +112 @@
 
         //Orxocast returns object with casted type if otherObject has that class, and if not a nullptr
-        SOBMushroom* mush = orxonox_cast<SOBMushroom*>(otherObject);
-        SOBGumba* gumba = orxonox_cast<SOBGumba*>(otherObject);
-        SOBFlagstone* flagstone = orxonox_cast<SOBFlagstone*>(otherObject);
-        SOBCastlestone* castlestone = orxonox_cast<SOBCastlestone*>(otherObject);
-
-        //Check if otherObject is a powerup
+        SOBMushroom*    mush        = orxonox_cast<SOBMushroom*>    (otherObject);
+        SOBGumba*       gumba       = orxonox_cast<SOBGumba*>       (otherObject);
+        SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>   (otherObject);
+        SOBFlagstone*   flagstone   = orxonox_cast<SOBFlagstone*>   (otherObject);
+        SOBCastlestone* castlestone = orxonox_cast<SOBCastlestone*> (otherObject);
+        SOBFireball*    fireball    = orxonox_cast<SOBFireball*>    (otherObject);
+        SOB* SOBGame                = orxonox_cast<SOB*>            (getGametype()); 
+
+
+        //Check if otherObject is a powerup-mushroom
         if (mush != nullptr && !(mush->hasCollided_)) {
             otherObject->destroyLater();
-            gotPowerUp_ = true;
-            SOB* SOBGame = orxonox_cast<SOB*>(getGametype()); //Get the Gametype
+
+            PowerUpCounter_++;
+            if(PowerUpCounter_ > maxPowerUp_)   PowerUpCounter_ = maxPowerUp_; // you had already the max
+            else                                this->changeClothes();
+
             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
+            
+            
+        }
+
+        
 
         //Check if otherObject is a Gumba (that walking enemies)
-        } else if (gumba != nullptr && !(gumba->hasCollided_)) {
-
-            //If player jumps on its head, kill it, else, kill the player
+
+         else if (gumba != nullptr && gumbaBoss == nullptr && !(gumba->hasCollided_)) {
+
+            //If player jumps on its head, kill the Gumba, else, kill the player
             if (getVelocity().z >= -20) {
-              Vector3 vel = getVelocity();
-              vel.y = -80;
-              vel.z = 200;
-              setVelocity(vel);
-              predead_=true; 
-              SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
-              SOBGame->setDone(true);
+                // If player hasn't a power up, he dies. Else he shrinks and the gumba dies.
+                if(PowerUpCounter_ == 0){
+                    this->die();
+                } 
+                else{
+                    PowerUpCounter_--;
+                    this->changeClothes();
+
+                    gumba->destroyLater();
+                    gumba->hasCollided_ = true;
+                }
 
           } else {
             gumba->destroyLater();
             gumba->hasCollided_ = true;
-            SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
             SOBGame->addGumba();
 
 
-        }
-    }
+            }
+        }
+        else if (gumbaBoss != nullptr && !(gumbaBoss->hasCollided_)) {
+            if (getVelocity().z >= -20) {
+                // If player hasn't a power up, he dies. Else he dies directly.
+                this->die(); 
+            }
+
+            else {
+                gumbaBoss->destroyLater();
+                gumbaBoss->hasCollided_ = true;
+                SOBGame->addGumbaBoss();
+                }
+        }
+        else if (fireball != nullptr && !(fireball->hasCollided_)){
+            if(PowerUpCounter_ == 0){
+                    this->die();
+                } 
+            PowerUpCounter_--;
+            this->changeClothes();
+            fireball->destroyLater();
+        }
 
     //Purpose is that if player hits the flag, he should walk into the castle at the end of the level. For that we use SOBCastlestone
@@ -137 +188 @@
         flagstone->hasCollided_ = true;
         reachedLvlEndState_ = 1;
-        SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+
         SOBGame->setDone(true);
         SOBGame->addPoints(flagstone->getPoints());
@@ -159 +210 @@
 }
 
+//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");
+            bool direction = ((this->getWorldOrientation().getRoll().valueRadians())>-1.6&&(this->getWorldOrientation().getRoll().valueRadians()<1.6));
+            ball->setDirection(direction);
+            if(direction)
+            {
+                spawnpos.x+=10;
+            }
+            else
+            {
+                spawnpos.x-=10;
+            }
+            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)
@@ -166 +243 @@
 
     bool inputAllowed = true;
+    //SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
 
     //the particle spawner that generates the fire from the backpack when pressed
@@ -174 +252 @@
             particlespawner_ = object;
         }
-    }
+
+    }
+    
 
 
@@ -190 +270 @@
     //if input blocked, then cancel every movement operation
     if (!inputAllowed) {
-        moveUpPressed_ = false;
-        moveDownPressed_ = false;
-        moveLeftPressed_ = false;
-        moveRightPressed_ = false;
+        moveUpPressed_      = false;
+        moveDownPressed_    = false;
+        moveLeftPressed_    = false;
+        moveRightPressed_   = false;
     }
 
@@ -204 +284 @@
     if (hasLocalController())
     {
+        SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
         Vector3 velocity = getVelocity();
         Vector3 position = getPosition();
@@ -212 +293 @@
         if (position.z < -100) {
             dead_ = true;
-            SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
             SOBGame->setDone(true);
         }
@@ -221 +301 @@
             velocity.z = 0;
             setVelocity(velocity);
-            SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+           
             if (firePressed_)
                 SOBGame->restart();
@@ -242 +322 @@
         else
             particlespawner_->setVisible(false); 
-
+        
 
         //If player hits space and collides against an object under him then jump
-        if (inputAllowed && firePressed_ && isColliding_ && (collDisZ_ >= 7.75 && collDisZ_ <+ 8.25)) {
-            gravityAcceleration_ = 100.0;
-            velocity.z = 110; 
+        if (inputAllowed && firePressed_ && isColliding_ && (collDisZ_ >= 0 && collDisZ_ <+ 10)) {
+            gravityAcceleration_ = 350;
+            velocity.z = 175; 
         }
 
@@ -274 +354 @@
         }
 
+        //If moveUp pressed, fire a fireball
+        if(moveUpPressed_ && (PowerUpCounter_ >= FireballPower) && fireallowed_)
+        {
+            spawnFireball();
+            fireallowed_  = false;
+            firecooldown_ = 0;
+        }
+
+        //Increase the firecooldown
+        if(firecooldown_> 0.5)
+        {
+            fireallowed_ = true;
+        }
+        if(!fireallowed_)
+        {
+            firecooldown_ += dt;
+        }
 
         //Again another EndOfLevel behavior
@@ -283 +380 @@
             velocity.x = 0;
             velocity.y = 20;
+            setOrientation(Vector3::UNIT_Z, Degree(90));
         }
         if (reachedLvlEndState_ == 4) {
+            //Highscore
+            if (Highscore::exists())
+            {
+                int score = SOBGame->getPoints();
+                bool isHighScore = Highscore::getInstance().storeScore("Super Orxo Bros.", score, this->getPlayer());
+                SOBGame->newHighscore = isHighScore;
+            }
             lvlEnded_ = true;
             dead_ = true;
@@ -307 +412 @@
         }
 
-
-
-
-    }
-
-
+    }
 
     // Reset key variables
-    moveUpPressed_ = false;
-    moveDownPressed_ = false;
-    moveLeftPressed_ = false;
-    moveRightPressed_ = false;
+    moveUpPressed_      = false;
+    moveDownPressed_    = false;
+    moveLeftPressed_    = false;
+    moveRightPressed_   = false;
 
     isColliding_ = false;
@@ -364 +464 @@
 
 
-}
+
+// PRE: name is an existing name of a material. Example orxo_material for orxo_material.material in data_extern/materials
+//      !!! PowerUpCounter_ has to be modified before changing the clothes!!!
+// POST: clothes of body of player are changed to name
+void SOBFigure::changeClothes(){
+            // clothes: white (basic), red (one PowerUp), orange (Fireball enabled)
+            std::string clothes[] = {"orxo_material", "orxo_material_gross", "orxo_material_fire"};
+
+            std::set<WorldEntity*> attachedObjects = this->getAttachedObjects();
+            std::set<WorldEntity*>::iterator it;
+            for (it = attachedObjects.begin(); it != attachedObjects.end(); ++it)
+            {
+                Model* FiguresModel = orxonox_cast<Model*>(*it);
+                if (FiguresModel != nullptr)
+                {
+                    FiguresModel->setSubMaterial(clothes[PowerUpCounter_] , 4); // 4 is the body
+                }
+            }   
+}
+// PRE:
+// POST: Player jumps out of the game, game is finished and can be restarted.
+void SOBFigure::die(){
+    Vector3 vel = getVelocity();
+    vel.y = -80;
+    vel.z = 200;
+    setVelocity(vel);
+    predead_= true; 
+    SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
+    SOBGame->setDone(true);
+}
+
+}

code/trunk/src/modules/superorxobros/SOBFigure.h

@@ -46 +46 @@
             virtual void boost(bool boost) override;
             virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+            void changeClothes();
+            void spawnFireball();
+            void die();
 
             bool dead_;
@@ -54 +57 @@
 
             //Soooo many declarations
-            bool gotPowerUp_;
+            bool fireallowed_;
+
             bool moveUpPressed_;
             bool moveDownPressed_;
@@ -63 +67 @@
             float timeSinceLastFire_;
             float lastSpeed_z;
-            SOBCenterpoint* sobcenterpoint;
-            float pitch_;
+            float firecooldown_;
             bool isColliding_;
             WorldEntity* particlespawner_;
+            int PowerUpCounter_;
+            int maxPowerUp_;
+            int FireballPower;
             int sgn(float x);
             int reachedLvlEndState_;

code/trunk/src/modules/superorxobros/SOBFlagstone.cc

@@ -52 +52 @@
         
         hasCollided_=false;
-        
+        points_=0;
         
     }

code/trunk/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/trunk/src/modules/superorxobros/SOBGumba.cc

@@ -48 +48 @@
         RegisterObject(SOBGumba);
 
-        attachedToFigure_ = false;
         setAngularFactor(0.0);
-        figure_ = nullptr;
         this->enableCollisionCallback();
         gravityAcceleration_ = 350.0;
@@ -56 +54 @@
         hasCollided_=false;
         goesRight_ = true;
-        lastPos_ = getPosition();
-        lastPos_.x -= 20;
         changeAllowed_ = true;
         changedOn_ = 0.0;
+        creator_ = nullptr;
+        maxLifetime_ = 10;
+        lifetime_ = 0;
         
     }
@@ -86 +85 @@
 
 
-    void SOBGumba::setFigure(SOBFigure* newFigure)
+    void SOBGumba::setDirection(const bool direction)
     {
-        figure_ = newFigure;
+        if(direction)
+        {
+            goesRight_=true;
+        }
+        else
+        {
+            goesRight_=false;
+        }
     }
 
-
+    void SOBGumba::die(){
+        Vector3 velocity = this->getVelocity();
+        velocity.y = speed_;
+        this->setVelocity(velocity);
+    }
 
     void SOBGumba::tick(float dt)
@@ -100 +110 @@
             changedOn_+= dt;
             // After a collision, we don't listen for collisions for 200ms - that's because one wall can cause several collisions!
-            if (changedOn_> 0.200) {
+            if (changedOn_> 0.400) {
                 changeAllowed_ = true;
                 changedOn_ = 0.0;
@@ -106 +116 @@
             }
         }
-        
+    
 
         int dir = 1;
@@ -113 +123 @@
 
         Vector3 velocity = getVelocity();
+        if(velocity.z > -1 && velocity.z < 1)
+        {
+            velocity.x = dir*speed_;
+        }      
+
         velocity.z -= gravityAcceleration_*dt;
-        velocity.x = dir*speed_;
         setVelocity(velocity);
 
-        lastPos_ = getPosition();
+        if (creator_ != nullptr)
+        {
+            lifetime_ += dt;
+            if(lifetime_>maxLifetime_)
+            {
+                
+            }
+        }
+
+        if(abs(this->getPosition().z) > 1000) this->destroyLater();
+
     }
-
-
 }

code/trunk/src/modules/superorxobros/SOBGumba.h

@@ -47 +47 @@
             SOBGumba(Context* context);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-            virtual void setFigure(SOBFigure* newFigure);
             virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void tick(float dt) override;
 
+            void setDirection(const bool direction);
+            void die();
           
-            bool attachedToFigure_;
-
             void setSpeed(const float speed)
                 { this->speed_ = speed; }
@@ -60 +59 @@
 
             bool hasCollided_;
+            SOBGumbaBoss* creator_;
         protected:
             float gravityAcceleration_;
             float speed_;
-            WeakPtr<SOBFigure> figure_;
             bool goesRight_;
-            Vector3 lastPos_;
             bool changeAllowed_;
             float changedOn_;
+            float maxLifetime_;
+            float lifetime_;
+
            
     };

code/trunk/src/modules/superorxobros/SOBMushroom.cc

@@ -48 +48 @@
         RegisterObject(SOBMushroom);
 
-        attachedToFigure_ = false;
         setAngularFactor(0.0);
-        figure_ = nullptr;
         this->enableCollisionCallback();
         gravityAcceleration_ = 350.0;
@@ -56 +54 @@
         hasCollided_=false;
         goesRight_ = true;
-        lastPos_ = getPosition();
-        lastPos_.x -= 20;
         changeAllowed_ = true;
         changedOn_ = 0.0;
@@ -86 +82 @@
 
 
-    void SOBMushroom::setFigure(SOBFigure* newFigure)
-    {
-        figure_ = newFigure;
-    }
-
-
-
     void SOBMushroom::tick(float dt)
     {
@@ -104 +93 @@
                 changedOn_ = 0.0;
 
+            }
         }
-    }
         
 
@@ -116 +105 @@
         velocity.x = dir*speed_;
         setVelocity(velocity);
-
-
-    
-        lastPos_ = getPosition();
-            }
+    }
 
 

code/trunk/src/modules/superorxobros/SOBMushroom.h

@@ -47 +47 @@
             SOBMushroom(Context* context);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-            virtual void setFigure(SOBFigure* newFigure);
             virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void tick(float dt) override;
 
           
-            bool attachedToFigure_;
-
             void setSpeed(const float speed)
                 { this->speed_ = speed; }
@@ -63 +60 @@
             float gravityAcceleration_;
             float speed_;
-            WeakPtr<SOBFigure> figure_;
             bool goesRight_;
-            Vector3 lastPos_;
             bool changeAllowed_;
             float changedOn_;

code/trunk/src/modules/superorxobros/SOBPrereqs.h

@@ -76 +76 @@
     class SOBHUDInfo;
     class SOBGumba;
+    class SOBGumbaBoss;
     class SOBFlagstone;
     class SOBCastlestone;

code/trunk/src/modules/superorxobros/SOBQBlock.cc

@@ -39 +39 @@
 #include "SOBMushroom.h"
 #include "SOBCoin.h"
+#include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
+
 
 namespace orxonox
@@ -62 +64 @@
         //If you hit the QBlock, the visibility of all attached objects get inverted! Pretty easy way to create changing blocks :)
         float v_z = otherObject->getVelocity().z;
-        if (!used_ && v_z > 50.0) {
+        float collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
+        if (!used_ && v_z > 50.0 && collDisZ_ > 0) {
             used_ = true;