Changeset 10629 for code/trunk/src/modules

Timestamp:

Oct 10, 2015, 4:34:26 PM (9 years ago)

Author:

fvultier

Message:

Merged towerdefenseFabien branch back to trunk. The towerdefense Minigame is now a plugin.

Location:

code/trunk/src/modules

Files:

• towerdefense/CMakeLists.txt (modified) (1 diff)
• towerdefense/TDCoordinate.cc (modified) (2 diffs)
• towerdefense/TDCoordinate.h (modified) (2 diffs)
• towerdefense/TDEnemy.h (deleted)
• towerdefense/TowerDefense.cc (modified) (11 diffs)
• towerdefense/TowerDefense.h (modified) (3 diffs)
• towerdefense/TowerDefenseCenterpoint.cc (modified) (3 diffs)
• towerdefense/TowerDefenseCenterpoint.h (modified) (3 diffs)
• towerdefense/TowerDefenseController.cc (deleted)
• towerdefense/TowerDefenseController.h (deleted)
• towerdefense/TowerDefenseEnemy.cc (modified) (2 diffs)
• towerdefense/TowerDefenseEnemy.h (modified) (2 diffs)
• towerdefense/TowerDefenseField.cc (added)
• towerdefense/TowerDefenseField.h (added)
• towerdefense/TowerDefenseHUDController.cc (modified) (2 diffs)
• towerdefense/TowerDefenseSelecter.cc (modified) (4 diffs)
• towerdefense/TowerDefenseSelecter.h (modified) (1 diff)
• towerdefense/TowerDefenseTower.cc (modified) (2 diffs)
• towerdefense/TowerDefenseTower.h (modified) (3 diffs)
• weapons/CMakeLists.txt (modified) (1 diff)
• weapons/IceGunFreezer.cc (added)
• weapons/IceGunFreezer.h (added)
• weapons/munitions/CMakeLists.txt (modified) (1 diff)
• weapons/munitions/IceMunition.cc (added)
• weapons/munitions/IceMunition.h (added)
• weapons/munitions/SplitMunition.cc (added)
• weapons/munitions/SplitMunition.h (added)
• weapons/projectiles/BillboardProjectile.cc (modified) (1 diff)
• weapons/projectiles/BillboardProjectile.h (modified) (1 diff)
• weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• weapons/projectiles/IceGunProjectile.cc (added)
• weapons/projectiles/IceGunProjectile.h (added)
• weapons/projectiles/Projectile.cc (modified) (4 diffs)
• weapons/projectiles/Projectile.h (modified) (2 diffs)
• weapons/projectiles/SplitGunProjectile.cc (added)
• weapons/projectiles/SplitGunProjectile.h (added)
• weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• weapons/weaponmodes/IceGun.cc (added)
• weapons/weaponmodes/IceGun.h (added)
• weapons/weaponmodes/SplitGun.cc (added)
• weapons/weaponmodes/SplitGun.h (added)

code/trunk/src/modules/towerdefense/CMakeLists.txt

@@ -8 +8 @@
   TowerDefenseEnemy.cc
   TowerDefenseSelecter.cc
+  TowerDefenseField.cc
+  TDCoordinate.cc
 )
 

code/trunk/src/modules/towerdefense/TDCoordinate.cc

