Changeset 10125

Timestamp:

Nov 12, 2014, 11:53:34 PM (9 years ago)

Author:

maxima

Message:

Enemies use the new template enemytowerdefense

Location:

code/branches/towerdefenseHS14

Files:

• data/levels/templates/TowerdefenseEnemy.oxt (deleted)
• data/levels/templates/enemyTowerdefense.oxt (added)
• data/levels/towerDefense.oxw (modified) (3 diffs)
• src/modules/towerdefense/TDCoordinate.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (5 diffs)

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

@@ -21 +21 @@
   include("templates/spaceshipPirate.oxt")
   include("templates/tower.oxt")
+  include("templates/enemyTowerdefense.oxt")
 ?>
 
@@ -78 +79 @@
     <SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=3 team=1 >
       <templates>
-        <Template link=spaceshipassff />
+        <Template link=enemytowerdefense />
       </templates>
       <controller>
@@ -132 +133 @@
     direction="0,0,0"
     collisionType=dynamic
-    mass=100000>
-
-    </TowerDefenseCenterpoint>
+    mass=100000
+    />
 
   </Scene>

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

@@ -36 +36 @@
         coord->x= (x-8) * tileScale;
         coord->y= (y-8) * tileScale;
-        coord->z=0;
+        coord->z=100;
 
         return *coord;

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

@@ -148 +148 @@
 
         TDCoordinate* coord1 = new TDCoordinate(1,1);
-        TDCoordinate* coord2 = new TDCoordinate(1,1);
-        TDCoordinate* coord3 = new TDCoordinate(1,2);
+        TDCoordinate* coord2 = new TDCoordinate(1,3);
+        TDCoordinate* coord3 = new TDCoordinate(10,3);
 
 
@@ -163 +163 @@
 
 
-        for(int i = 0 ; i < 20 ; ++i)
+        for(int i = 0 ; i < 1 ; ++i)
         {
                 addTowerDefenseEnemy(path);
@@ -175 +175 @@
     }
 
+    // Generates a TowerDefenseEnemy. Uses Template "enemytowerdefense". Sets position at first waypoint of path.
+
     void TowerDefense::addTowerDefenseEnemy(std::vector<TDCoordinate*> path){
 
@@ -180 +182 @@
 
         TowerDefenseEnemy* en1 = new TowerDefenseEnemy(this->center_->getContext());
-        en1->addTemplate("spaceshipassff");
-        /*en1->setInitialHealth(1000);
+        en1->addTemplate("enemytowerdefense");
+        en1->setScale(3);
+
+
+        /*en1->setInitialHealth(1000);
         en1->setHealth(1000);
         en1->setMaxHealth(1000);
@@ -190 +195 @@
 
 
-        Model* TowerDefenseEnemymodel = new Model(this->center_->getContext());
-
-        TowerDefenseEnemymodel->setMeshSource("cube.mesh");
-
-        TowerDefenseEnemymodel->setPosition(0,0,75);
-        en1->setPosition(0,0,150);
-        TowerDefenseEnemymodel->setScale(10);
-
-
-        en1->attach(TowerDefenseEnemymodel);
+        //Model* TowerDefenseEnemymodel = new Model(this->center_->getContext());
+
+        //TowerDefenseEnemymodel->setMeshSource("cube.mesh");
+
+        //TowerDefenseEnemymodel->setPosition(0,0,75);
+        en1->setPosition(path.at(0)->get3dcoordinate());
+
+        //TowerDefenseEnemymodel->setScale(10);
+
+
+        //en1->attach(TowerDefenseEnemymodel);
 
         TowerDefenseEnemyvector.push_back(en1);