Changeset 11572

Timestamp:

Nov 20, 2017, 2:46:48 PM (7 years ago)

Author:

merholzl

Message:

hitboxes

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/FlappyOrx.oxw (modified) (1 diff)
• data/levels/templates/spaceshipFlappyOrx.oxt (modified) (1 diff)
• src/modules/flappyorx/FlappyOrx.h (modified) (1 diff)

code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw

@@ -32 +32 @@
   <Scene
     ambientlight = "0.8, 0.7, 0.4"
-    skybox     = "Orxonox/skyBox"
+    skybox     = "Orxonox/skyBoxBasic"
   >
 

code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt

@@ -58 +58 @@
     </attached>
     <collisionShapes>
-      <SphereCollisionShape position="0    ,0 ,  3" radius="100" />
+      <SphereCollisionShape position="-0.8    ,0 ,  -10" radius="15" />
     </collisionShapes>
     <explosion >

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h

@@ -161 +161 @@
            
             const std::string DeathMessage10[6] = {
-                "Game Over, /n but you should really try again",
-                "Game Over! /n You can do better, can you?",
-                "Game Over! /n Hey maybe you get a paticipation award, that's good isn't it?",
-                "Game Over! /n Hey congratulations, you get an medal, a wooden one",
-                "Game Over! /n That was flappin bad!",
-                "Game Over! /n Well that was a waste of time"};
-            const std::string DeathMessage30[6] = {"Asteroid6_1","Asteroid6_2","Asteroid6_3","Asteroid6_4","Asteroid6_5","Asteroid6_6"};
+                "You should really try again",
+                "You can do better, can you?",
+                "Hey maybe you get a paticipation award, that's good isn't it?",
+                "Hey congratulations, you get an medal, a wooden one",
+                "That was flappin bad!",
+                "Well that was a waste of time"};
+            const std::string DeathMessage30[6] = {
+                "Getting better!",
+                "","Asteroid6_3","Asteroid6_4","Asteroid6_5","Asteroid6_6"};
             const std::string DeathMessage50[6] = {"Asteroid9_1","Asteroid9_2","Asteroid9_3","Asteroid9_4","Asteroid9_5","Asteroid9_6"};
             const std::string DeathMessageover50[6] = {"Asteroid12_1","Asteroid12_2","Asteroid12_3","Asteroid12_4","Asteroid12_5","Asteroid12_6"};