Skip to content

Commit 051026b

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #26 from TheRealDjmr/Patch7hf2
Patch7hf2
2 parents d941ae1 + 303af45 commit 051026b

File tree

4 files changed

+143
-338
lines changed

4 files changed

+143
-338
lines changed

‎ImprovedUI/Public/Game/GUI/Library/DataTemplates.xaml

+21
Original file line numberDiff line numberDiff line change
@@ -2872,5 +2872,26 @@
28722872
<Rectangle x:Name="InventoryBlocker" Fill="{StaticResource LS_DisabledPanelColor}"
28732873
Visibility="{Binding IsContentEditable, Mode=OneWay, Converter={StaticResource BoolToCollapsedConverter}}"/>
28742874
</ControlTemplate>
2875+
2876+
<Style x:Key="TutorialCategoryStyle" TargetType="TextBlock">
2877+
<Setter Property="ls:TextBlockFormatter.SourceText" Value="{Binding Source='he162765ega290g4934ga287g65430dcac222', Converter={StaticResource TranslatedStringConverter}}"/>
2878+
<Style.Triggers>
2879+
<DataTrigger Binding="{Binding Tutorial.Category}" Value="Combat">
2880+
<Setter Property="ls:TextBlockFormatter.SourceText" Value="{Binding Source='h470a1dcfg4daag4f70g8f74g7c40dd9e56fe', Converter={StaticResource TranslatedStringConverter}}"/>
2881+
</DataTrigger>
2882+
2883+
<DataTrigger Binding="{Binding Tutorial.Category}" Value="Gameplay">
2884+
<Setter Property="ls:TextBlockFormatter.SourceText" Value="{Binding Source='h1e323305g61b3g4f01gb4dag9f9e4d9cf670', Converter={StaticResource TranslatedStringConverter}}"/>
2885+
</DataTrigger>
2886+
2887+
<DataTrigger Binding="{Binding Tutorial.Category}" Value="Character">
2888+
<Setter Property="ls:TextBlockFormatter.SourceText" Value="{Binding Source='h3c4dec9bgf673g4967gb69ag4a143056e291', Converter={StaticResource TranslatedStringConverter}}"/>
2889+
</DataTrigger>
2890+
2891+
<DataTrigger Binding="{Binding Tutorial.Category}" Value="Exploration">
2892+
<Setter Property="ls:TextBlockFormatter.SourceText" Value="{Binding Source='h4447b265g36e8g4ed2g9f91g96dcd20dd041', Converter={StaticResource TranslatedStringConverter}}"/>
2893+
</DataTrigger>
2894+
</Style.Triggers>
2895+
</Style>
28752896

28762897
</ResourceDictionary>

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

+12-232
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@
609609
<ls:State Name = "PlayerPanelsHolder" Layout = "Player" Owner = "Player">
610610
<ls:State.InitialSubstates>
611611
<ls:InitialSubstate Name="PlayerPanels"/>
612-
<ls:InitialSubstate Name="ExtractedPanels"/>
613612
<ls:InitialSubstate Name="PlayerRadials"/>
614613
</ls:State.InitialSubstates>
615614
</ls:State>
@@ -618,89 +617,7 @@
618617

619618
</ls:State>
620619

