Changeset 9127 for code/branches/shipSelection/data

Timestamp:

Apr 27, 2012, 3:56:15 PM (13 years ago)

Author:

huttemat

Message:

shipselection core works now

Location:

code/branches/shipSelection/data

Files:

• gui/scripts/ShipSelectionMenu.lua (modified) (2 diffs)
• gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• levels/tutorial.oxw (modified) (2 diffs)

code/branches/shipSelection/data/gui/scripts/ShipSelectionMenu.lua

@@ -16 +16 @@
 
    P.shipList = {}
+
+  --for line in io.lines("../levels/templates/.shipmodels") do  orxonox.execute("orxout user_warning " .. line) end
+  for line in io.lines("../levels/templates/.shipmodels") do  
+        P.shipList[#P.shipList+1] = string.lower(line)
+  end 
    --[[for f in io.lines("../levels/templates/.shipmodels") do
         if selectedlevel:hasShip(f) then
@@ -151 +156 @@
     end
 end
---]]
+
 function P.ShipSelectionStartButton_clicked(e)
 
     if selectedlevel ~= nil then
-        selectedlevel:selectShip("meinModell")
-        --orxonox.execute("startGame " .. selectedlevel:getXMLFilename())
+        selectedlevel:selectShip(P.ShipSelectionGetSelectedLevel())
+        orxonox.execute("startGame " .. "_temp.oxw")
         hideAllMenuSheets()
     else

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

@@ -47 +47 @@
     while index < size do
         level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
-        if level ~= nil then
+        if (level ~= nil and level:getXMLFilename() ~= "_temp.oxw") then
+            --os.execute("echo " .. level:getXMLFilename() .." >> ~/outputorx")
             local levelXMLFilename = level:getXMLFilename()
             -- create an imageset for each screenshot

code/branches/shipSelection/data/levels/tutorial.oxw

@@ -4 +4 @@
  tags = "tutorial, shipselection"
  screenshot = "codingtutorial.png"
- startingships = "spaceshipGhost, spaceshipPirate, spaceshipSpacecruiser"
+ startingships = "spaceshipghost, spaceshippirate, spaceshipspacecruiser"
 />
 
@@ -11 +11 @@
   include("stats.oxo")
   include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipGhost.oxt")
+  include("templates/spaceshipSpacecruiser.oxt")
   include("templates/lodInformation.oxt")
 ?>