Changeset 10134

Timestamp:

Nov 26, 2014, 3:58:47 PM (10 years ago)

Author:

erbj

Message:

different models with style

Location:

code/branches/towerdefenseHS14

Files:

• data/levels/templates/enemyTowerdefense.oxt (deleted)
• data/levels/templates/enemytowerdefense.oxt (added)
• data/levels/towerDefense.oxw (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseEnemy.cc (modified) (1 diff)

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

@@ -21 +21 @@
   include("templates/spaceshipPirate.oxt")
   include("templates/tower.oxt")
-  include("templates/enemyTowerdefense.oxt")
+  include("templates/enemytowerdefense.oxt")
 ?>
 

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

@@ -158 +158 @@
     // Generates a TowerDefenseEnemy. Uses Template "enemytowerdefense". Sets position at first waypoint of path.
 
-    void TowerDefense::addTowerDefenseEnemy(std::vector<TDCoordinate*> path){
+    void TowerDefense::addTowerDefenseEnemy(std::vector<TDCoordinate*> path, int templatenr){
 
         TowerDefenseEnemy* en1 = new TowerDefenseEnemy(this->center_->getContext());
-        en1->addTemplate("enemytowerdefense");
-        en1->setScale(3);
+
+        switch(templatenr)
+        {
+        case 1 :
+                en1->addTemplate("enemytowerdefense1");
+            en1->setScale(3);
+                break;
+        case 2 :
+                        en1->addTemplate("enemytowerdefense2");
+                en1->setScale(2);
+                        break;
+        case 3 :
+                        en1->addTemplate("enemytowerdefense3");
+                en1->setScale(1);
+                        break;
+        }
+
         en1->getController();
 
@@ -283 +298 @@
             if(time>1 && TowerDefenseEnemyvector.size() < 30)
             {
-                addTowerDefenseEnemy(path);
+
+                addTowerDefenseEnemy(path, rand() %3 +1 );
                 time = time-1;
             }

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

@@ -56 +56 @@
         std::vector<TowerDefenseEnemy*> TowerDefenseEnemyvector;
 
-        void addTowerDefenseEnemy(std::vector<TDCoordinate*> path);
+        void addTowerDefenseEnemy(std::vector<TDCoordinate*> path, int templatenr);
         virtual void start(); //<! The function is called when the gametype starts
         virtual void end();

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

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