@@ -8 +8 @@
 namespace orxonox
 {
-    //RegisterClass(TDCoordinate);
-
     /**
     @brief
-        Constructor. Registers and initializes the object.
+        Constructor. Sets the default coordinates: (0,0)
     */
     TDCoordinate::TDCoordinate()
     {
-        //RegisterObject(TDCoordinate);
         Set(0,0);
-
     }
 
@@ -73 +69 @@
         coord->x= (_x-8) * tileScale;
         coord->y= (_y-8) * tileScale;
-        coord->z=100;
+        coord->z=0;
 
         return *coord;

code/trunk/src/modules/towerdefense/TDCoordinate.h

@@ -2 +2 @@
 #define _TDCoordinate_H__
 
+#include "core/CoreIncludes.h"
 #include "TDCoordinate.h"
 //#include "towerdefense/TowerDefense.h"
@@ -21 +22 @@
             virtual int GetX();
             virtual int GetY();
-            virtual Vector3 get3dcoordinate(); 
+            virtual Vector3 get3dcoordinate();
 
         private:

code/trunk/src/modules/towerdefense/TowerDefense.cc

@@ -75 +75 @@
 #include "TowerDefenseTower.h"
 #include "TowerDefenseCenterpoint.h"
-//#include "TDCoordinate.h"
 #include "worldentities/SpawnPoint.h"
-#include "worldentities/pawns/Pawn.h"
-#include "worldentities/pawns/SpaceShip.h"
 #include "controllers/WaypointController.h"
 #include "graphics/Model.h"
@@ -84 +81 @@
 #include "chat/ChatManager.h"
 #include "core/CoreIncludes.h"
-/* Part of a temporary hack to allow the player to add towers */
-#include "core/command/ConsoleCommandIncludes.h"
-#include <cmath>
-
 
 namespace orxonox
 {
-    static const std::string __CC_addTower_name  = "addTower";
-    static const std::string __CC_upgradeTower_name = "upgradeTower";
-    static const int upgradeCost = 20;
-    static const int towerCost = 20;
-    unsigned int maxspaceships = 30;
-    int maxspaceshipsstandard = 30;
-
-
-
-    SetConsoleCommand("TowerDefense", __CC_addTower_name,  &TowerDefense::addTower ).addShortcut().defaultValues(1);
-    SetConsoleCommand("TowerDefense", __CC_upgradeTower_name, &TowerDefense::upgradeTower).addShortcut().defaultValues(0);
-
     RegisterUnloadableClass(TowerDefense);
 
@@ -108 +89 @@
     {
         RegisterObject(TowerDefense);
-/*
-        for (int i=0; i < 16 ; i++){
-            for (int j = 0; j< 16 ; j++){
-                towermatrix[i][j] = NULL;
-            }
-        }*/
-
-        //Timer for the waves (10 seconds between the waves)
+
         selecter = NULL;
         this->player_ = NULL;        
         this->setHUDTemplate("TowerDefenseHUD");
-        this->nextwaveTimer_.setTimer(10, false, createExecutor(createFunctor(&TowerDefense::nextwave, this)));
-        this->nextwaveTimer_.stopTimer();
-        this->waves_ = 0;
-        this->time = 0;
+        this->waveNumber_ = 0;
+        this->timeSinceLastSpawn_ = 0.0;
+        this->timeUntilNextWave_ = 0.0;
         this->credit_ = 0;
         this->lifes_ = 0;
-        this->timeSetTower_ = 0;
-        spaceships =15;
-        eggs=3;
-        ufos=7;
-        randomships=5;
-
-
-        ModifyConsoleCommand(__CC_addTower_name).setObject(this);
-        ModifyConsoleCommand(__CC_upgradeTower_name).setObject(this);
+        this->waveSize_ = 0;
+        offset_ = Vector3(0,0,10);
     }
 
     TowerDefense::~TowerDefense()
     {
-        /* Part of a temporary hack to allow the player to add towers */
         if (this->isInitialized())
         {
-            ModifyConsoleCommand(__CC_addTower_name).setObject(NULL);
-            ModifyConsoleCommand(__CC_upgradeTower_name).setObject(NULL);
+
         }
     }
@@ -148 +112 @@
     void TowerDefense::setCenterpoint(TowerDefenseCenterpoint *centerpoint)
     {
-        orxout() << "Centerpoint now setting..." << endl;
         this->center_ = centerpoint;
-        orxout() << "Centerpoint now set..." << endl;
     }
 
     void TowerDefense::start()
-    {
+    {        
         if (center_ != NULL) // There needs to be a TowerDefenseCenterpoint, i.e. the area the game takes place.
         {
@@ -170 +132 @@
         }
 
+        enemies_.clear();
+
+        createFields();
         TeamDeathmatch::start();
 
-        // Waypoints: [1,3] [10,3] [10,11] [13,11] -> add the points to a matrix so the player cant place towers on the path
-        for (int i=0; i < 16 ; i++)
-        {
-            for (int j = 0; j< 16 ; j++)
-            {
-                towerModelMatrix[i][j] = NULL;
-                towerTurretMatrix[i][j] = NULL;
-            }
-        }
-
-        
-
-        if (player_ != NULL)
-        {
-            //this->player_->startControl(selecter);
-        }
-        else
-        {
-            orxout() << "player=NULL" << endl;
-        }
-
-
-        Model* dummyModel = new Model(this->center_->getContext());
-
-        //the path of the spacehips has to be blocked, so that no towers can be build there
-        for (int k=0; k<3; k++)
-            towerModelMatrix[1][k]=dummyModel;
-        for (int l=1; l<11; l++)
-                towerModelMatrix[l][3]=dummyModel;
-        for (int m=3; m<12; m++)
-                towerModelMatrix[10][m]=dummyModel;
-        for (int n=10; n<14; n++)
-                towerModelMatrix[n][11]=dummyModel;
-        for (int o=13; o<16; o++)
-                towerModelMatrix[13][o]=dummyModel;
-
-
         //set initial credits, lifes and WaveNumber
-        this->setCredit(100);
-        this->setLifes(100);
+        this->setCredit(1000);
+        this->setLifes(100);        
+        this->timeSinceLastSpawn_ = 0.0;
+        this->timeUntilNextWave_ = 5.0;
+        this->waveSize_ = 0;
         this->setWaveNumber(0);
-        time=0.0;
-
-        /*
-        //adds initial towers
-        for (int i=0; i <7; i++){
-            addTower(i+3,4);
-        }
-                */
     }
 
     // Generates a TowerDefenseEnemy. Uses Template "enemytowerdefense". Sets position at first waypoint of path.
-    void TowerDefense::addTowerDefenseEnemy(std::vector<TDCoordinate*> path, int templatenr){
-
-
+    void TowerDefense::addTowerDefenseEnemy(int templatenr)
+    {
         TowerDefenseEnemy* en1 = new TowerDefenseEnemy(this->center_->getContext());
         
@@ -234 +156 @@
             en1->addTemplate("enemytowerdefense1");
             en1->setScale(3);
-            en1->lookAt(Vector3(0,0,100000));
-            en1->setHealth(en1->getHealth() +50 + this->getWaveNumber()*4);
+            en1->setHealth(en1->getHealth() + this->getWaveNumber()*4);
             break;
 
@@ -241 +162 @@
             en1->addTemplate("enemytowerdefense2");
             en1->setScale(2);
-            en1->lookAt(Vector3(0,0,100000));
-            en1->roll(Degree(120));
-            en1->setHealth(en1->getHealth() -30 + this->getWaveNumber()*4);
-            //  en1->setShieldHealth(en1->getShield() = this->getWaveNumber()*2))
+            en1->setHealth(en1->getHealth() + this->getWaveNumber()*4);
             break;
 
@@ -250 +168 @@
             en1->addTemplate("enemytowerdefense3");
             en1->setScale(1);
-            en1->lookAt(Vector3(0,0,100000));
-            en1->roll(Degree(120));
-            en1->setHealth(en1->getHealth() -10 + this->getWaveNumber()*4);
+            en1->setHealth(en1->getHealth() + this->getWaveNumber()*4);
             break;
-        }
+        }        
 
         en1->setTeam(2);
-        en1->getController();
-        en1->setPosition(path.at(0)->get3dcoordinate());        
-        TowerDefenseEnemyvector.push_back(en1);
-
-        for(unsigned int i = 0; i < path.size(); ++i)
-        {
-            en1->addWaypoint((path.at(i)));
-        }
+
+        WaypointController* controller = (WaypointController*)(en1->getXMLController());
+
+        if (controller != NULL && waypoints_.size() > 1)
+        {
+            en1->setPosition(waypoints_.at(0)->getPosition() + offset_);
+            en1->setOrientation(Vector3(0,0,10), Degree(0));
+            en1->setDirection(Vector3(0,1,0));
+            en1->lookAt(waypoints_.at(1)->getPosition() + offset_);
+
+            for (unsigned int i = 0; i < waypoints_.size(); ++ i)
+            {
+                orxonox::WeakPtr<MovableEntity> waypoint = new MovableEntity(this->center_->getContext());
+                waypoint->setPosition(waypoints_.at(i)->getPosition() + offset_);
+                controller->addWaypoint(waypoint);
+            }
+        }
+
+        enemies_.push_back(en1);
     }
 
@@ -279 +206 @@
     {
         assert(player);
-        this->player_ = player;
+        player_ = player;
 
         if (selecter->getPlayer() == NULL)
         {
-            this->player_ = player;
-            player->startControl(selecter);
+            player_->startControl(selecter);
             players_[player].state_ = PlayerState::Alive;
         } 
@@ -301 +227 @@
 
     //not working yet
-    void TowerDefense::upgradeTower(int x,int y)
+    void TowerDefense::addTower(int x,int y)
     {
         TDCoordinate* coord = new TDCoordinate(x,y);
         x = coord->GetX();
         y = coord->GetY();
-        
-
-        if (!this->hasEnoughCreditForTower(upgradeCost))
-        {
-            orxout() << "not enough credit: " << (this->getCredit()) << " available, " << upgradeCost << " needed.";
-            return;
-        }
-
-
-        Model* dummyModel2 = new Model(this->center_->getContext());
-
-        if (towerModelMatrix [x][y] == NULL || (towerModelMatrix [x][y])->getMeshSource() == dummyModel2->getMeshSource())
-        {
-            orxout() << "no tower on this position" << endl;
-            return;
-        }
-
-        else
-        {
-            (towerTurretMatrix [x][y])->upgradeTower();
-            switch(towerTurretMatrix[x][y]->upgrade)
-                   {
-                   case 1 :
-                           towerModelMatrix[x][y]->setMeshSource("TD_T2.mesh");
-                           break;
-
-                   case 2 :
-                           towerModelMatrix[x][y]->setMeshSource("TD_T3.mesh");
-                           break;
-                   case 3 :
-                           towerModelMatrix[x][y]->setMeshSource("TD_T4.mesh");
-                           break;
-                   case 4 :
-                           towerModelMatrix[x][y]->setMeshSource("TD_T5.mesh");
-                           break;
-
-                   }
-
-            this->buyTower(upgradeCost);
+
+        int cost = center_->getTowerCost(1);
+
+        if (fields_[x][y]->isFree() == true && getCredit() >= cost)
+        {
+            payCredit(cost);
+            fields_[x][y]->createTower(1);
         }
     }
@@ -352 +246 @@
     */
 
-    void TowerDefense::addTower(int x, int y)
-    {        
+    void TowerDefense::upgradeTower(int x, int y)
+    {    
         TDCoordinate* coord = new TDCoordinate(x,y);
         x = coord->GetX();
-        y = coord->GetY();
-
-
-        if (!this->hasEnoughCreditForTower(towerCost))
-        {
-            orxout() << "not enough credit: " << (this->getCredit()) << " available, " << towerCost << " needed.";
+        y = coord->GetY();     
+
+        int cost = center_->getTowerCost(fields_[x][y]->getUpgrade() + 1);
+
+        if (fields_[x][y]->isFree() == false && fields_[x][y]->canUpgrade() == true && getCredit() >= cost)
+        {
+            payCredit(cost);
+            fields_[x][y]->upgrade();
+        }
+    }    
+
+    void TowerDefense::tick(float dt)
+    {
+        SUPER(TowerDefense, tick, dt);
+
+        if (hasStarted() == false || player_ == NULL)
+        {
             return;
         }
-
-        if (towerModelMatrix [x][y]!=NULL)
-        {
-            orxout() << "not possible to put tower here!!" << endl;
-            return;
-        }
-
-/*
-        unsigned int width = this->center_->getWidth();
-        unsigned int height = this->center_->getHeight();
-*/
-
-        int tileScale = (int) this->center_->getTileScale();
-
-        /*if (x > 15 || y > 15 || x < 0 || y < 0)
-        {
-            //Hard coded: TODO: let this depend on the centerpoint's height, width and fieldsize (fieldsize doesn't exist yet)
-            orxout() << "Can not add Tower: x and y should be between 0 and 15" << endl;
-            return;
-        }*/
-
-        //orxout() << "Will add tower at (" << (x-8) * tileScale << "," << (y-8) * tileScale << ")" << endl;
-        orxout() << "Will add tower at (" << x << "," << y << ")" << endl;
-
-
-        //Create Model
-        Model* newTowerModel = new Model(this->center_->getContext());
-        newTowerModel->setMeshSource("TD_T1.mesh");
-        newTowerModel->setScale(30);
-        newTowerModel->pitch(Degree(90));
-        newTowerModel->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 80);
-
-        //Creates tower
-        TowerDefenseTower* towernew = new TowerDefenseTower(this->center_->getContext());
-        towernew->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 275);
-        towernew->setGame(this);
-        towernew->setTeam(1);
-
-        //Reduce credit
-         this->buyTower(towerCost);
-         towerModelMatrix [x][y]= newTowerModel;
-         towerTurretMatrix [x][y]= towernew;
-    }    
-
-    bool TowerDefense::hasEnoughCreditForTower(int towerCost)
-    {
-        return ((this->getCredit()) >= towerCost);
-    }
-
-
-    bool TowerDefense::hasEnoughCreditForUpgrade()
-    {
-        return true;
-    }
-
- 
-    void TowerDefense::nextwave()
-    {
-
-        orxout() << "newwave" << endl;
-        TowerDefenseEnemyvector.clear();
-        waves_++;
-        //maxspaceships = round(maxspaceshipsstandard + 0.25*(waves_));
-        time=0;
-
-        int helpnumber = 40 -(waves_);
-        if(helpnumber <= 0) {helpnumber =1;}
-        float numSpaceships = std::abs((rand() % 100)*5.0f*(helpnumber));
-        float numEggs = std::abs((rand() % 100)*1.0f*(waves_));
-        float numUfos = std::abs((rand() % 100)*1.5f*(0.5f*(waves_))) ;
-
-        float totalnumber = (numSpaceships + numEggs + numUfos)*1.3f;
-
-        int newspaceships = (int)(maxspaceships* numSpaceships / totalnumber);
-        int neweggs = (int)(maxspaceships*numEggs / totalnumber);
-        int newufos = (int)(maxspaceships*numUfos / totalnumber);
-        int newrandomships = maxspaceships -newspaceships - neweggs - newufos;
-        spaceships =newspaceships;
-        eggs=neweggs;
-        ufos=newufos;
-        randomships=newrandomships;
-
-        orxout() << spaceships << endl;
-        orxout() << eggs << endl;
-        orxout() << ufos << endl;
-        orxout() << randomships << endl;
-
-
-
-
-
-    }
-
-    void TowerDefense::tick(float dt)
-    {
-        SUPER(TowerDefense, tick, dt);
-        time +=dt;
-        timeSetTower_ +=dt;
-
-        //Check if tower has to be set (because TowerDefenseSelecter asks for it)
-        if(timeSetTower_ >= 0.25)
-        {
-                timeSetTower_ =0;
-                        if(selecter != NULL && selecter->firePressed_)
-                        {
-
-                                int x = selecter->selectedPos_->GetX();
-                                int y = selecter->selectedPos_->GetY();
-                                Model* dummyModel2 = new Model(this->center_->getContext());
-
-
-
-                                if(towerModelMatrix[x][y] == NULL)
-                                {
-                                        addTower(x,y);
-                                }
-                                else
-                                {
-                                        if(!((towerModelMatrix [x][y])->getMeshSource() == dummyModel2->getMeshSource()))
-                                        {
-                                                towerTurretMatrix[x][y]->upgradeTower();
-                                        if(towerTurretMatrix[x][y]->upgrade < towerTurretMatrix[x][y]->upgradeMax)
-                                        {
-                                                int specificupgradecost = (int)(upgradeCost*(std::pow(1.5,towerTurretMatrix[x][y]->upgrade)));
-                                                if(this->credit_ >= specificupgradecost)
-                                                {
-                                                        this->buyTower(specificupgradecost);
-                                                                switch(towerTurretMatrix[x][y]->upgrade)
-                                                           {
-                                                                   case 1 :
-                                                                           towerModelMatrix[x][y]->setMeshSource("TD_T2.mesh");
-                                                                           break;
-
-                                                                   case 2 :
-                                                                           towerModelMatrix[x][y]->setMeshSource("TD_T3.mesh");
-                                                                           break;
-                                                   case 3 :
-                                                           towerModelMatrix[x][y]->setMeshSource("TD_T4.mesh");
-                                                           break;
-                                                   case 4 :
-                                                           towerModelMatrix[x][y]->setMeshSource("TD_T5.mesh");
-                                                           break;
-
-                                                           }
-                                                }
-
-
-                                        }
-                                        }
-                                }
-                                selecter->firePressed_ = false;
-                        }
-        }
-
-        TDCoordinate* coord1 = new TDCoordinate(1,1);
-        std::vector<TDCoordinate*> path;
-        path.push_back(coord1);
-
-
-
-
-
-        if(time>=TowerDefenseEnemyvector.size() && TowerDefenseEnemyvector.size() < maxspaceships)
-                {
-
-                //adds different types of enemys depending on the WaveNumber progressively making the combination of enemys more difficult
-                if(spaceships>0)
-                {
-                        addTowerDefenseEnemy(path, 1);
-                        spaceships--;
-
-                }else if(ufos>0)
-                {
-                        addTowerDefenseEnemy(path, 3);
-                        ufos--;
-                }else if(eggs>0)
-                {
-                        addTowerDefenseEnemy(path, 2);
-                        eggs--;
-                }else if(randomships>0)
-                {
-                        addTowerDefenseEnemy(path, rand() % 3 +1);
-                        randomships--;
-
-                }
-
-                }
-
-
-        Vector3* endpoint = new Vector3(500, 700, 150);
-        //if ships are at the end they get destroyed
-        for(unsigned int i =0; i < TowerDefenseEnemyvector.size(); ++i)
-        {
-            if(TowerDefenseEnemyvector.at(i) != NULL && TowerDefenseEnemyvector.at(i)->isAlive())
-            {
-                //destroys enemys at the end of the path and reduces the life by 1. no credits gifted
-
-                Vector3 ship = TowerDefenseEnemyvector.at(i)->getRVWorldPosition();
-                float distance = ship.distance(*endpoint);
-
-                if(distance <50){
-                    TowerDefenseEnemyvector.at(i)->destroy();
+        timeUntilNextWave_ -= dt;
+        timeSinceLastSpawn_ += dt;
+
+        //build/upgrade tower at selecter position
+        if (selecter != NULL && selecter->buildTower_ == true)
+        {
+            selecter->buildTower_ = false;
+
+            if (getField(selecter->selectedPos_)->canUpgrade() == true)
+            {
+                upgradeTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
+            }
+            else
+            {
+                addTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
+            }            
+        }
+        
+        for (std::list<WeakPtr<TowerDefenseEnemy> >::iterator it = enemies_.begin(); it != enemies_.end(); )
+        {
+            if (*it == NULL)
+            {
+                // the enemy was destroyed by a tower - remove it from the list
+                enemies_.erase(it++);
+                addCredit(1);
+            }
+            else
+            {
+                //if ships are at the end they get destroyed
+                Vector3 ship = (*it)->getRVWorldPosition();
+                float distance = ship.distance(endpoint_);
+                if(distance < 40)
+                {
+                    (*it)->destroy();
+                    enemies_.erase(it++);
                     this->reduceLifes(1);
-                    this->buyTower(1);
-                    if (this->getLifes()==0)
+                    if (this->getLifes() == 0)
                     {
                         this->end();
                     }
                 }
-            }
-        }
-
-        //goes thorugh vector to see if an enemy is still alive. if not next wave is launched
-        int count= 0;
-        for(unsigned int i =0; i < TowerDefenseEnemyvector.size(); ++i)
-        {
-            if(TowerDefenseEnemyvector.at(i)!= NULL)
-            {
-                ++count;
-            }
-        }
-
-        if (count == 0 && !this->nextwaveTimer_.isActive())
-            this->nextwaveTimer_.startTimer();
-
-/*            time2 +=dt;
-        if(count== 0)
-        {
-            if(time2 > 10)
-            {
-                TowerDefenseEnemyvector.clear();
-                this->nextwave();
-                time=0;
-                time2=0;
-            }
-        }
-*/
-
-    }
-
-
-    // Function to test if we can add waypoints using code only. Doesn't work yet
-
-    // THE PROBLEM: WaypointController's getControllableEntity() returns null, so it won't track. How do we get the controlableEntity to NOT BE NULL???
-    /*
-    void TowerDefense::addWaypointsAndFirstEnemy()
-    {
-        SpaceShip *newShip = new SpaceShip(this->center_);
-        newShip->addTemplate("spaceshipassff");
-
-        WaypointController *newController = new WaypointController(newShip);
-        newController->setAccuracy(3);
-
-        Model *wayPoint1 = new Model(newController);
-        wayPoint1->setMeshSource("crate.mesh");
-        wayPoint1->setPosition(7,-7,5);
-        wayPoint1->setScale(0.2);
-
-        Model *wayPoint2 = new Model(newController);
-        wayPoint2->setMeshSource("crate.mesh");
-        wayPoint2->setPosition(7,7,5);
-        wayPoint2->setScale(0.2);
-
-        newController->addWaypoint(wayPoint1);
-        newController->addWaypoint(wayPoint2);
-
-        // The following line causes the game to crash
-
-        newShip->setController(newController);
-//        newController -> getPlayer() -> startControl(newShip);
-        newShip->setPosition(-7,-7,5);
-        newShip->setScale(0.1);
-        //newShip->addSpeed(1);
-
-
-
-//      this->center_->attach(newShip);
-    }
-    */
-    /*
-    void TowerDefense::playerEntered(PlayerInfo* player)
-    {
-        TeamDeathmatch::playerEntered(player);
-
-        const std::string& message = player->getName() + " entered the game";
-        ChatManager::message(message);
-    }
-
-    bool TowerDefense::playerLeft(PlayerInfo* player)
-    {
-        bool valid_player = TeamDeathmatch::playerLeft(player);
-
-        if (valid_player)
-        {
-            const std::string& message = player->getName() + " left the game";
-            ChatManager::message(message);
-        }
-
-        return valid_player;
-    }
-
-
-    void TowerDefense::pawnKilled(Pawn* victim, Pawn* killer)
-    {
-        if (victim && victim->getPlayer())
-        {
-            std::string message;
-            if (killer)
-            {
-                if (killer->getPlayer())
-                    message = victim->getPlayer()->getName() + " was killed by " + killer->getPlayer()->getName();
                 else
-                    message = victim->getPlayer()->getName() + " was killed";
-            }
-            else
-                message = victim->getPlayer()->getName() + " died";
-
-            ChatManager::message(message);
-        }
-
-        TeamDeathmatch::pawnKilled(victim, killer);
-    }
-
-    void TowerDefense::playerScored(PlayerInfo* player, int score)
-    {
-        Gametype::playerScored(player, score);
-    }*/
+                {
+                    ++ it;
+                }
+            }
+        }  
+
+        // Add new enemy?
+        if (timeSinceLastSpawn_ >= 1.0 && waveSize_ > 0)
+        {
+            // Add new enemy
+            timeSinceLastSpawn_ -= 1.0;
+            -- waveSize_;
+            addTowerDefenseEnemy(this->getWaveNumber() % 3 + 1);
+        }
+        else if (timeUntilNextWave_ <= 0.0 && waveSize_ <= 0)
+        {
+            //New wave
+            ++ waveNumber_;
+            timeSinceLastSpawn_ = 0.0;
+
+            timeUntilNextWave_ = waveNumber_+20;
+            waveSize_ = waveNumber_+5;
+        }
+
+    }
+
+    void TowerDefense::createFields()
+    {
+        assert(center_);
+        TDCoordinate coord(0,0);
+        TDCoordinate startCoord(0,0);
+        std::string fields = center_->getFields();
+        int pos = 0;
+        for (int j = 15; j >= 0; --j)
+        {
+            for (int i = 0; i < 16; ++i)
+            {
+                coord.Set(i,j);
+                fields_[i][j] = new TowerDefenseField(center_->getContext());
+                fields_[i][j]->setCenterpoint(center_);
+                center_->attach(fields_[i][j]);
+                fields_[i][j]->setPosition(coord.get3dcoordinate()); 
+                fields_[i][j]->create(fields.at(pos), fields.at(pos+1));
+                pos += 2;
+                if (fields_[i][j]->getType() == START)
+                {
+                    startCoord.Set(i,j);
+                    waypoints_.push_back(fields_[i][j]);
+                }
+            }
+        }
+        //Place waypoints along the street for the waypoint controllers of the enemies
+        TDCoordinate* thisCoord = &startCoord;
+        TDCoordinate* nextCoord;
+        while ((nextCoord = getNextStreetCoord(thisCoord)) != NULL)
+        {
+            waypoints_.push_back(fields_[nextCoord->GetX()][nextCoord->GetY()]);            
+            thisCoord = nextCoord;
+            endpoint_ = nextCoord->get3dcoordinate();
+        }
+
+    }
+
+    TDCoordinate* TowerDefense::getNextStreetCoord(TDCoordinate* thisCoord)
+    {        
+        TowerDefenseField* thisField = fields_[thisCoord->GetX()][thisCoord->GetY()];
+        TDCoordinate* nextCoord = new TDCoordinate(0,0);
+
+        if (thisField->getType() != STREET && thisField->getType() != START)
+        {
+            return NULL;
+        }
+
+        if (thisField->getAngle() == 0)
+        {
+            nextCoord->Set(thisCoord->GetX(), thisCoord->GetY() - 1);
+        }
+        else if (thisField->getAngle() == 1)
+        {
+            nextCoord->Set(thisCoord->GetX() + 1, thisCoord->GetY());
+        }
+        else if (thisField->getAngle() == 2)
+        {
+            nextCoord->Set(thisCoord->GetX(), thisCoord->GetY() + 1);
+        }
+        else if (thisField->getAngle() == 3)
+        {
+            nextCoord->Set(thisCoord->GetX() - 1, thisCoord->GetY());
+        }
+
+        if (thisCoord->GetX() != nextCoord->GetX() || thisCoord->GetY() != nextCoord->GetY())
+        {
+            return nextCoord;
+        }
+
+        return NULL;
+    }
 }

code/trunk/src/modules/towerdefense/TowerDefense.h

@@ -43 +43 @@
 #include "TowerDefenseEnemy.h"
 #include "util/Output.h"
-#include "core/object/WeakPtr.h"
-#include "TowerDefenseSelecter.h"
-#include "graphics/Camera.h"    
-
+#include "TowerDefenseField.h"
 
 namespace orxonox
@@ -54 +51 @@
     public:
         TowerDefense(Context* context);
-        virtual ~TowerDefense();
-
-        std::vector<orxonox::WeakPtr<TowerDefenseEnemy> > TowerDefenseEnemyvector;
-        Model* towerModelMatrix[16][16];
-        TowerDefenseTower* towerTurretMatrix[16][16];
-        void addTowerDefenseEnemy(std::vector<TDCoordinate*> path, int templatenr);
+        virtual ~TowerDefense();        
+        void addTowerDefenseEnemy(int templatenr);
         virtual void start(); //<! The function is called when the gametype starts
         virtual void end();
@@ -66 +59 @@
         PlayerInfo* getPlayer(void) const;
         int getCredit(){ return this->credit_; }
+        void payCredit(int pay){ this->credit_ -= pay; }
         int getLifes(){ return this->lifes_; }
-        int getWaveNumber(){ return this->waves_; }
+        int getWaveNumber(){ return this->waveNumber_; }
+        void setWaveNumber(int wavenumber){ waveNumber_=wavenumber; }
         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 setLifes(int lifes){ lifes_ = lifes; }        
+        void buyTower(int cost){ cost -= cost;}
         void addCredit(int credit) { credit_+=credit; }
-        void nextwave();
         int reduceLifes(int NumberofLifes){ return lifes_-=NumberofLifes; }
-        TowerDefenseSelecter* selecter;
-        int spaceships;
-        int eggs;
-        int ufos;
-        int randomships;
-
-
-        //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
-        //virtual void playerScored(PlayerInfo* player, int score);
-
-
-        /*  Called by TowerDefenseCenterpoint upon game start
-            The centerpoint is used to create towers
-        */
-        void setCenterpoint(TowerDefenseCenterpoint *centerpoint);
-
-        /* Adds a tower at x, y in the playfield */
+        TowerDefenseField* getField(TDCoordinate* coord){ return fields_[coord->GetX()][coord->GetY()]; }
+        void setCenterpoint(TowerDefenseCenterpoint* centerpoint);        
         void addTower(int x, int y);
-        void upgradeTower(int x, int y);
-
-        //TODO: void spawnNewWave()
-        //TODO: create a timer which regularly calls the spawnNewWave function  (time driven)
-        //      or spawn a new wave when the old wave has been killed           (event driven)
-
+        void upgradeTower(int x, int y); 
+        virtual TDCoordinate* getNextStreetCoord(TDCoordinate*);
+        
+        TowerDefenseSelecter* selecter;        
 
     private:
-        TowerDefenseCenterpoint *center_;
+        void createFields();
+
+        orxonox::WeakPtr<TowerDefenseCenterpoint> center_;
         PlayerInfo* player_;
-        float time;
-        float timeSetTower_;
-//        float time2;
+        float timeSinceLastSpawn_;
+        float timeUntilNextWave_;
+        int waveSize_;
         int credit_;
-        int waves_;
+        int waveNumber_;
         int lifes_;
-        Timer nextwaveTimer_;
-
-        /* handles stats */
-        bool hasEnoughCreditForTower(int towerCost);
-        bool hasEnoughCreditForUpgrade();
+        std::list<orxonox::WeakPtr<TowerDefenseEnemy> > enemies_;
+        TowerDefenseField* fields_[16][16];
+        std::vector<orxonox::WeakPtr<TowerDefenseField> > waypoints_;
+        Vector3 endpoint_;
+        Vector3 offset_;        
     };
 }

code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "core/class/Super.h"
 
 #include "TowerDefense.h"
@@ -72 +73 @@
         XMLPortParam(TowerDefenseCenterpoint, "tileScale", setTileScale, getTileScale, xmlelement, mode);
         XMLPortParam(TowerDefenseCenterpoint, "selecterTemplate", setSelecterTemplate, getSelecterTemplate, xmlelement, mode);
-
-        //TODO: add XMLPortObject(TowerDefenseCenterpoint, WorldEntity, "waypoints", addWaypoint, getWaypoint,  xmlelement, mode);
-        // This was copied and shightly modified from WaypointController.cc ; there are no getters and setters and no membervariable yet
-        // The centerpoint should have all waypoints for "attached" to it. By using this function you can seperately add waypoints
-        // When you spawn a new enemy you should let it be controlled by a WaypointController. And that controller should get the waypoints.
-
-        // Alternatively you can manage the waypoints directly in TowerDefense.cc
+        XMLPortParam(TowerDefenseCenterpoint, "tower1Template", setTower1Template, getTower1Template, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower2Template", setTower2Template, getTower2Template, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower3Template", setTower3Template, getTower3Template, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower4Template", setTower4Template, getTower4Template, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower5Template", setTower5Template, getTower5Template, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "fields", setFields, getFields, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower1Cost", setTower1Cost, getTower1Cost, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower2Cost", setTower2Cost, getTower2Cost, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower3Cost", setTower3Cost, getTower3Cost, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower4Cost", setTower4Cost, getTower4Cost, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "tower5Cost", setTower5Cost, getTower5Cost, xmlelement, mode);
     }
 
