Changeset 11206 for code/branches/presentationFS16/data/gui/scripts

Timestamp:

May 26, 2016, 4:15:54 PM (8 years ago)

Author:

fvultier

Message:

merged campain menu

Location:

code/branches/presentationFS16

Files:

• . (modified) (1 prop)
• data/gui/scripts/CampaignMenu.lua (modified) (1 diff)
• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)

code/branches/presentationFS16/data/gui/scripts/CampaignMenu.lua

@@ -17 +17 @@
     P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
     P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
+end
 
 
-    if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
-        local label = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
-        label:setProperty("Visible","True")
+function P.updateButton(index, button)
+    local lastMission = orxonox.LevelManager:getInstance():getLastWonMission()
+    if (lastMission == "") then
+    else
+        local lastwon =P.getIndexOfLastFinishedMission()
+        orxonox.LevelManager:getInstance():updatewon(lastwon)
+    end
+
+    local test =orxonox.LevelManager:getInstance():missionactivate(index)
+
+    if (test==1) then
+        button:setProperty("Visible", "True")
+        button:setProperty("Disabled", "False")
+    elseif (test==2) then
+        button:setProperty("Visible", "True")
+        button:setProperty("Disabled", "True")
+    else
+        button:setProperty("Visible", "False")
+        button:setProperty("Disabled", "True")
     end
 end
 
-function P.updateButton(index, button)
-    if (P.shouldDisplayButton(index)) then
-        button:setProperty("Visible", "True")
-
-        if (P.shouldEnableButton(index)) then
-            button:setProperty("Disabled", "False")
-        end
-    end
-end
-
-function P.shouldDisplayButton(index)
-    local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
-    return index < size
-end
-
-function P.shouldEnableButton(index)
-    return index <= P.getIndexOfLastFinishedMission() + 1
-end
-
 function P.getIndexOfLastFinishedMission()
-    local lastMission = orxonox.LevelManager:getInstance():getLastFinishedCampaignMission()
+    local lastMission = orxonox.LevelManager:getInstance():getLastWonMission()
     if (lastMission and lastMission ~= "") then
         local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()

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

@@ -172 +172 @@
 
 function P.CampaignButton_clicked(e)
+--    P.test()
     showMenuSheet("CampaignMenu", true)
 end
 
+--function P.test()
+--    orxonox.CampaignMenu:test()
+--end
+
 return P