Skip to content

Commit 4e81282

Browse files
TheRealDjmrTheRealDjmr
authored
Add files via upload
1 parent 36fac85 commit 4e81282

File tree

3 files changed

+393
-505
lines changed

3 files changed

+393
-505
lines changed

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

+84
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,20 @@
8585
</MultiDataTrigger.Setters>
8686
</MultiDataTrigger>
8787
<!-- MOD START - Custom action resources -->
88+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="SneakAttack">
89+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.SneakAttackDieGroup}"/>
90+
<Setter Property="MaxGroupActionPoints" Value="1"/>
91+
<Setter Property="ActionPointSize" Value="48" />
92+
</DataTrigger>
93+
<MultiDataTrigger>
94+
<MultiDataTrigger.Conditions>
95+
<Condition Binding="{Binding ActionResource.TypeId}" Value="SneakAttack"/>
96+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
97+
</MultiDataTrigger.Conditions>
98+
<MultiDataTrigger.Setters>
99+
<Setter Property="Margin" Value="0,-15,0,0"/>
100+
</MultiDataTrigger.Setters>
101+
</MultiDataTrigger>
88102
<DataTrigger Binding="{Binding TypeId}" Value="PsiPoint">
89103
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.PsiPointGroup}"/>
90104
<Setter Property="MaxGroupActionPoints" Value="1"/>
@@ -140,6 +154,76 @@
140154
<MultiDataTrigger.Setters>
141155
<Setter Property="Margin" Value="0,-15,0,0"/>
142156
</MultiDataTrigger.Setters>
157+
</MultiDataTrigger>
158+
<DataTrigger Binding="{Binding TypeId}" Value="MartialArtsDieD4">
159+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup1}"/>
160+
<Setter Property="MaxGroupActionPoints" Value="1"/>
161+
<Setter Property="ActionPointSize" Value="48" />
162+
</DataTrigger>
163+
<MultiDataTrigger>
164+
<MultiDataTrigger.Conditions>
165+
<Condition Binding="{Binding TypeId}" Value="MartialArtsDieD4"/>
166+
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
167+
</MultiDataTrigger.Conditions>
168+
<MultiDataTrigger.Setters>
169+
<Setter Property="Margin" Value="0,-15,0,0"/>
170+
</MultiDataTrigger.Setters>
171+
</MultiDataTrigger>
172+
<DataTrigger Binding="{Binding TypeId}" Value="MartialArtsDieD6">
173+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup2}"/>
174+
<Setter Property="MaxGroupActionPoints" Value="1"/>
175+
<Setter Property="ActionPointSize" Value="48" />
176+
</DataTrigger>
177+
<MultiDataTrigger>
178+
<MultiDataTrigger.Conditions>
179+
<Condition Binding="{Binding TypeId}" Value="MartialArtsDieD6"/>
180+
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
181+
</MultiDataTrigger.Conditions>
182+
<MultiDataTrigger.Setters>
183+
<Setter Property="Margin" Value="0,-15,0,0"/>
184+
</MultiDataTrigger.Setters>
185+
</MultiDataTrigger>
186+
<DataTrigger Binding="{Binding TypeId}" Value="MartialArtsDieD8">
187+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup3}"/>
188+
<Setter Property="MaxGroupActionPoints" Value="1"/>
189+
<Setter Property="ActionPointSize" Value="48" />
190+
</DataTrigger>
191+
<MultiDataTrigger>
192+
<MultiDataTrigger.Conditions>
193+
<Condition Binding="{Binding TypeId}" Value="MartialArtsDieD8"/>
194+
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
195+
</MultiDataTrigger.Conditions>
196+
<MultiDataTrigger.Setters>
197+
<Setter Property="Margin" Value="0,-15,0,0"/>
198+
</MultiDataTrigger.Setters>
199+
</MultiDataTrigger>
200+
<DataTrigger Binding="{Binding TypeId}" Value="MartialArtsDieD10">
201+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup4}"/>
202+
<Setter Property="MaxGroupActionPoints" Value="1"/>
203+
<Setter Property="ActionPointSize" Value="48" />
204+
</DataTrigger>
205+
<MultiDataTrigger>
206+
<MultiDataTrigger.Conditions>
207+
<Condition Binding="{Binding TypeId}" Value="MartialArtsDieD10"/>
208+
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
209+
</MultiDataTrigger.Conditions>
210+
<MultiDataTrigger.Setters>
211+
<Setter Property="Margin" Value="0,-15,0,0"/>
212+
</MultiDataTrigger.Setters>
213+
</MultiDataTrigger>
214+
<DataTrigger Binding="{Binding TypeId}" Value="NecroThaum">
215+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.NecroThaumGroup}"/>
216+
<Setter Property="MaxGroupActionPoints" Value="1"/>
217+
<Setter Property="ActionPointSize" Value="48" />
218+
</DataTrigger>
219+
<MultiDataTrigger>
220+
<MultiDataTrigger.Conditions>
221+
<Condition Binding="{Binding TypeId}" Value="NecroThaum"/>
222+
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
223+
</MultiDataTrigger.Conditions>
224+
<MultiDataTrigger.Setters>
225+
<Setter Property="Margin" Value="0,-15,0,0"/>
226+
</MultiDataTrigger.Setters>
143227
</MultiDataTrigger>
144228
<!-- MOD END -->
145229
<DataTrigger Binding="{Binding TypeId}" Value="KiPoint">

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