@@ -94 +99 @@
         }
     }
+
+    /**
+    @brief
+        Removes all blanks, tabs and returns from the string passed.
+    */
+    void TowerDefenseCenterpoint::trimString(std::string* str)
+    {
+        std::string* trimmed = new std::string("");
+        int length = str->size();
+        char temp;
+        for (int i = 0; i < length; ++ i)
+        {
+            temp = str->at(i);
+            if (temp != ' ' && temp != '\t' && temp != '\n')
+            {
+                trimmed->push_back(temp);
+            }
+        }
+
+        *str = *trimmed;
+    }
+
+    const int TowerDefenseCenterpoint::getTowerCost(int upgrade) const
+    {
+        return towerCosts_[(upgrade%5)];
+    }
 }

code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h

@@ -41 +41 @@
 #include <string>
 #include <util/Math.h>
-
+#include "TowerDefenseTower.h"
 #include "worldentities/MobileEntity.h"
 
@@ -65 +65 @@
             unsigned int getHeight(void) const
                 { return this->height_; }
+            void setFields(const std::string& newFields)
+                { this->fields_ = newFields; trimString(&fields_); }
+            const std::string& getFields() const
+                { return this->fields_; }                    
             void setSelecterTemplate(const std::string& newTemplate)
                 { this->selecterTemplate_ = newTemplate; }
             const std::string& getSelecterTemplate() const
                 { return this->selecterTemplate_; }   
