Skip to content

Commit 686d3cb

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #255 from TheRealDjmr/hotfix16
Hotfix16
2 parents 55d4bec + a250171 commit 686d3cb

7 files changed

+217
-179
lines changed

‎Assets - Supported Mods.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ How-To Guide (for modders): https://bg3.wiki/wiki/Guide:Modding_Class_Icons
2020
- Cleric Subclasses — https://www.nexusmods.com/baldursgate3/mods/432
2121
- Death Domain Subclass — https://www.nexusmods.com/baldursgate3/mods/1552
2222
- Death Knight Class — https://www.nexusmods.com/baldursgate3/mods/1725
23+
- Death Soul - Sorcerer Subclass — https://www.nexusmods.com/baldursgate3/mods/5763
2324
- Demon Hunter Class — https://www.nexusmods.com/baldursgate3/mods/3165
2425
- Drakewarden Subclass — https://www.nexusmods.com/baldursgate3/mods/2838
2526
- Echo Knight Fighter (and War Caster) <sup>d</sup> — https://www.nexusmods.com/baldursgate3/mods/3939

‎ImprovedUI/Mods/ImprovedUI/meta.lsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -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="110338193018060800"/>
25+
<attribute id="Version" type="int64" value="110478928358932480"/>
2626
<children>
2727
<node id="PublishVersion">
28-
<attribute id="Version" type="int64" value="110338193018060800"/>
28+
<attribute id="Version" type="int64" value="110478928358932480"/>
2929
</node>
3030
<node id="Scripts"/>
3131
<node id="TargetModes">

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

+14-75
Original file line numberDiff line numberDiff line change
@@ -1184,64 +1184,6 @@
11841184
</ControlTemplate.Triggers>
11851185
</ControlTemplate>
11861186

1187-
<!--Inventory Grid-->
1188-
<Style TargetType="ListBox" x:Key="InventoryGrid" BasedOn="{StaticResource {x:Type ListBox}}">
1189-
<Setter Property="Background" Value="Transparent" />
1190-
<Setter Property="BorderBrush" Value="Transparent" />
1191-
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Visible" />
1192-
<Setter Property="ItemsPanel" >
1193-
<Setter.Value>
1194-
<ItemsPanelTemplate>
1195-
<ls:LSGrid x:Name="InvGrid" Background="{StaticResource InventoryCell2x2Brush}" noesis:Element.PPAAMode="Disabled" SnapsToDevicePixels="True" ContainerData="{Binding }" Columns="{DynamicResource invCols}" Rows="{DynamicResource invRows}" ScrollAmount="114" CellWidth="{DynamicResource InvSlotSize}" CellHeight="{DynamicResource InvSlotSize}" VerticalSpacing="{DynamicResource InvSpacing}" HorizontalSpacing="{DynamicResource InvSpacing}" ActionUpEvent="UIUp" ActionDownEvent="UIDown" ActionRightEvent="UIRight" ActionLeftEvent="UILeft">
1196-
<ls:LSGrid.Style>
1197-
<Style TargetType="ls:LSGrid">
1198-
<Setter Property="Margin" Value="0,4,0,0" />
1199-
<Style.Triggers>
1200-
<DataTrigger Binding="{Binding DataContext.Data.UIInputMethod, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" Value="Controller">
1201-
<Setter Property="Margin" Value="0,0,0,0" />
1202-
</DataTrigger>
1203-
</Style.Triggers>
1204-
</Style>
1205-
</ls:LSGrid.Style>
1206-
<b:Interaction.Behaviors>
1207-
<ls:DropOnInventoryGridBehavior DropCommand="{Binding DataContext.DropOnInventorySlotCommand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}"/>
1208-
<ls:DragGameObjectGridBehavior/>
1209-
</b:Interaction.Behaviors>
1210-
<b:Interaction.Triggers>
1211-
<b:EventTrigger EventName="WidgetClosing">
1212-
<b:InvokeCommandAction Command="{Binding DataContext.ClearInventoryNewFlags, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" CommandParameter="{Binding }"/>
1213-
</b:EventTrigger>
1214-
</b:Interaction.Triggers>
1215-
</ls:LSGrid>
1216-
</ItemsPanelTemplate>
1217-
</Setter.Value>
1218-
</Setter>
1219-
<Setter Property="ItemContainerStyle">
1220-
<Setter.Value>
1221-
<Style TargetType="ListBoxItem">
1222-
<Setter Property="Template" Value="{StaticResource InventoryCellTemplate}" />
1223-
<Setter Property="BorderBrush" Value="Transparent" />
1224-
<Setter Property="Background" Value="Transparent" />
1225-
<Setter Property="Width" Value="{DynamicResource InvSlotSize}" />
1226-
<Setter Property="Height" Value="{DynamicResource InvSlotSize}" />
1227-
<Setter Property="Padding" Value="0" />
1228-
<Setter Property="BorderThickness" Value="0" />
1229-
<Setter Property="VerticalContentAlignment" Value="Top"/>
1230-
<Style.Triggers>
1231-
<Trigger Property="IsSelected" Value="True">
1232-
<Setter Property="BorderBrush" Value="Transparent" />
1233-
<Setter Property="Background" Value="Transparent" />
1234-
</Trigger>
1235-
<Trigger Property="IsMouseOver" Value="True">
1236-
<Setter Property="BorderBrush" Value="Transparent" />
1237-
<Setter Property="Background" Value="Transparent" />
1238-
</Trigger>
1239-
</Style.Triggers>
1240-
</Style>
1241-
</Setter.Value>
1242-
</Setter>
1243-
</Style>
1244-
12451187
<!--interrupts-->
12461188
<BitmapImage x:Key="QuestionMarkIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Reactions_c/c_ico_reactionAsk_active.png"/>
12471189

