Skip to content

Commit 788261d

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #291 from TheRealDjmr/patch6beta
Patch6beta
2 parents bbe7b86 + a4dfede commit 788261d

10 files changed

+598
-559
lines changed

‎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="110478928358932480"/>
25+
<attribute id="Version" type="int64" value="110619665847287808"/>
2626
<children>
2727
<node id="PublishVersion">
28-
<attribute id="Version" type="int64" value="110478928358932480"/>
28+
<attribute id="Version" type="int64" value="110619665847287808"/>
2929
</node>
3030
<node id="Scripts"/>
3131
<node id="TargetModes">

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

+73-43
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@
2424
<!-- MOD END -->
2525
</ResourceDictionary.MergedDictionaries>
2626

27+
<!-- CC Grid Icons -->
28+
<SolidColorBrush x:Key="CCIconDefault" Color="{StaticResource baseColor}"/>
29+
<SolidColorBrush x:Key="CCIconSelected" Color="{StaticResource accent75Color}"/>
30+
<SolidColorBrush x:Key="CCIconSelectedPad" Color="{StaticResource accent100Color}"/>
31+
<SolidColorBrush x:Key="CCIconHovered" Color="{StaticResource accent75Color}"/>
32+
33+
<SolidColorBrush x:Key="CCTextPrimary" Color="{StaticResource tint100}"/>
34+
<SolidColorBrush x:Key="CCTextNormal" Color="{StaticResource baseColor}"/>
35+
<SolidColorBrush x:Key="CCTextLight" Color="{StaticResource accent75Color}"/>
36+
<SolidColorBrush x:Key="CCTextLightest" Color="{StaticResource accent100Color}"/>
37+
<SolidColorBrush x:Key="CCTextSpecial" Color="{StaticResource accent25Color}"/>
38+
39+
<SolidColorBrush x:Key="CCTabSelected" Color="{StaticResource tint100}"/>
40+
<SolidColorBrush x:Key="CCTabToDo" Color="{StaticResource alertColor}"/>
41+
<SolidColorBrush x:Key="CCTabDone" Color="{StaticResource baseColor}"/>
42+
2743
<BitmapImage x:Key="LevelUpBanner" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/bannergame.png"/>
2844
<BitmapImage x:Key="IconRace" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/ico_race.png"/>
2945
<BitmapImage x:Key="IconClass" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/ico_class.png"/>
@@ -98,7 +114,7 @@
98114
</Style>
99115

100116
<!-- MOD START - Custom Deity icons -->
101-
<Style x:Key="DeityIconStyle" TargetType="Rectangle" BasedOn="{StaticResource IUI_DeityIconStyle}">
117+
<Style x:Key="DeityIconStyle" TargetType="Rectangle" BasedOn="{StaticResource IUI_DeityIconStyle}">
102118
<!-- MOD END -->
103119
<Style.Triggers>
104120
<DataTrigger Binding="{Binding Guid}" Value="182b6754-ca35-436a-a17a-8d30fe8e8179">
@@ -749,7 +765,7 @@
749765
<ItemsControl ItemsSource="{Binding DummyCharacter.Stats.ClassList}" AlternationCount="{Binding DummyCharacter.Stats.ClassList.Count}" HorizontalAlignment="Center">
750766
<ItemsControl.ItemsPanel>
751767
<ItemsPanelTemplate>
752-
<WrapPanel IsItemsHost="True" MaxWidth="610"/>
768+
<ls:AlignableWrapPanel HorizontalContentAlignment="Center" IsItemsHost="True" MaxWidth="610"/>
753769
</ItemsPanelTemplate>
754770
</ItemsControl.ItemsPanel>
755771
<ItemsControl.ItemTemplate>
@@ -772,7 +788,7 @@
772788
<Binding Path="DataContext.DummyCharacter.Stats.ClassList.Count" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type ItemsControl}}"/>
773789
</MultiBinding>
774790
</StackPanel.Tag>
775-
791+
776792
<TextBlock x:Name="classInfo">
777793
<TextBlock.Text>
778794
<MultiBinding Converter="{StaticResource ParameterizedTranslatedStringConverter}">
@@ -795,6 +811,14 @@
795811
</ItemsControl.ItemTemplate>
796812
</ItemsControl>
797813

