Skip to content

Commit 88faf4a

Browse files
TheRealDjmrTheRealDjmr
authored
Add files via upload
1 parent 836ebdf commit 88faf4a

File tree

2 files changed

+108
-3
lines changed

2 files changed

+108
-3
lines changed

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

+105
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,111 @@
156156
<!-- MOD END -->
157157
</Style.Triggers>
158158

159+
</Style>
160+
161+
<Style x:Key="MainClassIconHotbarStyle" TargetType="Image" >
162+
<Setter Property="Stretch" Value="None"/>
163+
<Style.Triggers>
164+
<DataTrigger Binding="{Binding IDString}" Value="Barbarian">
165+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/barbarian.png"/>
166+
</DataTrigger>
167+
<DataTrigger Binding="{Binding IDString}" Value="Cleric">
168+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/cleric.png"/>
169+
</DataTrigger>
170+
<DataTrigger Binding="{Binding IDString}" Value="Druid">
171+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/druid.png"/>
172+
</DataTrigger>
173+
<DataTrigger Binding="{Binding IDString}" Value="Fighter">
174+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/fighter.png"/>
175+
</DataTrigger>
176+
<DataTrigger Binding="{Binding IDString}" Value="Ranger">
177+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/ranger.png"/>
178+
</DataTrigger>
179+
<DataTrigger Binding="{Binding IDString}" Value="Rogue">
180+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/rogue.png"/>
181+
</DataTrigger>
182+
<DataTrigger Binding="{Binding IDString}" Value="Sorcerer">
183+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/sorcerer.png"/>
184+
</DataTrigger>
185+
<DataTrigger Binding="{Binding IDString}" Value="Warlock">
186+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/warlock.png"/>
187+
</DataTrigger>
188+
<DataTrigger Binding="{Binding IDString}" Value="Wizard">
189+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/wizard.png"/>
190+
</DataTrigger>
191+
192+
</Style.Triggers>
193+
194+
</Style>
195+
196+
<Style x:Key="ClassIconHotbarStyle" TargetType="Image" BasedOn="{StaticResource MainClassIconHotbarStyle}">
197+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/generic.png"/>
198+
<Style.Triggers>
199+
<!-- Subclass -->
200+
<DataTrigger Binding="{Binding SubclassIDString}" Value="BerserkerPath">
201+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/barbarian_berserker.png"/>
202+
</DataTrigger>
203+
<DataTrigger Binding="{Binding SubclassIDString}" Value="TotemWarriorPath">
204+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/barbarian_totemWarrior.png"/>
205+
</DataTrigger>
206+
<DataTrigger Binding="{Binding SubclassIDString}" Value="WildMagicPath">
207+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/barbarian_wildMagic.png"/>
208+
</DataTrigger>
209+
<DataTrigger Binding="{Binding SubclassIDString}" Value="LifeDomain">
210+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/cleric_life.png"/>
211+
</DataTrigger>
212+
<DataTrigger Binding="{Binding SubclassIDString}" Value="TrickeryDomain">
213+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/cleric_trickery.png"/>
214+
</DataTrigger>
215+
<DataTrigger Binding="{Binding SubclassIDString}" Value="LightDomain">
216+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/cleric_light.png"/>
217+
</DataTrigger>
218+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Fiend">
219+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/warlock_fiend.png"/>
220+
</DataTrigger>
221+
<DataTrigger Binding="{Binding SubclassIDString}" Value="GreatOldOne">
222+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/warlock_greatOldOne.png"/>
223+
</DataTrigger>
224+
<DataTrigger Binding="{Binding SubclassIDString}" Value="EvocationSchool">
225+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/wizard_evocation.png"/>
226+
</DataTrigger>
227+
<DataTrigger Binding="{Binding SubclassIDString}" Value="AbjurationSchool">
228+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/wizard_abjuration.png"/>
229+
</DataTrigger>
230+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Thief">
231+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/rogue_thief.png"/>
232+
</DataTrigger>
233+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Arcane Trickster">
234+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/rogue_trickster.png"/>
235+
</DataTrigger>
236+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Hunter">
237+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/ranger_hunter.png"/>
238+
</DataTrigger>
239+
<DataTrigger Binding="{Binding SubclassIDString}" Value="BeastMaster">
240+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/ranger_beastmaster.png"/>
241+
</DataTrigger>
242+
<DataTrigger Binding="{Binding SubclassIDString}" Value="BattleMaster">
243+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/fighter_battlemaster.png"/>
244+
</DataTrigger>
245+
<DataTrigger Binding="{Binding SubclassIDString}" Value="EldritchKnight">
246+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/fighter_eldritchKnight.png"/>
247+
</DataTrigger>
248+
<DataTrigger Binding="{Binding SubclassIDString}" Value="CircleOfTheLand">
249+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/druid_circleOfLand.png"/>
250+
</DataTrigger>
251+
<DataTrigger Binding="{Binding SubclassIDString}" Value="CircleOfTheMoon">
252+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/druid_circleOfMoon.png"/>
253+
</DataTrigger>
254+
<DataTrigger Binding="{Binding SubclassIDString}" Value="CircleOfTheMoon">
255+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/druid_circleOfMoon.png"/>
256+
</DataTrigger>
257+
<DataTrigger Binding="{Binding SubclassIDString}" Value="DraconicBloodline">
258+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/sorcerer_dragoniceBloodline.png"/>
259+
</DataTrigger>
260+
<DataTrigger Binding="{Binding SubclassIDString}" Value="WildMagic">
261+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/sorcerer_wildMagic.png"/>
262+
</DataTrigger>
263+
</Style.Triggers>
159264
</Style>
160265