+
+            void setTower1Template(const std::string& newTemplate)
+                { this->towerTemplates_[0] = newTemplate;}
+            const std::string& getTower1Template() const
+                { return this->towerTemplates_[0]; }  
+            void setTower2Template(const std::string& newTemplate)
+                { this->towerTemplates_[1] = newTemplate; }
+            const std::string& getTower2Template() const
+                { return this->towerTemplates_[1]; }
+            void setTower3Template(const std::string& newTemplate)
+                { this->towerTemplates_[2] = newTemplate; }
+            const std::string& getTower3Template() const
+                { return this->towerTemplates_[2]; } 
+            void setTower4Template(const std::string& newTemplate)
+                { this->towerTemplates_[3] = newTemplate; }
+            const std::string& getTower4Template() const
+                { return this->towerTemplates_[3]; }
+            void setTower5Template(const std::string& newTemplate)
+                { this->towerTemplates_[4] = newTemplate; }
+            const std::string& getTower5Template() const
+                { return this->towerTemplates_[4]; }  
+
+            void setTower1Cost(const int& newCost)
+                { this->towerCosts_[0] = newCost;}
+            const int& getTower1Cost() const
+                { return this->towerCosts_[0]; }  
+            void setTower2Cost(const int& newCost)
+                { this->towerCosts_[1] = newCost; }
+            const int& getTower2Cost() const
+                { return this->towerCosts_[1]; }
+            void setTower3Cost(const int& newCost)
+                { this->towerCosts_[2] = newCost; }
+            const int& getTower3Cost() const
+                { return this->towerCosts_[2]; } 
+            void setTower4Cost(const int& newCost)
+                { this->towerCosts_[3] = newCost; }
+            const int& getTower4Cost() const
+                { return this->towerCosts_[3]; }
+            void setTower5Cost(const int& newCost)
+                { this->towerCosts_[4] = newCost; }
+            const int& getTower5Cost() const
+                { return this->towerCosts_[4]; }
+
+            const int getTowerCost(int upgrade) const;
+                                            
+
             /**
                 @brief How to convert to world coordinates, e.g. that 0,15 is not at -8,-8 but at -80,-80 (if scale would be 10)
@@ -80 +130 @@
         private:
             void checkGametype();
-
+            void trimString(std::string*);
             std::string selecterTemplate_;
+            std::string towerTemplates_[5];
+            int towerCosts_[5];
+            std::string fields_;
             unsigned int width_;
             unsigned int height_;

code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -30 +30 @@
         //needed to keep track of the PlayerStats coded in TowerDefense.h
         this->td = orxonox_cast<TowerDefense*>(this->getGametype());
-        once_=false;
+        once_ = false;
+    }
+
+    TowerDefenseEnemy::~TowerDefenseEnemy()
+    {
 
     }
-    //add credit if enemy is destroyed
-    TowerDefenseEnemy::~TowerDefenseEnemy(){
 
-        if (this->isInitialized())
-        {
-                getGame()->addCredit(1);
-        }
+    void TowerDefenseEnemy::tick(float dt)
+    {   
+        //orxout() << "TDE tick1" << endl;
+        SUPER(TowerDefenseEnemy, tick, dt);
+        //orxout() << "TDE tick2" << endl;
     }
 
-    void TowerDefenseEnemy::addWaypoint(TDCoordinate* coord)
-    {
-        this->Waypointsvector_.push_back(coord);
-    }
-
-
-    void TowerDefenseEnemy::tick(float dt)
-    {
-        SUPER(TowerDefenseEnemy, tick, dt);
-    }
-
-    TowerDefense* TowerDefenseEnemy::getGame()
+    WeakPtr<TowerDefense> TowerDefenseEnemy::getGame()
     {
         if (game == NULL)
@@ -63 +55 @@
     }
 
-    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
+    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
-        Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
+        Pawn::damage(damage, healthdamage, shielddamage, originator);
+        
         if (getGame() && once_ == false && getHealth() <= 0)
         {
-                orxout() << "damagefunctionIF" << endl;
             getGame()->addCredit(1);
             once_ = true;
         }
-        orxout() << "damagefunction" << endl;
-
     }
-
-/*
-    void TowerDefenseEnemy::popWaypoint()
-    {
-        if(Waypointsvector_.size()>0)
-            Waypointsvector_.pop_back();
-    }
-
-    TDCoordinate TowerDefenseEnemy::peekWaypoint()
-    {
-        if(Waypointsvector_.size()<=0){
-            TDCoordinate* coord = TDCoordinate(-1,-1);
-            return coord;
-        }else{
-            return Waypointsvector_.at(Waypointsvector_.size()-1);
-
-        }
-
-
-    }
-*/
-
 }

