Skip to content

Commit 669ec16

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #216 from TheRealDjmr/patch5initial
Patch5initial
2 parents d6f8609 + 6084433 commit 669ec16

File tree

7 files changed

+924
-485
lines changed

7 files changed

+924
-485
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
BG3ImprovedUI.zip
21
*.zip
32
*.pak

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

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

+477-228
Large diffs are not rendered by default.

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

+64-56
Original file line numberDiff line numberDiff line change
@@ -1299,43 +1299,43 @@
12991299
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
13001300
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding ClassProgressionDetails.NotSubPassiveSelectors}"/>
13011301
</MultiDataTrigger>
1302-
<!-- MOD START - Racial passive selection in CC -->
1303-
<MultiDataTrigger>
1304-
<MultiDataTrigger.Conditions>
1305-
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=Self}}" Value="race"/>
1306-
<Condition Binding="{Binding Path=DataContext.RacePassives.Count, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True"/>
1307-
</MultiDataTrigger.Conditions>
1308-
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
1309-
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding RaceProgressionDetails.NotSubPassiveSelectors}"/>
1310-
</MultiDataTrigger>
1311-
<MultiDataTrigger>
1312-
<MultiDataTrigger.Conditions>
1313-
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=Self}}" Value="subrace"/>
1314-
<Condition Binding="{Binding Path=DataContext.SubRacePassives.Count, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True"/>
1315-
</MultiDataTrigger.Conditions>
1316-
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
1317-
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding RaceProgressionDetails.SubPassiveSelectors}"/>
1318-
</MultiDataTrigger>
1319-
<!-- MOD NOTE - Racial passive selection in LevelUp -->
1320-
<MultiDataTrigger>
1321-
<MultiDataTrigger.Conditions>
1322-
<Condition Binding="{Binding DataContext.IsLevelUp, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, FallbackValue=False}" Value="True"/>
1323-
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=Self}}" Value="race"/>
1324-
<Condition Binding="{Binding Path=RaceProgressionDetails.NotSubPassiveSelectors.Count, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True"/>
1325-
</MultiDataTrigger.Conditions>
1326-
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
1327-
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding RaceProgressionDetails.NotSubPassiveSelectors}"/>
1328-
</MultiDataTrigger>
1329-
<MultiDataTrigger>
1330-
<MultiDataTrigger.Conditions>
1331-
<Condition Binding="{Binding DataContext.IsLevelUp, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, FallbackValue=False}" Value="True"/>
1332-
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=Self}}" Value="race"/>
1333-
<Condition Binding="{Binding Path=RaceProgressionDetails.SubPassiveSelectors.Count, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True"/>
1334-
</MultiDataTrigger.Conditions>
1335-
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
1336-
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding RaceProgressionDetails.SubPassiveSelectors}"/>
1337-
</MultiDataTrigger>
1338-
<!-- MOD END -->
1302+
<!-- MOD START - Racial passive selection in CC -->
1303+
<MultiDataTrigger>
1304+
<MultiDataTrigger.Conditions>
1305+
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=Self}}" Value="race"/>
1306+
<Condition Binding="{Binding Path=DataContext.RacePassives.Count, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True"/>
1307+
</MultiDataTrigger.Conditions>
1308+
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
1309+
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding RaceProgressionDetails.NotSubPassiveSelectors}"/>
1310+
</MultiDataTrigger>
1311+
<MultiDataTrigger>
1312+
<MultiDataTrigger.Conditions>
1313+
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=Self}}" Value="subrace"/>
1314+
<Condition Binding="{Binding Path=DataContext.SubRacePassives.Count, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True"/>
1315+
</MultiDataTrigger.Conditions>
1316+
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
1317+
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding RaceProgressionDetails.SubPassiveSelectors}"/>
1318+
</MultiDataTrigger>
1319+
<!-- MOD NOTE - Racial passive selection in LevelUp -->
1320+
<MultiDataTrigger>
1321+
<MultiDataTrigger.Conditions>
1322+
<Condition Binding="{Binding DataContext.IsLevelUp, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, FallbackValue=False}" Value="True"/>
1323+
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=Self}}" Value="race"/>
1324+
<Condition Binding="{Binding Path=RaceProgressionDetails.NotSubPassiveSelectors.Count, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True"/>
1325+
</MultiDataTrigger.Conditions>
1326+
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
1327+
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding RaceProgressionDetails.NotSubPassiveSelectors}"/>
1328+
</MultiDataTrigger>
1329+
<MultiDataTrigger>
1330+
<MultiDataTrigger.Conditions>
1331+
<Condition Binding="{Binding DataContext.IsLevelUp, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}, FallbackValue=False}" Value="True"/>
1332+
<Condition Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=Self}}" Value="race"/>
1333+
<Condition Binding="{Binding Path=RaceProgressionDetails.SubPassiveSelectors.Count, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True"/>
1334+
</MultiDataTrigger.Conditions>
1335+
<Setter TargetName="subTabs" Property="Visibility" Value="Visible"/>
1336+
<Setter TargetName="subTabsPassivesList" Property="ItemsSource" Value="{Binding RaceProgressionDetails.SubPassiveSelectors}"/>
1337+
</MultiDataTrigger>
1338+
<!-- MOD END -->
13391339

