[Orxonox-commit 7401] r12018 - in code/branches/PresentationFS18: . data/levels src/modules/towerdefense

[patricwi at orxonox.net]

Author: patricwi
Date: 2018-05-30 14:44:47 +0200 (Wed, 30 May 2018)
New Revision: 12018

Modified:
   code/branches/PresentationFS18/
   code/branches/PresentationFS18/data/levels/towerDefense.oxw
   code/branches/PresentationFS18/src/modules/towerdefense/TowerDefense.cc
   code/branches/PresentationFS18/src/modules/towerdefense/TowerDefenseEnemy.cc
Log:
Merged TowerDefense

Index: code/branches/PresentationFS18
===================================================================
--- code/branches/PresentationFS18	2018-05-30 12:41:42 UTC (rev 12017)
+++ code/branches/PresentationFS18	2018-05-30 12:44:47 UTC (rev 12018)

Property changes on: code/branches/PresentationFS18
___________________________________________________________________
Modified: svn:mergeinfo
## -25,6 +25,7 ##
 /code/branches/StoryModeMap_HS16:11221-11358
 /code/branches/SuperOrxoBros_FS17:11365-11448
 /code/branches/SuperOrxoBros_FS18:11820-12016
+/code/branches/TowerDefense_FS18:11818-12017
 /code/branches/Waypoints_HS17:11496-11773
 /code/branches/ai:6592-7033
 /code/branches/ai2:8721-8880
Modified: code/branches/PresentationFS18/data/levels/towerDefense.oxw
===================================================================
--- code/branches/PresentationFS18/data/levels/towerDefense.oxw	2018-05-30 12:41:42 UTC (rev 12017)
+++ code/branches/PresentationFS18/data/levels/towerDefense.oxw	2018-05-30 12:44:47 UTC (rev 12018)
@@ -22,7 +22,7 @@
 <Template name=selectercameras defaults=0>
   <TowerDefenseSelecter>
     <camerapositions>
-      <CameraPosition position="0,0,1300" lookat="0,0,0" absolute=true drag=true mouselook=true/>
+      <CameraPosition position="0,0,1600" lookat="0,0,0" absolute=true drag=true mouselook=true/>
     </camerapositions>
   </TowerDefenseSelecter>
 </Template>
@@ -498,19 +498,19 @@
             F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
             F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
             F1F1F1I2F1F1F1F1F1F1F1Y1Y1Y1F1F1
-            F1F1F1I2F1F1F1F1F1F1F1F1F1F1F1F1
+            F1F1F1I2F1F1F1F1F1F1F1Y1F1Y1F1F1
             F1F1F1I2F1F1F1F1F1F1F1Y1Y1Y1F1F1
-            F1F1F1R2I3I3I3I3L3F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1I2F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1I2F1F1F1F1F1F1F1
-            X1I1I1I1R0F1F1F1I2F1F1F1F1F1F1F1
+            F1F1F1R2I3I3I3I3I3I3I3I3I3I3L3F1
+            F1F1F1F1F1F1F1F1F1F1F1F1F1F1I2F1
+            F1F1F1F1F1F1F1F1F1F1F1F1F1F1I2F1
+            X1I1I1I1R0F1F1F1F1F1F1F1F1F1I2F1
+            F1F1F1F1I0F1F1F1F1F1F1F1F1F1I2F1
+            F1F1F1F1I0F1F1F1F1F1F1F1F1F1I2F1
+            F1F1F1F1I0F1F1F1R1I1I1I1I1I1L2F1
             F1F1F1F1I0F1F1F1I2F1F1F1F1F1F1F1
             F1F1F1F1I0F1F1F1I2F1F1F1F1F1F1F1
-            F1F1F1F1L1I1I1I1L2F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1
-            F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1"
-    width=16
+            F1F1F1F1L1I1I1I1L2F1F1F1F1F1F1F1"
+    width=18
     height=16
     tileScale=100
     position="0,0,0"

Modified: code/branches/PresentationFS18/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/PresentationFS18/src/modules/towerdefense/TowerDefense.cc	2018-05-30 12:41:42 UTC (rev 12017)
+++ code/branches/PresentationFS18/src/modules/towerdefense/TowerDefense.cc	2018-05-30 12:44:47 UTC (rev 12018)
@@ -141,7 +141,8 @@
         this->setCredit(1000);
         this->setLifes(100);        
         this->timeSinceLastSpawn_ = 0.0;
-        this->timeUntilNextWave_ = 5.0;
+        // Veraenderung1: timeuntilnextwave von 5.0 auf 1.0 abgesetzt
+        this->timeUntilNextWave_ = 1.0;
         this->waveSize_ = 0;
         this->setWaveNumber(0);
     }
@@ -241,7 +242,8 @@
 
         if (fields_[x][y]->isFree() == true && getCredit() >= cost)
         {
-            payCredit(cost);
+            // Veraenderung 2 Paycredit von cost auf 0 gesetzt
+            payCredit(0);
             fields_[x][y]->createTower(1);
         }
     }
@@ -260,7 +262,8 @@
 
         if (fields_[x][y]->isFree() == false && fields_[x][y]->canUpgrade() == true && getCredit() >= cost)
         {
-            payCredit(cost);
+             // Veraenderung 3 Paycredit von cost auf 0 gesetzt
+            payCredit(0);
             fields_[x][y]->upgrade();
         }
     }    

Modified: code/branches/PresentationFS18/src/modules/towerdefense/TowerDefenseEnemy.cc
===================================================================
--- code/branches/PresentationFS18/src/modules/towerdefense/TowerDefenseEnemy.cc	2018-05-30 12:41:42 UTC (rev 12017)
+++ code/branches/PresentationFS18/src/modules/towerdefense/TowerDefenseEnemy.cc	2018-05-30 12:44:47 UTC (rev 12018)
@@ -47,6 +47,7 @@
         
         if (getGame() && once_ == false && getHealth() <= 0)
         {
+            
             getGame()->addCredit(1);
             once_ = true;
         }