814+
<TextBlock x:Name="SubclassLabel" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Text="{Binding DummyCharacter.Stats.ClassList[0].SubclassDisplayName}" Style="{StaticResource StatsText}" Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource NullToCollapsedConverter}, ConverterParameter='EmptyString'}">
815+
<TextBlock.ToolTip>
816+
<ls:LSTooltip>
817+
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Path=DataContext.DummyCharacter.Stats.ClassList[0].SubclassDescription, ElementName=SubclassLabel}" TextWrapping="Wrap"/>
818+
</ls:LSTooltip>
819+
</TextBlock.ToolTip>
820+
</TextBlock>
821+
798822
<TextBlock x:Name="deity" Text="{Binding DummyCharacter.Stats.God}" Style="{StaticResource StatsText}" Visibility="{Binding DummyCharacter.Stats.God, Converter={StaticResource StringToVisibilityConverter}}">
799823
<TextBlock.ToolTip>
800824
<ls:LSTooltip>
@@ -864,52 +888,52 @@
864888
<ls:LSScrollViewer Template="{StaticResource NoForcedStyleScrollViewerTemplate}" VerticalScrollBarVisibility="Auto" Margin="0,0,0,0"
865889
Padding="0,0,0,20" MaxHeight="1080" Width="630">
866890
<StackPanel HorizontalAlignment="Left">
867-
<StackPanel x:Name="Cantrips" Margin="0,20,0,0" Visibility="{Binding ProgressionCantrips.Count, Converter={StaticResource CountToVisibilityConverter}}">
868-
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h7d02199dg44ecg4a1egbcacg9cc1cec197b3', Converter={StaticResource TranslatedStringConverter}}" Foreground="{DynamicResource CCTextPrimary}"/>
869-
<Grid HorizontalAlignment="Center">
870-
<Image Style="{DynamicResource SummarySpellsDecorationStyle}"/>
871-
<ItemsControl Style="{StaticResource SpellSelectorItemControlStyle}" ItemsSource="{Binding ProgressionCantrips}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
872-
</Grid>
873-
</StackPanel>
891+
<StackPanel x:Name="Cantrips" Margin="0,20,0,0" Visibility="{Binding ProgressionCantrips.Count, Converter={StaticResource CountToVisibilityConverter}}">
892+
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h7d02199dg44ecg4a1egbcacg9cc1cec197b3', Converter={StaticResource TranslatedStringConverter}}" Foreground="{DynamicResource CCTextPrimary}"/>
893+
<Grid HorizontalAlignment="Center">
894+
<Image Style="{DynamicResource SummarySpellsDecorationStyle}"/>
895+
<ItemsControl Style="{StaticResource SpellSelectorItemControlStyle}" ItemsSource="{Binding ProgressionCantrips}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
896+
</Grid>
897+
</StackPanel>
874898

875-
<StackPanel x:Name="Spells" Visibility="{Binding ProgressionSpells.Count, Converter={StaticResource CountToVisibilityConverter}}">
876-
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h2975f9c0gc2aag47d9ga3b3g3dd5171b9bf4', Converter={StaticResource TranslatedStringConverter}}"/>
877-
<Grid HorizontalAlignment="Center">
878-
<Image Style="{DynamicResource SummarySpellsDecorationStyle}"/>
879-
<ItemsControl Style="{StaticResource SpellSelectorItemControlStyle}" ItemsSource="{Binding ProgressionSpells}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
880-
</Grid>
881-
</StackPanel>
899+
<StackPanel x:Name="Spells" Visibility="{Binding ProgressionSpells.Count, Converter={StaticResource CountToVisibilityConverter}}">
900+
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h2975f9c0gc2aag47d9ga3b3g3dd5171b9bf4', Converter={StaticResource TranslatedStringConverter}}"/>
901+
<Grid HorizontalAlignment="Center">
902+
<Image Style="{DynamicResource SummarySpellsDecorationStyle}"/>
903+
<ItemsControl Style="{StaticResource SpellSelectorItemControlStyle}" ItemsSource="{Binding ProgressionSpells}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
904+
</Grid>
905+
</StackPanel>
882906

883-
<StackPanel x:Name="Actions" Visibility="{Binding ProgressionActions.Count, Converter={StaticResource CountToVisibilityConverter}}">
884-
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h7ba895aaga020g4cf0g9ec0g6a98f5eaaa3c', Converter={StaticResource TranslatedStringConverter}}"/>
885-
<Grid HorizontalAlignment="Center">
886-
<Image Style="{DynamicResource SummarySpellsDecorationStyle}"/>
887-
<ItemsControl Style="{StaticResource SpellSelectorItemControlStyle}" ItemsSource="{Binding ProgressionActions}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
888-
</Grid>
889-
</StackPanel>
907+
<StackPanel x:Name="Actions" Visibility="{Binding ProgressionActions.Count, Converter={StaticResource CountToVisibilityConverter}}">
908+
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h7ba895aaga020g4cf0g9ec0g6a98f5eaaa3c', Converter={StaticResource TranslatedStringConverter}}"/>
909+
<Grid HorizontalAlignment="Center">
910+
<Image Style="{DynamicResource SummarySpellsDecorationStyle}"/>
911+
<ItemsControl Style="{StaticResource SpellSelectorItemControlStyle}" ItemsSource="{Binding ProgressionActions}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
912+
</Grid>
913+
</StackPanel>
890914

