Changeset 11616 for code/branches/Asteroid_HS17/src

Timestamp:

Dec 2, 2017, 6:15:54 PM (7 years ago)

Author:

vyang

Message:

Asteroids2DStones erstellt, lassen sich ins Level laden, random spawn wenn position nicht als Attribut im XML File angegeben wird. Random Geschwindigkeit funktioniert noch nicht → vllt Einstellungen in Pawn bzw MovableEntity?, Gametype ein wenig aufgeraemt → am Anfang fuenf Asteroiden mit random Geschwindigkeit und Position spawnen

Location:

code/branches/Asteroid_HS17/src/modules/asteroids2D

Files:

• Asteroids2D.cc (modified) (5 diffs)
• Asteroids2D.h (modified) (4 diffs)
• Asteroids2DCube.cc (deleted)
• Asteroids2DCube.h (deleted)
• Asteroids2DStone.cc (added)
• Asteroids2DStone.h (added)
• CMakeLists.txt (modified) (1 diff)

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc

@@ -34 +34 @@
 #include "Asteroids2D.h"
 #include "Asteroids2DShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
+#include "Asteroids2DStone.h"
 #include "core/CoreIncludes.h"
 #include "Highscore.h"
@@ -46 +47 @@
 
         bEndGame = false;
-        lives = 1;
+        lives = 3;
         level = 1;
         point = 0;
@@ -52 +53 @@
         multiplier = 1;
         b_combo = false;
-        counter = 5000;
-        pattern = 1;
-        lastPosition = 0;
+        firstTick_ = true;
         this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
         this->center_ = nullptr;
@@ -87 +86 @@
     void Asteroids2D::tick(float dt)
     {
+        //Do this only for the first tick, generate stones
+        if(this->firstTick_)
+        {
+            for(int i = 0; i < 5; ++i)
+            {
+                spawnStone();
+            }
+            this->firstTick_ = false;
+        }
         
         SUPER(Asteroids2D, tick, dt);
+    }
+
+    void Asteroids2D::spawnStone()
+    {
+        if (getPlayer() == nullptr)
+            return;
+        Asteroids2DStone* newStone = new Asteroids2DStone(this->center_->getContext());
+        newStone->setAsteroids2DPlayer(player);
+        //addtemplate
+
     }
 
@@ -151 +169 @@
         if (Highscore::exists()){
                     int score = this->getPoints();
-                    if(score > Highscore::getInstance().getHighestScoreOfGame("Dodge Race")) 
-                        Highscore::getInstance().storeHighscore("Dodge Race",score);
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Asteroids2D")) 
+                        Highscore::getInstance().storeHighscore("Asteroids2D",score);
 
           }

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h

@@ -82 +82 @@
             int getMultiplier(){return this->multiplier;}
 
+            void spawnStone();
             void setCenterpoint(Asteroids2DCenterPoint* center)
                        { this->center_ = center; }
@@ -94 +95 @@
             int lives;
             int multiplier;
-            float counter;
-            int pattern;
-            float currentPosition;
-            float lastPosition;
 
        private:
@@ -104 +101 @@
             Asteroids2DShip* getPlayer();
             WeakPtr<Asteroids2DShip> player;
-            std::vector<Asteroids2DCube*> cubeList;
             void toggleShowLevel(){bShowLevel = !bShowLevel;}
             void addPoints(int numPoints);
@@ -111 +107 @@
             int level;
             int point;
-            bool b_combo;
+            bool b_combo, firstTick_;
 
             Timer enemySpawnTimer;

code/branches/Asteroid_HS17/src/modules/asteroids2D/CMakeLists.txt

@@ -3 +3 @@
 Asteroids2DCenterPoint.cc
 Asteroids2DShip.cc
-Asteroids2DCube.cc
+Asteroids2DStone.cc
 Asteroids2DHUDinfo.cc
 )