Changeset 11503 for code

Timestamp:

Oct 23, 2017, 3:19:08 PM (7 years ago)

Author:

pascscha

Message:

MoveUpDown

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/FlappyOrx.oxw (modified) (1 diff)
• data/levels/Invaders.oxw (modified) (1 diff)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/flappyorx/CMakeLists.txt (added)
• src/modules/flappyorx/FlappyOrx.cc (modified) (3 diffs)
• src/modules/flappyorx/FlappyOrx.h (modified) (2 diffs)
• src/modules/flappyorx/FlappyOrxCenterPoint.cc (added)
• src/modules/flappyorx/FlappyOrxCenterPoint.h (added)
• src/modules/flappyorx/FlappyOrxHUDinfo.cc (added)
• src/modules/flappyorx/FlappyOrxHUDinfo.h (added)
• src/modules/flappyorx/FlappyOrxPrereqs.h (added)
• src/modules/flappyorx/FlappyOrxShip.cc (added)
• src/modules/flappyorx/FlappyOrxShip.h (added)
• src/modules/flappyorx/FlappyOrxWeapon.cc (added)
• src/modules/flappyorx/FlappyOrxWeapon.h (added)
• src/modules/flappyorx/FlappyOrxWeaponEnemy.cc (added)
• src/modules/flappyorx/FlappyOrxWeaponEnemy.h (added)

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

@@ -7 +7 @@
 
 <?lua
-  include("overlays/FlappyHUD.oxo")
+  include("stats.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipAssff2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipFlappyOrx.oxt")
+  include("templates/enemyFlappyOrx.oxt")
+  include("overlays/FlappyOrxHUD.oxo")
 ?>
 
 <Level
+  plugins = flappyorx
+  gametype = FlappyOrx
 >
-        <Scene
-            ambientlight = "0.8, 0.7, 0.4"
-            skybox     = "Orxonox/skyBoxBasic"
-          >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+  <?lua include("includes/notifications.oxi") ?>
 
-          <WorldAmbientSound
-            source="Earth.ogg"
-            looping="true"
-            playOnLoad="true"
-          />
+    <!-- ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/Starbox" -->
+  <Scene
+    ambientlight = "0.8, 0.7, 0.4"
+    skybox     = "Orxonox/skyBoxBasic"
+  >
 
-            <Light type=directional position="1100, 11000, -7000" lookat="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-            <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0"/>
+  <WorldAmbientSound
+    source="Earth.ogg"
+    looping="true"
+    playOnLoad="true"
+  />
 
-            
-          </Scene>
+    <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
+    <Light type=directional position="1100, 11000, -7000" lookat="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx />
+
+    
+    <FlappyOrxCenterPoint name=flappyorxcenter />
+    
+
+    
+  </Scene>
 </Level>
+

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

@@ -5 +5 @@
  screenshot = "orxonoxArcade.png"
 />
+
 <?lua
   include("stats.oxo")

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

@@ -46 +46 @@
 ADD_SUBDIRECTORY(hover)
 ADD_SUBDIRECTORY(superorxobros)
+ADD_SUBDIRECTORY(flappyorx)

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

@@ -29 +29 @@
 /**
     @file FlappyOrx.cc
+    @brief Implementation of the FlappyOrx class.
 */
 
+#include "FlappyOrx.h"
+#include "Highscore.h"
+#include "core/CoreIncludes.h"
+#include "core/EventIncludes.h"
+#include "core/command/Executor.h"
+#include "core/config/ConfigValueIncludes.h"
+
+#include "gamestates/GSLevel.h"
+#include "chat/ChatManager.h"
+
+// ! HACK
+#include "infos/PlayerInfo.h"
+
+#include "FlappyOrxCenterPoint.h"
+#include "FlappyOrxShip.h"
+
+#include "core/command/ConsoleCommand.h"
+#include "worldentities/ExplosionPart.h"
 
 namespace orxonox
