Skip to content

Commit cf1889a

Browse files
authored
Merge pull request #72 from TheRealDjmr/finishingcustomassets
Finishingcustomassets
2 parents 1b05f06 + 4a58ac9 commit cf1889a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+429
-6312
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

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

+23-10
Original file line numberDiff line numberDiff line change
@@ -2392,7 +2392,7 @@
23922392
<TextBlock x:Name="description" ls:TextBlockFormatter.SourceText="{Binding Description.Text}" Style="{StaticResource PanelDescriptionText}" Margin="0,50,0,0"/>
23932393

23942394
<!-- MOD START - Restrict passive list max height -->
2395-
<ls:LSScrollViewer Style="{StaticResource gameplayPanelScrollViewerStyle}" Height="1000" VerticalScrollBarVisibility="Auto">
2395+
<ls:LSScrollViewer Style="{StaticResource gameplayPanelScrollViewerStyle}" MaxHeight="1000" Height="Auto" VerticalScrollBarVisibility="Auto">
23962396
<ItemsControl ItemsSource="{Binding Passives}" HorizontalAlignment="Center" Margin="-32,32,0,0">
23972397
<ItemsControl.ItemTemplate>
23982398
<DataTemplate DataType="{x:Type ls:VMCharacterCreationPassive}">
@@ -4534,15 +4534,27 @@
45344534
<Grid Grid.Column="1" Height="1650" DataContext="{Binding SelectedFeatDetails}" Visibility="{Binding HasFeat, Converter={StaticResource BoolToVisibleConverter}}" Margin="0,100">
45354535
<ls:LSNineSliceImage Slices="100,80,100,80" Width="800" MinHeight="1650" Margin="-12,-16,-12,-12" ImageSource="{StaticResource FeatEditBackground}"/>
45364536

4537-
<StackPanel x:Name="featEditPanel">
4538-
<Image Source="{StaticResource IconClass}" Stretch="None" Margin="0,64,0,0"/>
4539-
4540-
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Name}" Style="{StaticResource PanelHeaderText}"/>
4541-
4542-
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Description.Text}" Style="{StaticResource PanelDescriptionText}" MaxWidth="700" Margin="0,20,0,0"/>
4537+
<!-- MOD START - Feat panel changes to support modded feats -->
4538+
<Grid x:Name="featEditPanel" VerticalAlignment="Top">
4539+
<Grid.RowDefinitions>
4540+
<RowDefinition Height="Auto"/>
4541+
<RowDefinition Height="Auto"/>
4542+
<RowDefinition Height="Auto"/>
4543+
<RowDefinition Height="*"/>
4544+
</Grid.RowDefinitions>
4545+
<Image Grid.Row="0" Source="{StaticResource IconClass}" Stretch="None" Margin="0,64,0,0"/>
4546+
4547+
<TextBlock Grid.Row="1" ls:TextBlockFormatter.SourceText="{Binding Name}" Style="{StaticResource PanelHeaderText}"/>
4548+
4549+
<ls:LSScrollViewer Grid.Row="2" Style="{StaticResource gameplayPanelScrollViewerStyle}" VerticalScrollBarVisibility="Auto" MaxHeight="350" Height="Auto" Width="840" Margin="0,20,0,0" Padding="-40,0,40,60">
4550+
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Description.Text}" Style="{StaticResource PanelDescriptionText}" MaxWidth="700"/>
4551+
</ls:LSScrollViewer>
45434552

4544-
<ls:LSScrollViewer Style="{StaticResource gameplayPanelScrollViewerStyle}" VerticalScrollBarVisibility="Auto" Height="1200" Width="840" Margin="-20,20,-20,0">
4545-
<StackPanel Width="800" HorizontalAlignment="Left" Margin="20,0">
4553+
<ls:LSScrollViewer Grid.Row="3" Style="{StaticResource gameplayPanelScrollViewerStyle}" VerticalScrollBarVisibility="Auto" Height="Auto" Width="840" Margin="-20,20,-20,0">
4554+
<Grid>
4555+
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Description.Text}" Style="{StaticResource PanelDescriptionText}" MaxWidth="700" Margin="0,20,0,0"/>
4556+
</Grid>
4557+
<StackPanel Width="800" HorizontalAlignment="Left" Margin="20,0">
45464558

45474559
<!-- Boosts and Abilities -->
45484560
<ItemsControl ItemsSource="{Binding FeatDetails.Progressions}">
@@ -4842,7 +4854,8 @@
48424854
</ItemsControl>
48434855
</StackPanel>
48444856
</ls:LSScrollViewer>
4845-
</StackPanel>
4857+
</Grid>
4858+
<!-- MOD END -->
48464859
</Grid>
48474860

48484861
<Grid x:Name="SpellSelectorGrid" Grid.Column="2" Height="1650" Margin="0,100" Visibility="Collapsed" Panel.ZIndex="10" Width="800">

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

+182-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
xmlns:noesis="clr-namespace:NoesisGUIExtensions;assembly=Noesis.GUI.Extensions"
1010
mc:Ignorable="d">
1111

