Skip to content

Commit 602fdc4

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #148 from TheRealDjmr/3.12-moreassets
3.12 moreassets
2 parents f377015 + d6b9d6e commit 602fdc4

8 files changed

+85
-87
lines changed

‎Assets - Supported Mods.md

+10-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Since it's gotten bigger, here's a list of custom icons currently supported:
1313
- Cleric Subclasses - https://www.nexusmods.com/baldursgate3/mods/432
1414
- Death Domain Subclass - https://www.nexusmods.com/baldursgate3/mods/1552
1515
- Death Knight Class - https://www.nexusmods.com/baldursgate3/mods/1725
16+
- Demon Hunter Class - https://www.nexusmods.com/baldursgate3/mods/3165
1617
- Drakewarden Subclass - https://www.nexusmods.com/baldursgate3/mods/2838
1718
- The Way of the Drunken Master Subclass - https://www.nexusmods.com/baldursgate3/mods/1832
1819
- Expansion (Bladesinger only) - https://www.nexusmods.com/baldursgate3/mods/279
@@ -24,29 +25,34 @@ Since it's gotten bigger, here's a list of custom icons currently supported:
2425

2526
(Via Dynamic support)
2627
- Alternate Monk - https://www.nexusmods.com/baldursgate3/mods/2266
27-
- Pirate Homebrew Subclass - https://www.nexusmods.com/baldursgate3/mods/3070
28-
- Red Mage - https://www.nexusmods.com/baldursgate3/mods/2056
28+
- Monk Subclass - Way of the Kensei - https://www.nexusmods.com/baldursgate3/mods/1330
29+
- Pirate (Homebrew Rogue Subclass) - https://www.nexusmods.com/baldursgate3/mods/3070
30+
- Red Mage / White Mage - https://www.nexusmods.com/baldursgate3/mods/2056 / https://www.nexusmods.com/baldursgate3/mods/2961
2931
- Thanator - https://www.nexusmods.com/baldursgate3/mods/2796
3032

3133
#### Race Icons
3234
- Aasimar - https://www.nexusmods.com/baldursgate3/mods/1824
3335
- Shadar-Kai - https://www.nexusmods.com/baldursgate3/mods/1305
3436
- Fizbans Treasury of Dragons - https://www.nexusmods.com/baldursgate3/mods/1793
3537
- Whispers of the Fey: Changelings Race - https://www.nexusmods.com/baldursgate3/mods/3110
38+
- Whispers of the Fey: Goblins Race - https://www.nexusmods.com/baldursgate3/mods/3254
3639

3740
#### Background Icons
3841
- Was a Goat - https://www.nexusmods.com/baldursgate3/mods/552
3942
- Additional Backgrounds - https://www.nexusmods.com/baldursgate3/mods/1874
4043

4144
#### Deity Icons
45+
- Faithful and Faithless - https://www.nexusmods.com/baldursgate3/mods/1512
4246
- Gods Extra - https://www.nexusmods.com/baldursgate3/mods/433
4347

4448
#### Action Resource Icons
4549
- Alternate Monk (Keyboard only) - https://www.nexusmods.com/baldursgate3/mods/2266
4650
- Artificer - https://www.nexusmods.com/baldursgate3/mods/1779
4751
- Blood Hunter (Keyboard only) - https://www.nexusmods.com/baldursgate3/mods/2151
48-
- Death Knight Class (Keyboard only) - https://www.nexusmods.com/baldursgate3/mods/1725
52+
- Death Knight Class - https://www.nexusmods.com/baldursgate3/mods/1725
53+
- Demon Hunter Class - https://www.nexusmods.com/baldursgate3/mods/3165
4954
- Expansion (Bladesinger - Keyboard only) - https://www.nexusmods.com/baldursgate3/mods/279
5055
- Improved Breath Weapon - https://www.nexusmods.com/baldursgate3/mods/993
5156
- Magus (Keyboard only) - https://www.nexusmods.com/baldursgate3/mods/422
52-
- Wizard Traditions Runesmith (Keyboard only) - https://www.nexusmods.com/baldursgate3/mods/2563
57+
- Mystic (Keyboard only) - https://www.nexusmods.com/baldursgate3/mods/2786
58+
- Wizard Traditions Runesmith (Keyboard only) - https://www.nexusmods.com/baldursgate3/mods/2563

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