@@ -39 +58 @@
     {
         RegisterObject(FlappyOrx);
-        this->setHUDTemplate("FlappyHUD");
+        this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
+        this->center_ = nullptr;
+        bEndGame = false;
+        lives = 3;
+        level = 1;
+        point = 0;
+        bShowLevel = false;
+        multiplier = 1;
+        b_combo = false;
+        
+        this->setHUDTemplate("FlappyOrxHUD");
+    }
+
+    void FlappyOrx::levelUp()
+    {
+        level++;
+        if (getPlayer() != nullptr)
+        {
+            for (int i = 0; i < 7; i++)
+            {
+
+                WeakPtr<ExplosionPart> chunk5 = new ExplosionPart(this->center_->getContext());
+                chunk5->setPosition(this->center_->getPosition());
+                chunk5->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
+                chunk5->setScale(10);
+                chunk5->setEffect1("Orxonox/explosion2b");
+                chunk5->setEffect2("Orxonox/smoke6");
+                chunk5->setMinSpeed(0);
+                chunk5->setMaxSpeed(0);
+                chunk5->Explode();
+
+            }
+        }
+        addPoints(multiplier * 42);
+        multiplier *= 2;
+        toggleShowLevel();
+        showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&FlappyOrx::toggleShowLevel, this)));
+    }
+
+    FlappyOrxShip* FlappyOrx::getPlayer()
+    {
+        if (player == nullptr)
+        {
+            for (FlappyOrxShip* ship : ObjectList<FlappyOrxShip>())
+                player = ship;
+        }
+        return player;
+    }
+
+
+    void FlappyOrx::setCenterpoint(FlappyOrxCenterPoint* center)
+    {
+        this->center_ = center;
+    }
+
+    void FlappyOrx::costLife()
+    {
+        lives--;
+        multiplier = 1;
+        // end the game in 30 seconds.
+        if (lives <= 0)
+            enemySpawnTimer.setTimer(30.0f, false, createExecutor(createFunctor(&FlappyOrx::end, this)));
+    };
+
+    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.
+        this->bForceSpawn_ = true;
+
+        if (this->center_ == nullptr)  // abandon mission!
+        {
+            orxout(internal_error) << "FlappyOrx: No Centerpoint specified." << endl;
+            GSLevel::startMainMenu();
+            return;
+        }
+        // Call start for the parent class.
         Deathmatch::start();
+    }
+    void FlappyOrx::addPoints(int numPoints)
+    {
+        if (!bEndGame)
+        {
+            point += numPoints * multiplier;
+            b_combo = true;
+        }
     }
 
@@ -53 +161 @@
         // It will misteriously crash the game!
         // Instead startMainMenu, this won't crash.
+        if (Highscore::exists()){
+                    int score = this->getPoints();
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Orxonox Arcade")) 
+                        Highscore::getInstance().storeHighscore("Orxonox Arcade",score);
+
+          }
         GSLevel::startMainMenu();
     }

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

@@ -36 +36 @@
 #define _FlappyOrx_H__
 
+#include "flappyorx/FlappyOrxPrereqs.h"
+
 #include "gametypes/Deathmatch.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -48 +51 @@
             virtual void start() override;
             virtual void end() override;
-            
+            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
+
+            void spawnEnemy();
+
+            void setCenterpoint(FlappyOrxCenterPoint* center);
+
+            int getLives(){return this->lives;}
+            int getLevel(){return this->level;}
+            int getPoints(){return this->point;}
+            int getMultiplier(){return this->multiplier;}
+
+            void costLife();
+            void levelUp();
+            void addPoints(int numPoints);
+            // checks if multiplier should be reset.
+            void comboControll();
+            int lives;
+            int multiplier;
+            bool bEndGame;
+            bool bShowLevel;
         private:
             void toggleShowLevel(){bShowLevel = !bShowLevel;}
+            FlappyOrxShip* getPlayer();
+            WeakPtr<FlappyOrxCenterPoint> center_;
+            WeakPtr<FlappyOrxShip> player;
+
+            Timer enemySpawnTimer;
+            Timer comboTimer;
+            Timer showLevelTimer;
+            //Context* context;
+            int level;
+            int point;
+            bool b_combo;
     };
 }