Skip to content

Commit 86f1b3f

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #168 from TheRealDjmr/patch4
Patch4
2 parents 736bc62 + 6475460 commit 86f1b3f

11 files changed

+1526
-1124
lines changed

‎ImprovedUI/Mods/ImprovedUI/meta.lsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<children>
77
<node id="Dependencies"/>
88
<node id="ModuleInfo">
9-
<attribute id="Author" type="LSString" value="AlanaSP,ShinyHobo,Djmr"/>
9+
<attribute id="Author" type="LSString" value="AlanaSP,ShinyHobo,Djmr,Zee"/>
1010
<attribute id="CharacterCreationLevelName" type="FixedString" value=""/>
1111
<attribute id="Description" type="LSString" value=""/>
1212
<attribute id="Folder" type="LSString" value="ImprovedUI"/>
@@ -22,10 +22,10 @@
2222
<attribute id="Tags" type="LSString" value=""/>
2323
<attribute id="Type" type="FixedString" value="Add-on"/>
2424
<attribute id="UUID" type="FixedString" value="00000000-0000-0000-0000-ImprovedUI12"/>
25-
<attribute id="Version" type="int64" value="109775245212123136"/>
25+
<attribute id="Version" type="int64" value="109915978405511168"/>
2626
<children>
2727
<node id="PublishVersion">
28-
<attribute id="Version" type="int64" value="109775245212123136"/>
28+
<attribute id="Version" type="int64" value="109915978405511168"/>
2929
</node>
3030
<node id="Scripts"/>
3131
<node id="TargetModes">

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

+660-527
Large diffs are not rendered by default.

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

+478-158
Large diffs are not rendered by default.

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

+3-56
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- This is a file that is overwritten in ImprovedUI for Action Resources in CC/Levelup Keyboard UI. Entries here are optional as the tooltip action resource will be used if no entry exists here -->
1+
<!-- This is a null file that will be overridden by ImprovedUI Assets. The same entries are still required here to populate on CC without ImprovedUI Assets. -->
22

33
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -10,13 +10,7 @@
1010
xmlns:noesis="clr-namespace:NoesisGUIExtensions;assembly=Noesis.GUI.Extensions"
1111
mc:Ignorable="d">
1212

13-
<ResourceDictionary.MergedDictionaries>
14-
<!-- Revert to Action Resource icon when icon is missing -->
15-
<ResourceDictionary Source="../Library/IUI_ActionResourceIcons.xaml"/>
16-
</ResourceDictionary.MergedDictionaries>
17-
18-
<!-- This is the icon that appears when the action resource is given during CC/level up -->
19-
<!-- The icon is slightly different, and is placed in a different folder -->
13+
<!-- Action Resource Decorative Icons-->
2014
<BitmapImage x:Key="ActionPointIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_resources/ap_d.png" />
2115
<BitmapImage x:Key="BonusActionPointIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_resources/bap_d.png" />
2216
<BitmapImage x:Key="ReactionPointIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_resources/ico_mini_spellSlot_reaction_d.png" />
@@ -38,21 +32,8 @@
3832
<BitmapImage x:Key="WarPriestPointIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_resources/ico_classRes_warPriest.png" />
3933
<BitmapImage x:Key="FungalInfestationIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_resources/ico_classRes_FungalInfestationCharge.png" />
4034
<BitmapImage x:Key="LuckPointIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_resources/ico_classRes_luck.png" />
41-
<!-- Custom icons from here -->
42-
<!-- <BitmapImage x:Key="ADIFFERENTUNIQUENAMEFORIMAGE" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/MODNAME/CC/icons_resources/NAMEOFDDSFILEFORTHEICON.png" /> -->
43-
<BitmapImage x:Key="PsiPointIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_resources/ico_classRes_psipoint.png" />
44-
<BitmapImage x:Key="BladesongIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Expansion/CC/icons_resources/ico_classRes_bladesong.png" />
45-
<BitmapImage x:Key="BloodMaledictIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/BloodHunter/CC/icons_resources/ico_classRes_BloodMaledict.png" />
46-
<BitmapImage x:Key="HybridTransformationIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/BloodHunter/CC/icons_resources/ico_classRes_HybridTransformation.png" />
47-
<BitmapImage x:Key="WuJenSpellSlotIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/AlternateMonk/CC/icons_resources/ico_classRes_WuJenSpellSlot.png" />
48-
<BitmapImage x:Key="MysticPsiPointsResourceIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Mystic/CC/icons_resources/ico_classRes_PsiPointsResource.png" />
49-
<BitmapImage x:Key="MysticPsionicMasteryResourceIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Mystic/CC/icons_resources/ico_classRes_PsionicMasteryResource.png" />
50-
<BitmapImage x:Key="SpellbaneDiceIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Spellbreaker/CC/icons_resources/ico_classRes_SpellbaneDie_d.png" />
51-
<!-- EDIT HERE -->
5235

