Changeset 9829

Timestamp:

Nov 25, 2013, 6:51:39 PM (10 years ago)

Author:

zifloria

Message:

points, level up, hud

Location:

code/branches/invaders

Files:

• data/overlays/InvaderHUD.oxo (modified) (1 diff)
• src/modules/invader/Invader.cc (modified) (2 diffs)
• src/modules/invader/Invader.h (modified) (2 diffs)
• src/modules/invader/InvaderEnemy.cc (modified) (1 diff)
• src/modules/invader/InvaderEnemy.h (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (4 diffs)
• src/modules/invader/InvaderShip.h (modified) (1 diff)

code/branches/invaders/data/overlays/InvaderHUD.oxo

@@ -30 +30 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
-     caption   = "Players: "
+     caption   = "Level: "
     />
 

code/branches/invaders/src/modules/invader/Invader.cc

@@ -64 +64 @@
         this->setHUDTemplate("InvaderHUD");
 
+        lives = 3;
+        level = 1;
+        point = 0;
+        multiplier = 1;
+        b_combo = false;
         enemySpawnTimer.setTimer(2.0f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
+        comboTimer.setTimer(2.5f, true, createExecutor(createFunctor(&Invader::comboControll, this)));
     }
 
@@ -85 +91 @@
 
         newPawn->setPosition(player->getPosition() + Vector3(1000, 0, 0)); // BUG: 
+    }
+
+    void Invader::comboControll()
+    {
+        if (b_combo)
+            multiplier++;
+        else
+            multiplier = 1;
+        b_combo = false;
     }
 

code/branches/invaders/src/modules/invader/Invader.h

@@ -66 +66 @@
             int getLevel(){return this->level;}
             int getPoints(){return this->point;}
+
+            void costLife(){lives--; if (lives == 0) orxout() << "end<<<<<<<<<<<<<<<<<" << endl;};
+            void levelUp(){level++;}
+            void addPoints(int numPoints){point += numPoints * multiplier; b_combo = true;}
+            void comboControll();
         private:
             WeakPtr<InvaderCenterPoint> center_;
@@ -72 +77 @@
             ConsoleCommand* console_addEnemy;
             Timer enemySpawnTimer;
+            Timer comboTimer;
             //Context* context;
             int lives;
             int level;
             int point;
+            bool b_combo;
+            int multiplier;
     };
 }

code/branches/invaders/src/modules/invader/InvaderEnemy.cc

@@ -58 +58 @@
         return false;
     }
+
+    WeakPtr<Invader> InvaderEnemy::getGame()
+    {
+        if (game == NULL)
+        {
+            for (ObjectList<Invader>::iterator it = ObjectList<Invader>::begin(); it != ObjectList<Invader>::end(); ++it)
+                game = *it;
+        }
+        return game;
+    }
+
+    void InvaderEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
+    {
+        if (getGame())
+            getGame()->addPoints(42);
+        // SUPER(InvaderEnemy, damage, damage, healthdamage, shielddamage, originator);
+    }
 }

code/branches/invaders/src/modules/invader/InvaderEnemy.h

@@ -49 +49 @@
             virtual void tick(float dt);
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
 
         private:
+            WeakPtr<Invader> getGame();
+            WeakPtr<Invader> game;
             Camera* camera;
             bool isFireing;

code/branches/invaders/src/modules/invader/InvaderShip.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "Invader.h"
 
 namespace orxonox
@@ -120 +121 @@
     {
         lastTime = 0;
+        if (getGame())
+        {
+            getGame()->levelUp();
+            // SmartPtr<Invader> game = orxonox_cast<Invader>(getGametype());
+            
+        }
         //level++
     }
@@ -151 +158 @@
             {
                 orxout() << "DIED!!!! " << endl;
+                if (getGame())
+                {
+                    getGame()->costLife();
+                    // SmartPtr<Invader> game = orxonox_cast<Invader>(getGametype());
+                    
+                }
             }
             return false;
@@ -157 +170 @@
         // SUPER(InvaderShip, collidesAgainst, otherObject, contactPoint);
     }
+
+    WeakPtr<Invader> InvaderShip::getGame()
+    {
+        if (game == NULL)
+        {
+            for (ObjectList<Invader>::iterator it = ObjectList<Invader>::begin(); it != ObjectList<Invader>::end(); ++it)
+                game = *it;
+        }
+        return game;
+    }
 }

code/branches/invaders/src/modules/invader/InvaderShip.h

@@ -65 +65 @@
             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
         private:
+
+            WeakPtr<Invader> getGame();
+            WeakPtr<Invader> game;
             Camera* camera;
             bool isFireing;