Changeset 11173 for code/branches/bindermFS16/data/gui

Timestamp:

Apr 21, 2016, 4:05:15 PM (9 years ago)

Author:

binderm

Message:

Campaignmenu improved, it's now possible to only show single levels and not all together.

Location:

code/branches/bindermFS16/data/gui

Files:

• layouts/CampaignMenu.layout (modified) (10 diffs)
• scripts/CampaignMenu.lua (modified) (1 diff)
• scripts/SingleplayerMenu.lua (modified) (1 diff)

code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout

@@ -8 +8 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
             <Property Name="Text" Value="Mission One" />
@@ -13 +14 @@
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.1,0},{0.65,0},{0.15,0}}" />
+            <Property Name="Disabled" Value="False" />
             <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
             <Property Name="Text" Value="Fight in our Back" />
@@ -23 +26 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
             <Property Name="Text" Value="Pirate Attack" />
@@ -31 +35 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
             <Property Name="Text" Value="Trip to Area 51" />
@@ -39 +44 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
             <Property Name="Text" Value="Area 51 under Fire" />
@@ -47 +53 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
             <Property Name="Text" Value="Escape the Bastards" />
@@ -55 +62 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
             <Property Name="Text" Value="Expedition to Sector 5C" />
@@ -63 +71 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
             <Property Name="Text" Value="Shuttle under Attack" />
@@ -71 +80 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
             <Property Name="Text" Value="Retaliation" />
@@ -80 +90 @@
         </Window>
 
-
         <Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
             <Property Name="Text" Value="Back" />
+            <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.85,0},{0.65,0},{0.9,0}}" />
+            <Property Name="Visible" Value="True"/>
+            <Property Name="Disabled" Value="False"/>
             <Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/> 
         </Window>
+
         <Window Type="MenuWidgets/StaticText" Name="orxonox/CampaignMenuCongratulation" >
             <Property Name="Text" Value="Campaign Completed!!!" />

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

@@ -19 +19 @@
 
 
-    if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
-        local label = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
-        label:setProperty("Visible","True")
+--    if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
+--        local label = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
+--        label:setProperty("Visible","True")
+--    end
+end
+
+function P.updateButton(index, button)
+    if (orxonox.LevelManager:getInstance():missionactivate(index)) then
+        button:setProperty("Visible", "True")
+        button:setProperty("Disabled", "False")
+    else
+        button:setProperty("Disabled", "True")
     end
 end
 
-function P.updateButton(index, button)
-    if (P.shouldDisplayButton(index)) then
-        button:setProperty("Visible", "True")
+--function P.shouldDisplayButton(index)
+--    local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
+--    return index < size
+--end
 
-        if (P.shouldEnableButton(index)) then
-            button:setProperty("Disabled", "False")
-        end
-    end
-end
+--function P.shouldActivateButton(index) --checks if button should be activated or not
+--    return index <= P.getIndexOfLastFinishedMission() + 1
+--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()
-    if (lastMission and lastMission ~= "") then
-        local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
-        local index = 0
-        while index < size do
-            local mission = orxonox.LevelManager:getInstance():getCampaignMission(index)
-            if (mission == lastMission) then 
-                return index
-            end
-            index = index + 1
-        end
-    end
-    return -1
-end
+--function P.getIndexOfLastFinishedMission()
+--    local lastMission = orxonox.LevelManager:getInstance():getLastFinishedCampaignMission()
+--    if (lastMission and lastMission ~= "") then
+--        local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
+--        local index = 0
+--        while index < size do
+--            local mission = orxonox.LevelManager:getInstance():getCampaignMission(index)
+--            if (mission == lastMission) then 
+--                return index
+--            end
+--            index = index + 1
+--        end
+--    end
+--    return -1
+--end
 
 function P.Mission1Button_clicked(e)

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

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