[Orxonox-commit 2327] r7042 - in code/branches/presentation3/data: gui/scripts levels

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-05-31 13:41:26 +0200 (Mon, 31 May 2010)
New Revision: 7042

Modified:
   code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua
   code/branches/presentation3/data/gui/scripts/SingleplayerMenu.lua
   code/branches/presentation3/data/levels/PresentationFS10.oxw
Log:
Updates in presentation level.


Modified: code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua	2010-05-31 11:30:58 UTC (rev 7041)
+++ code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua	2010-05-31 11:41:26 UTC (rev 7042)
@@ -177,7 +177,7 @@
         window:addChildWindow(line)
     end
 
-    pane = tolua.cast(window, "CEGUI::ScrollablePane")
+    local pane = tolua.cast(window, "CEGUI::ScrollablePane")
     pane:setVerticalStepSize(getScrollingStepSize(window))
 end
 

Modified: code/branches/presentation3/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/presentation3/data/gui/scripts/SingleplayerMenu.lua	2010-05-31 11:30:58 UTC (rev 7041)
+++ code/branches/presentation3/data/gui/scripts/SingleplayerMenu.lua	2010-05-31 11:41:26 UTC (rev 7042)
@@ -26,6 +26,7 @@
             listbox:setItemSelectState(item, true)
         end
     end
+
 end
 
 function P.SingleplayerStartButton_clicked(e)

Modified: code/branches/presentation3/data/levels/PresentationFS10.oxw
===================================================================
--- code/branches/presentation3/data/levels/PresentationFS10.oxw	2010-05-31 11:30:58 UTC (rev 7041)
+++ code/branches/presentation3/data/levels/PresentationFS10.oxw	2010-05-31 11:41:26 UTC (rev 7042)
@@ -28,6 +28,12 @@
     <Billboard position="12.5, -30, -500" material="Banners/Pickups" scale="0.5"/>
     <Billboard position="500, -30, -500" material="Banners/Drone" scale="0.5"/>
 
+    <PickupSpawner position="500,-50,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+      <pickup>
+        <DronePickup template=dronepickup />
+      </pickup>
+    </PickupSpawner>
+
     <!-- Shield pickups -->
 
     <PickupSpawner position="-25,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
@@ -44,12 +50,6 @@
       </pickup>
     </PickupSpawner>
 
-    <PickupSpawner position="25,-50,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
-      <pickup>
-        <HealthPickup template=crazyhealthpickup />
-      </pickup>
-    </PickupSpawner>
-
     <!-- Speed pickups -->
 
     <PickupSpawner position="50,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
@@ -72,23 +72,9 @@
       </pickup>
     </PickupSpawner>
 
-    <!-- Meta pickups -->
-
-    <PickupSpawner position="0,-75,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
-      <pickup>
-        <MetaPickup metaType="use" />
-      </pickup>
-    </PickupSpawner>
-
-    <PickupSpawner position="-25,-75,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
-      <pickup>
-        <MetaPickup metaType="drop" />
-      </pickup>
-    </PickupSpawner>
-
     <!-- Pickup Collection pickups -->
 
-    <PickupSpawner position="0,-100,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+    <PickupSpawner position="0,-75,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
       <pickup>
         <PickupCollection template=triplehealthspeedinvisibilitypickup />
       </pickup>
@@ -106,7 +92,7 @@
       </pickup>
     </PickupRepresentation>
 
-    <PickupSpawner position="25,-100,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
+    <PickupSpawner position="25,-50,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
       <pickup>
         <HealthPickup health=50 activationType=onUse durationType=once />
       </pickup>