@@ -1838,12 +1780,12 @@
18381780

18391781
<Grid x:Name="Slot" ToolTipService.Placement="Top" ToolTipService.IsEnabled="True" Tag="{Binding IsActive, FallbackValue=False}" ToolTipService.ShowOnDisabled="True" Background="Transparent">
18401782
<Grid.ToolTip>
1841-
<ls:LSTooltip x:Name="hbTooltip" Content="{Binding DataContext.Spell, ElementName=Slot}" ls:TooltipExtender.Context="Hotbar" VerticalOffset="-60" />
1783+
<ls:LSTooltip x:Name="hbTooltip" Content="{Binding DataContext.Spell, ElementName=Slot}" ls:TooltipExtender.Context="Hotbar" VerticalOffset="-60"/>
18421784
</Grid.ToolTip>
18431785
<b:Interaction.Triggers>
18441786
<b:EventTrigger EventName="MouseEnter">
1845-
<b:InvokeCommandAction Command="{Binding DataContext.HighlightResourcesCommand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" CommandParameter="{Binding}"/>
1846-
<b:InvokeCommandAction Command="{Binding DataContext.RemoveIsNewFlag, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" CommandParameter="{Binding}"/>
1787+
<b:InvokeCommandAction Command="{Binding (ls:WidgetData.DataContext).HighlightResourcesCommand, RelativeSource={RelativeSource TemplatedParent}}" CommandParameter="{Binding}"/>
1788+
<b:InvokeCommandAction Command="{Binding (ls:WidgetData.DataContext).RemoveIsNewFlag, RelativeSource={RelativeSource TemplatedParent}}" CommandParameter="{Binding}"/>
18471789
</b:EventTrigger>
18481790
<b:EventTrigger EventName="MouseEnter">
18491791
<b:Interaction.Behaviors>
@@ -1853,10 +1795,10 @@
18531795
</b:ConditionalExpression>
18541796
</b:ConditionBehavior>
18551797
</b:Interaction.Behaviors>
1856-
<b:InvokeCommandAction Command="{Binding DataContext.SetDebugUIEntityCommand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" CommandParameter="{Binding GameObject.EntityHandle}"/>
1798+
<b:InvokeCommandAction Command="{Binding (ls:WidgetData.DataContext).SetDebugUIEntityCommand, RelativeSource={RelativeSource TemplatedParent}}" CommandParameter="{Binding GameObject.EntityHandle}"/>
18571799
</b:EventTrigger>
18581800
<b:EventTrigger EventName="MouseLeave">
1859-
<b:InvokeCommandAction Command="{Binding DataContext.ClearResourceHighlightsCommand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" CommandParameter="{Binding}"/>
1801+
<b:InvokeCommandAction Command="{Binding (ls:WidgetData.DataContext).ClearResourceHighlightsCommand, RelativeSource={RelativeSource TemplatedParent}}" CommandParameter="{Binding}"/>
18601802
</b:EventTrigger>
18611803
<b:EventTrigger EventName="MouseLeave">
18621804
<b:Interaction.Behaviors>
@@ -1866,7 +1808,7 @@
18661808
</b:ConditionalExpression>
18671809
</b:ConditionBehavior>
18681810
</b:Interaction.Behaviors>
1869-
<b:InvokeCommandAction Command="{Binding DataContext.ClearDebugUIEntityCommand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}"/>
1811+
<b:InvokeCommandAction Command="{Binding (ls:WidgetData.DataContext).ClearDebugUIEntityCommand, RelativeSource={RelativeSource TemplatedParent}}"/>
18701812
</b:EventTrigger>
18711813
<b:EventTrigger EventName="Unloaded">
18721814
<b:ChangePropertyAction TargetName="HotbarslotBtn" PropertyName="CommandParameter" Value="{x:Null}"/>
@@ -1919,7 +1861,7 @@
19191861

19201862
<!-- Icon glow animation slot (Metamagic, UnlockSpellVariant) -->
19211863
<Control x:Name="MetaMagicOverlay" IsHitTestVisible="False" Width="{StaticResource HotBarSlotWidth}" Height="{StaticResource HotBarSlotHeight}" Template="{x:Null}"/>
1922-
<TextBlock x:Name="HotKey" IsHitTestVisible="False" Text="{Binding HotKey}" Margin="4,0,0,-6" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="{StaticResource ScaledSmallFontSize}" Visibility="Collapsed" />
1864+
<TextBlock x:Name="HotKey" IsHitTestVisible="False" Text="{Binding HotKey}" Margin="4,0,0,-6" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="{StaticResource ScaledSmallFontSize}"/>
19231865

