[Orxonox-commit 7011] r11630 - code/branches/FlappyOrx_HS17/src/modules/flappyorx

[pascscha at orxonox.net]

Author: pascscha
Date: 2017-12-04 15:53:25 +0100 (Mon, 04 Dec 2017)
New Revision: 11630

Modified:
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc
Log:
adjusted death messages

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-12-04 14:36:20 UTC (rev 11629)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-12-04 14:53:25 UTC (rev 11630)
@@ -255,10 +255,10 @@
         firstGame = false;
         
         //Set randomized deathmessages
-        if(point<10)        sDeathMessage = DeathMessage10[rand()%(DeathMessage10.size())];
+        if(point<7)         sDeathMessage = DeathMessage7[rand()%(DeathMessage7.size())];
+        else if(point<20)   sDeathMessage = DeathMessage20[rand()%(DeathMessage20.size())];
         else if(point<30)   sDeathMessage = DeathMessage30[rand()%(DeathMessage30.size())];
-        else if(point<50)   sDeathMessage = DeathMessage50[rand()%(DeathMessage50.size())];
-        else                sDeathMessage = DeathMessageover50[rand()%(DeathMessageover50.size())];
+        else                sDeathMessage = DeathMessageover30[rand()%(DeathMessageover30.size())];
         
         //Update Highscore
         if (Highscore::exists()){

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h	2017-12-04 14:36:20 UTC (rev 11629)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h	2017-12-04 14:53:25 UTC (rev 11630)
@@ -140,7 +140,7 @@
            const std::string Asteroid15[5] = {"Asteroid9_1","Asteroid9_2","Asteroid9_3","Asteroid9_4","Asteroid9_5"};
            const std::string Asteroid20[5] = {"Asteroid12_1","Asteroid12_2","Asteroid12_3","Asteroid12_4","Asteroid12_5"};
            
-            std::vector<std::string> DeathMessage10 = {
+            std::vector<std::string> DeathMessage7 = {
                 "You should really try that again",
                 "You can do better, can you?",
                 "Hey, maybe you get a participation award, that's good isn't it?",
@@ -151,7 +151,7 @@
                 "Maybe try SuperOrxoBros. That game is not as hard.",
                 "Here's a tip: Try not to fly into these grey thingies.",
                 "We won't comment on that."};
-            std::vector<std::string> DeathMessage30 = {
+            std::vector<std::string> DeathMessage20 = {
                 "Getting better!",
                 "Training has paid off, huh?",
                 "Good average!",
@@ -160,7 +160,7 @@
                 "Getting closer to something",
                 "That wasn't crap, not bad",
                 "Surprisingly not bad."};
-            std::vector<std::string> DeathMessage50 = {
+            std::vector<std::string> DeathMessage30 = {
                 "Flappin great",
                 "Good job!",
                 "Okay, we give you a shiny medal, not a golden one, tough",
@@ -167,7 +167,7 @@
                 "Maybe you should do that professionally",
                 "That was really good,!",
                 "We are proud of you"};
-            std::vector<std::string> DeathMessageover50 = {
+            std::vector<std::string> DeathMessageover30 = {
                 "You're flappin amazing",
                 "Fucking great job",
                 "Wow, we're really impressed",

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2017-12-04 14:36:20 UTC (rev 11629)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2017-12-04 14:53:25 UTC (rev 11630)
@@ -86,7 +86,7 @@
                     if(this->FlappyOrxGame->firstGame){
                         if(messageID==3){
                             setTextSize(0.05);
-                            this->setCaption("Press fire and then press space to start");
+                            this->setCaption("First click, then press space to start");
                         }
                     }
                     else{