+17-21
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@
143143
<ImageSource x:Key="MysticPsiPointsUnavailable">pack://application:,,,/GustavNoesisGUI;component/Assets/Mystic/Shared/Resources/ico_classRes_psipointsresource_missing.png</ImageSource>
144144
<ImageSource x:Key="MysticPsionicMasteryCharge">pack://application:,,,/GustavNoesisGUI;component/Assets/Mystic/Shared/Resources/ico_classRes_psionicmasteryresource_d.png</ImageSource>
145145
<ImageSource x:Key="MysticPsionicMasteryChargeUnavailable">pack://application:,,,/GustavNoesisGUI;component/Assets/Mystic/Shared/Resources/ico_classRes_psionicmasteryresource_missing.png</ImageSource>
146-
<!-- EDIT HERE -->
147-
<ImageSource x:Key="DemonicFury">pack://application:,,,/GustavNoesisGUI;component/Assets/WoWDemonHunterClass/Shared/Resources/Icon_DH_DemonicFury.png</ImageSource>
146+
<ImageSource x:Key="DemonicFury">pack://application:,,,/GustavNoesisGUI;component/Assets/WoWDemonHunterClass/Shared/Resources/Icon_DH_DemonicFury.png</ImageSource>
148147
<ImageSource x:Key="DemonicFuryUnavailable">pack://application:,,,/GustavNoesisGUI;component/Assets/WoWDemonHunterClass/Shared/Resources/Icon_DH_DemonicFury_Missing.png</ImageSource>
148+
<!-- EDIT HERE -->
149149

150150
<!-- This is the icon that appears on the tooltip -->
151151
<Style TargetType="Image" x:Key="IUI_ActionResourceTypeIdToSource" BasedOn="{StaticResource IUI_ActionResourceTypeIdToSourceDefault}">
@@ -210,17 +210,16 @@
210210
<DataTrigger Binding="{Binding TypeId}" Value="CunningDie">
211211
<Setter Property="Source" Value="{StaticResource CunningDie}"/>
212212
</DataTrigger>
213-
214-
<DataTrigger Binding="{Binding TypeId}" Value="PsiPointsResource">
213+
<DataTrigger Binding="{Binding TypeId}" Value="PsiPointsResource">
215214
<Setter Property="Source" Value="{StaticResource MysticPsiPoints}"/>
216215
</DataTrigger>
217216
<DataTrigger Binding="{Binding TypeId}" Value="PsionicMasteryResource">
218217
<Setter Property="Source" Value="{StaticResource MysticPsionicMasteryCharge}"/>
219218
</DataTrigger>
220-
<!-- EDIT HERE -->
221-
<DataTrigger Binding="{Binding TypeId}" Value="DemonicFury">
219+
<DataTrigger Binding="{Binding TypeId}" Value="DemonicFury">
222220
<Setter Property="Source" Value="{StaticResource DemonicFury}"/>
223221
</DataTrigger>
222+
<!-- EDIT HERE -->
224223
</Style.Triggers>
225224
</Style>
226225

@@ -812,7 +811,6 @@
812811
<Setter Property="Source" Value="{StaticResource CunningDieUnavailable}"/>
813812
</MultiDataTrigger.Setters>
814813
</MultiDataTrigger>
815-
816814
<MultiDataTrigger>
817815
<MultiDataTrigger.Conditions>
818816
<Condition Binding="{Binding TypeId}" Value="PsiPointsResource"/>
@@ -832,9 +830,8 @@
832830
<MultiDataTrigger.Setters>
833831
<Setter Property="Source" Value="{StaticResource MysticPsionicMasteryChargeUnavailable}"/>
834832
</MultiDataTrigger.Setters>
835-
</MultiDataTrigger>
836-
<!-- EDIT HERE -->
837-
<MultiDataTrigger>
833+
</MultiDataTrigger>
834+
<MultiDataTrigger>
838835
<MultiDataTrigger.Conditions>
839836
<Condition Binding="{Binding TypeId}" Value="DemonicFury"/>
840837
<Condition Binding="{Binding Value}" Value="0"/>
@@ -844,7 +841,7 @@
844841
<Setter Property="Source" Value="{StaticResource DemonicFuryUnavailable}"/>
845842
</MultiDataTrigger.Setters>
846843
</MultiDataTrigger>
847-
844+
<!-- EDIT HERE -->
848845
</Style.Triggers>
849846
</Style>
850847