code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h

@@ -22 +22 @@
 #include "worldentities/pawns/SpaceShip.h"
 #include "util/Output.h"
-#include "controllers/ArtificialController.h"
 #include "TowerDefense.h"
 
@@ -39 +38 @@
 
         virtual void tick(float dt);
-        void addWaypoint(TDCoordinate* coord);
-        void popWaypoint();
-        TDCoordinate peekWaypoint();
-
-        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
-
+        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
 
     private:
-        TowerDefense* getGame();
+        WeakPtr<TowerDefense> getGame();
         WeakPtr<TowerDefense> game;
         TowerDefense* td;
         bool once_;
-        std::vector<TDCoordinate*> Waypointsvector_;
-
     };
 

code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc

@@ -50 +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());
@@ -55 +56 @@
 
         if(showlives == true)
-          this->setCaption(multi_cast<std::string>(lifes));
+        {
+            this->setCaption(multi_cast<std::string>(lifes));
+        }          
         else if(showcredits == true)
-          this->setCaption(multi_cast<std::string>(credits));
+        {
+            this->setCaption(multi_cast<std::string>(credits));
+        }          
         else if(showwaves == true)
-          this->setCaption(multi_cast<std::string>(wave));
-
-
+        {
+            this->setCaption(multi_cast<std::string>(wave));
+        }          
     }
 

