Changeset 11316 for code

Timestamp:

Dec 5, 2016, 3:57:07 PM (8 years ago)

Author:

jhuwyler

Message:

Durch fehlen von Imagesetts konnte nicht alles gemacht werden. Die Levelnamen wurden in eigenen Buttons auf der Map platziert. Sie werden auch geupdated und brauchen noch ein Buttonlayout. Zudem muss das Probelm vom vorigen Mal noch gemacht werden.

Location:

code/branches/StoryModeMap_HS16/data

Files:

• gui/layouts/CampaignMenu.layout (modified) (10 diffs)
• gui/schemes/OrxonoxHUDWidgets.scheme (modified) (1 diff)
• gui/schemes/OrxonoxLook.scheme (modified) (1 diff)
• gui/scripts/CampaignMenu.lua (modified) (1 diff)
• levels/StoryModeMap.oxw (modified) (1 diff)

code/branches/StoryModeMap_HS16/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/JuuButton" Name="orxonox/Mission1Button" >
+
+        <!-- Misson 1************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission1Text" >
             <Property Name="Text" Value="Mission One" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
+        </Window>
+
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -15 +22 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission2Button" >
+
+        <!-- Misson 2************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission2Text" >
             <Property Name="Text" Value="Fight in our Back" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
+        </Window>
+
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -23 +37 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission3Button" >
+
+        <!-- Misson 3************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission3Text" >
             <Property Name="Text" Value="Pirate Attack" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.75,0},{0.8,0},{0.8,0}}" />
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
+
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -31 +52 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission4Button" >
+
+        <!-- Misson 4************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission4Text" >
             <Property Name="Text" Value="Trip to Area 51" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.575,0},{0.5,0},{0.775,0},{0.55,0}}" />
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
+
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -39 +67 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission5Button" >
+
+        <!-- Misson 5************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission5Text" >
             <Property Name="Text" Value="Area 51 under Fire" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.625,0},{0.4,0},{0.825,0},{0.45,0}}" />
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
+
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -47 +82 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission6Button" >
+
+        <!-- Misson 6************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission6Text" >
             <Property Name="Text" Value="Escape the Bastards" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.1,0},{0.725,0},{0.15,0}}" />
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
+
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -55 +97 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission7Button" >
+
+        <!-- Misson 7************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission7Text" >
             <Property Name="Text" Value="Expedition to Sector 5C" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
+
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -63 +112 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission8Button" >
+
+        <!-- Misson 8************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission8Text" >
             <Property Name="Text" Value="Shuttle under Attack" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2,0},{0.45,0},{0.25,0}}" />
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
+
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -71 +127 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
         </Window>
-        <Window Type="MenuWidgets/JuuButton" Name="orxonox/Mission9Button" >
+
+        <!-- Misson 9************************************* -->
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/Mission9Text" >
             <Property Name="Text" Value="Retaliation" />
+            <Property Name="Visible" Value="False"/>
+            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.145,0},{0.3,0},{0.195,0}}" />
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
+
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -80 +143 @@
         </Window>
 
-
+        <!-- Back Button************************************* -->
         <Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
             <Property Name="Text" Value="Back" />

code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxHUDWidgets.scheme

@@ -41 +41 @@
     <WindowAlias Alias="HUDWidgets/Tree"                     Target="OrxonoxLook/Tree" />
 
-    <WindowAlias Alias="HUDWidgets/JuuButton"              Target="OrxonoxLook/JuuButton" />
+    <WindowAlias Alias="HUDWidgets/ImageButton"              Target="OrxonoxLook/JuuButton" />
 </GUIScheme>

code/branches/StoryModeMap_HS16/data/gui/schemes/OrxonoxLook.scheme

@@ -52 +52 @@
     <FalagardMapping WindowType="OrxonoxLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"         LookNFeel="OrxonoxLook/LargeVerticalScrollbarThumb" />
 
+    <!-- Special Button for CampaignMenu -->
     <FalagardMapping WindowType="OrxonoxLook/JuuButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="OrxonoxLook/JuuButton" />
 

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

@@ -9 +9 @@
 function P.updateButtons()
     P.updateButton(0, winMgr:getWindow("orxonox/Mission1Button"))
+    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Text"))
     P.updateButton(1, winMgr:getWindow("orxonox/Mission2Button"))
+    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Text"))
     P.updateButton(2, winMgr:getWindow("orxonox/Mission3Button"))
+    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Text"))
     P.updateButton(3, winMgr:getWindow("orxonox/Mission4Button"))
+    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Text"))
     P.updateButton(4, winMgr:getWindow("orxonox/Mission5Button"))
+    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Text"))
     P.updateButton(5, winMgr:getWindow("orxonox/Mission6Button"))
+    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Text"))
     P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
+    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Text"))
     P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
+    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Text"))
     P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
+    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Text"))
 
 

code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw

@@ -3 +3 @@
 <LevelInfo
  name = "StoryModeMap"
- description = "Level that should have planets with different missions in it"
- tags = "test"
+ description = "The Campaign Menu Map with all the Campaignmissons in it"
+ tags = "Campaign, Campaignmissons"
  screenshot = "emptylevel.png"
 />