Changeset 11624 for code/branches/FlappyOrx_HS17/src

Timestamp:

Dec 4, 2017, 2:38:03 PM (7 years ago)

Author:

merholzl

Message:

More clean-up, particle fix, deleting unnecessary files, adding quotes

Location:

code/branches/FlappyOrx_HS17/src/modules/flappyorx

Files:

• CMakeLists.txt (modified) (1 diff)
• FlappyOrx.cc (modified) (4 diffs)
• FlappyOrx.h (modified) (4 diffs)
• FlappyOrxAsteroid.cc (deleted)
• FlappyOrxAsteroid.h (deleted)
• FlappyOrxCenterPoint.cc (modified) (1 diff)
• FlappyOrxCenterPoint.h (modified) (1 diff)
• FlappyOrxHUDinfo.cc (modified) (2 diffs)
• FlappyOrxPrereqs.h (modified) (1 diff)
• FlappyOrxShip.cc (modified) (6 diffs)
• FlappyOrxShip.h (modified) (2 diffs)
• FlappyOrxWeapon.cc (deleted)
• FlappyOrxWeapon.h (deleted)
• FlappyOrxWeaponEnemy.cc (deleted)
• FlappyOrxWeaponEnemy.h (deleted)

code/branches/FlappyOrx_HS17/src/modules/flappyorx/CMakeLists.txt

@@ -4 +4 @@
   FlappyOrxCenterPoint.cc
   FlappyOrxShip.cc
-  FlappyOrxWeapon.cc
-  FlappyOrxWeaponEnemy.cc
   FlappyOrxHUDinfo.cc
-  FlappyOrxAsteroid.cc
 END_BUILD_UNIT
 )

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

@@ -21 +21 @@
  *
  *   Author:
- *      Leo Mehr Holz
+ *      Leo Merholz
  *      Pascal Schärli
+ *   Co-authors:
+ *      ...
  *
  */
@@ -47 +49 @@
 
 #include "FlappyOrxCenterPoint.h"
-#include "FlappyOrxAsteroid.h"
 #include "FlappyOrxShip.h"
 
@@ -73 +74 @@
     }
     
-    void FlappyOrx::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-        {   
-            SUPER(FlappyOrx, XMLPort, xmlelement, mode);
-            XMLPortParam(FlappyOrx, "spawnDistance", setspawnDistance, getspawnDistance, xmlelement, mode);
-            XMLPortParam(FlappyOrx, "Speed", setSpeed, getSpeed, xmlelement, mode);
-        }
-
     void FlappyOrx::updatePlayerPos(int x){
 
@@ -287 +281 @@
     void FlappyOrx::end()
     {
-        // DON'T CALL THIS!
-        //      Deathmatch::end();
-        // It will misteriously crash the game!
-        // Instead startMainMenu, this won't crash.
         if (Highscore::exists()){
                     int score = this->getPoints();

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

@@ -21 +21 @@
  *
  *   Author:
- *      Leo Mehr Holz
+ *      Leo Merholz
  *      Pascal Schärli
+ *   Co-authors:
+ *      ...
  *
  */
@@ -67 +69 @@
             virtual void end() override;
             virtual void death();
-            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            
-            void setspawnDistance( int spawnDistance)
-                {this->spawnDistance = spawnDistance; }
-            int getspawnDistance()
-                { return this->spawnDistance; }  
-            inline void setSpeed( float speed ){   
-                orxout()<< speed<< endl;
-                this->speed = speed; }
-            inline float getSpeed( )
-                { return this->speed; }
-
+           
             void updatePlayerPos(int x);
             void createAsteroid(Circle &c);
@@ -159 +149 @@
                 "Well, that was a waste of time",
                 "You suck!",
-                "Maybe try SuperOrxoBros? That game is not as hard.",
-                "Here's a tip: Try not to fly into these grey thingies."};
+                "Maybe try SuperOrxoBros. That game is not as hard.",
+                "Here's a tip: Try not to fly into these grey thingies.",
+                "We won't comment on that."};
             std::vector<std::string> DeathMessage30 = {
                 "Getting better!",
@@ -182 +173 @@
                 "Wow, we're really impressed",
                 "We will honor you!",
-                "Please do that again!",
-                "Take that golden medal! You've earned it"};
+                "Please, please do that again!",
+                "Take that golden medal! You've earned it",
+                "We are completely speechless! That was magnificent"};
             
 

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

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Leo Merholz
+ *      Pascal Schärli
  *   Co-authors:
  *      ...

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxCenterPoint.h

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Leo Merholz
+ *      Pascal Schärli
  *   Co-authors:
  *      ...

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

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Leo Merholz
+ *      Pascal Schärli
  *
+ *      Co-authors:
+ *      ...
  */
 
@@ -84 +87 @@
                         if(messageID==3){
                             setTextSize(0.05);
-                            this->setCaption("press space to start");
+                            this->setCaption("Press fire and then press space to start");
                         }
                     }

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxPrereqs.h

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Leo Merholz
+ *      Pascal Schärli
  *   Co-authors:
  *      ...

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

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      FLeo Merholz
+ *      Pascal Schärli
  *   Co-authors:
  *      ...
@@ -52 +53 @@
         deathTime = 0;
 
-        particleLifespan = 0.1;
+        particleLifespan = 0.08;
         particleAge = 0;
 
@@ -119 +120 @@
             if (camera != nullptr)
             {
-                //camera->setPosition(Vector3(-pos.z, -pos.y, 0));
                 camera->setPosition(pos.x,-100,0);
                 camera->setOrientation(Vector3::UNIT_Z, Degree(0));
@@ -138 +138 @@
 
     int FlappyOrxShip::timeUntilRespawn(){
-        return 2-time(0)+deathTime;
+        return 1-time(0)+deathTime;
     }
 
@@ -154 +154 @@
     }
 
-    // void FlappyOrxShip::rotateRoll(const Vector2& value)
-    // {
-    //     if (getGame())
-    //         if (getGame()->bEndGame)
-    //             getGame()->end();
-    // }
-
+  
     FlappyOrx* FlappyOrxShip::getGame()
     {
@@ -177 +171 @@
         deathTime = time(0);
 
-        orxout()<<"death time: "<<deathTime<<std::endl;
+        //orxout()<<"death time: "<<deathTime<<std::endl;
         Vector3 pos = getPosition();
         pos.x = 0;

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

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Leo Merholz
+ *      Pascal Schärli
  *   Co-authors:
  *      ...
@@ -56 +57 @@
 
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value) override;
             
-            inline void  setSpeedBase(int speedBase){ getGame()->setSpeedBase(speedBase);}
+            inline void  setSpeedBase(float speedBase){ getGame()->setSpeedBase(speedBase);}
             inline float getSpeedBase(){ return getGame()->getSpeedBase();}
             inline void  setSpeedIncrease(int speedIncrease){ getGame()->setSpeedIncrease(speedIncrease);}