Skip to content

Commit 85dfaa5

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #110 from TheRealDjmr/magicmirrortweak
Magicmirrortweak
2 parents 34ac4d8 + 02e4858 commit 85dfaa5

File tree

4 files changed

+187
-3
lines changed

4 files changed

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

‎ImprovedUI/Public/Game/GUI/Widgets/CharacterChangeAppearance.xaml

+183
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
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=SharedGUI"
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>
56+
57+
<Grid x:Name="appearanceRightSidePanels" HorizontalAlignment="Right">
58+
59+
<Grid HorizontalAlignment="Right" Width="1372">
60+
<Image Source="pack://application:,,,/GustavNoesisGUI;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:,,,/GustavNoesisGUI;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:,,,/GustavNoesisGUI;component/Assets/CC/ico_race.png"/>
87+
<BitmapImage x:Key="tabIconHover" UriSource="pack://application:,,,/GustavNoesisGUI;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+
<ListBoxItem x:Name="hairTab" Tag="hair" Visibility="{Binding SelectableHair.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
99+
<ListBoxItem x:Name="facialHairTab" Tag="facialhair" Visibility="{Binding SelectableBeards.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
100+
<ListBoxItem x:Name="hornsTab" Tag="horns" Visibility="{Binding SelectableHorns.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
101+
<ListBoxItem x:Name="tailTab" Tag="tail" Visibility="{Binding Path=SelectableTail.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
102+
<ListBoxItem x:Name="draconicTab" Tag="draconic" Visibility="{Binding SelectableScales.Count, Converter={StaticResource CountToVisibilityConverter}}"/>
103+
<!-- MOD END -->
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+
<!-- MOD START - Can always confirm -->
118+
<ls:LSButton x:Name="confirmButton" Content="{Binding Source='h7a174735g0099g4ca9ga1f7ga53ad66b1aa4', Converter={StaticResource TranslatedStringConverter}, ConverterParameter='ToUpper'}" Style="{StaticResource CCNextButtonStyle}" Command="{Binding FinishHenchmenCreating}" Foreground="{StaticResource CCTextPrimary}" Margin="0,0,0,0"/>
119+
<!-- MOD END -->
120+
121+
<Control Template="{StaticResource rotateDummyControlsTemplate}"/>
122+
123+
</StackPanel>
124+
125+
<ls:LSButton Template="{StaticResource FrameWithIconButtonTemplate}" Command="{Binding CancelHenchmenCreating}" SoundID="UI_HUD_CC_Accept" VerticalAlignment="Top" Margin="10,20,20,0" HorizontalAlignment="Right">
126+
<ls:LSButton.Resources>
127+
<BitmapImage x:Key="FrameNormal" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/btn_roundBig_d.png"/>
128+
<BitmapImage x:Key="FrameHighlight" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/btn_roundBig_h.png"/>
129+
<BitmapImage x:Key="FramePressed" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/btn_roundBig_d.png"/>
130+
<BitmapImage x:Key="FrameDisabled" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/btn_roundBig_d.png"/>
131+
<BitmapImage x:Key="IconNormal" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/ico_close_big_d.png"/>
132+
<BitmapImage x:Key="IconHighlight" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/ico_close_big_h.png"/>
133+
<BitmapImage x:Key="IconPressed" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/ico_close_big_d.png"/>
134+
<BitmapImage x:Key="IconDisabled" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/CC/ico_close_big_d.png"/>
135+
</ls:LSButton.Resources>
136+
</ls:LSButton>
137+
138+
</Grid>
139+
140+
<DataTemplate.Triggers>
141+
142+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="general">
143+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceGeneralPanel}"/>
144+
</DataTrigger>
145+
146+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="tattooandpiercing">
147+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceTattooAndPiercingPanel}"/>
148+
</DataTrigger>
149+
150+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="eyes">
151+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceEyesPanel}"/>
152+
</DataTrigger>
153+
154+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="makeup">
155+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceMakeupPanel}"/>
156+
</DataTrigger>
157+
158+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="hair">
159+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceHairPanel}"/>
160+
</DataTrigger>
161+
162+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="facialhair">
163+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceFacialHairPanel}"/>
164+
</DataTrigger>
165+
166+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="horns">
167+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceHornsPanel}"/>
168+
</DataTrigger>
169+
170+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="draconic">
171+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource draconicAppearancePanelTemplate}"/>
172+
</DataTrigger>
173+
174+
<DataTrigger Binding="{Binding ElementName=appearanceTabs, Path=SelectedItem.Tag}" Value="tail">
175+
<Setter TargetName="appearancePanel" Property="Template" Value="{StaticResource appearanceTailPanel}"/>
176+
</DataTrigger>
177+
178+
</DataTemplate.Triggers>
179+
180+
</DataTemplate>
181+
</ls:UIWidget.ContentTemplate>
182+
183+
</ls:UIWidget>

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This mod is aimed at making changes to the overall user interface to improve usa
1313
</p>
1414

1515
- Unlocks edit appearance option for all Origin characters in Character Creation.
16+
- Magic Mirror tweaks: Allows all combinations to hit confirm.
1617
- <b>OPTIONAL FILE REQUIRED</b> Switches "Show all items" (highlighting all interactables, default left ALT key/right stick) from requiring a held input to an on/off switch. Works for both Keyboard and Controller - switching between the two input methods when enabled would cause an additional toggle to be required. Stays on UI change (such as game menu/dialogue) except when showing other tooltips. (Credit: Violet-Vibes)
1718

1819
<b>OPTIONAL FILE REQUIRED</b> Keyboard-only tweaks:

‎manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ImprovedUI",
3-
"version_number": "3.9.1",
3+
"version_number": "3.9.2",
44
"website_url": "https://github.com/TheRealDjmr/BG3ImprovedUI",
55
"description": "This mod is aimed at making changes to the overall user interface to improve usability as well as opening options to more potential mods.",
66
"dependencies": [

0 commit comments

Comments
 (0)