Changeset 10142

Timestamp:

Nov 26, 2014, 5:14:33 PM (9 years ago)

Author:

maxima

Message:

hzilly. Alle files zusammengefuegt.

Location:

code/branches/towerdefenseHS14

Files:

• data/levels/templates/tower.oxt (modified) (4 diffs)
• src/modules/towerdefense/CMakeLists.txt (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (7 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseEnemy.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefensePlayerStats.h (modified) (1 diff)
• src/modules/towerdefense/TowerDefensePrereqs.h (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseTower.cc (added)
• src/modules/towerdefense/TowerDefenseTower.h (added)

code/branches/towerdefenseHS14/data/levels/templates/tower.oxt

@@ -1 +1 @@
 <Template name=tower>
-  <Tower
+  <TowerDefenseTower
 
 
@@ -9 +9 @@
 
    collisionType     = "dynamic"
-   team = 0
+   team = 2
 
 
@@ -20 +20 @@
         </WaypointPatrolController>
     </controller>
+    
 
 
     <attached>
         <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
+        
+        <Turret position="0,0,-100" collisionType="dynamic" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=2000 minAttackRadius=30>
+        
+                <collisionShapes>
+                        <SphereCollisionShape radius="10"   position = "0,0,0"/>
+                </collisionShapes>
+                <controller>
+                        <TurretController/>
+                </controller>
+                <?lua
+                        include("../includes/weaponSettingsTurret.oxi")
+                ?>
+        </Turret>
     </attached>
 
@@ -33 +47 @@
   include("../includes/towerWeaponSettings.oxi")
 ?>
-  </Tower>
+  </TowerDefenseTower>
 </Template>
 

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

@@ -1 +1 @@
 SET_SOURCE_FILES(TOWERDEFENSE_SRC_FILES
   TowerDefense.cc
-  Tower.cc
+  TowerDefenseTower.cc
   TowerTurret.cc
   TowerDefenseCenterpoint.cc

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

@@ -75 +75 @@
 
 #include "TowerDefense.h"
-//#include "Tower.h"
+#include "TowerDefenseTower.h"
 #include "TowerTurret.h"
 #include "TowerDefenseCenterpoint.h"
@@ -130 +130 @@
 
         Deathmatch::start();
+
+// Waypoints: [1,3] [10,3] [10,11] [13,11]
+        for (int i=0; i < 16 ; i++){
+                for (int j = 0; j< 16 ; j++){
+                        towermatrix[i][j] = false;
+                }
+        }
+        for (int k=0; k<3; k++)
+                towermatrix[1][k]=true;
+        for (int l=1; l<11; l++)
+                towermatrix[l][3]=true;
+        for (int m=3; m<12; m++)
+                towermatrix[10][m]=true;
+        for (int n=10; n<14; n++)
+                towermatrix[n][11]=true;
+        for (int o=13; o<16; o++)
+                towermatrix[13][o]=true;
+
+
         credits = 5000;
         life = 20;
@@ -135 +154 @@
         time=0.0;
 
-/*
-        const int kInitialTowerCount = 3;
+        const int kInitialTowerCount = 3;
 
         for (int i = 0; i < kInitialTowerCount; i++)
         {
-                //{{3,2}, {8,5}, {12,10}}; old coordinates
-            TDCoordinate* coordinate = new TDCoordinate(i,(i*2));
-            addTower(coordinate->x, coordinate->y);
-        }
-*/
+            addTower(i+4,(i+5));
+        }
+
 
 
@@ -221 +237 @@
 
     void TowerDefense::addTower(int x, int y)
-    {/*
+    {
         const TowerCost towerCost = TDDefaultTowerCost;
 
@@ -230 +246 @@
         }
 
-        if (this->towerExists(x,y))
-        {
-            orxout() << "tower exists!!" << endl;
+        if (towermatrix [x][y]==true)
+        {
+            orxout() << "not possible to put tower here!!" << endl;
             return;
         }
@@ -252 +268 @@
         orxout() << "Will add tower at (" << (x-8) * tileScale << "," << (y-8) * tileScale << ")" << endl;
 
-        // Add tower to coordinatesStack
-        TDCoordinate newTowerCoordinates;
-        newTowerCoordinates.x=x;
-        newTowerCoordinates.y=y;
-
-
-        addedTowersCoordinates_.push_back(newTowerCoordinates);
-
-        // Reduce credit
+        
+
+       //Reduce credit
         this->stats_->buyTower(towerCost);
 
-        // Create tower
-        TowerTurret* newTower = new TowerTurret(this->center_->getContext());
-        newTower->addTemplate(this->center_->getTowerTemplate());
-
-        newTower->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 75);
-        newTower->setGame(this);*/
+        orxout() << "Credit: " << this->stats_->getCredit() << endl;
+
+  //    Create tower
+        TowerDefenseTower* towernew = new TowerDefenseTower(this->center_->getContext());
+        towernew->addTemplate("tower");
+        towernew->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 75);
+        towernew->setGame(this);
+
+        towermatrix[x][y]=true;
     }
 
@@ -276 +289 @@
     }
 
-    bool TowerDefense::towerExists(int x, int y)
-    {
-        for(std::vector<TDCoordinate>::iterator it = addedTowersCoordinates_.begin(); it != addedTowersCoordinates_.end(); ++it)
-        {
-            TDCoordinate currentCoordinates = (TDCoordinate) (*it);
-            if (currentCoordinates.x == x && currentCoordinates.y == y)
-                return true;
-        }
-
-        return false;
-    }
-
-
+ 
     void TowerDefense::tick(float dt)
     {

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

@@ -55 +55 @@
 
         std::vector<TowerDefenseEnemy*> TowerDefenseEnemyvector;
-
+        bool towermatrix[16][16];
         void addTowerDefenseEnemy(std::vector<TDCoordinate*> path, int templatenr); 
         virtual void start(); //<! The function is called when the gametype starts
@@ -94 +94 @@
         bool hasEnoughCreditForTower(TowerCost towerCost);
 
-        bool towerExists(int x, int y);
-
-
-        std::vector<TDCoordinate> addedTowersCoordinates_;
         std::vector<TowerTurret*> towers_;
     };

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

@@ -48 +48 @@
         float distance = ship.distance(*endpoint);
 
-        orxout() << "distance" << distance << endl;
+        //orxout() << "distance" << distance << endl;
         if(distance <50){
-                orxout() << "ENEMY KILLED!!!!" << endl;
+        //      orxout() << "ENEMY KILLED!!!!" << endl;
                 this->destroy(); }
     }

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

@@ -44 +44 @@
     typedef enum _TowerCosts {
         // Set to 0 for debug...
-        TDDefaultTowerCost = 0
+        TDDefaultTowerCost = 20
     } TowerCost;
 

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

@@ -66 +66 @@
 {
     class TowerDefense;
-    //class Tower;
+    class TowerDefenseTower;
     class TowerDefenseCenterpoint;
     class TowerDefenseHUDController;