[Orxonox-commit 6955] r11576 - in code/branches/FlappyOrx_HS17: data/overlays src/modules/flappyorx
pascscha at orxonox.net
pascscha at orxonox.net
Mon Nov 20 15:26:32 CET 2017
Author: pascscha
Date: 2017-11-20 15:26:31 +0100 (Mon, 20 Nov 2017)
New Revision: 11576
Modified:
code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo
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
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
Log:
deathmessages again
Modified: code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo
===================================================================
--- code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo 2017-11-20 14:21:35 UTC (rev 11575)
+++ code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo 2017-11-20 14:26:31 UTC (rev 11576)
@@ -18,36 +18,53 @@
/>
<FlappyOrxHUDinfo
- position = "0.02, 0.01"
+ position = "0.5, 0.5"
pickpoint = "0.0, 0.0"
font = "ShareTechMono"
textsize = 0.04
- colour = "1.0, 1.0, 1.0, 1.0"
- align = "left"
+ colour = "1.0, 0.0, 0.0, 1.0"
+ align = "center"
showmessage = true
+ messageID = 0
+
/>
- <!-- <FlappyOrxHUDinfo
- position = "0.14, 0.01"
+ <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"
- showlives = true
- showpoints = false
+ showmessage = true
+ messageID = 2
/>
-
- <OverlayText
- position = "0.14, 0.02"
+ <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"
- caption = "Lives: "
- /> -->
+ align = "center"
+
+ showmessage = true
+ messageID = 3
+
+ />
+
+
</OverlayGroup>
</Template>
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc 2017-11-20 14:21:35 UTC (rev 11575)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc 2017-11-20 14:26:31 UTC (rev 11576)
@@ -66,7 +66,7 @@
level = 0;
point = 0;
bShowLevel = false;
- sDeathMessage = "Welcome to FlappyOrx\nPress Space to start!";
+ sDeathMessage = "Welcome to FlappyOrx";
bIsDead = true;
multiplier = 1;
b_combo = false;
@@ -197,8 +197,13 @@
return bIsDead;
}
- std::string FlappyOrx::getDeathMessage(){
- return sDeathMessage;
+ void FlappyOrx::setDead(bool value){
+ bIsDead = value;
+ if(not value){
+ point = -1;
+ level=-1;
+ levelUp();
+ }
}
void FlappyOrx::comboControll()
@@ -236,15 +241,20 @@
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();
if(score > Highscore::getInstance().getHighestScoreOfGame("Flappy Orx"))
Highscore::getInstance().storeHighscore("Flappy Orx",score);
}
- point = -1;
- level=-1;
- levelUp();
while (!tubes.empty())
{
tubes.pop();
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h 2017-11-20 14:21:35 UTC (rev 11575)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h 2017-11-20 14:26:31 UTC (rev 11576)
@@ -89,8 +89,8 @@
void comboControll();
bool isDead();
- std::string getDeathMessage();
-
+ void setDead(bool value);
+
int lives;
int multiplier;
bool bEndGame;
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc 2017-11-20 14:21:35 UTC (rev 11575)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc 2017-11-20 14:26:31 UTC (rev 11576)
@@ -52,9 +52,9 @@
{
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);
}
@@ -69,8 +69,6 @@
if(this->bShowPoints_){
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);
}
else if(this->bShowGameOver_){
@@ -82,14 +80,26 @@
setTextSize(0);
}
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));
}
}
}
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h 2017-11-20 14:21:35 UTC (rev 11575)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.h 2017-11-20 14:26:31 UTC (rev 11576)
@@ -70,7 +70,15 @@
inline bool getShowMessage() const
{ return this->bShowGameOver_; }
+ inline void setMessageID(int value){
+ messageID = value;
+ }
+ inline int getMessageID() const
+ { return messageID; }
+
+
+
private:
FlappyOrx* FlappyOrxGame;
bool bShowLives_;
@@ -78,6 +86,7 @@
bool bShowPoints_;
bool bShowMultiplier_;
bool bShowGameOver_;
+ int messageID;
std::string sGameOverMessage_;
};
}
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc 2017-11-20 14:21:35 UTC (rev 11575)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc 2017-11-20 14:26:31 UTC (rev 11576)
@@ -130,7 +130,7 @@
void FlappyOrxShip::boost(bool boost){
if(isDead){
isDead = false;
- getGame()->bIsDead = false;
+ getGame()->setDead(false);
}
isFlapping=boost;
}
More information about the Orxonox-commit
mailing list