Changeset 10325

Timestamp:

Mar 19, 2015, 3:59:26 PM (10 years ago)

Author:

erbj

Message:

tower templates verwaltet und tower direkt turret, nicht eigenes objekt

Location:

code/branches/towerdefenseFS15

Files:

• data/levels/templates/tower.oxt (deleted)
• data/levels/templates/towerdefensetower.oxt (added)
• data/levels/towerDefense.oxw (modified) (3 diffs)
• src/modules/towerdefense/TowerDefense.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseTower.cc (modified) (2 diffs)

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

@@ -20 +20 @@
   include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
-  include("templates/tower.oxt")
+  include("templates/towerdefensetower.oxt")
   include("templates/enemytowerdefense.oxt")
   include("templates/standardTurret.oxt")
@@ -42 +42 @@
   </Pawn>
 </Template>
-
-
-<!-- Template for a tower   EDIT: new towertemplate is included with "templates/tower" -->
-<!--Template name=towertemplate>
-  <Tower>
-    <attached>
-      <Model position="0,0,0" scale=0.25 mesh="Tower_ME.mesh" />
-    </attached>
-  </Tower>
-</Template-->
-
-
-
 
 
@@ -114 +101 @@
     height=16
     tileScale=100
-    towerTemplate=tower
     position="0,0,0"
     direction="0,0,0"

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

@@ -154 +154 @@
         //set initial credits, lifes and WaveNumber
         this->setCredit(1000);
-        this->setLifes(50);
+        this->setLifes(25);
         this->setWaveNumber(0);
         time=0.0;
@@ -278 +278 @@
         //Creates tower
         TowerDefenseTower* towernew = new TowerDefenseTower(this->center_->getContext());
-        towernew->addTemplate("towerturret");
         towernew->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 75);
         towernew->setGame(this);

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

@@ -53 +53 @@
         this->width_ = 15;
         this->height_ = 15;
-        this->towerTemplate_ = "";
 
         //this->setCollisionType(Static);
@@ -72 +71 @@
         XMLPortParam(TowerDefenseCenterpoint, "height", setHeight, getHeight, xmlelement, mode);
         XMLPortParam(TowerDefenseCenterpoint, "tileScale", setTileScale, getTileScale, xmlelement, mode);
-        XMLPortParam(TowerDefenseCenterpoint, "towerTemplate", setTowerTemplate, getTowerTemplate, xmlelement, mode);
 
         //TODO: add XMLPortObject(TowerDefenseCenterpoint, WorldEntity, "waypoints", addWaypoint, getWaypoint,  xmlelement, mode);

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

@@ -79 +79 @@
                 { return this->tileScale_; }
 
-            /**
-            @brief Set the template for the towers.
-            @param template The template name to be applied to each tower.
-            */
-            void setTowerTemplate(const std::string& templateName)
-                { this->towerTemplate_ = templateName; }
-
-            const std::string& getTowerTemplate(void) const
-                { return this->towerTemplate_; }
-
         private:
             void checkGametype();
@@ -95 +85 @@
             unsigned int height_;
             unsigned int tileScale_;
-
-            std::string towerTemplate_;
     };
 }

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

@@ -26 +26 @@
         RegisterObject(TowerDefenseTower);
         game_ =NULL;
-        this->setCollisionType(WorldEntity::Dynamic);
+        this->setCollisionType(WorldEntity::None);
         upgrade = 0;
-
+        this->addTemplate("towerdefensetower");
 
 
@@ -70 +70 @@
             setReloadRate(reloadrate);
             setReloadWaitTime(reloadwaittime);
-            this->addTemplate("towerturret1");
+            //this->addTemplate("towerturret1");
         }
         else