621-
<!-- STATE: ExtractedPanels - TO REMOVE -->
622-
<ls:State Name = "ExtractedPanels" Layout = "Player" Owner = "Player">
623-
<ls:State.Events>
624-
<ls:StateEvent Name = "ExtractEquipment">
625-
<ls:StateEvent.Actions>
626-
<ls:AddSubstate Name="ExtractedEquipment"/>
627-
</ls:StateEvent.Actions>
628-
</ls:StateEvent>
629-
<ls:StateEvent Name = "ExtractInventory">
630-
<ls:StateEvent.Actions>
631-
<ls:AddSubstate Name="ExtractedInventory"/>
632-
</ls:StateEvent.Actions>
633-
</ls:StateEvent>
634-
<ls:StateEvent Name = "ExtractCharacterSheet">
635-
<ls:StateEvent.Actions>
636-
<ls:AddSubstate Name="ExtractedCharacterSheet"/>
637-
</ls:StateEvent.Actions>
638-
</ls:StateEvent>
639-
<ls:StateEvent Name = "ExtractSpellBook">
640-
<ls:StateEvent.Actions>
641-
<ls:AddSubstate Name="ExtractedSpellBook"/>
642-
</ls:StateEvent.Actions>
643-
</ls:StateEvent>
644-
</ls:State.Events>
645-
</ls:State>
646-
647-
<!--STATE: Extracted Equipment - TO REMOVE -->
648-
<ls:State Name = "ExtractedEquipment" DisableStatesBelow = "False" Layout = "Player" Owner = "Player">
649-
<ls:State.Widgets>
650-
<ls:StateWidget Filename="ExtractedPanel.xaml" Layer="HUD"/>
651-
</ls:State.Widgets>
652-
<ls:State.Events>
653-
<ls:StateEvent Name = "CloseEquipmentPanel">
654-
<ls:StateEvent.Actions>
655-
<ls:RemoveState/>
656-
</ls:StateEvent.Actions>
657-
</ls:StateEvent>
658-
</ls:State.Events>
659-
</ls:State>
660-
661-
<!--STATE: Extracted Inventory - TO REMOVE -->
662-
<ls:State Name = "ExtractedInventory" DisableStatesBelow = "False" Layout = "Player" Owner = "Player">
663-
<ls:State.Widgets>
664-
<ls:StateWidget Filename="ExtractedPanel.xaml" Layer="HUD"/>
665-
</ls:State.Widgets>
666-
<ls:State.Events>
667-
<ls:StateEvent Name = "CloseInventoryPanel">
668-
<ls:StateEvent.Actions>
669-
<ls:RemoveState/>
670-
</ls:StateEvent.Actions>
671-
</ls:StateEvent>
672-
</ls:State.Events>
673-
</ls:State>
674-
675-
<!--STATE: Extracted Character Sheet - TO REMOVE -->
676-
<ls:State Name = "ExtractedCharacterSheet" DisableStatesBelow = "False" Layout = "Player" Owner = "Player">
677-
<ls:State.Widgets>
678-
<ls:StateWidget Filename="ExtractedPanel.xaml" Layer="HUD"/>
679-
</ls:State.Widgets>
680-
<ls:State.Events>
681-
<ls:StateEvent Name = "CloseCharSheetPanel">
682-
<ls:StateEvent.Actions>
683-
<ls:RemoveState/>
684-
</ls:StateEvent.Actions>
685-
</ls:StateEvent>
686-
</ls:State.Events>
687-
</ls:State>
688-
689-
<!--STATE: Extracted Spell Book - TO REMOVE -->
690-
<ls:State Name = "ExtractedSpellBook" DisableStatesBelow = "False" Layout = "Player" Owner = "Player">
691-
<ls:State.Widgets>
692-
<ls:StateWidget Filename="ExtractedPanel.xaml" Layer="HUD"/>
693-
</ls:State.Widgets>
694-
<ls:State.Events>
695-
<ls:StateEvent Name = "CloseSpellBookPanel">
696-
<ls:StateEvent.Actions>
697-
<ls:RemoveState/>
698-
</ls:StateEvent.Actions>
699-
</ls:StateEvent>
700-
</ls:State.Events>
701-
</ls:State>
702-
703-
<!--STATE: PlayerPanels - TO EDIT -->
620+
704621
<ls:State Name = "PlayerPanels" Layout = "Player" Owner = "Player">
705622
<ls:State.Events>
706623
<ls:StateEvent Name = "CloseAll">
@@ -763,26 +680,6 @@
763680
<ls:SetSubstate Name="TutorialPopup"/>
764681
</ls:StateEvent.Actions>
765682
</ls:StateEvent>
766-
<ls:StateEvent Name = "ToggleInventory">
767-
<ls:StateEvent.Actions>
768-
<ls:SetSubstate Name="PartyInventory"/>
769-
</ls:StateEvent.Actions>
770-
</ls:StateEvent>
771-
<ls:StateEvent Name = "ToggleEquipment">
772-
<ls:StateEvent.Actions>
773-
<ls:SetSubstate Name="PartyEquipment"/>
774-
</ls:StateEvent.Actions>
775-
</ls:StateEvent>
776-
<ls:StateEvent Name = "ToggleCharacterPane">
777-
<ls:StateEvent.Actions>
778-
<ls:SetSubstate Name="PartyCharacterSheet"/>
779-
</ls:StateEvent.Actions>
780-
</ls:StateEvent>
781-
<ls:StateEvent Name = "ToggleCharacterOverview">
782-
<ls:StateEvent.Actions>
783-
<ls:SetSubstate Name="CharacterOverview"/>
784-
</ls:StateEvent.Actions>
785-
</ls:StateEvent>
786683
<ls:StateEvent Name = "ToggleSpells">
787684
<ls:StateEvent.Actions>
788685
<ls:SetSubstate Name="CharacterPanel" Metadata="ToggleSpells"/>
@@ -816,145 +713,22 @@
816713
</ls:State.Events>
817714
</ls:State>
818715