12-
<!-- MOD START - Custom Class/Race icon files to load -->
12+
<!-- MOD START - Custom modded icon files to load -->
1313
<ResourceDictionary.MergedDictionaries>
1414
<ResourceDictionary Source="../Library/IUI_ClassIcons.xaml"/>
1515
<ResourceDictionary Source="../Library/IUI_RaceIcons.xaml"/>
1616
<ResourceDictionary Source="../Library/IUI_ActionResourceIcons.xaml"/>
17+
<ResourceDictionary Source="../Library/IUI_BackgroundIcons.xaml"/>
1718
</ResourceDictionary.MergedDictionaries>
1819
<!-- MOD END -->
1920

@@ -88,7 +89,9 @@
8889

8990
<!-- Section styles -->
9091

91-
<Style TargetType="Image" x:Key="ActionResourceTypeIdToSource" BasedOn="{StaticResource IUI_ActionResourceTypeIdToSource}">
92+
<!-- MOD START - Custom modded action resources -->
93+
<Style TargetType="Image" x:Key="ActionResourceTypeIdToSource" BasedOn="{StaticResource IUI_ActionResourceTypeIdToSource}">
94+
<!-- MOD END -->
9295
<Style.Triggers>
9396
<DataTrigger Binding="{Binding TypeId}" Value="ActionPoint">
9497
<Setter Property="Source" Value="{StaticResource IconActionPoint}"/>
@@ -158,8 +161,185 @@
158161
</DataTrigger>
159162
</Style.Triggers>
160163
</Style>
164+
165+
<!-- MOD START - Custom backgrounds, taken directly from DefaultTheme.Styles and just overwritten here -->
166+
<Style x:Key="BackgroundIconStyle" TargetType="Rectangle" BasedOn="{StaticResource IUI_BackgroundIconStyle}">
167+
<Style.Triggers>
168+
<DataTrigger Binding="{Binding Guid}" Value="633aa4be-365f-4358-ba56-e2b85f9a88ec">
169+
<Setter Property="OpacityMask">
170+
<Setter.Value>
171+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Acolyte.png"/>
172+
</Setter.Value>
173+
</Setter>
174+
</DataTrigger>
175+
<DataTrigger Binding="{Binding Guid}" Value="38c7c859-c284-4df2-b17f-6199edc40e6b">
176+
<Setter Property="OpacityMask">
177+
<Setter.Value>
178+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Astarion.png"/>
179+
</Setter.Value>
180+
</Setter>
181+
</DataTrigger>
182+
<DataTrigger Binding="{Binding Guid}" Value="76925f0b-3ec8-4f42-86a9-cd4f745af2ac">
183+
<Setter Property="OpacityMask">
184+
<Setter.Value>
185+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Charlatan.png"/>
186+
</Setter.Value>
187+
</Setter>
188+
</DataTrigger>
189+
<DataTrigger Binding="{Binding Guid}" Value="e8c84134-5e91-4ecc-881a-efc47680129b">
190+
<Setter Property="OpacityMask">
191+
<Setter.Value>
192+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Criminal.png"/>
193+
</Setter.Value>
194+
</Setter>
195+
</DataTrigger>
196+
<DataTrigger Binding="{Binding Guid}" Value="229775c9-3044-4779-a3bb-532c39238e03">
197+
<Setter Property="OpacityMask">
198+
<Setter.Value>
199+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Entertainment.png"/>
200+
</Setter.Value>
201+
</Setter>
202+
</DataTrigger>
203+
<DataTrigger Binding="{Binding Guid}" Value="efcb0b57-5d5a-4a54-a7b3-a618829fe379">
204+
<Setter Property="OpacityMask">
205+
<Setter.Value>
206+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Folk_Hero.png"/>
207+
</Setter.Value>
208+
</Setter>
209+
</DataTrigger>
210+
<DataTrigger Binding="{Binding Guid}" Value="5426bad7-d02e-4884-aa2c-382d40f611bf">
211+
<Setter Property="OpacityMask">
212+
<Setter.Value>
213+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Gale.png"/>
214+
</Setter.Value>
215+
</Setter>
216+
</DataTrigger>
217+
<DataTrigger Binding="{Binding Guid}" Value="e9aeac40-6c4e-4d81-9a24-e9eeb6208e85">
218+
<Setter Property="OpacityMask">
219+
<Setter.Value>
220+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Guild_Artisan.png"/>
221+
</Setter.Value>
222+
</Setter>
223+
</DataTrigger>
224+
<DataTrigger Binding="{Binding Guid}" Value="da427b49-2732-43a0-808c-c8987de56251">
225+
<Setter Property="OpacityMask">
226+
<Setter.Value>
227+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Halsin.png"/>
228+
</Setter.Value>
229+
</Setter>
230+
</DataTrigger>
231+
<DataTrigger Binding="{Binding Guid}" Value="20d865ea-03bd-47bf-97d3-777e1b36b073">
232+
<Setter Property="OpacityMask">
233+
<Setter.Value>
234+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/HauntedOne.png"/>
235+
</Setter.Value>
236+
</Setter>
237+
</DataTrigger>
238+
<DataTrigger Binding="{Binding Guid}" Value="a1dab8dc-3be9-4062-b4db-a640230bba61">
239+
<Setter Property="OpacityMask">
240+
<Setter.Value>
241+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Hermit.png"/>
242+
</Setter.Value>
243+
</Setter>
244+
</DataTrigger>
245+
<DataTrigger Binding="{Binding Guid}" Value="1441d9c8-c117-47c9-858d-588cd003192e">
246+
<Setter Property="OpacityMask">
247+
<Setter.Value>
248+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Jaheira.png"/>
249+
</Setter.Value>
250+
</Setter>
251+
</DataTrigger>
252+
<DataTrigger Binding="{Binding Guid}" Value="7e9fc515-6c03-47d0-952f-f346128d56e6">
253+
<Setter Property="OpacityMask">
254+
<Setter.Value>
255+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Karlach.png"/>
256+
</Setter.Value>
257+
</Setter>
258+
</DataTrigger>
259+
<DataTrigger Binding="{Binding Guid}" Value="a16099db-2d25-4d02-bf66-476302beb66e">
260+
<Setter Property="OpacityMask">
261+
<Setter.Value>
262+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Laezel.png"/>
263+
</Setter.Value>
264+
</Setter>
265+
</DataTrigger>
266+
<DataTrigger Binding="{Binding Guid}" Value="dba0a9d1-15bd-4061-99f2-f1ec0f758258">
267+
<Setter Property="OpacityMask">
268+
<Setter.Value>
269+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Minsc.png"/>
270+
</Setter.Value>
271+
</Setter>
272+
</DataTrigger>
273+
<DataTrigger Binding="{Binding Guid}" Value="38a3fe7a-59f4-4dbf-88e1-6e9b62e74ff1">
274+
<Setter Property="OpacityMask">
275+
<Setter.Value>
276+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Minthara.png"/>
277+
</Setter.Value>
278+
</Setter>
279+
</DataTrigger>
280+
<DataTrigger Binding="{Binding Guid}" Value="7e820dee-a8fc-43b2-8661-2b404454bade">
281+
<Setter Property="OpacityMask">
282+
<Setter.Value>
283+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Noble.png"/>
284+
</Setter.Value>
285+
</Setter>
286+
</DataTrigger>
287+
<DataTrigger Binding="{Binding Guid}" Value="5b1e726f-52bf-4e93-a798-9f93c067ee7f">
288+
<Setter Property="OpacityMask">
289+
<Setter.Value>
290+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Outlander.png"/>
291+
</Setter.Value>
292+
</Setter>
293+
</DataTrigger>
294+
<DataTrigger Binding="{Binding Guid}" Value="8807a6c6-d8cf-494b-aec2-cc01d7517a56">
295+
<Setter Property="OpacityMask">
296+
<Setter.Value>
297+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Sage.png"/>
298+
</Setter.Value>
299+
</Setter>
300+
</DataTrigger>
301+
<DataTrigger Binding="{Binding Guid}" Value="7a7be1dc-4bf7-49a0-bc33-31440b68c035">
302+
<Setter Property="OpacityMask">
303+
<Setter.Value>
304+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Sailor.png"/>
305+
</Setter.Value>
306+
</Setter>
307+
</DataTrigger>
308+
<DataTrigger Binding="{Binding Guid}" Value="aa8ee193-973a-4d2b-906f-3f8488a75f2c">
309+
<Setter Property="OpacityMask">
310+
<Setter.Value>
311+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Shadowheart.png"/>
312+
</Setter.Value>
313+
</Setter>
314+
</DataTrigger>
315+
<DataTrigger Binding="{Binding Guid}" Value="1252a86e-9baa-4ccb-b8ce-2378ae006f0b">
316+
<Setter Property="OpacityMask">
317+
<Setter.Value>
318+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Soldier.png"/>
319+
</Setter.Value>
320+
</Setter>
321+
</DataTrigger>
322+
<DataTrigger Binding="{Binding Guid}" Value="ac38525a-222b-4280-9c8e-60d5533b675c">
323+
<Setter Property="OpacityMask">
324+
<Setter.Value>
325+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Urchin.png"/>
326+
</Setter.Value>
327+
</Setter>
328+
</DataTrigger>
329+
<DataTrigger Binding="{Binding Guid}" Value="30a9679f-be5b-4484-9c8e-e5edc9245f53">
330+
<Setter Property="OpacityMask">
331+
<Setter.Value>
332+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_backgrounds/Wyll.png"/>
333+
</Setter.Value>
334+
</Setter>
335+
</DataTrigger>
336+
</Style.Triggers>
337+
</Style>
338+
<!-- MOD END -->
161339

340+
<!-- MOD START - Custom action resource icons -->
162341
<Style TargetType="Image" x:Key="SectionImageStyle" BasedOn="{StaticResource ActionResourceTypeIdToSource}">
342+
<!-- MOD END -->
163343
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Shared/ico_red_star.png"/>
164344
<Setter Property="Width" Value="{StaticResource IconActionPointSize}"/>
165345
<Setter Property="MaxHeight" Value="{StaticResource IconActionPointSize}"/>

0 commit comments

Comments
 (0)