[Orxonox-commit 5082] r9746 - code/branches/levelMichael/data/levels

[schlaem at orxonox.net]

Author: schlaem
Date: 2013-11-04 16:03:59 +0100 (Mon, 04 Nov 2013)
New Revision: 9746

Modified:
   code/branches/levelMichael/data/levels/Spacefight.oxw
Log:
Pirate-problem is still existing
and the Pickup is not visibel

Modified: code/branches/levelMichael/data/levels/Spacefight.oxw
===================================================================
--- code/branches/levelMichael/data/levels/Spacefight.oxw	2013-11-04 15:00:56 UTC (rev 9745)
+++ code/branches/levelMichael/data/levels/Spacefight.oxw	2013-11-04 15:03:59 UTC (rev 9746)
@@ -40,6 +40,7 @@
 
   <?lua include("includes/notifications.oxi") ?>
 
+
   <NotificationQueueCEGUI
     name="narrative"
     targets="simpleNotification"
@@ -57,6 +58,8 @@
     skybox       = "Orxonox/Starbox"
   >
 
+  <?lua include("includes/pickups.oxi") ?>
+
  <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
 
 <!-- QUESTS & SPAWNTRIGGER -->
@@ -79,6 +82,10 @@
 	  </events>
 	</EventMultiTrigger>
 
+    <!-- Drone pickup -->
+    
+    <PickupSpawner pickup=dronepickup position="50,0,0" triggerDistance="10" respawnTime="0" maxSpawnedItems="2" />
+
 <!-- QUEST DESCRIPTION-->
 
 	<LocalQuest id="spacefight.flying1">
@@ -604,13 +611,13 @@
 	<!-- links vor guard 1 -->	
 	<?lua
 		dofile("includes/asteroidField.lua")
-		asteroidField(-5000, -5000, -20000, 100, 300, 10000, 50, 1)
+		asteroidField(-5000, -5000, -20000, 20, 50, 10000, 200, 0)
 	?>
 
 	<!-- links hinter guard 1 -->
 	<?lua
 		dofile("includes/asteroidField.lua")
-		asteroidField(20000, -10000, -12000, 50, 1000, 10000, 40, 0)
+		asteroidField(20000, -10000, -12000, 30, 100, 10000, 200, 0)
 	?>
 
 	<!-- zwischen guard 2 & mainship -->
@@ -623,12 +630,12 @@
 	<!-- Peripherie -->
 	<?lua
 		dofile("includes/asteroidField.lua")
-		asteroidField(-5000, -10000, 30000, 10, 500, 10000, 20, 0)
+		asteroidField(-5000, -10000, 30000, 10, 50, 10000, 100, 0)
 	?>
 
 	<?lua
       		dofile("includes/asteroidField.lua")
-		asteroidBelt(-10000, -12500, 0, 0, 0, 30, 30, 300, 0, 7850, 150, 0)
+		asteroidBelt(-10000, -12500, 0, 0, 0, 30, 30, 500, 0, 7850, 150, 0)
     	?>