Skip to content

Commit 569bee2

Browse files
authored
Merge pull request #367 from TheRealDjmr/patch7
Patch 7 files added to Github
2 parents b8594b7 + 449fb8f commit 569bee2

File tree

199 files changed

+30258
-43
lines changed

Some content is hidden

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

199 files changed

+30258
-43
lines changed

Assets - Supported Mods.md Assets - Supported Mods - PATCH 6.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
1. Download any "Optional files" based on which features you want to add.
22
2. Copy ImprovedUI.pak and the optional .pak files once extracted.
33
3. Paste into your mods folder - "%LocalAppData%\Larian Studios\Baldur's Gate 3\Mods" - shortcut provided
4-
4. Enjoy!
4+
4. Enjoy!

INSTALL INSTRUCTIONS - PATCH 7.txt

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
1. Copy ImpUI.pak
2+
2. Paste into your mods folder - "%LocalAppData%\Larian Studios\Baldur's Gate 3\Mods" - shortcut provided
3+
3. In game main menu, go to mod manager -> enable ImpUI
4+
4. Enjoy!
Binary file not shown.
Binary file not shown.
Binary file not shown.

ImpUI_26922ba9-6018-5252-075d-7ff2ba6ed879/GUI/Library/CCLib.xaml

+1,021
Large diffs are not rendered by default.

ImpUI_26922ba9-6018-5252-075d-7ff2ba6ed879/GUI/Library/CCLib_c.xaml

+6,695
Large diffs are not rendered by default.

ImpUI_26922ba9-6018-5252-075d-7ff2ba6ed879/GUI/Library/CCLib_k.xaml

+6,236
Large diffs are not rendered by default.

ImpUI_26922ba9-6018-5252-075d-7ff2ba6ed879/GUI/Library/IUI_ActionResourceTemplates_c.xaml

+832
Large diffs are not rendered by default.

ImpUI_26922ba9-6018-5252-075d-7ff2ba6ed879/GUI/Library/IUI_ActionResources.xaml

+502
Large diffs are not rendered by default.

ImpUI_26922ba9-6018-5252-075d-7ff2ba6ed879/GUI/Library/Lib_Controller.xaml

+945
Large diffs are not rendered by default.

ImpUI_26922ba9-6018-5252-075d-7ff2ba6ed879/GUI/Library/Lib_Keyboard.xaml

+2,105
Large diffs are not rendered by default.

ImpUI_26922ba9-6018-5252-075d-7ff2ba6ed879/GUI/Library/RedeclaredTooltips.xaml

