[Orxonox-commit 6933] r11554 - in code/branches/FlappyOrx_HS17: data/levels src/modules/flappyorx

[pascscha at orxonox.net]

Author: pascscha
Date: 2017-11-13 15:44:45 +0100 (Mon, 13 Nov 2017)
New Revision: 11554

Modified:
   code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
Log:
Increasing difficulty

Modified: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-11-09 17:13:50 UTC (rev 11553)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-11-13 14:44:45 UTC (rev 11554)
@@ -31,7 +31,7 @@
     skybox       = "Orxonox/Starbox" -->
   <Scene
     ambientlight = "0.8, 0.7, 0.4"
-    skybox     = "Orxonox/skyBoxBasic"
+    skybox     = "Orxonox/skyBoxFlappyOrx"
   >
 
   <WorldAmbientSound

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-11-09 17:13:50 UTC (rev 11553)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-11-13 14:44:45 UTC (rev 11554)
@@ -67,7 +67,7 @@
         bShowLevel = false;
         multiplier = 1;
         b_combo = false;
-        this->spawnDistance=300;
+        this->spawnDistance=200;
         this->tubeOffsetX=500;
         this->setHUDTemplate("FlappyOrxHUD");
     }
@@ -74,14 +74,18 @@
 
     void FlappyOrx::updatePlayerPos(int x){
 
-        if(this->tubes.size()==0||x-this->tubes.back()-tubeOffsetX>spawnDistance){
+        if(this->tubes.size()==0||x-tubes.back()+tubeOffsetX>spawnDistance){
+            orxout()<<"true: ";
             spawnTube();
             this->tubes.push(x+tubeOffsetX);
         }
+        else{
+            orxout()<<"false:";
+        }
+        orxout()<<"x("<<x<<")- tubes.back()("<<tubes.back()<<") + tubeOffsetX("<<tubeOffsetX<<") > spawnDistance("<<spawnDistance<<")"<<std::endl;
         if(this->tubes.size()!=0&&x>this->tubes.front()){
             this->tubes.pop();
             levelUp();
-            point++;
         }
         while((this->asteroids.front())->getPosition().x<x-300){
             MovableEntity* deleteMe = asteroids.front();
@@ -92,7 +96,9 @@
 
     void FlappyOrx::levelUp()
     {
-        level++;
+        point++;
+        spawnDistance = 300-3*point;
+        getPlayer()->setSpeed(100+.5*point);
         toggleShowLevel();
         //showLevelTimer.setTimer(3.0f, false, createExecutor(createFunctor(&FlappyOrx::toggleShowLevel, this)));
     }
@@ -110,7 +116,7 @@
 
     void FlappyOrx::spawnTube()
     {
-        int space = 90;
+        int space = 120;
         int height = (float(rand())/RAND_MAX-0.5)*(280-space);
            
         if (getPlayer() == nullptr)
@@ -128,6 +134,10 @@
 
         ClearAsteroids();
         Circle newAsteroid = Circle();
+        newAsteroid.x=x;
+        newAsteroid.y=y;
+        newAsteroid.r=r;
+        addIfPossible(newAsteroid);
         while(r>0){
             if(slope>0)
                 newAsteroid.y=float(rand())/RAND_MAX*(150+y)-150;
@@ -223,11 +233,13 @@
     void FlappyOrx::death(){
         if (Highscore::exists()){
                     int score = this->getPoints();
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Orxonox Arcade")) 
-                        Highscore::getInstance().storeHighscore("Orxonox Arcade",score);
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Flappy Orx")) 
+                        Highscore::getInstance().storeHighscore("Flappy Orx",score);
 
         }
-        point = 0;
+        point = -1;
+        level=-1;
+        levelUp();
         while (!tubes.empty())
         {
             tubes.pop();

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-11-09 17:13:50 UTC (rev 11553)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-11-13 14:44:45 UTC (rev 11554)
@@ -53,6 +53,8 @@
         this->gravity = 1;
         
     }
+
+    
     void FlappyOrxShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
         {   
             SUPER(FlappyOrxShip, XMLPort, xmlelement, mode);