819-
<!--STATE: PartyEquipment - TO REMOVE (Inventory) -->
716+
<!--Legacy states, they're still existing in the controller version -->
820717
<ls:State Name = "PartyEquipment" Layout = "Player" Owner = "Player">
821-
<ls:State.Widgets>
822-
<ls:StateWidget Filename="PartyEquipment.xaml" Layer="Panels"/>
823-
</ls:State.Widgets>
824718

825-
<ls:State.Events>
826-
<ls:StateEvent Name = "CloseWidget">
827-
<ls:StateEvent.Actions>
828-
<ls:RemoveState/>
829-
</ls:StateEvent.Actions>
830-
</ls:StateEvent>
831-
<ls:StateEvent Name = "CloseAllFullscreen">
832-
<ls:StateEvent.Actions>
833-
<ls:RemoveState/>
834-
</ls:StateEvent.Actions>
835-
</ls:StateEvent>
836-
<ls:StateEvent Name = "IE.ToggleEquipment">
837-
<ls:StateEvent.Actions>
838-
<ls:RemoveState/>
839-
</ls:StateEvent.Actions>
840-
</ls:StateEvent>
841-
<ls:StateEvent Name = "ToggleEquipment">
842-
<ls:StateEvent.Actions>
843-
<ls:RemoveState/>
844-
</ls:StateEvent.Actions>
845-
</ls:StateEvent>
846-
<ls:StateEvent Name = "IE.ToggleInGameMenu">
847-
<ls:StateEvent.Actions>
848-
<ls:RemoveState/>
849-
</ls:StateEvent.Actions>
850-
</ls:StateEvent>
851-
</ls:State.Events>
852719
</ls:State>
853720

854-
<!--STATE: PartyCharacterSheet - TO REPLACE -->
855721
<ls:State Name = "PartyCharacterSheet" Layout = "Player" Owner = "Player">
856-
<ls:State.Widgets>
857-
<ls:StateWidget Filename="PartyCharacterSheet.xaml" Layer="Panels"/>
858-
</ls:State.Widgets>
859-
860-
<ls:State.Events>
861-
<ls:StateEvent Name = "CloseWidget">
862-
<ls:StateEvent.Actions>
863-
<ls:RemoveState/>
864-
</ls:StateEvent.Actions>
865-
</ls:StateEvent>
866-
<ls:StateEvent Name = "CloseAllFullscreen">
867-
<ls:StateEvent.Actions>
868-
<ls:RemoveState/>
869-
</ls:StateEvent.Actions>
870-
</ls:StateEvent>
871-
<ls:StateEvent Name = "IE.ToggleCharacterPane">
872-
<ls:StateEvent.Actions>
873-
<ls:RemoveState/>
874-
</ls:StateEvent.Actions>
875-
</ls:StateEvent>
876-
<ls:StateEvent Name = "ToggleCharacterPane">
877-
<ls:StateEvent.Actions>
878-
<ls:RemoveState/>
879-
</ls:StateEvent.Actions>
880-
</ls:StateEvent>
881-
<ls:StateEvent Name = "IE.ToggleInGameMenu">
882-
<ls:StateEvent.Actions>
883-
<ls:RemoveState/>
884-
</ls:StateEvent.Actions>
885-
</ls:StateEvent>
886-
</ls:State.Events>
722+
887723
</ls:State>
888724