+147-3
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@
152152
</DataTrigger>
153153
<DataTrigger Binding="{Binding IDString}" Value="Oathbreaker">
154154
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/Oathbreaker.png"/>
155+
</DataTrigger>
156+
<DataTrigger Binding="{Binding IDString}" Value="Monk">
157+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/Icon_Class_Monk.dds"/>
155158
</DataTrigger>
156159
<!-- MOD END -->
157160
</Style.Triggers>
@@ -1745,29 +1748,86 @@
17451748
</ControlTemplate>
17461749

17471750
<!-- MOD START - Custom action resources -->
1748-
<ControlTemplate x:Key="ActionResources.ActionGroup.PsiPointGroup" TargetType="ls:LSActionPoint"> <ControlTemplate.Resources>
1751+
<ControlTemplate x:Key="ActionResources.ActionGroup.SneakAttackDieGroup" TargetType="ls:LSActionPoint">
1752+
<ControlTemplate.Resources>
1753+
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_res_sneakAttack_h.png</ImageSource>
1754+
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_res_sneakAttack_d.png</ImageSource>
1755+
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_res_sneakAttack_spent.png</ImageSource>
1756+
</ControlTemplate.Resources>
1757+
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
1758+
</ControlTemplate>
1759+
1760+
<ControlTemplate x:Key="ActionResources.ActionGroup.PsiPointGroup" TargetType="ls:LSActionPoint">
1761+
<ControlTemplate.Resources>
17491762
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_psi_h.png</ImageSource>
17501763
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_psi_d.png</ImageSource>
17511764
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_psi_spent.png</ImageSource>
17521765
</ControlTemplate.Resources>
17531766
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
17541767
</ControlTemplate>
17551768

1756-
<ControlTemplate x:Key="ActionResources.ActionGroup.HitDiceGroup" TargetType="ls:LSActionPoint"> <ControlTemplate.Resources>
1769+
<ControlTemplate x:Key="ActionResources.ActionGroup.HitDiceGroup" TargetType="ls:LSActionPoint">
1770+
<ControlTemplate.Resources>
17571771
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_hitdice_h.png</ImageSource>
17581772
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_hitdice_d.png</ImageSource>
17591773
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_hitdice_spent.png</ImageSource>
17601774
</ControlTemplate.Resources>
17611775
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
17621776
</ControlTemplate>
17631777

