[Orxonox-commit 6616] r11256 - in code/branches/SpaceRace_HS16: data/levels src/modules/gametypes

[bberabi at orxonox.net]

Author: bberabi
Date: 2016-10-31 16:01:40 +0100 (Mon, 31 Oct 2016)
New Revision: 11256

Modified:
   code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw
   code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
   code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc
   code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h
   code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc
Log:
racing bots.. under maintanence...

Modified: code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw	2016-10-31 14:58:20 UTC (rev 11255)
+++ code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw	2016-10-31 15:01:40 UTC (rev 11256)
@@ -19,9 +19,9 @@
   include("templates/spaceshipAssff2.oxt")
   include("templates/spaceshipPirate.oxt")
 ?>
-
+    
 <Level
- name         = "Spacerace2"
+ name         = "Spacerace2"    
  description  = "Just a few tests"
  plugins = "gametypes"
  gametype = "SpaceRace"

Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-10-31 14:58:20 UTC (rev 11255)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-10-31 15:01:40 UTC (rev 11256)
@@ -73,22 +73,28 @@
     </WorldAmbientSound>
 
 
-    <SpaceShip position="0,0,200" lookat="0,0,0">
+
+  <!-- Das erste Bot -->
+    <SpaceShip position="20,0,0" lookat="25,0,0">
       <templates>
-        <Template link=spaceshipassff />
+        <Template link=fastship />
       </templates>
       <controller>
-        <WaypointPatrolController alertnessradius=0 team=10>
+        <WaypointPatrolController alertnessradius=1 team=10>
           <waypoints>
-            <Model mesh="cube.mesh" scale=0 position="0,-2000,1000" />
-            <Model mesh="cube.mesh" scale=0 position="0,2100,2300" />
-            <Model mesh="cube.mesh" scale=0 position="0,-400,300" />
+            <Model mesh="cube.mesh" scale=0 position="1000,0,0" />
+            <Model mesh="cube.mesh" scale=0 position="1500,1000,250" />
+            <Model mesh="cube.mesh" scale=0 position="0,400,300" />
           </waypoints>
         </WaypointPatrolController>
       </controller>
     </SpaceShip>
 
 
+
+
+
+
   <!--   <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" /> -->
   
 

Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc	2016-10-31 14:58:20 UTC (rev 11255)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc	2016-10-31 15:01:40 UTC (rev 11256)
@@ -32,24 +32,41 @@
 #include "chat/ChatManager.h"
 #include "util/Convert.h"
 #include "util/Math.h"
-#include "SpaceRaceBot.h"
+#include "infos/Bot.h"
 #include "items/Engine.h"
 #include "controllers/HumanController.h"
+#include "SpaceRaceBot.h"
 
+#include "core/CoreIncludes.h"
+#include "chat/ChatManager.h"
+#include "infos/PlayerInfo.h"
+#include "worldentities/pawns/Pawn.h"
+#include "core/config/ConfigValueIncludes.h"
 
 
+
 namespace orxonox
 {
     RegisterUnloadableClass(OldSpaceRace);
 
+
     OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context)
     {
         RegisterObject(OldSpaceRace);
+        
+        //this->botclass_ = Class();
+
         this->checkpointsReached_ = 0;
         this->bTimeIsUp_ = false;
-        this->numberOfBots_ = 1;
+        this->setConfigValues();
     }
 
+    void OldSpaceRace::setConfigValues()
+    {
+       
+    
+    }
+
     void OldSpaceRace::end()
     {
         this->Gametype::end();
@@ -126,6 +143,17 @@
 
     }
  
+
+ void OldSpaceRace::playerEntered(PlayerInfo* player)
+    {
+        Gametype::playerEntered(player);
+
+        const std::string& message = player->getName() + " entered the game";
+        ChatManager::message(message);
+    }
+
+
+
     void OldSpaceRace::newCheckpointReached()
     {
         this->checkpointsReached_++;

Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h	2016-10-31 14:58:20 UTC (rev 11255)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h	2016-10-31 15:01:40 UTC (rev 11256)
@@ -54,16 +54,20 @@
             OldSpaceRace(Context* context);
             virtual ~OldSpaceRace() {}
 
+                        void setConfigValues();
+
             virtual void start() override;
 
             virtual void end() override;
 
-
+            virtual void playerEntered(PlayerInfo* player) override;
             virtual void newCheckpointReached();
             virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command.
-            virtual  void countdownFinished();
                                           //<! This is only a temporary solution. Better: create racingBots.
 
+
+            virtual  void countdownFinished();
+
             inline void setCheckpointsReached(int n)
                 { this->checkpointsReached_ = n;}
             inline int getCheckpointsReached()

Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc	2016-10-31 14:58:20 UTC (rev 11255)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc	2016-10-31 15:01:40 UTC (rev 11256)
@@ -35,4 +35,12 @@
         this->defaultController_ = Class(SpaceRaceController);// ClassByString("")
         this->createController();
     }
+
+
+
+
+
+
+
+    
 }