Changeset 10591 for code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc

Timestamp:

Sep 17, 2015, 3:32:50 PM (9 years ago)

Author:

fvultier

Message:

Different wave types with different enemies. New field type: obstacle. It is impossible to build a tower on a field with an obstacle.

File:

• code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc (modified) (15 diffs)

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

@@ -87 +87 @@
 namespace orxonox
 {
-    static const std::string __CC_addTower_name  = "addTower";
-    static const std::string __CC_upgradeTower_name = "upgradeTower";
-
-    SetConsoleCommand("TowerDefense", __CC_addTower_name,  &TowerDefense::addTower ).addShortcut().defaultValues(1);
-    SetConsoleCommand("TowerDefense", __CC_upgradeTower_name, &TowerDefense::upgradeTower).addShortcut().defaultValues(0);
-
     RegisterUnloadableClass(TowerDefense);
 
@@ -102 +96 @@
         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->waveSize_ = 0;
+        offset_ = Vector3(0,0,10);
 
         //this->stats_ = new TowerDefensePlayerStats();
-
-        ModifyConsoleCommand(__CC_addTower_name).setObject(this);
-        ModifyConsoleCommand(__CC_upgradeTower_name).setObject(this);
     }
 
     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);
+
         }
     }
@@ -149 +140 @@
 
         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
-        
 
         //set initial credits, lifes and WaveNumber
         this->setCredit(1000);
-        this->setLifes(100);
+        this->setLifes(100);        
+        this->timeSinceLastSpawn_ = 0.0;
+        this->timeUntilNextWave_ = 5.0;
+        this->waveSize_ = 0;
         this->setWaveNumber(0);
-        time = 0.0;
     }
 
@@ -165 +154 @@
     void TowerDefense::addTowerDefenseEnemy(int templatenr)
     {
-        orxout() << "addTowerDefenseEnemy" << endl;
-
         TowerDefenseEnemy* en1 = new TowerDefenseEnemy(this->center_->getContext());
         
@@ -200 +187 @@
         if (controller != NULL && waypoints_.size() > 1)
         {
-            en1->setPosition(waypoints_.at(0)->getPosition());
+            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());
+            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());
+                waypoint->setPosition(waypoints_.at(i)->getPosition() + offset_);
                 controller->addWaypoint(waypoint);
             }
@@ -229 +216 @@
         assert(player);
         player_ = player;
-
-        orxout() << "spawnPlayer" << endl;
 
         if (selecter->getPlayer() == NULL)
@@ -287 +272 @@
     void TowerDefense::tick(float dt)
     {
-        //orxout() << "tick1" << endl;
         SUPER(TowerDefense, tick, dt);
-        //orxout() << "tick2" << endl;
 
         if (hasStarted() == false || player_ == NULL)
@@ -295 +278 @@
             return;
         }
-        time += dt;       
+        timeUntilNextWave_ -= dt;
+        timeSinceLastSpawn_ += dt;
 
         //build/upgrade tower at selecter position
@@ -311 +295 @@
             }            
         }
-
-        if (time >= 1.3 * enemies_.size() && enemies_.size() < 10)
-        {
-            //adds different types of enemys depending on the WaveNumber
-            addTowerDefenseEnemy(this->getWaveNumber() % 3 +1 );
-        }
-
-        //if ships are at the end they get destroyed
-
+        
         for (std::list<WeakPtr<TowerDefenseEnemy> >::iterator it = enemies_.begin(); it != enemies_.end(); )
         {
@@ -326 +302 @@
                 // the enemy was destroyed by a tower - remove it from the list
                 enemies_.erase(it++);
+                addCredit(1);
             }
             else
             {
-                //destroys enemys at the end of the path and reduces the life by 1. No credits gifted
+                //if ships are at the end they get destroyed
                 Vector3 ship = (*it)->getRVWorldPosition();
                 float distance = ship.distance(endpoint_);
-                if(distance < 50)
+                if(distance < 40)
                 {
-                    orxout() << "enemy deleted" << endl;
                     (*it)->destroy();
                     enemies_.erase(it++);
@@ -348 +324 @@
                 }
             }
-        }        
-
-        if (enemies_.size() == 0 && !this->nextwaveTimer_.isActive())
-        {
-            this->nextwaveTimer_.startTimer();
-        }
+        }  
+
+        // 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_+10;
+            waveSize_ = waveNumber_+5;
+        }
+
     }
 
@@ -361 +351 @@
         TDCoordinate coord(0,0);
         TDCoordinate startCoord(0,0);
-
         std::string fields = center_->getFields();
         int pos = 0;
@@ -372 +361 @@
                 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));           
+                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)
@@ -382 +371 @@
             }
         }
-
         //Place waypoints along the street for the waypoint controllers of the enemies
         TDCoordinate* thisCoord = &startCoord;
@@ -429 +417 @@
         return NULL;
     }
-
-    /*
-    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);
-    }*/
 }