1764-
<ControlTemplate x:Key="ActionResources.ActionGroup.RampageDieGroup" TargetType="ls:LSActionPoint"> <ControlTemplate.Resources>
1778+
<ControlTemplate x:Key="ActionResources.ActionGroup.RampageDieGroup" TargetType="ls:LSActionPoint">
1779+
<ControlTemplate.Resources>
17651780
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_rampagedie_h.png</ImageSource>
17661781
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_rampagedie_d.png</ImageSource>
17671782
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_rampagedie_spent.png</ImageSource>
17681783
</ControlTemplate.Resources>
17691784
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
17701785
</ControlTemplate>
1786+
1787+
<ControlTemplate x:Key="ActionResources.ActionGroup.MartialArtsDieGroup1" TargetType="ls:LSActionPoint">
1788+
<ControlTemplate.Resources>
1789+
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad1_d.dds</ImageSource>
1790+
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad1_d.dds</ImageSource>
1791+
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad1_d.dds</ImageSource>
1792+
</ControlTemplate.Resources>
1793+
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
1794+
</ControlTemplate>
1795+
1796+
<ControlTemplate x:Key="ActionResources.ActionGroup.MartialArtsDieGroup2" TargetType="ls:LSActionPoint">
1797+
<ControlTemplate.Resources>
1798+
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad2_d.dds</ImageSource>
1799+
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad2_d.dds</ImageSource>
1800+
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad2_d.dds</ImageSource>
1801+
</ControlTemplate.Resources>
1802+
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
1803+
</ControlTemplate>
1804+
1805+
<ControlTemplate x:Key="ActionResources.ActionGroup.MartialArtsDieGroup3" TargetType="ls:LSActionPoint">
1806+
<ControlTemplate.Resources>
1807+
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad3_d.dds</ImageSource>
1808+
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad3_d.dds</ImageSource>
1809+
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad3_d.dds</ImageSource>
1810+
</ControlTemplate.Resources>
1811+
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
1812+
</ControlTemplate>
1813+
1814+
<ControlTemplate x:Key="ActionResources.ActionGroup.MartialArtsDieGroup4" TargetType="ls:LSActionPoint">
1815+
<ControlTemplate.Resources>
1816+
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad4_d.dds</ImageSource>
1817+
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad4_d.dds</ImageSource>
1818+
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/ico_classRes_mad4_d.dds</ImageSource>
1819+
</ControlTemplate.Resources>
1820+
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
1821+
</ControlTemplate>
1822+
1823+
<ControlTemplate x:Key="ActionResources.ActionGroup.NecroThaumGroup" TargetType="ls:LSActionPoint">
1824+
<ControlTemplate.Resources>
1825+
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Shared/Resources/Resource_Thaumaturgy_Hover.dds</ImageSource>
1826+
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Shared/Resources/Resource_Thaumaturgy_Icon.dds</ImageSource>
1827+
<ImageSource x:Key="Used">/GustavNoesisGUI;component/Assets/Shared/Resources/Resource_Thaumaturgy_Used.dds</ImageSource>
1828+
</ControlTemplate.Resources>
1829+
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
1830+
</ControlTemplate>
17711831
<!-- MOD END -->
17721832

