ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-01-03 06:13:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split special collections.

Browse source
This commit is contained in:
Ottermandias 2022-09-27 15:37:21 +02:00
parent ef418b6821
commit 1d6d696cb7
9 changed files with 478 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Penumbra/UI/ConfigWindow.Changelog.cs
View file

@ -20,10 +20,17 @@ public partial class ConfigWindow
Add5_7_1( ret );
Add5_8_0( ret );
Add5_8_7( ret );
Add5_9_0( ret );
return ret;
}
private static void Add5_9_0( Changelog log )
=> log.NextVersion( "Version 0.5.9.0" )
.RegisterEntry( "Special Collections are now split between male and female." )
.RegisterEntry( "Fix a bug where the Base and Interface Collection were set to None instead of Default on a fresh install." )
.RegisterEntry( "TexTools .meta and .rgsp files are now incorporated based on file- and game path extensions." );
private static void Add5_8_7( Changelog log )
=> log.NextVersion( "Version 0.5.8.7" )
.RegisterEntry( "Fixed some problems with metadata reloading and reverting and IMC files. (5.8.1 to 5.8.7)." )

28
Penumbra/UI/ConfigWindow.CollectionsTab.cs
View file

@ -38,10 +38,10 @@ public partial class ConfigWindow
// Input text fields.
private string _newCollectionName = string.Empty;
private bool _canAddCollection = false;
private string _newCharacterName = string.Empty;
private CollectionType? _currentType = CollectionType.Yourself;
private string _newCollectionName = string.Empty;
private bool _canAddCollection = false;
private string _newCharacterName = string.Empty;
private (CollectionType, string, string)? _currentType = CollectionTypeExtensions.Special.First();
// Create a new collection that is either empty or a duplicate of the current collection.
// Resets the new collection name.
@ -150,9 +150,10 @@ public partial class ConfigWindow
+ $"but all {IndividualAssignments} take precedence before them.";
ImGui.SetNextItemWidth( _window._inputTextWidth.X );
if( _currentType == null || Penumbra.CollectionManager.ByType( _currentType.Value ) != null )
if( _currentType == null || Penumbra.CollectionManager.ByType( _currentType.Value.Item1 ) != null )
{
_currentType = CollectionTypeExtensions.Special.FindFirst( t => Penumbra.CollectionManager.ByType( t ) == null, out var t2 )
_currentType = CollectionTypeExtensions.Special.FindFirst( t => Penumbra.CollectionManager.ByType( t.Item1 ) == null,
out var t2 )
? t2
: null;
}
@ -162,16 +163,17 @@ public partial class ConfigWindow
return;
}
using( var combo = ImRaii.Combo( "##NewSpecial", _currentType.Value.ToName() ) )
using( var combo = ImRaii.Combo( "##NewSpecial", _currentType.Value.Item2 ) )
{
if( combo )
{
foreach( var type in CollectionTypeExtensions.Special.Where( t => Penumbra.CollectionManager.ByType( t ) == null ) )
foreach( var type in CollectionTypeExtensions.Special.Where( t => Penumbra.CollectionManager.ByType( t.Item1 ) == null ) )
{
if( ImGui.Selectable( type.ToName(), type == _currentType.Value ) )
if( ImGui.Selectable( type.Item2, type.Item1 == _currentType.Value.Item1 ) )
{
_currentType = type;
}
ImGuiUtil.HoverTooltip( type.Item3 );
}
}
}
@ -183,7 +185,7 @@ public partial class ConfigWindow
: description;
if( ImGuiUtil.DrawDisabledButton( $"Assign {ConditionalGroup}", new Vector2( 120 * ImGuiHelpers.GlobalScale, 0 ), tt, disabled ) )
{
Penumbra.CollectionManager.CreateSpecialCollection( _currentType!.Value );
Penumbra.CollectionManager.CreateSpecialCollection( _currentType!.Value.Item1 );
_currentType = null;
}
}
@ -212,7 +214,7 @@ public partial class ConfigWindow
private void DrawSpecialCollections()
{
foreach( var type in CollectionTypeExtensions.Special )
foreach( var (type, name, desc) in CollectionTypeExtensions.Special )
{
var collection = Penumbra.CollectionManager.ByType( type );
if( collection != null )
@ -228,7 +230,7 @@ public partial class ConfigWindow
ImGui.SameLine();
ImGui.AlignTextToFramePadding();
ImGuiUtil.LabeledHelpMarker( type.ToName(), type.ToDescription() );
ImGuiUtil.LabeledHelpMarker( name, desc );
}
}
}
@ -246,7 +248,7 @@ public partial class ConfigWindow
private void DrawIndividualAssignments()
{
using var _ = ImRaii.Group();
ImGui.TextUnformatted( $"Individual {ConditionalIndividual}s" );
ImGui.TextUnformatted( $"Individual {ConditionalIndividual}s" );
ImGui.Separator();
foreach( var name in Penumbra.CollectionManager.Characters.Keys.OrderBy( k => k ).ToArray() )
{