Skip to content

Commit 9b71e9a

Browse files
authored
Merge pull request #59 from TheRealDjmr/assets-class-and-race-icons
Assets class and race icons
2 parents 84fef1f + f42109f commit 9b71e9a

File tree

89 files changed

+374
-348
lines changed

Some content is hidden

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

89 files changed

+374
-348
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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

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

+231-348
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<!-- This is a file for storing Class icon entries. The idea is to put Class icons here instead of updating multiple files -->
2+
3+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
7+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
xmlns:System="clr-namespace:System;assembly=mscorlib"
9+
xmlns:ls="clr-namespace:ls;assembly=SharedGUI"
10+
xmlns:noesis="clr-namespace:NoesisGUIExtensions;assembly=Noesis.GUI.Extensions"
11+
mc:Ignorable="d">
12+
13+
<!-- This is the icon that appears in the top right of the CC screen/shows in character sheet when the class/subclass is selected -->
14+
<Style x:Key="IUI_MainClassIconStyle" TargetType="Image" >
15+
<!-- This is a generic icon for mods with no class icons provided -->
16+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/generic.png"/>
17+
<Style.Triggers>
18+
<!--<DataTrigger Binding="{Binding IDString}" Value="Barbarian">
19+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/barbarian.png"/>
20+
</DataTrigger> -->
21+
<DataTrigger Binding="{Binding IDString}" Value="Artificer">
22+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/artificer.png"/>
23+
</DataTrigger>
24+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Armorer">
25+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/armorer.png"/>
26+
</DataTrigger>
27+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Artillerist">
28+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/artillerist.png"/>
29+
</DataTrigger>
30+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Alchemist">
31+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/alchemist.png"/>
32+
</DataTrigger>
33+
<DataTrigger Binding="{Binding SubclassIDString}" Value="BattleSmith">
34+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/battlesmith.png"/>
35+
</DataTrigger>
36+
<DataTrigger Binding="{Binding SubclassIDString}" Value="ArcanaDomain">
37+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/cleric_clericsarcana.png"/>
38+
</DataTrigger>
39+
<DataTrigger Binding="{Binding SubclassIDString}" Value="ForgeDomain">
40+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/cleric_clericsforge.png"/>
41+
</DataTrigger>
42+
<DataTrigger Binding="{Binding SubclassIDString}" Value="DeathDomain">
43+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/cleric_clericsdeath.png"/>
44+
</DataTrigger>
45+
<DataTrigger Binding="{Binding SubclassIDString}" Value="GraveDomain">
46+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/cleric_clericsgrave.png"/>
47+
</DataTrigger>
48+
<DataTrigger Binding="{Binding SubclassIDString}" Value="OrderDomain">
49+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/cleric_clericsorder.png"/>
50+
</DataTrigger>
51+
<DataTrigger Binding="{Binding SubclassIDString}" Value="TwilightDomain">
52+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/cleric_clericstwilight.png"/>
53+
</DataTrigger>
54+
<DataTrigger Binding="{Binding SubclassIDString}" Value="PeaceDomain">
55+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/cleric_clericspeace.png"/>
56+
</DataTrigger>
57+
</Style.Triggers>
58+
</Style>
59+
60+
<!-- This is the icon that appears as an option when choosing class/subclass in CC/shows in bottom left of hotbar -->
61+
<Style x:Key="IUI_MainClassIconHotbarStyle" TargetType="Image" >
62+
<Style.Triggers>
63+
<!--<DataTrigger Binding="{Binding IDString}" Value="Barbarian">
64+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/ClassIcons/hotbar/barbarian.png"/>
65+
</DataTrigger> -->
66+
<DataTrigger Binding="{Binding IDString}" Value="Artificer">
67+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/hotbar/artificer.png"/>
68+
</DataTrigger>
69+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Armorer">
70+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/hotbar/armorer.png"/>
71+
</DataTrigger>
72+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Artillerist">
73+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/hotbar/artillerist.png"/>
74+
</DataTrigger>
75+
<DataTrigger Binding="{Binding SubclassIDString}" Value="Alchemist">
76+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/hotbar/alchemist.png"/>
77+
</DataTrigger>
78+
<DataTrigger Binding="{Binding SubclassIDString}" Value="BattleSmith">
79+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Artificer/ClassIcons/hotbar/battlesmith.png"/>
80+
</DataTrigger>
81+
<DataTrigger Binding="{Binding SubclassIDString}" Value="ArcanaDomain">
82+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/hotbar/cleric_clericsarcana.png"/>
83+
</DataTrigger>
84+
<DataTrigger Binding="{Binding SubclassIDString}" Value="ForgeDomain">
85+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/hotbar/cleric_clericsforge.png"/>
86+
</DataTrigger>
87+
<DataTrigger Binding="{Binding SubclassIDString}" Value="DeathDomain">
88+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/hotbar/cleric_clericsdeath.png"/>
89+
</DataTrigger>
90+
<DataTrigger Binding="{Binding SubclassIDString}" Value="GraveDomain">
91+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/hotbar/cleric_clericsgrave.png"/>
92+
</DataTrigger>
93+
<DataTrigger Binding="{Binding SubclassIDString}" Value="OrderDomain">
94+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/hotbar/cleric_clericsorder.png"/>
95+
</DataTrigger>
96+
<DataTrigger Binding="{Binding SubclassIDString}" Value="TwilightDomain">
97+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/hotbar/cleric_clericstwilight.png"/>
98+
</DataTrigger>
99+
<DataTrigger Binding="{Binding SubclassIDString}" Value="PeaceDomain">
100+
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Clerics/ClassIcons/hotbar/cleric_clericspeace.png"/>
101+
</DataTrigger>
102+
</Style.Triggers>
103+
</Style>
104+
105+
</ResourceDictionary>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!-- This is a file for storing Race icon entries. The idea is to put Race icons here instead of updating multiple files -->
2+
3+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
7+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
xmlns:System="clr-namespace:System;assembly=mscorlib"
9+
xmlns:ls="clr-namespace:ls;assembly=SharedGUI"
10+
xmlns:noesis="clr-namespace:NoesisGUIExtensions;assembly=Noesis.GUI.Extensions"
11+
mc:Ignorable="d">
12+
13+
<!-- This is the icon that appears as an option when choosing race/subrace in CC -->
14+
<Style x:Key="IUI_RaceIconStyle" TargetType="Rectangle">
15+
<Setter Property="OpacityMask">
16+
<Setter.Value>
17+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC_c/CustomCharacter.png"/>
18+
</Setter.Value>
19+
</Setter>
20+
<Style.Triggers>
21+
<!--<DataTrigger Binding="{Binding Guid}" Value="9c61a74a-20df-4119-89c5-d996956b6c66">
22+
<Setter Property="OpacityMask">
23+
<Setter.Value>
24+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/icons_races/Dragonborn.png"/>
25+
</Setter.Value>
26+
</Setter>
27+
</DataTrigger> -->
28+
<DataTrigger Binding="{Binding Guid}" Value="27844147-3e0f-4b2e-8377-8d015b8384df">
29+
<Setter Property="OpacityMask">
30+
<Setter.Value>
31+
<ImageBrush ImageSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Shadarkai/CC/icons_races/Elf_ShadarKai.png"/>
32+
</Setter.Value>
33+
</Setter>
34+
</DataTrigger>
35+
</Style.Triggers>
36+
</Style>
37+
38+
</ResourceDictionary>

0 commit comments

Comments
 (0)