[Orxonox-commit 7012] r11631 - in code/branches/FlappyOrx_HS17: data/levels data/levels/templates src/modules/flappyorx

[merholzl at orxonox.net]

Author: merholzl
Date: 2017-12-04 15:57:10 +0100 (Mon, 04 Dec 2017)
New Revision: 11631

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/FlappyOrxShip.cc
Log:
level preview

Modified: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-12-04 14:53:25 UTC (rev 11630)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-12-04 14:57:10 UTC (rev 11631)
@@ -2,7 +2,7 @@
  name = "Flappy Orx"
  description = "A clone of the iconic Flappy Bird"
  tags = "minigame"
- screenshot = "orxonoxArcade.png"
+ screenshot = "FlappyOrx.png"
 />
 
 <?lua

Modified: code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt	2017-12-04 14:53:25 UTC (rev 11630)
+++ code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt	2017-12-04 14:57:10 UTC (rev 11631)
@@ -26,7 +26,7 @@
   tubeDistanceBase = 200
   tubeDistanceIncrease = -1
 
-  upwardThrust = 210
+  upwardThrust = 220
   gravity = 700
 
   >

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-12-04 14:53:25 UTC (rev 11630)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-12-04 14:57:10 UTC (rev 11631)
@@ -115,7 +115,7 @@
         if (getPlayer() == nullptr)
             return;
 
-        int space = 120;    //vertical space between top and bottom tube
+        int space = 130;    //vertical space between top and bottom tube
         int height = (float(rand())/RAND_MAX-0.5)*(280-space);  //Randomize height
            
         Vector3 pos = player->getPosition();

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-12-04 14:53:25 UTC (rev 11630)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-12-04 14:57:10 UTC (rev 11631)
@@ -52,7 +52,7 @@
         isDead = true;
         deathTime = 0;
 
-        particleLifespan = 0.08;
+        particleLifespan = 0.1;
         particleAge = 0;
 
         particlespawner_ = NULL;