[Orxonox-commit 6947] r11568 - in code/branches/FlappyOrx_HS17: data/levels data/levels/templates src/modules/flappyorx

[merholzl at orxonox.net]

Author: merholzl
Date: 2017-11-20 14:16:00 +0100 (Mon, 20 Nov 2017)
New Revision: 11568

Modified:
   code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
   code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
Log:
some messages

Modified: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-11-20 13:15:02 UTC (rev 11567)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-11-20 13:16:00 UTC (rev 11568)
@@ -31,7 +31,7 @@
     skybox       = "Orxonox/Starbox" -->
   <Scene
     ambientlight = "0.8, 0.7, 0.4"
-    skybox     = "Orxonox/skyBoxBasic"
+    skybox     = "Orxonox/skyBox"
   >
 
   <WorldAmbientSound

Modified: code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt	2017-11-20 13:15:02 UTC (rev 11567)
+++ code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt	2017-11-20 13:16:00 UTC (rev 11568)
@@ -49,8 +49,8 @@
       <MultiStateEngine position="-7.6, 0, 0" template=spaceshipFlappyOrxengine />
     </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" />
 <Model mesh="cube.mesh" mass=10 position="-12.6,-2,3" scale3D="2.8,2.8,11" />
@@ -57,10 +57,7 @@
 <Model mesh="cube.mesh" mass=10 position="0,0,-12" scale3D="4,4,7" /-->
     </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 >
       <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h	2017-11-20 13:15:02 UTC (rev 11567)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h	2017-11-20 13:16:00 UTC (rev 11568)
@@ -158,6 +158,17 @@
             const std::string Asteroid10[6] = {"Asteroid6_1","Asteroid6_2","Asteroid6_3","Asteroid6_4","Asteroid6_5","Asteroid6_6"};
             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"};