161266
<Style x:Key="ClassIconStyle" TargetType="Image" BasedOn="{StaticResource MainClassIconStyle}">

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3359,13 +3359,13 @@
33593359
<DataTemplate DataType="{x:Type ls:VMAdvantage}">
33603360
<ContentPresenter x:Name="AdvantageTooltipContent" Content="{Binding TooltipData}"/>
33613361
<DataTemplate.Triggers>
3362-
<DataTrigger Binding="{Binding TooltipData}" Value="{x:Null}">
3362+
<DataTrigger Binding="{Binding TooltipData, Converter={StaticResource NullToBoolFalseConverter}, FallbackValue=False}" Value="False">
33633363
<Setter TargetName="AdvantageTooltipContent" Property="Content" Value="{Binding .}"/>
33643364
<Setter TargetName="AdvantageTooltipContent" Property="ContentTemplate" Value="{StaticResource BoostSimpleTooltipContent}"/>
33653365
</DataTrigger>
33663366
<MultiDataTrigger>
33673367
<MultiDataTrigger.Conditions>
3368-
<Condition Binding="{Binding TooltipData}" Value="{x:Null}"/>
3368+
<Condition Binding="{Binding TooltipData, Converter={StaticResource NullToBoolFalseConverter}, FallbackValue=False}" Value="False"/>
33693369
<Condition Binding="{Binding AdvantageType}" Value="Advantage"/>
33703370
</MultiDataTrigger.Conditions>
33713371
<Setter TargetName="AdvantageTooltipContent" Property="Content" Value="h079123e0geee2g410cgaaf3g7978a3dafdc7"/>
@@ -3374,7 +3374,7 @@
33743374
</MultiDataTrigger>
33753375
<MultiDataTrigger>
33763376
<MultiDataTrigger.Conditions>
3377-
<Condition Binding="{Binding TooltipData}" Value="{x:Null}"/>
3377+
<Condition Binding="{Binding TooltipData, Converter={StaticResource NullToBoolFalseConverter}, FallbackValue=False}" Value="False"/>
33783378
<Condition Binding="{Binding AdvantageType}" Value="Disadvantage"/>
33793379
</MultiDataTrigger.Conditions>
33803380
<Setter TargetName="AdvantageTooltipContent" Property="Content" Value="h3723f6abgc46cg42b4gb95eg2449e683e25a"/>

0 commit comments

Comments
 (0)