Changeset 7042

Timestamp:

May 31, 2010, 1:41:26 PM (14 years ago)

Author:

dafrick

Message:

Updates in presentation level.

Location:

code/branches/presentation3/data

Files:

• gui/scripts/KeyBindMenu.lua (modified) (1 diff)
• gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• levels/PresentationFS10.oxw (modified) (4 diffs)

code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua

@@ -178 +178 @@
     end
 
-    pane = tolua.cast(window, "CEGUI::ScrollablePane")
+    local pane = tolua.cast(window, "CEGUI::ScrollablePane")
     pane:setVerticalStepSize(getScrollingStepSize(window))
 end

code/branches/presentation3/data/gui/scripts/SingleplayerMenu.lua

@@ -27 +27 @@
         end
     end
+
 end
 

code/branches/presentation3/data/levels/PresentationFS10.oxw

@@ -29 +29 @@
     <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 -->
 
@@ -42 +48 @@
       <pickup>
         <HealthPickup template=hugehealthpickup />
-      </pickup>
-    </PickupSpawner>
-
-    <PickupSpawner position="25,-50,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
-      <pickup>
-        <HealthPickup template=crazyhealthpickup />
       </pickup>
     </PickupSpawner>
@@ -73 +73 @@
     </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 />
@@ -107 +93 @@
     </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 />