+1,235
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<ls:UIWidget x:Name="AlwaysOnTopOverlay"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:System="clr-namespace:System;assembly=mscorlib"
6+
xmlns:ls="clr-namespace:ls;assembly=Code"
7+
xmlns:noesis="clr-namespace:NoesisGUIExtensions;assembly=Noesis.GUI.Extensions"
8+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
9+
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
10+
mc:Ignorable="d"
11+
d:DesignHeight="2160" d:DesignWidth="3840"
12+
d:DataContext="{d:DesignInstance {x:Type ls:Widget}, IsDesignTimeCreatable=True}">
13+
14+
<ls:UIWidget.Template>
15+
<ControlTemplate>
16+
<Grid IsHitTestVisible="False">
17+
<!-- Save / Cross-save in progress -->
18+
<StackPanel x:Name="SavingPanel" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" IsHitTestVisible="False" Visibility="Collapsed" Margin="{StaticResource SavingElementMargin}">
19+
<Control Template="{StaticResource BusyElement}"/>
20+
<ls:LSNineSliceImage VerticalAlignment="Center" HorizontalAlignment="Left" Slices="24, 12" Padding="24,0" Margin="-24,0,0,0" ImageSource="pack://application:,,,/Core;component/Assets/Shared/spinnerTextBG.png">
21+
<TextBlock x:Name="SavingText" FontSize="{StaticResource ScaledLargeFontSize}" Foreground="{StaticResource LS_extraspecialTxtColor}"/>
22+
</ls:LSNineSliceImage>
23+
</StackPanel>
24+
</Grid>
25+
<ControlTemplate.Triggers>
26+
<DataTrigger Binding="{Binding CurrentPlayer.UIData.PendingCloudSaveFiles, Converter={StaticResource GreaterThanConverter}, ConverterParameter=0}" Value="True">
27+
<Setter TargetName="SavingText" Property="Text">
28+
<Setter.Value>
29+
<MultiBinding Converter="{StaticResource ParameterizedTranslatedStringConverter}">
30+
<Binding Source="h5469055egd3e6g422bga6d5gc1ee14a2c165"/>
31+
<Binding Path="CurrentPlayer.UIData.PendingCloudSaveFiles"/>
32+
</MultiBinding>
33+
</Setter.Value>
34+
</Setter>
35+
<Setter TargetName="SavingPanel" Property="Visibility" Value="Visible"/>
36+
</DataTrigger>
37+
<DataTrigger Binding="{Binding CurrentPlayer.UIData.PlatformSaveInProgress}" Value="True">
38+
<Setter TargetName="SavingText" Property="Text" Value="{Binding Source='hc75cb765g7f08g4fc5g819agbb37c467518d',Converter={StaticResource TranslatedStringConverter}}"/>
39+
<Setter TargetName="SavingText" Property="Foreground" Value="{StaticResource LS_specialTxtColor}"/>
40+
<Setter TargetName="SavingPanel" Property="Visibility" Value="Visible"/>
41+
</DataTrigger>
42+
</ControlTemplate.Triggers>
43+
</ControlTemplate>
44+
</ls:UIWidget.Template>
45+
</ls:UIWidget>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
<ls:UIWidget x:Name="CharacterChangeAppearance"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:ls="clr-namespace:ls;assembly=Code"
6+
xmlns:System="clr-namespace:System;assembly=mscorlib"
7+
xmlns:noesis="clr-namespace:NoesisGUIExtensions;assembly=Noesis.GUI.Extensions"
8+
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
9+
10+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
11+
mc:Ignorable="d"
12+
d:DesignHeight="2160" d:DesignWidth="3840"
13+
ls:UIWidget.ContextName="CharacterCreation"
14+
ls:TooltipExtender.Owner="{Binding DummyCharacter}">
15+
16+
<ls:UIWidget.Resources>
17+
<ResourceDictionary>
18+
<ResourceDictionary.MergedDictionaries>
19+
<ResourceDictionary Source="../Library/CCLib_k.xaml"/>
20+
</ResourceDictionary.MergedDictionaries>
21+
</ResourceDictionary>
22+
</ls:UIWidget.Resources>
23+
24+
<b:Interaction.Triggers>
25+
<b:EventTrigger EventName="Loaded">
26+
<b:InvokeCommandAction Command="{Binding SetCharacterCreationStep}" CommandParameter="Appearance"/>
27+
<b:InvokeCommandAction Command="{Binding SetCameraMode}" CommandParameter="CloseupB"/>
28+
<b:InvokeCommandAction Command="{Binding Path=SetCameraOffsets}">
29+
<b:InvokeCommandAction.CommandParameter>
30+
<MultiBinding Converter="{StaticResource PassThroughConverter}">
31+
<Binding>
32+
<Binding.Source>
33+
<System:Single>3.8</System:Single>
34+
</Binding.Source>
35+
</Binding>
36+
<Binding>
37+
<Binding.Source>
38+
<System:Single>4</System:Single>
39+
</Binding.Source>
40+
</Binding>
41+
<Binding>
42+
<Binding.Source>
43+
<System:Single>4.2</System:Single>
44+
</Binding.Source>
45+
</Binding>
46+
</MultiBinding>
47+
</b:InvokeCommandAction.CommandParameter>
48+
</b:InvokeCommandAction>
49+
</b:EventTrigger>
50+
</b:Interaction.Triggers>
51+
52+
<ls:UIWidget.ContentTemplate>
53+
<DataTemplate>
54+
55+
<Grid x:Name="widgetBase" IsEnabled="{Binding IsLocked, Converter={StaticResource InvertBoolConverter}}">
56+
57+
<Grid x:Name="appearanceRightSidePanels" HorizontalAlignment="Right">
58+
59+
<Grid HorizontalAlignment="Right" Width="1372">
60+
<Image Source="pack://application:,,,/Core;component/Assets/CC/vignette_left.png" Stretch="Fill">
61+
<Image.RenderTransform>
62+
<ScaleTransform ScaleX="-1" CenterX="686"/>
63+
</Image.RenderTransform>
64+
</Image>
65+
</Grid>
66+
67+
<StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Orientation="Horizontal" Margin="0,58,0,0">
68+
69+
<Grid Margin="-76,0">
70+
71+
<Image x:Name="bg" Source="pack://application:,,,/Core;component/Assets/CC/appearanceOptionsPane.png" Stretch="None" />
72+
73+
<Control x:Name="appearancePanel"/>
74+
75+
</Grid>
76+
77+
<ListBox x:Name="appearanceTabs" ItemContainerStyle="{StaticResource AppearanceTabsStyle}" HorizontalAlignment="Right" Margin="0,300,8,0">
78+
79+
<b:Interaction.Triggers>
80+
<b:DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.IsVisible}" Value="False">
81+
<b:ChangePropertyAction TargetName="appearanceTabs" PropertyName="SelectedItem" Value="{Binding ElementName=generalTab}"/>
82+
</b:DataTrigger>
83+
</b:Interaction.Triggers>
84+
85+
<ListBox.Resources>
86+
<BitmapImage x:Key="tabIcon" UriSource="pack://application:,,,/Core;component/Assets/CC/ico_race.png"/>
87+
<BitmapImage x:Key="tabIconHover" UriSource="pack://application:,,,/Core;component/Assets/CC/ico_race_h.png"/>
88+
</ListBox.Resources>
89+
90+
<ListBoxItem x:Name="raceTab" Tag="race" Visibility="Collapsed"/>
91+
<ListBoxItem x:Name="subRaceTab" Tag="subrace" Visibility="Collapsed"/>
92+
93+
<ListBoxItem x:Name="generalTab" Tag="general" IsSelected="True"/>
94+
<!-- MOD START - All tabs visible based on content -->
95+
<ListBoxItem x:Name="tattooAndPiercingTab" Tag="tattooandpiercing" Visibility="{Binding SelectablePiercings.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
96+
<ListBoxItem x:Name="eyesTab" Tag="eyes" Visibility="{Binding SelectedOrigin.IsLockedAppearance, Converter={StaticResource BoolToCollapsedConverter}}"/>
97+
<ListBoxItem x:Name="makeupTab" Tag="makeup" Visibility="{Binding SelectableMakeup.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
98+
<!-- MOD END -->
99+
<ListBoxItem x:Name="hairTab" Tag="hair" Visibility="{Binding SelectableHair.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
100+
<ListBoxItem x:Name="facialHairTab" Tag="facialhair" Visibility="{Binding SelectableBeards.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
101+
<ListBoxItem x:Name="hornsTab" Tag="horns" Visibility="{Binding SelectableHorns.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
102+
<ListBoxItem x:Name="draconicTab" Tag="draconic" Visibility="{Binding Path=HasAppearancePassive, Converter={StaticResource BoolToVisibleConverter}, FallbackValue=Collapsed}"/>
103+
<ListBoxItem x:Name="tailTab" Tag="tail" Visibility="{Binding Path=SelectableTail.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
104+
105+
</ListBox>
106+
</StackPanel>
107+
108+
<!-- Appearance Buttons on Appearance Page -->
109+
<Control x:Name="appearanceButtons" Template="{StaticResource AppearanceButtonsTemplateRandomOnly}" Margin="0,0,500,150" VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
110+
111+
</Grid>
112+
113+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="-1000,0,0,100">
114+
115+
<Control Template="{StaticResource cameraModeControlsTemplate}"/>
116+
117+
<ls:LSButton x:Name="confirmButton" Content="{Binding Source='h7a174735g0099g4ca9ga1f7ga53ad66b1aa4', Converter={StaticResource TranslatedStringConverter}, ConverterParameter='ToUpper'}" Style="{StaticResource CCNextButtonStyle}" IsEnabled="{Binding IsCharacterComplete}" Command="{Binding FinishHenchmenCreating}" Foreground="{StaticResource CCTextPrimary}" Margin="0,0,0,0"/>
118+
119+
<Control Template="{StaticResource rotateDummyControlsTemplate}"/>
120+
121+
</StackPanel>
122+
123+
<ls:LSButton Template="{StaticResource FrameWithIconButtonTemplate}" Command="{Binding CancelHenchmenCreating}" SoundID="UI_HUD_CC_Accept" VerticalAlignment="Top" Margin="10,20,20,0" HorizontalAlignment="Right">
124+
<ls:LSButton.Resources>
125+
<BitmapImage x:Key="FrameNormal" UriSource="pack://application:,,,/Core;component/Assets/CC/btn_roundBig_d.png"/>
126+
<BitmapImage x:Key="FrameHighlight" UriSource="pack://application:,,,/Core;component/Assets/CC/btn_roundBig_h.png"/>
127+
<BitmapImage x:Key="FramePressed" UriSource="pack://application:,,,/Core;component/Assets/CC/btn_roundBig_d.png"/>
128+
<BitmapImage x:Key="FrameDisabled" UriSource="pack://application:,,,/Core;component/Assets/CC/btn_roundBig_d.png"/>
129+
<BitmapImage x:Key="IconNormal" UriSource="pack://application:,,,/Core;component/Assets/CC/ico_close_big_d.png"/>
130+
<BitmapImage x:Key="IconHighlight" UriSource="pack://application:,,,/Core;component/Assets/CC/ico_close_big_h.png"/>
131+
<BitmapImage x:Key="IconPressed" UriSource="pack://application:,,,/Core;component/Assets/CC/ico_close_big_d.png"/>
132+
<BitmapImage x:Key="IconDisabled" UriSource="pack://application:,,,/Core;component/Assets/CC/ico_close_big_d.png"/>
133+
</ls:LSButton.Resources>
134+
</ls:LSButton>
135+
136+
</Grid>
137+
138+
<DataTemplate.Triggers>
139+
140+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="general">
141+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceGeneralPanel}"/>
142+
</DataTrigger>
143+
144+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="tattooandpiercing">
145+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceTattooAndPiercingPanel}"/>
146+
</DataTrigger>
147+
148+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="eyes">
149+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceEyesPanel}"/>
150+
</DataTrigger>
151+
152+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="makeup">
153+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceMakeupPanel}"/>
154+
</DataTrigger>
155+
156+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="hair">
157+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceHairPanel}"/>
158+
</DataTrigger>
159+
160+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="facialhair">
161+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceFacialHairPanel}"/>
162+
</DataTrigger>
163+
164+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="horns">
165+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceHornsPanel}"/>
166+
</DataTrigger>
167+
168+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="draconic">
169+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource draconicAppearancePanelTemplate}"/>
170+
</DataTrigger>
171+
172+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="tail">
173+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceTailPanel}"/>
174+
</DataTrigger>
175+
176+
</DataTemplate.Triggers>
177+
178+
</DataTemplate>
179+
</ls:UIWidget.ContentTemplate>
180+
181+
</ls:UIWidget>

0 commit comments

Comments
 (0)