@@ -1110,7 +1107,7 @@
11101107
</ControlTemplate.Resources>
11111108
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
11121109
</ControlTemplate>
1113-
1110+
11141111
<ControlTemplate x:Key="ActionResources.ActionGroup.PracticedStrikeGroup" TargetType="ls:LSActionPoint">
11151112
<ControlTemplate.Resources>
11161113
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/AlternateMonk/Shared/Resources/c_ico_res_PracticedStrike_h.png</ImageSource>
@@ -1149,8 +1146,8 @@
11491146
</ControlTemplate.Resources>
11501147
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
11511148
</ControlTemplate>
1152-
1153-
<ControlTemplate x:Key="ActionResources.ActionGroup.MysticPsiPointsGroup" TargetType="ls:LSActionPoint">
1149+
1150+
<ControlTemplate x:Key="ActionResources.ActionGroup.MysticPsiPointsGroup" TargetType="ls:LSActionPoint">
11541151
<ControlTemplate.Resources>
11551152
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/Mystic/Shared/Resources/ico_classRes_psipointsresource_h.png</ImageSource>
11561153
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/Mystic/Shared/Resources/ico_classRes_psipointsresource_d.png</ImageSource>
@@ -1169,7 +1166,7 @@
11691166
</ControlTemplate.Resources>
11701167
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
11711168
</ControlTemplate>
1172-
<!-- EDIT HERE -->
1169+
11731170
<ControlTemplate x:Key="ActionResources.ActionGroup.DemonicFuryGroup" TargetType="ls:LSActionPoint">
11741171
<ControlTemplate.Resources>
11751172
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/WoWDemonHunterClass/Shared/Resources/Icon_DH_DemonicFury_Hover.png</ImageSource>
@@ -1179,7 +1176,8 @@
11791176
</ControlTemplate.Resources>
11801177
<ContentPresenter ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
11811178
</ControlTemplate>
1182-
1179+
<!-- EDIT HERE -->
1180+
11831181
<!-- Setup default styles that are inherited before changes are applied, do not touch these -->
11841182
<ControlTemplate x:Key="ActionResources.ActionGroup.FallbackActionPointGroup">
11851183
<ControlTemplate.Resources>
@@ -1730,8 +1728,7 @@
17301728
<Setter Property="Margin" Value="0,-15,0,0"/>
17311729
</MultiDataTrigger.Setters>
17321730
</MultiDataTrigger>
1733-
1734-
<DataTrigger Binding="{Binding TypeId}" Value="PsiPointsResource">
1731+
<DataTrigger Binding="{Binding TypeId}" Value="PsiPointsResource">
17351732
<Setter Property="ActionPointTemplate" Value="{DynamicResource ActionResources.ActionGroup.MysticPsiPointsGroup}"/>
17361733
<Setter Property="ActionPointSize" Value="{DynamicResource ActionResources.ActionPointSize}" />
17371734
</DataTrigger>
@@ -1757,8 +1754,7 @@
17571754
<Setter Property="Margin" Value="0,-15,0,0"/>
17581755
</MultiDataTrigger.Setters>
17591756
</MultiDataTrigger>
1760-
<!-- EDIT HERE -->
1761-
<DataTrigger Binding="{Binding TypeId}" Value="DemonicFury">
1757+
<DataTrigger Binding="{Binding TypeId}" Value="DemonicFury">
17621758
<Setter Property="ActionPointTemplate" Value="{DynamicResource ActionResources.ActionGroup.DemonicFuryGroup}"/>
17631759
<Setter Property="MaxGroupActionPoints" Value="1"/>
17641760
<Setter Property="ActionPointSize" Value="{DynamicResource ActionResources.ActionPointSize}" />
@@ -1772,7 +1768,7 @@
17721768
<Setter Property="Margin" Value="0,-15,0,0"/>
17731769
</MultiDataTrigger.Setters>
17741770
</MultiDataTrigger>
1775-
1771+
<!-- EDIT HERE -->
17761772
</Style.Triggers>
17771773
</Style>
17781774
</ResourceDictionary>

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,8 @@
275275
</ControlTemplate.Resources>
276276
<ContentControl ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
277277
</ControlTemplate>
278-
<!-- EDIT HERE -->
279-
280-
<ControlTemplate x:Key="ActionResources.ActionGroup.BloodRuneGroup" TargetType="ls:LSActionPoint">
278+
279+
<ControlTemplate x:Key="ActionResources.ActionGroup.BloodRuneGroup" TargetType="ls:LSActionPoint">
281280
<ControlTemplate.Resources>
282281
<ImageSource x:Key="Highlight">/GustavNoesisGUI;component/Assets/WoWDeathKnightClass/ActionResources_c/Icons/Icon_DK_BloodRune_Hover.png</ImageSource>
283282
<ImageSource x:Key="Available">/GustavNoesisGUI;component/Assets/WoWDeathKnightClass/ActionResources_c/Icons/Icon_DK_BloodRune.png</ImageSource>
@@ -326,6 +325,5 @@
326325
</ControlTemplate.Resources>
327326
<ContentPresenter ContentTemplate="{StaticResource ActionResources.ActionGroup.ActionPoint}"/>
328327
</ControlTemplate>
329-
330-
328+
<!-- EDIT HERE -->
331329
</ResourceDictionary>

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@
4545
<BitmapImage x:Key="BloodMaledictIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/BloodHunter/CC/icons_resources/ico_classRes_BloodMaledict.png" />
4646
<BitmapImage x:Key="HybridTransformationIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/BloodHunter/CC/icons_resources/ico_classRes_HybridTransformation.png" />
4747
<BitmapImage x:Key="WuJenSpellSlotIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/AlternateMonk/CC/icons_resources/ico_classRes_WuJenSpellSlot.png" />
48-
49-
<BitmapImage x:Key="MysticPsiPointsResourceIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Mystic/CC/icons_resources/ico_classRes_PsiPointsResource.png" />
48+
<BitmapImage x:Key="MysticPsiPointsResourceIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Mystic/CC/icons_resources/ico_classRes_PsiPointsResource.png" />
5049
<BitmapImage x:Key="MysticPsionicMasteryResourceIcon" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Mystic/CC/icons_resources/ico_classRes_PsionicMasteryResource.png" />
51-
<!-- EDIT HERE -->
50+
<!-- EDIT HERE -->
5251