19241866
</Grid>
19251867
<ControlTemplate.Triggers>
@@ -1957,9 +1899,6 @@
19571899
</Setter.Value>
19581900
</Setter>
19591901
</DataTrigger>
1960-
<DataTrigger Binding="{Binding DataContext.Data.UIInputMethod, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" Value="Keyboard">
1961-
<Setter Property="Visibility" Value="Visible" TargetName="HotKey"/>
1962-
</DataTrigger>
19631902

19641903
<DataTrigger Binding="{Binding Name}" Value="">
19651904
<Setter Property="IsEnabled" Value="False"/>
@@ -1975,7 +1914,7 @@
19751914
<MultiDataTrigger.Conditions>
19761915
<Condition Binding="{Binding CanUse}" Value="False"/>
19771916
<Condition Binding="{Binding Spell.IsContainer}" Value="True"/>
1978-
<Condition Binding="{Binding DataContext.PanelContentType, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" Value="Spell"/>
1917+
<Condition Binding="{Binding (ls:WidgetData.DataContext).PanelContentType, RelativeSource={RelativeSource TemplatedParent}}" Value="Spell"/>
19791918
</MultiDataTrigger.Conditions>
19801919
<Setter Property="Command" Value="{x:Null}"/>
19811920
</MultiDataTrigger>
@@ -2054,17 +1993,17 @@
20541993
<MultiDataTrigger>
20551994
<MultiDataTrigger.Conditions>
20561995
<Condition Binding="{Binding Spell.WeaponActionType}" Value="Melee"/>
2057-
<Condition Binding="{Binding DataContext.CurrentPlayer.SelectedCharacter.Equipment.MeleeMainHand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, Converter={StaticResource NullToBoolFalseConverter}}" Value="True"/>
1996+
<Condition Binding="{Binding (ls:WidgetData.DataContext).CurrentPlayer.SelectedCharacter.Equipment.MeleeMainHand, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource NullToBoolFalseConverter}}" Value="True"/>
20581997
</MultiDataTrigger.Conditions>
2059-
<Setter Property="Command" Value="{Binding DataContext.UseMeleeWeaponCommand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}"/>
1998+
<Setter Property="Command" Value="{Binding (ls:WidgetData.DataContext).UseMeleeWeaponCommand, RelativeSource={RelativeSource TemplatedParent}}"/>
20601999
<Setter Property="CommandParameter" Value="{Binding .}"/>
20612000
</MultiDataTrigger>
20622001
<MultiDataTrigger>
20632002
<MultiDataTrigger.Conditions>
20642003
<Condition Binding="{Binding Spell.WeaponActionType}" Value="Ranged"/>
2065-
<Condition Binding="{Binding DataContext.CurrentPlayer.SelectedCharacter.Equipment.RangedMainHand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, Converter={StaticResource NullToBoolFalseConverter}}" Value="True"/>
2004+
<Condition Binding="{Binding (ls:WidgetData.DataContext).CurrentPlayer.SelectedCharacter.Equipment.RangedMainHand, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource NullToBoolFalseConverter}}" Value="True"/>
20662005
</MultiDataTrigger.Conditions>
2067-
<Setter Property="Command" Value="{Binding DataContext.UseRangedWeaponCommand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}"/>
2006+
<Setter Property="Command" Value="{Binding (ls:WidgetData.DataContext).UseRangedWeaponCommand, RelativeSource={RelativeSource TemplatedParent}}"/>
20682007
<Setter Property="CommandParameter" Value="{Binding .}"/>
20692008
</MultiDataTrigger>
20702009

@@ -2073,9 +2012,9 @@
20732012
<MultiDataTrigger.Conditions>
20742013
<Condition Binding="{Binding SlotType}" Value="Item"/>
20752014
<Condition Binding="{Binding GameObject.UseType}" Value="Arrow"/>
2076-
<Condition Binding="{Binding DataContext.CurrentPlayer.SelectedCharacter.Equipment.RangedMainHand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, Converter={StaticResource NullToBoolFalseConverter}}" Value="True"/>
2015+
<Condition Binding="{Binding (ls:WidgetData.DataContext).CurrentPlayer.SelectedCharacter.Equipment.RangedMainHand, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource NullToBoolFalseConverter}}" Value="True"/>
20772016
</MultiDataTrigger.Conditions>
2078-
<Setter Property="Command" Value="{Binding DataContext.UseRangedWeaponCommand, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}"/>
2017+
<Setter Property="Command" Value="{Binding (ls:WidgetData.DataContext).UseRangedWeaponCommand, RelativeSource={RelativeSource TemplatedParent}}"/>
20792018
<Setter Property="CommandParameter" Value="{Binding .}"/>
20802019
</MultiDataTrigger>
20812020
</Style.Triggers>

0 commit comments

Comments
 (0)