17731833
<ControlTemplate x:Key="ActionResources.ActionGroup.KiActionGroup" TargetType="ls:LSActionPoint">
@@ -1899,6 +1959,20 @@
18991959
</MultiDataTrigger.Setters>
19001960
</MultiDataTrigger>
19011961
<!-- MOD START - Custom action resources -->
1962+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="SneakAttack">
1963+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.SneakAttackDieGroup}"/>
1964+
<Setter Property="MaxGroupActionPoints" Value="1"/>
1965+
<Setter Property="ActionPointSize" Value="48" />
1966+
</DataTrigger>
1967+
<MultiDataTrigger>
1968+
<MultiDataTrigger.Conditions>
1969+
<Condition Binding="{Binding ActionResource.TypeId}" Value="SneakAttack"/>
1970+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
1971+
</MultiDataTrigger.Conditions>
1972+
<MultiDataTrigger.Setters>
1973+
<Setter Property="Margin" Value="0,-15,0,0"/>
1974+
</MultiDataTrigger.Setters>
1975+
</MultiDataTrigger>
19021976
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="PsiPoint">
19031977
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.PsiPointGroup}"/>
19041978
<Setter Property="MaxGroupActionPoints" Value="1"/>
@@ -1954,6 +2028,76 @@
19542028
<MultiDataTrigger.Setters>
19552029
<Setter Property="Margin" Value="0,-15,0,0"/>
19562030
</MultiDataTrigger.Setters>
2031+
</MultiDataTrigger>
2032+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD4">
2033+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup1}"/>
2034+
<Setter Property="MaxGroupActionPoints" Value="1"/>
2035+
<Setter Property="ActionPointSize" Value="48" />
2036+
</DataTrigger>
2037+
<MultiDataTrigger>
2038+
<MultiDataTrigger.Conditions>
2039+
<Condition Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD4"/>
2040+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2041+
</MultiDataTrigger.Conditions>
2042+
<MultiDataTrigger.Setters>
2043+
<Setter Property="Margin" Value="0,-15,0,0"/>
2044+
</MultiDataTrigger.Setters>
2045+
</MultiDataTrigger>
2046+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD6">
2047+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup2}"/>
2048+
<Setter Property="MaxGroupActionPoints" Value="1"/>
2049+
<Setter Property="ActionPointSize" Value="48" />
2050+
</DataTrigger>
2051+
<MultiDataTrigger>
2052+
<MultiDataTrigger.Conditions>
2053+
<Condition Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD6"/>
2054+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2055+
</MultiDataTrigger.Conditions>
2056+
<MultiDataTrigger.Setters>
2057+
<Setter Property="Margin" Value="0,-15,0,0"/>
2058+
</MultiDataTrigger.Setters>
2059+
</MultiDataTrigger>
2060+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD8">
2061+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup3}"/>
2062+
<Setter Property="MaxGroupActionPoints" Value="1"/>
2063+
<Setter Property="ActionPointSize" Value="48" />
2064+
</DataTrigger>
2065+
<MultiDataTrigger>
2066+
<MultiDataTrigger.Conditions>
2067+
<Condition Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD8"/>
2068+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2069+
</MultiDataTrigger.Conditions>
2070+
<MultiDataTrigger.Setters>
2071+
<Setter Property="Margin" Value="0,-15,0,0"/>
2072+
</MultiDataTrigger.Setters>
2073+
</MultiDataTrigger>
2074+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD10">
2075+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup4}"/>
2076+
<Setter Property="MaxGroupActionPoints" Value="1"/>
2077+
<Setter Property="ActionPointSize" Value="48" />
2078+
</DataTrigger>
2079+
<MultiDataTrigger>
2080+
<MultiDataTrigger.Conditions>
2081+
<Condition Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD10"/>
2082+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2083+
</MultiDataTrigger.Conditions>
2084+
<MultiDataTrigger.Setters>
2085+
<Setter Property="Margin" Value="0,-15,0,0"/>
2086+
</MultiDataTrigger.Setters>
2087+
</MultiDataTrigger>
2088+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="NecroThaum">
2089+
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.NecroThaumGroup}"/>
2090+
<Setter Property="MaxGroupActionPoints" Value="1"/>
2091+
<Setter Property="ActionPointSize" Value="48" />
2092+
</DataTrigger>
2093+
<MultiDataTrigger>
2094+
<MultiDataTrigger.Conditions>
2095+
<Condition Binding="{Binding ActionResource.TypeId}" Value="NecroThaum"/>
2096+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2097+
</MultiDataTrigger.Conditions>
2098+
<MultiDataTrigger.Setters>
2099+
<Setter Property="Margin" Value="0,-15,0,0"/>
2100+
</MultiDataTrigger.Setters>
19572101
</MultiDataTrigger>
19582102
<!-- MOD END -->
19592103
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="KiPoint">

0 commit comments

Comments
 (0)