Changeset 10368

Timestamp:

Apr 16, 2015, 4:24:41 PM (10 years ago)

Author:

erbj

Message:

added timer in tick function to pause for 10 seconds between waves , trying to solve the problem, that towers are shooting at (0,0,0) (center point). The Problem seems to be in the sameteam function as the turret and the pawn at the position (0,0,0) should have the same team

Location:

code/branches/towerdefenseFS15

Files:

• data/levels/towerDefense.oxw (modified) (2 diffs)
• src/modules/objects/controllers/TurretController.cc (modified) (2 diffs)
• src/modules/towerdefense/CMakeLists.txt (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (11 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (4 diffs)
• src/orxonox/controllers/FormationController.cc (modified) (2 diffs)

code/branches/towerdefenseFS15/data/levels/towerDefense.oxw

@@ -29 +29 @@
   <Pawn team=1>
     <camerapositions>
-      <CameraPosition position="-2000,0,1500"/>
+      <CameraPosition position="0,0,1500"/>
     </camerapositions>
   </Pawn>
@@ -59 +59 @@
 
     <!-- Spawns the camera, attached to a crate -->
-    <SpawnPoint team=1 position="2000,0,0" pawndesign=centerpointmark />
+    <SpawnPoint team=1 position="0,0,0" pawndesign=centerpointmark />
     <!--TeamSpawnPoint team=1 position="-7,7,4" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
 

code/branches/towerdefenseFS15/src/modules/objects/controllers/TurretController.cc

@@ -104 +104 @@
         {
             Pawn* entity = orxonox_cast<Pawn*>(*it);
-            if (!entity || FormationController::sameTeam(this->getControllableEntity(), entity, this->getGametype()))
+            if (!entity || FormationController::sameTeam(turret, entity, this->getGametype()))
                 continue;
             tempScore = turret->isInRange(entity);
@@ -196 +196 @@
             if(this->isLookingAtTargetNew(Degree(5).valueRadians()))
             {
+                orxout() << target_->getIdentifier()->getName() << " / " << target_->getWorldPosition() << " / " << target_->getHealth() << " / " << target_->getTeam() << " / " << this->getTeam() << " / " << turret->getTeam() << endl;
+                if (target_->getController())
+                        orxout() << target_->getController()->getIdentifier()->getName() << " / " << target_->getController()->getTeam() << endl;
                 this->getControllableEntity()->fire(0);
             }

code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt

@@ -7 +7 @@
   TDCoordinate.cc
   TowerDefenseEnemy.cc
+ # TowerDefenseSelecter.cc
 
 )

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

@@ -98 +98 @@
     RegisterUnloadableClass(TowerDefense);
 
-    TowerDefense::TowerDefense(Context* context) : Deathmatch(context)
+    TowerDefense::TowerDefense(Context* context) : TeamDeathmatch(context)
     {
         RegisterObject(TowerDefense);
@@ -108 +108 @@
         }*/
 
+        selectedPos = new TDCoordinate(0,0);
+//        TowerDefenseSelecter Selecter = new TowerDefenseSelecter();
 
 
         this->setHUDTemplate("TowerDefenseHUD");
+        this->nextwaveTimer_.setTimer(10, false, createExecutor(createFunctor(&TowerDefense::nextwave, this)));
+        this->nextwaveTimer_.stopTimer();
+        this->waves_ = 0;
+        this->time = 0;
+        this->credit_ = 0;
+        this->lifes_ = 0;
 
         //this->stats_ = new TowerDefensePlayerStats();
@@ -138 +146 @@
     {
 
-        Deathmatch::start();
+        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
@@ -220 +228 @@
     {
 
-        Deathmatch::end();
+        TeamDeathmatch::end();
         ChatManager::message("Match is over! Gameover!");
 
@@ -330 +338 @@
         std::vector<TDCoordinate*> path;
         path.push_back(coord1);
-        if(time>1 && TowerDefenseEnemyvector.size() < 30)
+        if(time>=TowerDefenseEnemyvector.size() && TowerDefenseEnemyvector.size() < 30)
         {
             //adds different types of enemys depending on the WaveNumber
             addTowerDefenseEnemy(path, this->getWaveNumber() % 3 +1 );
-            time = time-1;
         }
 
@@ -359 +366 @@
             }
         }
+
         //goes thorugh vector to see if an enemy is still alive. if not next wave is launched
         int count= 0;
@@ -369 +377 @@
         }
 
+        if (count == 0 && !this->nextwaveTimer_.isActive())
+            this->nextwaveTimer_.startTimer();
+
+/*            time2 +=dt;
         if(count== 0)
         {
-            time2 +=dt;
             if(time2 > 10)
             {
@@ -380 +391 @@
             }
         }
-
+*/
 
     }
@@ -425 +436 @@
     void TowerDefense::playerEntered(PlayerInfo* player)
     {
-        Deathmatch::playerEntered(player);
+        TeamDeathmatch::playerEntered(player);
 
         const std::string& message = player->getName() + " entered the game";
@@ -433 +444 @@
     bool TowerDefense::playerLeft(PlayerInfo* player)
     {
-        bool valid_player = Deathmatch::playerLeft(player);
+        bool valid_player = TeamDeathmatch::playerLeft(player);
 
         if (valid_player)
@@ -463 +474 @@
         }
 
-        Deathmatch::pawnKilled(victim, killer);
+        TeamDeathmatch::pawnKilled(victim, killer);
     }
 

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

@@ -39 +39 @@
 #include "TDCoordinate.h"
 #include "towerdefense/TowerDefensePrereqs.h"
-#include "gametypes/Deathmatch.h"
+#include "gametypes/TeamDeathmatch.h"
 #include "TowerDefenseEnemy.h"
 #include "util/Output.h"
@@ -46 +46 @@
 namespace orxonox
 {
-    class _TowerDefenseExport TowerDefense : public Deathmatch
+    class _TowerDefenseExport TowerDefense : public TeamDeathmatch
     {
     public:
@@ -70 +70 @@
         void buyTower(int cost){ credit_ -= cost;}
         void addCredit(int credit) { credit_+=credit; }
-        void nextwave(){ waves_++;}
+        void nextwave(){ TowerDefenseEnemyvector.clear(); waves_++; time=0;}
         int reduceLifes(int NumberofLifes){ return lifes_-=NumberofLifes; }
+        TDCoordinate* selectedPos;
 
         //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
@@ -95 +96 @@
         TowerDefenseCenterpoint *center_;
         float time;
-        float time2;
+//        float time2;
         int credit_;
         int waves_;
         int lifes_;
+        Timer nextwaveTimer_;
 
         /* handles stats */

code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc

@@ -987 +987 @@
         }
 
-        TeamDeathmatch* tdm = orxonox_cast<TeamDeathmatch*>(gametype);
+        TeamGametype* tdm = orxonox_cast<TeamGametype*>(gametype);
         if (tdm)
         {
@@ -995 +995 @@
             if (entity2->getPlayer())
                 team2 = tdm->getTeam(entity2->getPlayer());
-        }
-
-        Mission* miss = orxonox_cast<Mission*>(gametype);
-        if (miss)
-        {
-            if (entity1->getPlayer())
-                team1 = miss->getTeam(entity1->getPlayer());
-
-            if (entity2->getPlayer())
-                team2 = miss->getTeam(entity2->getPlayer());
         }