5352
<!-- Reference entries below -->
5453
<!-- Revert to Tooltip icon if CC icon is not defined here -->
@@ -141,13 +140,12 @@
141140
<DataTrigger Binding="{Binding TypeId}" Value="WuJenSpellSlot">
142141
<Setter Property="Source" Value="{StaticResource WuJenSpellSlotIcon}"/>
143142
</DataTrigger>
144-
145-
<DataTrigger Binding="{Binding TypeId}" Value="PsiPointsResource">
143+
<DataTrigger Binding="{Binding TypeId}" Value="PsiPointsResource">
146144
<Setter Property="Source" Value="{StaticResource MysticPsiPointsResourceIcon}"/>
147145
</DataTrigger>
148146
<DataTrigger Binding="{Binding TypeId}" Value="PsionicMasteryResource">
149147
<Setter Property="Source" Value="{StaticResource MysticPsionicMasteryResourceIcon}"/>
150-
</DataTrigger>
148+
</DataTrigger>
151149
<!-- EDIT HERE -->
152150
</Style.Triggers>
153151
</Style>

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

+9-6
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@
384384
<Setter TargetName="LevelImage" Property="Width" Value="50"/>
385385
<Setter TargetName="LevelImage" Property="Stretch" Value="Fill"/>
386386
</DataTrigger>
387-
<!-- EDIT HERE -->
388-
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="BloodRune">
387+
388+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="BloodRune">
389389
<Setter TargetName="ResourcePoints" Property="Visibility" Value="Collapsed"/>
390390
<Setter TargetName="ResourcePoints" Property="MaxActionPoints" Value="1"/>
391391
<Setter TargetName="ResourceName" Property="Visibility" Value="Visible"/>
@@ -459,8 +459,9 @@
459459
<Setter TargetName="LevelImage" Property="Stretch" Value="Fill"/>
460460
<Setter TargetName="ActionResourceBackground" Property="Fill" Value="#9933FF"/>
461461
<Setter TargetName="ActionResourceBackgroundStroke" Property="Stroke" Value="#9933FF"/>
462-
</DataTrigger>
463-
462+
</DataTrigger>
463+
<!-- EDIT HERE -->
464+
464465
<!-- Please leave the below alone -->
465466
<DataTrigger Binding="{Binding ActionResource.Level}" Value="1">
466467
<Setter TargetName="LevelImage" Property="Visibility" Value="Visible"/>
@@ -806,7 +807,7 @@
806807
</Setter>
807808
<Setter TargetName="ResourceImage" Property="Width" Value="50"/>
808809
</DataTrigger>
809-
<!-- EDIT HERE -->
810+
810811
<DataTrigger Binding="{Binding TypeId}" Value="BloodRune">
811812
<Setter TargetName="LevelImage" Property="Visibility" Value="Visible"/>
812813
<Setter TargetName="LevelImage" Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/WoWDeathKnightClass/ActionResources_c/Icons/Icon_DK_BloodRune.png"/>
@@ -846,7 +847,9 @@
846847
<Setter TargetName="ResourceName" Property="Visibility" Value="Visible"/>
847848
<Setter TargetName="ResourceValue" Property="Visibility" Value="Visible"/>
848849
<Setter TargetName="ResourceValue" Property="ls:TextBlockFormatter.SourceText" Value="{Binding MaxValue}"/>
849-
</DataTrigger>
850+
</DataTrigger>
851+
<!-- EDIT HERE -->
852+
850853

851854
<DataTrigger Binding="{Binding Level}" Value="1">
852855
<Setter TargetName="LevelImage" Property="Visibility" Value="Visible"/>

0 commit comments

Comments
 (0)