code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc

@@ -51 +51 @@
         moveLeftPressed_ = false;
         moveRightPressed_ = false;
-        firePressed_ = false;
-        setSelectedPosition(6,6);
-        timerSetFire_=0;
+        boostPressed_ = false;
+        buildTower_ = false;
+        setSelectedPosition(0,0);     
     }
 
@@ -70 +70 @@
         SUPER(TowerDefenseSelecter, tick, dt);
 
+        time_ += dt;
 
-        if (hasLocalController())
-        {
-                timerSetFire_ +=dt;
+        if (hasLocalController() && time_ >= 0.25)
+        {    
+            time_ = 0;
 
-                if(timerSetFire_ >= 0.25)
-                {
-                        timerSetFire_ = 0;
+            int selecterPosX = selectedPos_->GetX();
+            int selecterPosY = selectedPos_->GetY();
 
-                        int selecterPosX = selectedPos_->GetX();
-                                int selecterPosY = selectedPos_->GetY();
-
-                                if (moveUpPressed_ == true)
-                                {
-                                        moveUpPressed_ = false;
-                                        selectedPos_->Set(selecterPosX, selecterPosY + 1);
-                                        updatePosition();
-                                }
-                                if (moveDownPressed_ == true)
-                                {
-                                        moveDownPressed_ = false;
-                                        selectedPos_->Set(selecterPosX, selecterPosY - 1);
-                                        updatePosition();
-                                }
-
-                                if (moveLeftPressed_ == true)
-                                {
-                                        moveLeftPressed_ = false;
-                                        selectedPos_->Set(selecterPosX - 1, selecterPosY);
-                                        updatePosition();
-                                }
-                                if (moveRightPressed_ == true)
-                                {
-                                        moveRightPressed_ = false;
-                                        selectedPos_->Set(selecterPosX + 1, selecterPosY);
-                                        updatePosition();
-                                }
-
-
-                        }
-
-
-
-        }
-     }
+            if (moveUpPressed_ == true)
+            {                
+                moveUpPressed_ = false;
+                selectedPos_->Set(selecterPosX, selecterPosY + 1);
+                updatePosition();
+            }
+            if (moveDownPressed_ == true)
+            {
+                moveDownPressed_ = false;
+                selectedPos_->Set(selecterPosX, selecterPosY - 1);
+                updatePosition();
+            }
+            if (moveLeftPressed_ == true)
+            {
+                moveLeftPressed_ = false;
+                selectedPos_->Set(selecterPosX - 1, selecterPosY);
+                updatePosition();
+            }
+            if (moveRightPressed_ == true)
+            {
+                moveRightPressed_ = false;
+                selectedPos_->Set(selecterPosX + 1, selecterPosY);
+                updatePosition();
+            }
+            if (boostPressed_ == true)
+            {
+                boostPressed_ = false;
+                buildTower_ = true;
+            }
+        }         
+    }
 
 
@@ -157 +152 @@
     }
 
