Changeset 11982

Timestamp:

May 24, 2018, 1:56:22 PM (6 years ago)

Author:

arismu

Message:

SpaceRaceTemplates

Location:

code/branches/RacingBots_FS18

Files:

• data/levels/newnewnewspacerace.oxw (modified) (1 diff)
• data/levels/templates/SpaceRaceTemplates.oxt (added)
• src/modules/gametypes/SpaceRace.cc (modified) (1 diff)
• src/modules/gametypes/SpaceRaceController.cc (modified) (4 diffs)
• src/modules/gametypes/SpaceRaceController.h (modified) (1 diff)

code/branches/RacingBots_FS18/data/levels/newnewnewspacerace.oxw

@@ -538 +538 @@
     
     <PickupSpawner pickup=smallboostpickup position="42000,70,-30" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
-    <PickupSpawner pickup=smallboostpickup position="32000,0,650" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+    <PickupSpawner pickup=smallspeedpickup position="32000,0,650" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
 
     <PickupSpawner pickup=smallspeedpickup position="9000,-185,66" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>

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

@@ -142 +142 @@
         }
 
-        std::string message("Use headphones to hear the countdown! It is useful to start with a boost!");
+        std::string message("Use headphones to hear the countdown! Press W for forward acceleration, W+space bar for boost!");
 
         this->getGametypeInfo()->sendAnnounceMessage(message);

code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.cc

@@ -107 +107 @@
         return returnVec;
     }
-    void SpaceRaceController::endtheGame() const {
+    /*void SpaceRaceController::endtheGame() const {
         SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype());
         assert(gametype);
@@ -114 +114 @@
         gametype->end();
 
-    }
+    }*/
     /*
      * called from 'findStaticCheckpoints'
@@ -186 +186 @@
 
         }
-        if(minNextRaceCheckPoint == nullptr) {endtheGame(); orxout()<<"nullptr found @181 SpaceRaceController" << endl;}
+        if(minNextRaceCheckPoint == nullptr) { orxout()<<"nullptr found @181 SpaceRaceController" << endl;}
         return minNextRaceCheckPoint;
     }
@@ -252 +252 @@
             if (checkpoint->getCheckpointIndex() == index){
                 //if(checkpoint == nullptr) orxout()<<"returned nullptr @line 234 SpaceRaceController"<<endl;
-                orxout()<< "index of the checkpoint "<< index <<endl;
+                //orxout()<< "index of the checkpoint "<< index <<endl;
                 res = checkpoint;
                 return res;
             }
         }
-     if(index>2 )   
-        this->endtheGame();
+    /* if(index>2 )   
+        this->endtheGame();*/
 
         return res;

code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRaceController.h

@@ -58 +58 @@
             RaceCheckPoint* nextPointFind(RaceCheckPoint*);
             RaceCheckPoint* adjustNextPoint();
-            void endtheGame() const;
+            //void endtheGame() const;
 
             std::vector<RaceCheckPoint*> findStaticCheckpoints(RaceCheckPoint*, const std::vector<RaceCheckPoint*>&);