Changeset 10159

Timestamp:

Dec 5, 2014, 4:27:06 PM (9 years ago)

Author:

maxima

Message:

Changes of Hannes. Upgrading towers does not work yet.

Location:

code/branches/towerdefenseHS14

Files:

• data/overlays/towerdefenseHUD.oxo (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (9 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseEnemy.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseEnemy.h (modified) (3 diffs)
• src/modules/towerdefense/TowerDefenseHUDController.cc (modified) (4 diffs)
• src/modules/towerdefense/TowerDefenseHUDController.h (modified) (2 diffs)
• src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefensePlayerStats.h (modified) (2 diffs)
• src/modules/towerdefense/TowerDefensePrereqs.h (modified) (2 diffs)

code/branches/towerdefenseHS14/data/overlays/towerdefenseHUD.oxo

@@ -37 +37 @@
      align     = "left"
 
-     caption = "Lives:"
+     caption = "Lifes:"
     />
     

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc

@@ -102 +102 @@
         this->setHUDTemplate("TowerDefenseHUD");
 
-        this->stats_ = new TowerDefensePlayerStats();
+        //this->stats_ = new TowerDefensePlayerStats();
 
         /* Temporary hack to allow the player to add towers */
@@ -131 +131 @@
 
         Deathmatch::start();
-        credits = 5000;
+        /*credits = 5000;
         life = 20;
         waves = 0;
-        time=0.0;
+        time=0.0;*/
 
 // Waypoints: [1,3] [10,3] [10,11] [13,11]
@@ -154 +154 @@
 
 
-        credits = 5000;
-        life = 20;
-        waves = 0;
+        this->setCredit(200);
+        this->setLifes(10);
+        this->setWaveNumber(0);
         time=0.0;
 
@@ -236 +236 @@
         Deathmatch::end();
 
-        ChatManager::message("Match is over");
+        ChatManager::message("Match is over! Gameover!");
     }
 
     void TowerDefense::upgradeTower(int x,int y)
-    {
-        const TowerCost upgraeCost = TDDefaultUpgradeCost;
-
-        if (!this->hasEnoughCreditForTower(upgraeCost))
-        {
-            orxout() << "not enough credit: " << (this->stats_->getCredit()) << " available, " << TDDefaultTowerCost << " needed.";
+    {/*
+        const TowerCost upgradeCost = TDDefaultUpgradeCost;
+
+        if (!this->hasEnoughCreditForTower(upgradeCost))
+        {
+            orxout() << "not enough credit: " << (this->getCredit()) << " available, " << upgradeCost << " needed.";
             return;
         }
@@ -258 +258 @@
         {
                 (towermatrix [x][y])->upgradeTower();
-        }
+        }*/
     }
 
@@ -264 +264 @@
     void TowerDefense::addTower(int x, int y)
     {
-        const TowerCost towerCost = TDDefaultTowerCost;
+        const int towerCost = 20;
 
         if (!this->hasEnoughCreditForTower(towerCost))
         {
-            orxout() << "not enough credit: " << (this->stats_->getCredit()) << " available, " << TDDefaultTowerCost << " needed.";
+            orxout() << "not enough credit: " << (this->getCredit()) << " available, " << towerCost << " needed.";
             return;
         }
@@ -278 +278 @@
         }
 
-
+/*
         unsigned int width = this->center_->getWidth();
         unsigned int height = this->center_->getHeight();
-
+*/
 
         int tileScale = (int) this->center_->getTileScale();
@@ -297 +297 @@
 
        //Reduce credit
-        this->stats_->buyTower(towerCost);
-
-        orxout() << "Credit: " << this->stats_->getCredit() << endl;
+        this->buyTower(towerCost);
+
+        towermatrix [x][y]=true;
+
 
   //    Create tower
@@ -307 +308 @@
         towernew->setGame(this);
 
-        towermatrix[x][y]=true;
-    }
-
-    bool TowerDefense::hasEnoughCreditForTower(TowerCost towerCost)
-    {
-        return ((this->stats_->getCredit()) >= towerCost);
+    }
+
+    bool TowerDefense::hasEnoughCreditForTower(int towerCost)
+    {
+        return ((this->getCredit()) >= towerCost);
     }
 

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h

@@ -62 +62 @@
         //virtual void playerEntered(PlayerInfo* player);
         //virtual bool playerLeft(PlayerInfo* player);
+        //Player Stats (set,get, reduce)
+        int getCredit(){        return this->credit_;   }
+        int getLifes(){         return this->lifes_;    }
+        int getWaveNumber(){    return this->waves_;    }
+        void setCredit(int credit){ credit_ = credit; }
+        void setLifes(int lifes){ lifes_ = lifes; }
+        void setWaveNumber(int wavenumber){waves_=wavenumber;   }
+        void buyTower(int cost){ credit_ -= cost;}
+        void addCredit(int credit) {    credit_+=credit;        }
+        void nextwave(){ waves_++;}
+        int reduceLifes(int NumberofLifes){     return lifes_-=NumberofLifes;   }
 
-        int credits;
-        int life;
-        int waves;
         //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
         //virtual void playerScored(PlayerInfo* player, int score);
@@ -92 +100 @@
         float time;
         float time2;
+        int credit_;
+        int waves_;
+        int lifes_;
 
         /* handles stats */
-        TowerDefensePlayerStats *stats_;
-        bool hasEnoughCreditForTower(TowerCost towerCost);
+        bool hasEnoughCreditForTower(int towerCost);
         bool hasEnoughCreditForUpgrade();
 

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -29 +29 @@
 
         this->setCollisionType(WorldEntity::Dynamic);
+        this->td = orxonox_cast<TowerDefense*>(this->getGametype().get());
+        once_ = false;
 
     }
+
+    TowerDefenseEnemy::~TowerDefenseEnemy(){this->td->addCredit(20);}
 
     void TowerDefenseEnemy::addWaypoint(TDCoordinate* coord)
@@ -49 +53 @@
 
         //orxout() << "distance" << distance << endl;
-        if(distance <50){
+        if(distance < 50 && once_ == false){
+                this->td->reduceLifes(1);
+                once_=true;
                 orxout() << "ENEMY KILLED!!!!" << endl;
-                this->destroy(); }
+                this->td->buyTower(20);
+                if (this->td->getLifes()==0)
+                {
+                    this->td->end();
+                }
+
+        }
     }
 

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h