891-
<TextBlock x:Name="ProficienciesTitle" ls:TextBlockFormatter.SourceText="{Binding Source='hbdc95889g6f3fg46efg9993g036cf077a0e7', Converter={StaticResource TranslatedStringConverter}}" Margin="0,20,0,0"/>
892-
<StackPanel HorizontalAlignment="Center" Margin="0,10,0,20">
915+
<TextBlock x:Name="ProficienciesTitle" ls:TextBlockFormatter.SourceText="{Binding Source='hbdc95889g6f3fg46efg9993g036cf077a0e7', Converter={StaticResource TranslatedStringConverter}}" Margin="0,20,0,0"/>
916+
<StackPanel HorizontalAlignment="Center" Margin="0,10,0,20">
893917

894-
<Control Template="{StaticResource boostList}" DataContext="{Binding ProgressionData.AllProgressions.WeaponProficiencies}" Visibility="{Binding ProgressionData.AllProgressions.WeaponProficiencies.Count, Converter={StaticResource CountToVisibilityConverter}}">
895-
<Control.Resources>
896-
<ControlTemplate x:Key="labelTemplate">
897-
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source=h4a198683gedadg497dg9f15ga8606e44fc56, Converter={StaticResource TranslatedStringConverter}, StringFormat='{}{0} - '}" FontSize="{StaticResource ScaledDefaultFontSize}" Foreground="{StaticResource CCTextPrimary}"/>
898-
</ControlTemplate>
899-
</Control.Resources>
900-
</Control>
918+
<Control Template="{StaticResource boostList}" DataContext="{Binding ProgressionData.AllProgressions.WeaponProficiencies}" Visibility="{Binding ProgressionData.AllProgressions.WeaponProficiencies.Count, Converter={StaticResource CountToVisibilityConverter}}">
919+
<Control.Resources>
920+
<ControlTemplate x:Key="labelTemplate">
921+
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source=h4a198683gedadg497dg9f15ga8606e44fc56, Converter={StaticResource TranslatedStringConverter}, StringFormat='{}{0} - '}" FontSize="{StaticResource ScaledDefaultFontSize}" Foreground="{StaticResource CCTextPrimary}"/>
922+
</ControlTemplate>
923+
</Control.Resources>
924+
</Control>
901925

902-
<Control Template="{StaticResource boostList}" DataContext="{Binding ProgressionData.AllProgressions.ArmourProficiencies}" Visibility="{Binding ProgressionData.AllProgressions.ArmourProficiencies.Count, Converter={StaticResource CountToVisibilityConverter}}">
903-
<Control.Resources>
904-
<ControlTemplate x:Key="labelTemplate">
905-
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source=had29e589gd812g473bg90dfg66d1280fbbf1, Converter={StaticResource TranslatedStringConverter}, StringFormat='{}{0} - '}" FontSize="{StaticResource ScaledDefaultFontSize}" Foreground="{StaticResource CCTextPrimary}"/>
906-
</ControlTemplate>
907-
</Control.Resources>
908-
</Control>
926+
<Control Template="{StaticResource boostList}" DataContext="{Binding ProgressionData.AllProgressions.ArmourProficiencies}" Visibility="{Binding ProgressionData.AllProgressions.ArmourProficiencies.Count, Converter={StaticResource CountToVisibilityConverter}}">
927+
<Control.Resources>
928+
<ControlTemplate x:Key="labelTemplate">
929+
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source=had29e589gd812g473bg90dfg66d1280fbbf1, Converter={StaticResource TranslatedStringConverter}, StringFormat='{}{0} - '}" FontSize="{StaticResource ScaledDefaultFontSize}" Foreground="{StaticResource CCTextPrimary}"/>
930+
</ControlTemplate>
931+
</Control.Resources>
932+
</Control>
909933

910-
<Control Template="{StaticResource skillProgressions}" DataContext="{Binding SortedItems, ElementName=SortedSummarySkills}"/>
934+
<Control Template="{StaticResource skillProgressions}" DataContext="{Binding SortedItems, ElementName=SortedSummarySkills}"/>
911935

912-
</StackPanel>
936+
</StackPanel>
913937
</StackPanel>
914938
</ls:LSScrollViewer>
915939

@@ -944,6 +968,12 @@
944968
<Setter TargetName="ProficienciesTitle" Property="Visibility" Value="Collapsed"/>
945969
</MultiDataTrigger>
946970

971+
<!--Hide subclass when Multiclassing-->
972+
<DataTrigger Binding="{Binding DummyCharacter.stats.ClassList.Count, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True" >
973+
<Setter TargetName="SubclassLabel" Property="Visibility" Value="Collapsed"/>
974+
</DataTrigger>
975+
976+
947977
<!-- ToDo: update with assets when avaiable -->
948978
<DataTrigger Binding="{Binding ElementName=statInitiative, Path=IsFocused}" Value="True">
949979
<Setter TargetName="statInitiative" Property="Background" Value="White"/>
@@ -1179,4 +1209,4 @@
11791209
<Grid Background="Black" Opacity="0.9"/>
11801210
</ControlTemplate>
11811211

1182-
</ResourceDictionary>
1212+
</ResourceDictionary>

0 commit comments

Comments
 (0)