53-
<!-- Reference entries below -->
54-
<!-- Revert to Tooltip icon if CC icon is not defined here -->
55-
<Style TargetType="Image" x:Key="IUI_ActionResourceDecorativeIconDefault" BasedOn="{StaticResource IUI_ActionResourceTypeIdToSource}">
36+
<Style TargetType="Image" x:Key="IUI_ActionResourceDecorativeIcon">
5637
<Style.Triggers>
5738
<DataTrigger Binding="{Binding TypeId}" Value="ActionPoint">
5839
<Setter Property="Source" Value="{StaticResource ActionPointIcon}"/>
@@ -119,38 +100,4 @@
119100
</DataTrigger>
120101
</Style.Triggers>
121102
</Style>
122-
123-
<!-- This is the section for custom icons now -->
124-
<Style TargetType="Image" x:Key="IUI_ActionResourceDecorativeIcon" BasedOn="{StaticResource IUI_ActionResourceDecorativeIconDefault}">
125-
<Style.Triggers>
126-
<!--<DataTrigger Binding="{Binding TypeId}" Value="ACTIONRESOURCENAME">
127-
<Setter Property="Source" Value="{StaticResource ADIFFERENTUNIQUENAMEFORIMAGE}"/>
128-
</DataTrigger>-->
129-
<DataTrigger Binding="{Binding TypeId}" Value="PsiPoint">
130-
<Setter Property="Source" Value="{StaticResource PsiPointIcon}"/>
131-
</DataTrigger>
132-
<DataTrigger Binding="{Binding TypeId}" Value="BladesongCharge">
133-
<Setter Property="Source" Value="{StaticResource BladesongIcon}"/>
134-
</DataTrigger>
135-
<DataTrigger Binding="{Binding TypeId}" Value="BloodMaledict">
136-
<Setter Property="Source" Value="{StaticResource BloodMaledictIcon}"/>
137-
</DataTrigger>
138-
<DataTrigger Binding="{Binding TypeId}" Value="HybridTransformation">
139-
<Setter Property="Source" Value="{StaticResource HybridTransformationIcon}"/>
140-
</DataTrigger>
141-
<DataTrigger Binding="{Binding TypeId}" Value="WuJenSpellSlot">
142-
<Setter Property="Source" Value="{StaticResource WuJenSpellSlotIcon}"/>
143-
</DataTrigger>
144-
<DataTrigger Binding="{Binding TypeId}" Value="PsiPointsResource">
145-
<Setter Property="Source" Value="{StaticResource MysticPsiPointsResourceIcon}"/>
146-
</DataTrigger>
147-
<DataTrigger Binding="{Binding TypeId}" Value="PsionicMasteryResource">
148-
<Setter Property="Source" Value="{StaticResource MysticPsionicMasteryResourceIcon}"/>
149-
</DataTrigger>
150-
<DataTrigger Binding="{Binding TypeId}" Value="SpellbaneDie">
151-
<Setter Property="Source" Value="{StaticResource SpellbaneDiceIcon}"/>
152-
</DataTrigger>
153-
<!-- EDIT HERE -->
154-
</Style.Triggers>
155-
</Style>
156103
</ResourceDictionary>

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

+62-43
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<ls:InitialSubstate Name="EditorRoot"/>
1111
<ls:InitialSubstate Name="GameRoot"/>
1212
<ls:InitialSubstate Name="SystemRoot"/>
13+
<ls:InitialSubstate Name="SystemOverlayRoot"/>
1314
</ls:State.InitialSubstates>
1415
</ls:State>
1516

