Changeset 11281 for code/branches/SpaceRace_HS16/src

Timestamp:

Nov 14, 2016, 1:37:01 PM (7 years ago)

Author:

bberabi

Message:

bots addiert checkpoint problem gelost

Location:

code/branches/SpaceRace_HS16/src

Files:

• modules/gametypes/SpaceRace.cc (modified) (6 diffs)
• modules/gametypes/SpaceRace.h (modified) (1 diff)
• modules/gametypes/SpaceRaceBot.cc (modified) (1 diff)
• modules/gametypes/SpaceRaceManager.cc (modified) (1 diff)
• orxonox/infos/GametypeInfo.h (modified) (1 diff)

code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc

@@ -29 +29 @@
 #include "SpaceRace.h"
 
+#include "core/CoreIncludes.h"
+#include "chat/ChatManager.h"
+#include "util/Convert.h"
+#include "util/Math.h"
+#include "infos/Bot.h"
+#include "items/Engine.h"
+#include "controllers/HumanController.h"
+
+#include "core/CoreIncludes.h"
+#include "chat/ChatManager.h"
+#include "infos/PlayerInfo.h"
+#include "worldentities/pawns/Pawn.h"
+#include "core/config/ConfigValueIncludes.h"
+#include "infos/Bot.h"
+#include "SpaceRaceBot.h"
 #include "items/Engine.h"
 
@@ -49 +64 @@
         this->cantMove_ = false;
         this->bTimeIsUp_ = false;
-        this->numberOfBots_ = 1; // quick fix: don't allow default-bots to enter the race
+        this->setConfigValues();
+
+       // this->numberOfBots_ = 1; // quick fix: don't allow default-bots to enter the race
                                  // remove this line, if a raceBot has been created.
     }
 
-
-
+  void SpaceRace::setConfigValues()
+    {
+       
+    
+    }
+
+    void SpaceRace::start()
+    {
+        Gametype::start();
+
+   if (true)
+        {
+            this->spawnPlayersIfRequested();
+            this->cantMove_ = true;
+
+            for (Engine* engine : ObjectList<Engine>()){
+                engine->setActive(false);
+                
+
+            }
+            
+        }
+
+
+
+        std::string message("BE FAST BE FIRST");
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+
+Timer* countdownTimer = new Timer();
+        countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
+    }
 
 
@@ -84 +131 @@
     }
 
-    
-
-
-
-
-    void SpaceRace::tick(float dt)
+
+void SpaceRace::tick(float dt)
     {
         SUPER(SpaceRace,tick,dt);
+
+
 
         // spawns the players when the countdown starts, but deactivates their engines
@@ -103 +148 @@
         }
 
+
+gtInfo_->setStartCountdown(10.0);
+   
+        
+            /*this->spawnPlayersIfRequested();
+            this->cantMove_ = true;
+
+            for (Engine* engine : ObjectList<Engine>()){
+                engine->setActive(false);
+                }
+
+            
+            
+         std::string message("BE FAST BE FIRST");
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+
+Timer* countdownTimer = new Timer();
+        countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));*/
+
+
+
+
+
+
+
         // activate the engines when the countdown ends
         if (!this->isStartCountdownRunning() && this->cantMove_)
@@ -113 +184 @@
 
 
-            std::string message = "Hello!";
+            std::string message = "RACE STARTED!";
             this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
         }
-    }
-
-
-
-
-
+    
+}
 
     void SpaceRace::newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player)
@@ -138 +205 @@
     }
 
+ void SpaceRace::countdownFinished()
+    {
+
+        std::string message("RACE STARTED ");
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+
+
+    for (Engine* engine : ObjectList<Engine>())
+                engine->setActive(true);
+    
+}
+
+ void SpaceRace::playerEntered(PlayerInfo* player)
+    {
+        Gametype::playerEntered(player);
+
+        const std::string& message = player->getName() + " entered the game";
+        ChatManager::message(message);
+    }
+
+
+ void SpaceRace::addBots(unsigned int amount)
+    {
+        for (unsigned int i = 0; i < amount; ++i)
+            this->botclass_.fabricate(this->getContext());
+    }
+
+
+
+
+
+
+
     bool SpaceRace::allowPawnHit(Pawn* victim, Pawn* originator)
     {

code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.h

@@ -57 +57 @@
             virtual ~SpaceRace() {}
 
+             void setConfigValues();
 
             virtual void tick(float dt) override;
+            virtual void start() override;
+            virtual void end() override;
+ virtual void countdownFinished();
+             virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
 
-            virtual void end() override;
+
+
+             virtual void playerEntered(PlayerInfo* player) override;
+
+            //virtual void newCheckpointReached();
 
             void newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player);
+            
+
+
             inline RaceCheckPoint* getCheckpointReached(PlayerInfo* player)
                 { return this->checkpointReached_[player]; }

code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc

@@ -41 +41 @@
     SpaceRaceBot::SpaceRaceBot(Context* context) : Bot(context){
         RegisterObject(SpaceRaceBot);
-        this->defaultController_ = Class(AIController);// ClassByString("")
-        
-
-
-
-
-
+        this->defaultController_ = Class(SpaceRaceController);// ClassByString("")
         this->createController();
 

code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceManager.cc

@@ -48 +48 @@
         this->race_ = orxonox_cast<SpaceRace*>(this->getGametype());
         assert(race_);
-        amountOfPlayers=(race_->getPlayers()).size();
+        //amountOfPlayers=(race_->getPlayers()).size();
         this->firstcheckpointvisible_ = false;
     }

code/branches/SpaceRace_HS16/src/orxonox/infos/GametypeInfo.h

@@ -83 +83 @@
             inline bool isStartCountdownRunning() const
                 { return this->bStartCountdownRunning_; }
+            
             void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.