Changeset 11568

Timestamp:

Nov 20, 2017, 2:16:00 PM (6 years ago)

Author:

merholzl

Message:

some messages

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/FlappyOrx.oxw (modified) (1 diff)
• data/levels/templates/spaceshipFlappyOrx.oxt (modified) (2 diffs)
• 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/skyBoxBasic"
+    skybox     = "Orxonox/skyBox"
   >
 

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

@@ -50 +50 @@
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
-      <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
+      <Model position="0,0,0" yaw=180 pitch=90 roll=270 scale=9 mesh="FlappyOrxShip.mesh" />
+      <!-- <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" /> -->
 <!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
 <Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />
@@ -58 +58 @@
     </attached>
     <collisionShapes>
-      <BoxCollisionShape position="0    ,0 ,  3" halfExtents="10,   4,8" />
-      <BoxCollisionShape position="12.6 ,-2,  3" halfExtents="2.8,2.8,11"/>
-      <BoxCollisionShape position="-12.6,-2,  3" halfExtents="2.8,2.8,11"/>
-      <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
+      <SphereCollisionShape position="0    ,0 ,  3" radius="100" />
     </collisionShapes>
     <explosion >

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

@@ -159 +159 @@
             const std::string Asteroid15[6] = {"Asteroid9_1","Asteroid9_2","Asteroid9_3","Asteroid9_4","Asteroid9_5","Asteroid9_6"};
             const std::string Asteroid20[6] = {"Asteroid12_1","Asteroid12_2","Asteroid12_3","Asteroid12_4","Asteroid12_5","Asteroid12_6"};
+           
+            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"};
+            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"};