@@ -25,13 +26,23 @@
2526

2627
<ls:State Name = "SystemRoot" Layout = "Common" Owner = "All">
2728
<ls:State.Events>
28-
<!-- MOD START - Remove story message -->
29+
<!-- MOD START - Remove story message -->
2930
<!--<ls:StateEvent Name = "OpenSystemMessageBox">
31+
<ls:StateEvent.Actions>
32+
<ls:AddSubstate Name="SystemMessageBox"/>
33+
</ls:StateEvent.Actions>
34+
</ls:StateEvent>-->
35+
<!-- MOD END -->
36+
</ls:State.Events>
37+
</ls:State>
38+
39+
<ls:State Name = "SystemOverlayRoot" Layout = "Common" Owner = "All">
40+
<ls:State.Events>
41+
<ls:StateEvent Name = "ShowVoiceChat">
3042
<ls:StateEvent.Actions>
31-
<ls:AddSubstate Name="SystemMessageBox"/>
43+
<ls:AddSubstate Name="VoiceChat"/>
3244
</ls:StateEvent.Actions>
33-
</ls:StateEvent> -->
34-
<!-- MOD END -->
45+
</ls:StateEvent>
3546
</ls:State.Events>
3647
</ls:State>
3748

@@ -98,6 +109,19 @@
98109
</ls:State.Events>
99110
</ls:State>
100111

