Skip to content

Commit e0a1455

Browse files
authoredAug 4, 2023
Merge pull request #31 from TheRealDjmr/patch0hotfix1
Patch0hotfix1
2 parents 29000e1 + 3323aca commit e0a1455

File tree

3 files changed

+11
-829
lines changed

3 files changed

+11
-829
lines changed
 

‎ImprovedUI/Public/Game/GUI/StateMachine.xaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
<ls:State.InitialSubstates>
1010
<ls:InitialSubstate Name="EditorRoot"/>
1111
<ls:InitialSubstate Name="GameRoot"/>
12-
<!-- MOD START - Removes story message -->
13-
<!--<ls:InitialSubstate Name="SystemRoot"/>-->
14-
<!-- MOD END -->
12+
<ls:InitialSubstate Name="SystemRoot"/>
1513
</ls:State.InitialSubstates>
1614
</ls:State>
1715

@@ -27,11 +25,13 @@
2725

2826
<ls:State Name = "SystemRoot" Layout = "Common" Owner = "All">
2927
<ls:State.Events>
30-
<ls:StateEvent Name = "OpenSystemMessageBox">
28+
<!-- MOD START - Remove story message -->
29+
<!--<ls:StateEvent Name = "OpenSystemMessageBox">
3130
<ls:StateEvent.Actions>
3231
<ls:AddSubstate Name="SystemMessageBox"/>
3332
</ls:StateEvent.Actions>
34-
</ls:StateEvent>
33+
</ls:StateEvent> -->
34+
<!-- MOD END -->
3535
</ls:State.Events>
3636
</ls:State>
3737

@@ -276,7 +276,7 @@
276276
</ls:State.Widgets>
277277

278278
<ls:State.Events>
279-
<ls:StateEvent Name = "CloseWidget">
279+
<ls:StateEvent Name = "CloseWidget">
280280
<ls:StateEvent.Actions>
281281
<ls:RemoveState/>
282282
</ls:StateEvent.Actions>
@@ -357,14 +357,13 @@
357357
</ls:State.Widgets>
358358

359359
<ls:State.Events>
360-
<ls:StateEvent Name = "CloseWidget">
360+
<ls:StateEvent Name = "CloseWidget">
361361
<ls:StateEvent.Actions>
362362
<ls:RemoveState/>
363363
</ls:StateEvent.Actions>
364364
</ls:StateEvent>
365365
<ls:StateEvent Name = "OpenPinnedTooltips">
366366
<ls:StateEvent.Actions>
367-
<ls:PreloadState Name="PinnedTooltips"/>
368367
<ls:AddSubstate Name="PinnedTooltips"/>
369368
</ls:StateEvent.Actions>
370369
</ls:StateEvent>
@@ -381,7 +380,7 @@
381380
</ls:State.Widgets>
382381

383382
<ls:State.Events>
384-
<ls:StateEvent Name = "CloseWidget">
383+
<ls:StateEvent Name = "CloseWidget">
385384
<ls:StateEvent.Actions>
386385
<ls:RemoveState/>
387386
</ls:StateEvent.Actions>
@@ -470,6 +469,7 @@
470469
</ls:State.Events>
471470
</ls:State>
472471

472+
473473
<!--STATE: Paused-->
474474
<ls:State Name = "Paused" DisableStatesBelow = "True" Layout = "Player" Owner = "Player" HideStatesBelow = "True" IsModal="True" ForceSplitscreen="True" TutorialLayer="Paused">
475475
<ls:State.Widgets>
@@ -603,7 +603,7 @@
603603
</ls:State.InitialSubstates>
604604

605605
<ls:State.Events>
606-
<ls:StateEvent Name = "ToggleGameMenu">
606+
<ls:StateEvent Name = "ToggleGameMenu">
607607
<ls:StateEvent.Actions>
608608
<ls:PushState Name="Paused"/>
609609
</ls:StateEvent.Actions>
@@ -1559,7 +1559,7 @@
15591559
<ls:StateWidget Filename="AlwaysOnTopOverlay.xaml" Layer="MessageBox"/>
15601560
</ls:State.Widgets>
15611561
<ls:State.Events>
1562-
<ls:StateEvent Name = "GE.OnDialogueShow" />
1562+
<ls:StateEvent Name = "GE.OnDialogueShow" />
15631563
<ls:StateEvent Name = "OpenTrade">
15641564
<ls:StateEvent.Actions>
15651565
<ls:AddSubstate Name="Trade"/>

‎ImprovedUI/Public/Game/GUI/Widgets/Dialogue.xaml

-330
This file was deleted.

‎ImprovedUI/Public/Game/GUI/Widgets/Dialogue_c.xaml

-488
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.