+    void TowerDefenseSelecter::fire(unsigned int firemode)
+    {
+    }
+
+    void TowerDefenseSelecter::fired(unsigned int firemode)
+    {
+        
+    }
 
     void TowerDefenseSelecter::boost(bool bBoost)
     {
-        firePressed_ = true;
-        orxout() << "boost" << endl;
+        if (bBoost == true)
+        {
+            boostPressed_ = true;
+        }
     }
-
 
     void TowerDefenseSelecter::updatePosition()
@@ -180 +184 @@
         setSelectedPosition(new TDCoordinate(x,y));
     }
-
-
 }

code/trunk/src/modules/towerdefense/TowerDefenseSelecter.h

@@ -48 +48 @@
             virtual void rotatePitch(const Vector2& value);
             virtual void rotateRoll(const Vector2& value);
+            void fire(unsigned int firemode);
+            virtual void fired(unsigned int firemode);
             virtual void boost(bool bBoost);
             virtual void setSelectedPosition(TDCoordinate* newPos);
             virtual void setSelectedPosition(int x, int y);
-            bool firePressed_;
+
+            bool buildTower_;
             TDCoordinate* selectedPos_;
-
-
         private:            
-            virtual void updatePosition();
-            float timerSetFire_;
+            virtual void updatePosition();                        
+            float time_;
             bool moveUpPressed_;
             bool moveDownPressed_;
             bool moveLeftPressed_;
