[Orxonox-commit 6959] r11580 - in code/branches/FlappyOrx_HS17: data/levels data/levels/templates src/modules/flappyorx
merholzl at orxonox.net
merholzl at orxonox.net
Mon Nov 20 16:19:41 CET 2017
Author: merholzl
Date: 2017-11-20 16:19:40 +0100 (Mon, 20 Nov 2017)
New Revision: 11580
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.cc
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
Log:
colisson boxes and asteroidshapoeremoval
Modified: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw 2017-11-20 15:15:17 UTC (rev 11579)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw 2017-11-20 15:19:40 UTC (rev 11580)
@@ -50,7 +50,7 @@
<?lua
- for i = 1, 6, 1 do
+ for i = 1, 5, 1 do
for j = 3, 12,3 do
?>
@@ -68,7 +68,7 @@
<Model mass="1000" mesh="ast<?lua print(i) ?>.mesh" />
</attached>
<collisionShapes>
- <SphereCollisionShape radius="<?lua print(j) ?>" />
+ <SphereCollisionShape radius="<?lua print(j + 5) ?>" />
</collisionShapes>
</MovableEntity>
</Template>
Modified: code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt 2017-11-20 15:15:17 UTC (rev 11579)
+++ code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt 2017-11-20 15:19:40 UTC (rev 11580)
@@ -57,7 +57,9 @@
<Model mesh="cube.mesh" mass=10 position="0,0,-12" scale3D="4,4,7" /-->
</attached>
<collisionShapes>
- <SphereCollisionShape position="-0.8 ,0 , -10" radius="15" />
+ <SphereCollisionShape position="-1.8 ,0 , -11" radius="15" />
+ <SphereCollisionShape position="-0.8 ,0 , 0" radius="16" />
+ <SphereCollisionShape position="0 ,0 , 11" radius="12.5" />
</collisionShapes>
<explosion >
<ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc 2017-11-20 15:15:17 UTC (rev 11579)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc 2017-11-20 15:19:40 UTC (rev 11580)
@@ -50,8 +50,8 @@
#include "core/command/ConsoleCommand.h"
#include "worldentities/ExplosionPart.h"
+#include <vector>
-
namespace orxonox
{
RegisterUnloadableClass(FlappyOrx);
@@ -166,13 +166,13 @@
if(c.r<=5)
- newAsteroid->addTemplate(Asteroid5[rand()%6]);
+ newAsteroid->addTemplate(Asteroid5[rand()%NUM_ASTEROIDS]);
else if(c.r<=10)
- newAsteroid->addTemplate(Asteroid10[rand()%6]);
+ newAsteroid->addTemplate(Asteroid10[rand()%NUM_ASTEROIDS]);
else if(c.r<=15)
- newAsteroid->addTemplate(Asteroid15[rand()%6]);
+ newAsteroid->addTemplate(Asteroid15[rand()%NUM_ASTEROIDS]);
else
- newAsteroid->addTemplate(Asteroid20[rand()%6]);
+ newAsteroid->addTemplate(Asteroid20[rand()%NUM_ASTEROIDS]);
newAsteroid->setPosition(Vector3(c.x, 0, c.y));
newAsteroid->setOrientation(Vector3::UNIT_Z, Degree(rand()%360));
@@ -206,16 +206,6 @@
}
}
- void FlappyOrx::comboControll()
- {
- if (b_combo)
- multiplier++;
- // if no combo was performed before, reset multiplier
- else
- multiplier = 1;
- b_combo = false;
- }
-
void FlappyOrx::start()
{
// Set variable to temporarily force the player to spawn.
@@ -230,22 +220,15 @@
// Call start for the parent class.
Deathmatch::start();
}
- void FlappyOrx::addPoints(int numPoints)
- {
- if (!bEndGame)
- {
- point += numPoints * multiplier;
- b_combo = true;
- }
- }
+
void FlappyOrx::death(){
bIsDead = true;
- 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))];
+ if(point<10) sDeathMessage = DeathMessage10[rand()%(DeathMessage10.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())];
orxout()<<"message: "<<sDeathMessage<<std::endl;
Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h 2017-11-20 15:15:17 UTC (rev 11579)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h 2017-11-20 15:19:40 UTC (rev 11580)
@@ -39,11 +39,10 @@
#include "gametypes/Deathmatch.h"
#include "tools/Timer.h"
+#include <vector>
-
namespace orxonox
{
-
struct Circle{
int r;
int x;
@@ -101,6 +100,7 @@
std::queue<MovableEntity*> asteroids;
int spawnDistance;
int tubeOffsetX;
+
private:
void toggleShowLevel(){bShowLevel = !bShowLevel;}
@@ -154,20 +154,23 @@
int point;
bool b_combo;
- const std::string Asteroid5[6] = {"Asteroid3_1","Asteroid3_2","Asteroid3_3","Asteroid3_4","Asteroid3_5","Asteroid3_6"};
- 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 int NUM_ASTEROIDS = 5;
+
+
+ const std::string Asteroid5[5] = {"Asteroid3_1","Asteroid3_2","Asteroid3_3","Asteroid3_4","Asteroid3_5"};
+ const std::string Asteroid10[5] = {"Asteroid6_1","Asteroid6_2","Asteroid6_3","Asteroid6_4","Asteroid6_5"};
+ 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"};
- const std::string DeathMessage10[7] = {
+ std::vector<std::string> DeathMessage10 = {
"You should really try that again",
"You can do better, can you?",
- "Hey maybe you get a paticipation award, that's good isn't it?",
- "Hey congratulations, you get an medal, a wooden one",
+ "Hey maybe you get a participation award, that's good isn't it?",
+ "Congratulations, you get a medal, a wooden one",
"That was flappin bad!",
"Getting closer to something",
- "Well that was a waste of time"};
- const std::string DeathMessage30[6] = {
+ "Well, that was a waste of time"};
+ std::vector<std::string> DeathMessage30 = {
"Getting better!",
"Training has paid off, huh?",
"Good average!",
@@ -174,7 +177,7 @@
"That was somehow enjoyable to watch",
"Flappin average",
"That wasn't crap, not bad"};
- const std::string DeathMessage50[6] = {
+ std::vector<std::string> DeathMessage50 = {
"Flappin great",
"Good job!",
"Okay, we give you a shiny medal, not a golden one, tough",
@@ -181,7 +184,7 @@
"Maybe you should do that professionally",
"That was really good,!",
"We are proud of you"};
- const std::string DeathMessageover50[6] = {
+ std::vector<std::string> DeathMessageover50 = {
"You're flappin amazing",
"Fucking great job",
"Wow, we're really impressed",
More information about the Orxonox-commit
mailing list