[Orxonox-commit 4337] r9008 - code/branches/presentation2011/data/levels

[jo at orxonox.net]

Author: jo
Date: 2011-12-20 21:39:41 +0100 (Tue, 20 Dec 2011)
New Revision: 9008

Modified:
   code/branches/presentation2011/data/levels/asteroidField.oxw
   code/branches/presentation2011/data/levels/presentationHS11.oxw
Log:
Working on the levels.

Modified: code/branches/presentation2011/data/levels/asteroidField.oxw
===================================================================
--- code/branches/presentation2011/data/levels/asteroidField.oxw	2011-12-20 20:29:09 UTC (rev 9007)
+++ code/branches/presentation2011/data/levels/asteroidField.oxw	2011-12-20 20:39:41 UTC (rev 9008)
@@ -12,7 +12,7 @@
 ?>
 
 <?lua
-  include("templates/spaceshipAssff2.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
 ?>
 
@@ -32,7 +32,7 @@
   >
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
 
 
 

Modified: code/branches/presentation2011/data/levels/presentationHS11.oxw
===================================================================
--- code/branches/presentation2011/data/levels/presentationHS11.oxw	2011-12-20 20:29:09 UTC (rev 9007)
+++ code/branches/presentation2011/data/levels/presentationHS11.oxw	2011-12-20 20:39:41 UTC (rev 9008)
@@ -29,7 +29,37 @@
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
 
+    <Script code="formationcontroller formationflight true" onLoad="true">
+    </Script> <!-- activate formation behaviour-->
 
+    <Script code="artificialcontroller setbotlevel 0.1" onLoad="true">
+    </Script> <!-- make bots "friendly", doesn't work yet :-( -->
+
+    <SpaceShip position="3000,0,5000" lookat="-1300,-600,900" name="attacker" visible="true">
+        <!--events>
+            <visibility>
+                <EventListener event="ondock" />
+            </visibility>
+        </events-->
+        <templates>
+            <Template link=spaceshipassff /> <!--spaceshipTransporter spaceshippirate-->
+        </templates>
+        <controller>
+            <AIController team=0>
+                <!--events>
+                    <activity>
+                        <EventListener event="attack" />
+                     </activity>
+                </events-->
+            </AIController>
+        </controller>
+    </SpaceShip>
+
+
+
+
+<!-- ACTUAL LEVEL -->
+
 <!-- Generate asteroid field and asteroid belt -->
 <!-- asteroidBelt(centerX, centerY, centerZ, yaw, pitch, segments, minSize, maxSize, radius0, radius1, count, fog) --> 
     <?lua