Changeset 11554

Timestamp:

Nov 13, 2017, 3:44:45 PM (6 years ago)

Author:

pascscha

Message:

Increasing difficulty

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/FlappyOrx.oxw (modified) (1 diff)
• src/modules/flappyorx/FlappyOrx.cc (modified) (6 diffs)
• src/modules/flappyorx/FlappyOrxShip.cc (modified) (1 diff)

code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw

@@ -32 +32 @@
   <Scene
     ambientlight = "0.8, 0.7, 0.4"
-    skybox     = "Orxonox/skyBoxBasic"
+    skybox     = "Orxonox/skyBoxFlappyOrx"
   >
 

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

@@ -68 +68 @@
         multiplier = 1;
         b_combo = false;
-        this->spawnDistance=300;
+        this->spawnDistance=200;
         this->tubeOffsetX=500;
         this->setHUDTemplate("FlappyOrxHUD");
@@ -75 +75 @@
     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){
@@ -93 +97 @@
     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)));
@@ -111 +117 @@
     void FlappyOrx::spawnTube()
     {
-        int space = 90;
+        int space = 120;
         int height = (float(rand())/RAND_MAX-0.5)*(280-space);
            
@@ -129 +135 @@
         ClearAsteroids();
         Circle newAsteroid = Circle();
+        newAsteroid.x=x;
+        newAsteroid.y=y;
+        newAsteroid.r=r;
+        addIfPossible(newAsteroid);
         while(r>0){
             if(slope>0)
@@ -224 +234 @@
         if (Highscore::exists()){
                     int score = this->getPoints();
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Orxonox Arcade")) 
-                        Highscore::getInstance().storeHighscore("Orxonox Arcade",score);
-
-        }
-        point = 0;
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Flappy Orx")) 
+                        Highscore::getInstance().storeHighscore("Flappy Orx",score);
+
+        }
+        point = -1;
+        level=-1;
+        levelUp();
         while (!tubes.empty())
         {

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

@@ -54 +54 @@
         
     }
+
+    
     void FlappyOrxShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
         {