-            bool moveRightPressed_;            
+            bool moveRightPressed_;                        
+            bool boostPressed_;            
     };
 }

code/trunk/src/modules/towerdefense/TowerDefenseTower.cc

@@ -27 +27 @@
         game_ =NULL;
         this->setCollisionType(WorldEntity::None);
-        upgrade = 0;
-        this->addTemplate("towerdefensetower");
-
-        upgradeMax = 5;
-
+        upgrade = 1;
 
         //this->removeAllEngines();
@@ -62 +58 @@
     bool TowerDefenseTower::upgradeTower()
     {
-        if(upgrade < upgradeMax)
+        if(upgrade < 5)
         {
             upgrade++;
             float reloadrate = getReloadRate();
             float reloadwaittime = getReloadWaitTime();
-            this->setDamageMultiplier((upgrade+1)*1.5f);
-            this->setRotationThrust(2*this->getRotationThrust());
-            reloadrate = 0.7f*reloadrate;
-            reloadwaittime = 0.7f*reloadwaittime;
+            this->setDamageMultiplier((upgrade+1)*2);
+            //this->setRotationThrust(2*this->getRotationThrust());
+            reloadrate = 0.5f*reloadrate;
+            reloadwaittime = 0.5f*reloadwaittime;
             setReloadRate(reloadrate);
             setReloadWaitTime(reloadwaittime);

code/trunk/src/modules/towerdefense/TowerDefenseTower.h

@@ -19 +19 @@
 
 #include "towerdefense/TowerDefensePrereqs.h"
-#include "worldentities/pawns/SpaceShip.h"
 #include "objects/Turret.h"
 
@@ -38 +37 @@
 
         // Overriding these to stop TowerDefenseTowers from spasing out
-        /*
-        void setOrientation(const Quaternion& orientation);
-        virtual void rotateYaw(const Vector2& value);
-        virtual void rotatePitch(const Vector2& value);
-        virtual void rotateRoll(const Vector2& value);
-        */
+        //void setOrientation(const Quaternion& orientation);
+        //virtual void rotateYaw(const Vector2& value);
+        //virtual void rotatePitch(const Vector2& value);
+        //virtual void rotateRoll(const Vector2& value);
         virtual bool upgradeTower();
 
@@ -49 +46 @@
         void setGame(TowerDefense* Towerdefense)
         { assert(Towerdefense); game_ = Towerdefense; }
-        int upgrade;
-        int upgradeMax;
     private:
         TowerDefense* game_;
-
+        int upgrade;
     };
 }

code/trunk/src/modules/weapons/CMakeLists.txt

@@ -2 +2 @@
   MuzzleFlash.cc
   RocketController.cc
+  IceGunFreezer.cc
 )
 

code/trunk/src/modules/weapons/munitions/CMakeLists.txt

@@ -5 +5 @@
   RocketMunition.cc
   GravityBombMunition.cc
+  IceMunition.cc
+  SplitMunition.cc
 )

code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc

@@ -88 +88 @@
     /**
     @brief
+        Get the material of the BillboardProjectile.
+    @return
+        The material name.
+    */
+    const std::string& BillboardProjectile::getMaterial()
+    {
+        return this->billboard_.getMaterial();
+    }
+
+    /**
+    @brief
         Is called when the visibility of the BillboardProjectile has changed.
     */

code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h

@@ -60 +60 @@
             virtual void setColour(const ColourValue& colour);
             virtual void setMaterial(const std::string& material);
+            virtual const std::string& getMaterial();
             virtual void changedVisibility();
 

code/trunk/src/modules/weapons/projectiles/CMakeLists.txt

@@ -5 +5 @@
   Projectile.cc
   LightningGunProjectile.cc
+  SplitGunProjectile.cc
+  IceGunProjectile.cc
   Rocket.cc
   RocketOld.cc

code/trunk/src/modules/weapons/projectiles/Projectile.cc

@@ -39 +39 @@
 #include "core/command/Executor.h"
 
-#include "objects/collisionshapes/SphereCollisionShape.h"
 #include "worldentities/pawns/Pawn.h"
 
@@ -60 +59 @@
             this->setCollisionType(Dynamic);
 
-            SphereCollisionShape* shape = new SphereCollisionShape(this->getContext());
-            shape->setRadius(20.0f);
-            this->attachCollisionShape(shape);
+            // Create a sphere collision shape and attach it to the projectile.
+            collisionShape_ = new SphereCollisionShape(this->getContext());
+            setCollisionShapeRadius(20.0f);
+            this->attachCollisionShape(collisionShape_);
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
@@ -76 +76 @@
         SetConfigValue(lifetime_, 4.0f).description("The time in seconds a projectile stays alive");
     }
-
 
     void Projectile::tick(float dt)
@@ -93 +92 @@
     }
 
+    void Projectile::setCollisionShapeRadius(float radius)
+    {
+        if (collisionShape_ != NULL && radius > 0)
+        {
+            collisionShape_->setRadius(radius);
+        }        
+    }
 }

code/trunk/src/modules/weapons/projectiles/Projectile.h

@@ -39 +39 @@
 #include "tools/Timer.h"
 #include "worldentities/MovableEntity.h"
+#include "objects/collisionshapes/SphereCollisionShape.h"
 
 #include "BasicProjectile.h"
@@ -66 +67 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
+        protected:
+            virtual void setCollisionShapeRadius(float radius);
+
         private:
             float lifetime_; //!< The time the projectile exists.
             Timer destroyTimer_; //!< Timer to destroy the projectile after its lifetime has run out.
+            WeakPtr<SphereCollisionShape> collisionShape_; // The collision shape of the projectile.            
     };
 }

code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -5 +5 @@
   HsW01.cc
   LightningGun.cc
+  SplitGun.cc
+  IceGun.cc
   RocketFire.cc
   RocketFireOld.cc