[Orxonox-commit 6233] r10890 - code/branches/campaignHS15/data/levels

[bhatiab at orxonox.net]

Author: bhatiab
Date: 2015-11-30 10:26:22 +0100 (Mon, 30 Nov 2015)
New Revision: 10890

Modified:
   code/branches/campaignHS15/data/levels/expeditionSector.oxw
Log:
removed the other enemystations, as one should be enough, added enemies and fixed their coordinates, too many of them cause performance issues, so just 25 enemies at the moment

Modified: code/branches/campaignHS15/data/levels/expeditionSector.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/expeditionSector.oxw	2015-11-29 20:05:26 UTC (rev 10889)
+++ code/branches/campaignHS15/data/levels/expeditionSector.oxw	2015-11-30 09:26:22 UTC (rev 10890)
@@ -53,11 +53,7 @@
 
       	cEnemyBasePlanet = {-20000, -5500, -8000}
 
-        cEnemyBaseStation1 = {-15000, -5000, -4000}
-        --[[
-        cEnemyBaseStation2 = {-16000, -5500, -4000}
-        cEnemyBaseStation3 = {-14000, -4500, -4000}
-        ]]--
+        cEnemyBaseStation1 = {-12500, -4500, -3500}
 
 	      cField1 = {-5000, -4000, -3000}
  	      cField2 = {4000, 2000, 4500}
@@ -240,22 +236,6 @@
         </templates>
     </Pawn>
 
-    <!--TODO: The Other Stations are flying away...
-
-    <Pawn name="statB" team=1 radarname="EnemyBase" position="<?lua printC(cEnemyBaseStation2) ?>" direction="<?lua printC(cSpawn) ?>" yaw=45 pitch=-5 roll=-25 initialhealth=10000 maxhealth=10000 >
-        <templates>
-            <Template link="station" />
-        </templates>
-    </Pawn>
-
-    <Pawn name="statB" team=1 radarname="EnemyBase" position="<?lua printC(cEnemyBaseStation3) ?>" direction="<?lua printC(cSpawn) ?>" yaw=45 pitch=-5 roll=-25 initialhealth=10000 maxhealth=10000 >
-        <templates>
-            <Template link="station" />
-        </templates>
-    </Pawn>
-
-  -->
-
     <!-- New SpaceShip as destination of dock A-->
     <SpaceShip
             template            = "spaceshipassff"
@@ -390,28 +370,25 @@
       </collisionShapes>
     </Planet>
 
-    <!--TODO: Fix Enemies and their coordinates
-
     <?lua
-      rows = 10
-      colomns = 10
-      for k = 1, rows, 1
+      xi = 5
+      zi = 5
+      for k = 1, xi, 1
       do
     ?>
     <?lua
-      for i = 1, colomns, 1
+      for j = 1, zi, 1
       do
-      x = -10000+k*100
-      y = -5000+i*100
+      x = -2500+k*100
+      z = -4400+j*100
     ?>
-    <SpaceShip visible=false active=false name="Enemies" radarname="Attacker" position="<?lua print(y)?>,-4000,<?lua print(x)?>" lookat="0,0,0" team=1>
+    <SpaceShip visible=true active=false name="Enemies" radarname="Attacker" position="-11000,<?lua print(z)?>,<?lua print(x)?>" lookat="0,0,0" team=1>
         <templates>
             <Template link="spaceshippirate" />
         </templates>
     </SpaceShip>
     <?lua end ?>
     <?lua end ?>
-  -->
 
     </Scene>
 </Level>