889-
<!--STATE: CharacterOverview - TO REMOVE-->
890725
<ls:State Name = "CharacterOverview" Layout = "Player" Owner = "Player">
891-
<ls:State.Widgets>
892-
<ls:StateWidget Filename="CharacterOverview.xaml" Layer="Panels"/>
893-
</ls:State.Widgets>
894-
895-
<ls:State.Events>
896-
<ls:StateEvent Name = "CloseWidget">
897-
<ls:StateEvent.Actions>
898-
<ls:RemoveState/>
899-
</ls:StateEvent.Actions>
900-
</ls:StateEvent>
901-
<ls:StateEvent Name = "CloseAllFullscreen">
902-
<ls:StateEvent.Actions>
903-
<ls:RemoveState/>
904-
</ls:StateEvent.Actions>
905-
</ls:StateEvent>
906-
<ls:StateEvent Name = "ToggleCharacterOverview">
907-
<ls:StateEvent.Actions>
908-
<ls:RemoveState/>
909-
</ls:StateEvent.Actions>
910-
</ls:StateEvent>
911-
<ls:StateEvent Name = "IE.ToggleInGameMenu">
912-
<ls:StateEvent.Actions>
913-
<ls:RemoveState/>
914-
</ls:StateEvent.Actions>
915-
</ls:StateEvent>
916-
</ls:State.Events>
726+
917727
</ls:State>
918728

919729

920-
<!--STATE: Inventory - TO REPLACE -->
921730
<ls:State Name = "PartyInventory" Layout = "Player" Owner = "Player">
922-
<ls:State.Widgets>
923-
<ls:StateWidget Filename="PartyInventory.xaml" Layer="Panels"/>
924-
</ls:State.Widgets>
925-
926-
<ls:State.Events>
927-
<ls:StateEvent Name = "CloseWidget">
928-
<ls:StateEvent.Actions>
929-
<ls:RemoveState/>
930-
</ls:StateEvent.Actions>
931-
</ls:StateEvent>
932-
<ls:StateEvent Name = "CloseAllFullscreen">
933-
<ls:StateEvent.Actions>
934-
<ls:RemoveState/>
935-
</ls:StateEvent.Actions>
936-
</ls:StateEvent>
937-
<ls:StateEvent Name = "IE.ToggleInventory">
938-
<ls:StateEvent.Actions>
939-
<ls:RemoveState/>
940-
</ls:StateEvent.Actions>
941-
</ls:StateEvent>
942-
<ls:StateEvent Name = "ToggleInventory">
943-
<ls:StateEvent.Actions>
944-
<ls:RemoveState/>
945-
</ls:StateEvent.Actions>
946-
</ls:StateEvent>
947-
<ls:StateEvent Name = "OpenSortInventory">
948-
<ls:StateEvent.Actions>
949-
<ls:SetSubstate Name="SortInventory"/>
950-
</ls:StateEvent.Actions>
951-
</ls:StateEvent>
952-
<ls:StateEvent Name = "IE.ToggleInGameMenu">
953-
<ls:StateEvent.Actions>
954-
<ls:RemoveState/>
955-
</ls:StateEvent.Actions>
956-
</ls:StateEvent>
957-
</ls:State.Events>
731+
958732
</ls:State>
959733

960734
<ls:State Name = "SortInventory" Layout = "Player" Owner = "Player" DisableStatesBelow="True">
@@ -1029,6 +803,12 @@
1029803
<ls:RemoveState/>
1030804
</ls:StateEvent.Actions>
1031805
</ls:StateEvent>
806+
807+
<ls:StateEvent Name = "CloseAllFullscreen">
808+
<ls:StateEvent.Actions>
809+
<ls:RemoveState/>
810+
</ls:StateEvent.Actions>
811+
</ls:StateEvent>
1032812

1033813
<ls:StateEvent Name = "IE.ToggleMap">
1034814
<ls:StateEvent.Actions>
@@ -2055,7 +1835,7 @@
20551835
<ls:State Name = "CombatLog" Layout = "Player" Owner = "Player" HideStatesBelow = "False"/>
20561836

20571837
<!--STATE: Tutorials - The modal tutorial showing and highlighting other UIs while explaining their use-->
2058-
<ls:State Name="Tutorial" DisableStatesBelow="True" Layout="Player" Owner="Player" IsModal="True">
1838+
<ls:State Name="Tutorial" DisableStatesBelow="True" Layout="Player" Owner="Player" IsModal="False">
20591839
<ls:State.Widgets>
20601840
<ls:StateWidget Filename="Tutorial.xaml" Layer="PopupPanels"/>
20611841
</ls:State.Widgets>

0 commit comments

Comments
 (0)