Changeset 11576 for code/branches

Timestamp:

Nov 20, 2017, 3:26:31 PM (7 years ago)

Author:

pascscha

Message:

deathmessages again

Location:

code/branches/FlappyOrx_HS17

Files:

• data/overlays/FlappyOrxHUD.oxo (modified) (1 diff)
• src/modules/flappyorx/FlappyOrx.cc (modified) (4 diffs)
• src/modules/flappyorx/FlappyOrx.h (modified) (1 diff)
• src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) (3 diffs)
• src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) (2 diffs)
• src/modules/flappyorx/FlappyOrxShip.cc (modified) (1 diff)

code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo

@@ -19 +19 @@
 
     <FlappyOrxHUDinfo
-     position  = "0.02, 0.01"
+     position  = "0.5, 0.5"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 0.0, 0.0, 1.0"
+     align     = "center"
+
+     showmessage     = true
+     messageID = 0
+
+    />
+
+    <FlappyOrxHUDinfo
+         position  = "0.5, 0.6"
+         pickpoint = "0.0, 0.0"
+         font      = "ShareTechMono"
+         textsize  = 0.04
+         colour    = "1.0, 1.0, 1.0, 1.0"
+         align     = "center"
+
+         showmessage     = true
+         messageID = 1
+    />
+    <FlappyOrxHUDinfo
+     position  = "0.5, 0.65"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
      colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
+     align     = "center"
 
      showmessage     = true
+     messageID = 2
     />
-
-    <!-- <FlappyOrxHUDinfo 
-     position  = "0.14, 0.01"
+    <FlappyOrxHUDinfo
+     position  = "0.5, 0.7"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
      textsize  = 0.04
      colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
+     align     = "center"
 
-     showlives     = true
-     showpoints     = false
+     showmessage     = true
+     messageID = 3
+
     />
 
-    <OverlayText
-     position  = "0.14, 0.02"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-     caption   = "Lives: "
-    /> -->
+    
   </OverlayGroup>
 </Template>

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

@@ -67 +67 @@
         point = 0;
         bShowLevel = false;
-        sDeathMessage = "Welcome to FlappyOrx\nPress Space to start!";
+        sDeathMessage = "Welcome to FlappyOrx";
         bIsDead = true;
         multiplier = 1;
@@ -198 +198 @@
     }
 
-    std::string FlappyOrx::getDeathMessage(){
-        return sDeathMessage;
+    void FlappyOrx::setDead(bool value){
+        bIsDead = value;
+        if(not value){
+            point = -1;
+            level=-1;
+            levelUp();
+        }
     }
 
@@ -237 +242 @@
     void FlappyOrx::death(){
         bIsDead = true;
-        sDeathMessage = "GameOver";
+        
+        if(point<10)        sDeathMessage = DeathMessage10[rand()%(sizeof(DeathMessage10)/sizeof(*DeathMessage10))];
+        else if(point<30)   sDeathMessage = DeathMessage30[rand()%(sizeof(DeathMessage30)/sizeof(*DeathMessage30))];
+        else if(point<50)   sDeathMessage = DeathMessage50[rand()%(sizeof(DeathMessage50)/sizeof(*DeathMessage50))];
+        else                sDeathMessage = DeathMessageover50[rand()%(sizeof(DeathMessageover50)/sizeof(*DeathMessageover50))];
+        
+        orxout()<<"message: "<<sDeathMessage<<std::endl;
+
+
         if (Highscore::exists()){
                     int score = this->getPoints();
@@ -243 +256 @@
                         Highscore::getInstance().storeHighscore("Flappy Orx",score);
         }
-        point = -1;
-        level=-1;
-        levelUp();
         while (!tubes.empty())
         {

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

@@ -90 +90 @@
 
             bool isDead();
-            std::string getDeathMessage();
-
+            void setDead(bool value);
+            
             int lives;
             int multiplier;

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc

@@ -53 +53 @@
         SUPER(FlappyOrxHUDinfo, XMLPort, xmlelement, mode);
 
-        XMLPortParam(FlappyOrxHUDinfo, "showlives",     setShowLives,     getShowLives,     xmlelement, mode).defaultValues(false);
         XMLPortParam(FlappyOrxHUDinfo, "showpoints",    setShowPoints,    getShowPoints,    xmlelement, mode).defaultValues(false);
         XMLPortParam(FlappyOrxHUDinfo, "showmessage",   setShowMessage,   getShowMessage,   xmlelement, mode).defaultValues(false);
+        XMLPortParam(FlappyOrxHUDinfo, "messageID",     setMessageID,     getMessageID,     xmlelement, mode).defaultValues(0);
        
     
@@ -70 +70 @@
                     const std::string& points = "Score: "+multi_cast<std::string>(this->FlappyOrxGame->getPoints());
                     setTextSize(0.04);
-                    setPosition(Vector2(0.14, 0.02));
-                    this->setColour(ColourValue(1, 1, 1, 1));
                     this->setCaption(points);
                 }
@@ -83 +81 @@
                 }
                 else if(this->bShowGameOver_){
-                    std::string message = this->FlappyOrxGame->getDeathMessage();
-                    setTextSize(0.1);
-                    setPosition(Vector2(.5, .5));
-
-                    setAlignment(OverlayText::Alignment::Center);
-                    
+                    std::string message;
+                    setTextSize(0.05);
+                    switch(messageID){
+                        case 0:
+                            message = "Game Over";
+                            setTextSize(0.1);
+                            this->setCaption(message);
+                        break;
+                        case 1:
+                            message = this->FlappyOrxGame->sDeathMessage;
+                        break;
+                        case 2:
+                            message = "Your Score: "+multi_cast<std::string>(this->FlappyOrxGame->getPoints())+
+                                                    "  Local High Score: "+multi_cast<std::string>(Highscore::getInstance().getHighestScoreOfGame("Flappy Orx"));
+                        break;
+                        case 3:
+                            message = "Press space to restart.";
+                        break;
+                    }
                     this->setCaption(message);
-                    this->setColour(ColourValue(1, 0, 0, 1));
                 }
             }   

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

@@ -71 +71 @@
                 { return this->bShowGameOver_; }
 
+            inline void setMessageID(int value){
+                messageID = value;
+            }
+            inline int getMessageID() const
+                { return messageID; }
+
+
+
 
         private:
@@ -79 +87 @@
             bool bShowMultiplier_;
             bool bShowGameOver_;
+            int messageID;
             std::string sGameOverMessage_;
     };

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

@@ -131 +131 @@
         if(isDead){
             isDead = false;
-            getGame()->bIsDead = false;
+            getGame()->setDead(false);
         }
         isFlapping=boost;