13401340
<!-- Equipment subtabs -->
13411341
<MultiDataTrigger>
@@ -3578,7 +3578,7 @@
35783578
</TextBlock.Text>
35793579
</TextBlock>
35803580
</StackPanel>
3581-
<ItemsControl Grid.Row="1" Grid.Column="2" Width="100" ItemsSource="{Binding SortedItems, ElementName=SortedRaceSkills}" ItemTemplate="{StaticResource AllSkillTemplate}" Tag="Race" Visibility="{Binding RaceSkills.MaxSelectedSkillCount, Converter={StaticResource CountToVisibilityConverter}}"/>
3581+
<ItemsControl x:Name="selectableRaceCheckboxes" Grid.Row="1" Grid.Column="2" Width="100" ItemsSource="{Binding SortedItems, ElementName=SortedRaceSkills}" ItemTemplate="{StaticResource AllSkillTemplate}" Tag="Race" Visibility="{Binding RaceSkills.MaxSelectedSkillCount, Converter={StaticResource CountToVisibilityConverter}}"/>
35823582

35833583
<StackPanel x:Name="selectableClassSkills" Grid.Row="0" Grid.Column="3" Width="100" Visibility="{Binding AllSkills.ClassProficientSkills.MaxSelectedSkillCount, Converter={StaticResource CountToVisibilityConverter}}">
35843584
<StackPanel.ToolTip>
@@ -3638,6 +3638,18 @@
36383638
<DataTrigger Binding="{Binding AllSkills.ExpertiseSkills.IsComplete}" Value="False">
36393639
<Setter TargetName="ExpertiseSkillsTitle" Property="Foreground" Value="{StaticResource CCTabToDo}"/>
36403640
</DataTrigger>
3641+
<DataTrigger Binding="{Binding CurrentPlayer.UIData.CharacterCreationMode}" Value="Respec">
3642+
<Setter TargetName="selectableRaceSkills" Property="Visibility" Value="Collapsed"/>
3643+
<Setter TargetName="selectableRaceCheckboxes" Property="Visibility" Value="Collapsed"/>
3644+
</DataTrigger>
3645+
<DataTrigger Binding="{Binding CurrentPlayer.UIData.CharacterCreationMode}" Value="FullRespec">
3646+
<Setter TargetName="selectableRaceSkills" Property="Visibility" Value="Collapsed"/>
3647+
<Setter TargetName="selectableRaceCheckboxes" Property="Visibility" Value="Collapsed"/>
3648+
</DataTrigger>
3649+
<DataTrigger Binding="{Binding CurrentPlayer.UIData.CharacterCreationMode}" Value="LevelUp">
3650+
<Setter TargetName="selectableRaceSkills" Property="Visibility" Value="Collapsed"/>
3651+
<Setter TargetName="selectableRaceCheckboxes" Property="Visibility" Value="Collapsed"/>
3652+
</DataTrigger>
36413653
</ControlTemplate.Triggers>
36423654
</ControlTemplate>
36433655

@@ -3876,29 +3888,19 @@
38763888

38773889
</DockPanel>
38783890

3879-
<ls:LSButton x:Name="CancelButton" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,60"
3880-
Command="{Binding DataContext.SelectFirstUsedClass, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}" Visibility="Collapsed">
3891+
<ls:LSButton x:Name="CancelButton"
3892+
HorizontalAlignment="Center"
3893+
VerticalAlignment="Bottom"
3894+
Margin="0,0,0,60"
3895+
Command="{Binding DataContext.SelectFirstUsedClass, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}"
3896+
Visibility="Collapsed"
3897+
Style="{StaticResource SmallRedButtonStyle}"
3898+
Content="{Binding Source=h675a55aegd07cg4ab0g862dg0c564197d478, Converter={StaticResource TranslatedStringConverter}}">
38813899
<b:Interaction.Triggers>
38823900
<b:EventTrigger EventName="Click">
38833901
<b:ChangePropertyAction TargetName="gameplayTabs" PropertyName="SelectedItem" Value="{Binding ElementName=levelupTab}" />
38843902
</b:EventTrigger>
38853903
</b:Interaction.Triggers>
3886-
<ls:LSButton.Template>
3887-
<ControlTemplate TargetType="{x:Type ls:LSButton}">
3888-
<Grid Background="Transparent">
3889-
<Image x:Name="bg" Source="pack://application:,,,/GustavNoesisGUI;component/Assets/Buttons/Btn_small_red_d.png" Stretch="None"/>
3890-
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source=h675a55aegd07cg4ab0g862dg0c564197d478, Converter={StaticResource TranslatedStringConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
3891-
</Grid>
3892-
<ControlTemplate.Triggers>
3893-
<Trigger Property="IsMouseOver" Value="True">
3894-
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Buttons/Btn_small_red_h.png" TargetName="bg"/>
3895-
</Trigger>
3896-
<Trigger Property="IsPressed" Value="True">
3897-
<Setter Property="Source" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Buttons/Btn_small_red_p.png" TargetName="bg"/>
3898-
</Trigger>
3899-
</ControlTemplate.Triggers>
3900-
</ControlTemplate>
3901-
</ls:LSButton.Template>
39023904
</ls:LSButton>
39033905

39043906
</Grid>
@@ -5371,6 +5373,12 @@
53715373
</Grid>
53725374

53735375
<ControlTemplate.Triggers>
5376+
<DataTrigger Binding="{Binding CurrentPlayer.SelectedCharacter.TadpoledState}" Value="HalfIllithid">
5377+
<Setter TargetName="scars" Property="Visibility" Value="Collapsed"/>
5378+
</DataTrigger>
5379+
<DataTrigger Binding="{Binding CurrentPlayer.SelectedCharacter.TadpoledState}" Value="FullIllithid">
5380+
<Setter TargetName="scars" Property="Visibility" Value="Collapsed"/>
5381+
</DataTrigger>
53745382
<DataTrigger Binding="{Binding Path=IsChecked, ElementName=swatchSkinColourButton}" Value="True">
53755383
<Setter TargetName="scrollSection" Property="Visibility" Value="Hidden"/>
53765384
</DataTrigger>

0 commit comments

Comments
 (0)