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

[bberabi at orxonox.net]

Author: bberabi
Date: 2016-10-17 16:08:32 +0200 (Mon, 17 Oct 2016)
New Revision: 11239

Modified:
   code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
   code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw
   code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc
   code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.h
Log:
sound and countdown

Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-10-17 14:03:48 UTC (rev 11238)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw	2016-10-17 14:08:32 UTC (rev 11239)
@@ -31,17 +31,50 @@
   >
   
   <!-- SOUNDS & MUSIC -->
-    <WorldSound name="scoreSound" position="0,-2100,0" source="sounds/ReadyGo.ogg" >
+  <!--  <WorldSound name="scoreSound" position="0,-2100,0" source="sounds/ReadyGo.ogg" >
       <events>
         <play>
           <EventListener event="start" />
         </play>
       </events>
+    </WorldSound> -->
+  
+<WorldSound name="Countdown" position="0,-2100,0" source="sounds/Countdown.ogg" >
+      <events>
+        <play>
+          <EventListener event="start1" />
+        </play>
+      </events>
     </WorldSound>
-    <DistanceTrigger name="start" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
+
+
+<WorldSound name="Go" position="0,-2100,0" source="sounds/Go.ogg" >
+      <events>
+        <play>
+          <EventListener event="go" />
+        </play>
+      </events>
+    </WorldSound>
+
+<WorldSound name="racetheme" position="0,-2100,0" source="sounds/racetheme.ogg" >
+      <events>
+        <play>
+          <EventListener event="racetheme" />
+        </play>
+      </events>
+    </WorldSound>
+
+    <DistanceTrigger name="start1" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
+        <DistanceTrigger name="go" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=10.5  />
+         <DistanceTrigger name="racetheme" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=10.7  />
+
+
+
+
+      <WorldAmbientSound source="racetheme.ogg" looping="true" playOnLoad="true" />
+
+  <!--   <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" /> -->
   
-    <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
-  
 
     <?lua math.randomseed(98) ?>
 

Modified: code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw	2016-10-17 14:03:48 UTC (rev 11238)
+++ code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw	2016-10-17 14:08:32 UTC (rev 11239)
@@ -1,5 +1,5 @@
 <LevelInfo
- name = "Old Space Race"
+ name = "Space Race"
  description = "Have a furious Race in Space: Reach the checkpoints as fast as possible."
  tags = "gametype"
  screenshot = "spacerace.png"
@@ -38,6 +38,18 @@
         </play>
       </events>
     </WorldSound>
+
+  <WorldSound name="Countdown" position="0,-2100,0" source="sounds/Countdown.ogg" >
+      <events>
+        <play>
+          <EventListener event="start" />
+        </play>
+      </events>
+    </WorldSound>
+
+
+
+
     <DistanceTrigger name="start" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
   
     <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-17 14:03:48 UTC (rev 11238)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc	2016-10-17 14:08:32 UTC (rev 11239)
@@ -83,7 +83,7 @@
     {
         Gametype::start();
 
-        std::string message("The match has started! Reach the check points as quickly as possible!");
+        std::string message("Take Them All!");
         this->getGametypeInfo()->sendAnnounceMessage(message);
         ChatManager::message(message);
     }
@@ -101,4 +101,5 @@
         ChatManager::message(message);
     }
 
+
 }

Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.h
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.h	2016-10-17 14:03:48 UTC (rev 11238)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.h	2016-10-17 14:08:32 UTC (rev 11239)
@@ -35,7 +35,7 @@
 {
 
     /**
-/sdaasdasdasdasdas
+/sdaasdasdasdasdas	
     */
     class _GametypesExport SpaceRaceBot: public Bot
     {