@@ -23 +23 @@
 #include "util/Output.h"
 #include "controllers/ArtificialController.h"
+#include "TowerDefense.h"
 
 namespace orxonox
@@ -35 +36 @@
 
                 TowerDefenseEnemy(Context* context);
-        virtual ~TowerDefenseEnemy() {};
+        virtual ~TowerDefenseEnemy();
 
         //health gibt es unter: health_
@@ -47 +48 @@
         private:
 
+        TowerDefense* td;
+        bool once_;
         std::vector<TDCoordinate*> Waypointsvector_;
 

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.cc

@@ -39 +39 @@
     {
         RegisterObject(TowerDefenseHUDController);
+        this->td = 0;
     }
 
@@ -49 +50 @@
     {
         SUPER(TowerDefenseHUDController, tick, dt);
+        const std::string& lifes = multi_cast<std::string>(this->td->getLifes());
+        const std::string& credits = multi_cast<std::string>(this->td->getCredit());
+        const std::string& waves = multi_cast<std::string>(this->td->getWaveNumber());
 
         if(showlives == true)
-          this->setCaption(multi_cast<std::string>(this->td->life));
+          this->setCaption(multi_cast<std::string>(lifes));
         else if(showcredits == true)
-          this->setCaption(multi_cast<std::string>(this->td->credits));
+          this->setCaption(multi_cast<std::string>(credits));
         else if(showwaves == true)
-          this->setCaption(multi_cast<std::string>(this->td->waves));
+          this->setCaption(multi_cast<std::string>(waves));
 
 
@@ -74 +78 @@
             SUPER(TowerDefenseHUDController, changedOwner);
 
-            td = orxonox_cast<TowerDefense*>(this->getOwner()->getGametype().get());
-
+            if (this->getOwner() && this->getOwner()->getGametype())
+                    {
+                        this->td = orxonox_cast<TowerDefense*>(this->getOwner()->getGametype().get());
+                    }
+                    else
+                    {
+                        this->td = 0;
+                    }
+                }
             /*if (this->getOwner() != NULL && this->getOwner()->getGametype())
             {
@@ -86 +97 @@
         }
 
-}

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseHUDController.h

@@ -39 +39 @@
 
 #include "towerdefense/TowerDefensePrereqs.h"
-
+#include "TowerDefensePlayerStats.h"
 #include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
@@ -73 +73 @@
     private:
         TowerDefense* td;
-
         bool showcredits;
         bool showlives;

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.cc

@@ -25 +25 @@
  *      ...
  */
-
+/*
 #include "TowerDefensePlayerStats.h"
 
@@ -31 +31 @@
 {
     const int kDefaultCredit = 200;
-
+    const int kDefaultLifes=20;
     TowerDefensePlayerStats::TowerDefensePlayerStats()
     {
         this->credit_ = kDefaultCredit;
         this->waveNumber_ = 0;
+        this->lifes_=kDefaultLifes;
     }
-    /*
+
     TowerDefensePlayerStats::~TowerDefensePlayerStats()
     {
     }
-    */
+
 }
+*/

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.h

@@ -68 +68 @@
             { waveNumber_++; }
 
+        inline int getLifes()
+                {return lifes_; }
+
+        inline void reduceLifes(int NumberofLifes)
+        {lifes_-=NumberofLifes; }
+
         inline void upgradeTower(int upgradecost)
                 { credit_ -= upgradecost;}
@@ -77 +83 @@
         int waveNumber_;
         int upgradecost;
+        int lifes_;
         //int baseHealth_;
     };

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePrereqs.h

@@ -66 +66 @@
 {
     class TowerDefense;
+
     class TowerDefenseTower;
+
     class TowerDefenseCenterpoint;
     class TowerDefenseHUDController;
@@ -73 +75 @@
     class TDCoordinate;
     class TowerTurret;
+    class TowerDefenseTower;
 }