112+
<!--STATE: VoiceChat-->
113+
<ls:State Name = "VoiceChat" Layout="Common" Owner="All">
114+
<ls:State.Events>
115+
<ls:StateEvent Name = "ShowVoiceChat">
116+
</ls:StateEvent>
117+
<ls:StateEvent Name = "HideVoiceChat">
118+
<ls:StateEvent.Actions>
119+
<ls:RemoveState/>
120+
</ls:StateEvent.Actions>
121+
</ls:StateEvent>
122+
</ls:State.Events>
123+
</ls:State>
124+
101125
<!--STATE: ScreenFade-->
102126
<ls:State Name = "ScreenFadePlayer" DisableStatesBelow = "False" HideStatesBelow = "False" Layout="Player" Owner="Player">
103127
<ls:State.Widgets>
@@ -269,7 +293,7 @@
269293
<!--STATE: CharacterCreation -->
270294
<ls:State Name = "CharacterCreation" HideStatesBelow = "True" DisableStatesBelow = "True" Layout = "Player" Owner = "Player" ForceSplitscreen="True">
271295
<ls:State.Widgets>
272-
<!-- MOD START - Remove CC tutorial message -->
296+
<!-- MOD START - Remove CC tutorial message -->
273297
<!--<ls:StateWidget Filename="AlwaysOnTopOverlay.xaml" Layer="MessageBox"/>-->
274298
<ls:StateWidget Filename="Notification.xaml" Layer="Default"/>
275299
<ls:StateWidget Filename="CharacterCreation.xaml" Layer="HUD"/>
@@ -292,23 +316,23 @@
292316
<ls:PushState Name="Paused"/>
293317
</ls:StateEvent.Actions>
294318
</ls:StateEvent>
295-
<!-- MOD START - Remove CC tutorial message -->
319+
<!-- MOD START - Remove CC tutorial message -->
296320
<!--<ls:StateEvent Name = "OpenMessageBox">
297-
<ls:StateEvent.Actions>
298-
<ls:AddSubstate Name="MessageBox"/>
299-
</ls:StateEvent.Actions>
300-
</ls:StateEvent>-->
321+
<ls:StateEvent.Actions>
322+
<ls:AddSubstate Name="MessageBox"/>
323+
</ls:StateEvent.Actions>
324+
</ls:StateEvent>-->
301325
<ls:StateEvent Name = "IUI_OpenMainMenuPrompt">
302-
<ls:StateEvent.Actions>
303-
<ls:PushState Name="IUI_CharacterCreationMainMenuPrompt"/>
304-
</ls:StateEvent.Actions>
305-
</ls:StateEvent>
326+
<ls:StateEvent.Actions>
327+
<ls:PushState Name="IUI_CharacterCreationMainMenuPrompt"/>
328+
</ls:StateEvent.Actions>
329+
</ls:StateEvent>
306330
<ls:StateEvent Name = "OpenSplashScreen">
307-
<ls:StateEvent.Actions>
308-
<ls:PushState Name="SplashScreen"/>
309-
<ls:RemoveState/>
310-
</ls:StateEvent.Actions>
311-
</ls:StateEvent>
331+
<ls:StateEvent.Actions>
332+
<ls:PushState Name="SplashScreen"/>
333+
<ls:RemoveState/>
334+
</ls:StateEvent.Actions>
335+
</ls:StateEvent>
312336
<!-- MOD END -->
313337
<ls:StateEvent Name = "OpenPinnedTooltips">
314338
<ls:StateEvent.Actions>
@@ -317,28 +341,28 @@
317341
</ls:StateEvent>
318342
</ls:State.Events>
319343
</ls:State>
320-
344+
321345
<!-- MOD START - Custom state for main menu prompt -->
322346
<ls:State Name = "IUI_CharacterCreationMainMenuPrompt" DisableStatesBelow = "False" HideStatesBelow = "False" Layout="Player" Owner="Player">
323-
<ls:State.Widgets>
324-
<ls:StateWidget Filename="AlwaysOnTopOverlay.xaml" Layer="MessageBox"/>
347+
<ls:State.Widgets>
348+
<ls:StateWidget Filename="AlwaysOnTopOverlay.xaml" Layer="MessageBox"/>
325349
<ls:StateWidget Filename="IUI_CharacterCreationMainMenuPrompt.xaml" Layer="HUD"/>
326-
<ls:StateWidget Filename="ScreenFade.xaml" Layer="ScreenFade" BlockedLoading="True"/>
327-
</ls:State.Widgets>
328-
350+
<ls:StateWidget Filename="ScreenFade.xaml" Layer="ScreenFade" BlockedLoading="True"/>
351+
</ls:State.Widgets>
352+
329353
<ls:State.Events>
330-
<ls:StateEvent Name = "CloseWidget">
331-
<ls:StateEvent.Actions>
332-
<ls:RemoveState/>
333-
</ls:StateEvent.Actions>
334-
</ls:StateEvent>
335-
<ls:StateEvent Name = "OpenMessageBox">
336-
<ls:StateEvent.Actions>
337-
<ls:AddSubstate Name="MessageBox"/>
338-
</ls:StateEvent.Actions>
339-
</ls:StateEvent>
340-
</ls:State.Events>
341-
</ls:State>
354+
<ls:StateEvent Name = "CloseWidget">
355+
<ls:StateEvent.Actions>
356+
<ls:RemoveState/>
357+
</ls:StateEvent.Actions>
358+
</ls:StateEvent>
359+
<ls:StateEvent Name = "OpenMessageBox">
360+
<ls:StateEvent.Actions>
361+
<ls:AddSubstate Name="MessageBox"/>
362+
</ls:StateEvent.Actions>
363+
</ls:StateEvent>
364+
</ls:State.Events>
365+
</ls:State>
342366
<!-- MOD END -->
343367

344368
<!--STATE: CharacterLevelUp -->
@@ -992,11 +1016,6 @@
9921016
</ls:StateEvent.Actions>
9931017
</ls:StateEvent>
9941018

995-
<ls:StateEvent Name = "IE.UIToggleAlchemy">
996-
<ls:StateEvent.Actions>
997-
<ls:SetSubstate Name="CharacterPanel" Metadata="ToggleAlchemy"/>
998-
</ls:StateEvent.Actions>
999-
</ls:StateEvent>
10001019
<ls:StateEvent Name = "ToggleAlchemy">
10011020
<ls:StateEvent.Actions>
10021021
<ls:SetSubstate Name="CharacterPanel" Metadata="ToggleAlchemy"/>
@@ -1174,7 +1193,7 @@
11741193
<ls:RemoveState/>
11751194
</ls:StateEvent.Actions>
11761195
</ls:StateEvent>
1177-
<ls:StateEvent Name = "IE.UIToggleAlchemy">
1196+
<ls:StateEvent Name = "ToggleAlchemy">
11781197
<ls:StateEvent.Actions>
11791198
<ls:RemoveState/>
11801199
</ls:StateEvent.Actions>

0 commit comments

Comments
 (0)