[Orxonox-commit 6239] r10896 - in code/branches/campaignHS15/data/levels: . templates

[bhatiab at orxonox.net]

Author: bhatiab
Date: 2015-11-30 15:56:04 +0100 (Mon, 30 Nov 2015)
New Revision: 10896

Modified:
   code/branches/campaignHS15/data/levels/expeditionSector.oxw
   code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt
Log:
Added Waypoints for enemies

Modified: code/branches/campaignHS15/data/levels/expeditionSector.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/expeditionSector.oxw	2015-11-30 14:55:02 UTC (rev 10895)
+++ code/branches/campaignHS15/data/levels/expeditionSector.oxw	2015-11-30 14:56:04 UTC (rev 10896)
@@ -49,6 +49,8 @@
         cPathToEntry = {{0, -2000, 0}}
         cBeacon = {-6500, -5500, -4400}
 
+        radSector = 12000
+
 	      cStationA = {1400, 400, -800}
         cNewShip = {1000, 250, -350}
 
@@ -66,6 +68,11 @@
         function printC(coord)
           print(coord[1] .. [[,]] .. coord[2] .. [[,]] .. coord[3])
         end
+
+        --[[ Function to add Coordinates.]]--
+        function addC(coord1, coord2)
+            return {coord1[1]+coord2[1], coord1[2]+coord2[2], coord1[3]+coord2[3]}
+        end
     ?>
 
     <Scene
@@ -270,6 +277,15 @@
 
     <!--ELEMENTS -->
 
+    <?lua
+    for i = 1, 64, 1
+    do
+    rBillboard = {math.sin(i*math.pi/32)*radSector, 0, math.cos(i*math.pi/32)*radSector}
+    cBillNow = addC(cSector,rBillboard)
+    ?>
+    <Billboard position="<?lua printC(cBillNow) ?>"  scale=10 material="Flares/lensflare" colour="1,0.2,0.2"/>
+    <?lua end ?>
+
     <!-- Asteroids you have to fly through to get to the EnemyBase -->
 
     <?lua
@@ -399,7 +415,23 @@
     <?lua end ?>
     <?lua end ?>
 
-    
+    <SpaceShip visible=true active=true name="Enemies" radarname="Attacker" position="-2700,-800,-800" lookat="0,0,0" team=1>
+    <templates>
+        <Template link=spaceshipescort />
+    </templates>
+    <controller>
+      <WaypointController accuracy=10 team=3>
+        <waypoints>
+            <Model mesh="cube.mesh" scale=8 position="-2700,-800,-800" />
+            <Model mesh="cube.mesh" scale=8 position="-3400,-1200,-200" />
+            <Model mesh="cube.mesh" scale=8 position="-1600,-1000,-200" />
+            <Model mesh="cube.mesh" scale=8 position="-2000,-1600,-1700" />
+            <StaticEntity position="-2700,-800,-800" />
+        </waypoints>
+      </WaypointController>
+    </controller>
+</SpaceShip>
 
+
     </Scene>
 </Level>

Modified: code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt
===================================================================
--- code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt	2015-11-30 14:55:02 UTC (rev 10895)
+++ code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt	2015-11-30 14:56:04 UTC (rev 10896)
@@ -23,7 +23,7 @@
       <MultiStateEngine position=" 0, 0, 0" template=spaceshipTransporterengine />
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Transporter.mesh" />
+      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Spaceshiptransporter.mesh" />
     </attached>
     <collisionShapes>
       <!--TODO: real collision shapes -->