[Orxonox-commit 2387] r7102 - code/branches/presentation3/data/levels

[landauf at orxonox.net]

Author: landauf
Date: 2010-06-03 02:04:42 +0200 (Thu, 03 Jun 2010)
New Revision: 7102

Modified:
   code/branches/presentation3/data/levels/presentationFS10.oxw
Log:
drone-pirate shouldn't join the formation

Modified: code/branches/presentation3/data/levels/presentationFS10.oxw
===================================================================
--- code/branches/presentation3/data/levels/presentationFS10.oxw	2010-06-02 23:31:40 UTC (rev 7101)
+++ code/branches/presentation3/data/levels/presentationFS10.oxw	2010-06-03 00:04:42 UTC (rev 7102)
@@ -6,14 +6,14 @@
 <?lua
   include("templates/lodinformation.oxt")
   include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceship_pirate.oxt")
   include("templates/spaceship_swallow.oxt")
   include("templates/pickup_representation_templates.oxt")
 ?>
 
 <Level
  name         = "Sample"
- description  = "Just a few tests"
+ description  = "Just a few tests"
  gametype     = TeamDeathmatch
 >
   <templates>
@@ -33,68 +33,68 @@
     <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
 
     <Billboard position="12.5, -30, -500" material="Banners/Pickups" scale="0.5"/>
-    <Billboard position="500, -30, -500" material="Banners/Drone" scale="0.5"/>
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=pirate />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="500, -50, -500" distance=20 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <Billboard position="1000, -30, -500" material="Banners/Formation" scale="0.5"/>
-    <Billboard position="1000, -50, -500" material="Examples/Flare" scale="0.5"/>
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=formation />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="1000, -50, -500" distance=20 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <SpaceShip position="500,0,-1500">
-        <templates>
-          <Template link=spaceshippirate />
-        </templates>
-        <controller>
-          <AIController team=1 active=false name=pirate />
-        </controller>
+    <Billboard position="500, -30, -500" material="Banners/Drone" scale="0.5"/>
+    <EventDispatcher>
+      <targets>
+        <EventTarget target=pirate />
+      </targets>
+      <events>
+        <activity>
+          <DistanceTrigger position="500, -50, -500" distance=20 target="SpaceShip" stayactive=true />
+        </activity>
+      </events>
+    </EventDispatcher>
+
+    <Billboard position="1000, -30, -500" material="Banners/Formation" scale="0.5"/>
+    <Billboard position="1000, -50, -500" material="Examples/Flare" scale="0.5"/>
+    <EventDispatcher>
+      <targets>
+        <EventTarget target=formation />
+      </targets>
+      <events>
+        <activity>
+          <DistanceTrigger position="1000, -50, -500" distance=20 target="SpaceShip" stayactive=true />
+        </activity>
+      </events>
+    </EventDispatcher>
+
+    <SpaceShip position="500,0,-1500">
+        <templates>
+          <Template link=spaceshippirate />
+        </templates>
+        <controller>
+          <AIController team=1 active=false name=pirate formationFlight=false passive=false />
+        </controller>
     </SpaceShip>
-
-
-    <?lua
-      for i = 1, 10, 1 do
-        ?>
-      <SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
-        <templates>
-          <Template link=spaceshippirate />
-        </templates>
-        <controller>
-          <AIController formationFlight=true passive=true team=0 name=formation active=false />
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-
-    <?lua
-      for i = 1, 10, 1 do
-        ?>
-      <SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <AIController formationFlight=true passive=true team=1 name=formation active=false/>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
 
+
+    <?lua
+      for i = 1, 10, 1 do
+        ?>
+      <SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
+        <templates>
+          <Template link=spaceshippirate />
+        </templates>
+        <controller>
+          <AIController formationFlight=true passive=true team=0 name=formation active=false />
+        </controller>
+      </SpaceShip>
+    <?lua end ?>
+
+
+    <?lua
+      for i = 1, 10, 1 do
+        ?>
+      <SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
+        <templates>
+          <Template link=spaceshipassff />
+        </templates>
+        <controller>
+          <AIController formationFlight=true passive=true team=1 name=formation active=false/>
+        </controller>
+      </SpaceShip>
+    <?lua end ?>
+
     <PickupSpawner position="500,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
       <pickup>
         <DronePickup template=dronepickup />