ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added button to immediately assign collection to current player.

Browse source
This commit is contained in:
Ottermandias 2022-12-03 14:41:04 +01:00
parent 37a56c56af
commit 0534fecc0c
1 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs
View file

@ -69,11 +69,11 @@ public partial class ConfigWindow
private ObjectKind _newKind = ObjectKind.BattleNpc; private ObjectKind _newKind = ObjectKind.BattleNpc;
private readonly WorldCombo _worldCombo = new(Penumbra.Actors.Data.Worlds); private readonly WorldCombo _worldCombo = new(Penumbra.Actors.Data.Worlds);
private readonly NpcCombo _mountCombo = new("##mountCombo", Penumbra.Actors.Data.Mounts ); private readonly NpcCombo _mountCombo = new("##mountCombo", Penumbra.Actors.Data.Mounts);
private readonly NpcCombo _companionCombo = new("##companionCombo", Penumbra.Actors.Data.Companions ); private readonly NpcCombo _companionCombo = new("##companionCombo", Penumbra.Actors.Data.Companions);
private readonly NpcCombo _ornamentCombo = new("##ornamentCombo", Penumbra.Actors.Data.Ornaments ); private readonly NpcCombo _ornamentCombo = new("##ornamentCombo", Penumbra.Actors.Data.Ornaments);
private readonly NpcCombo _bnpcCombo = new("##bnpcCombo", Penumbra.Actors.Data.BNpcs ); private readonly NpcCombo _bnpcCombo = new("##bnpcCombo", Penumbra.Actors.Data.BNpcs);
private readonly NpcCombo _enpcCombo = new("##enpcCombo", Penumbra.Actors.Data.ENpcs ); private readonly NpcCombo _enpcCombo = new("##enpcCombo", Penumbra.Actors.Data.ENpcs);
private const string NewPlayerTooltipEmpty = "Please enter a valid player name and choose an available world or 'Any World'."; private const string NewPlayerTooltipEmpty = "Please enter a valid player name and choose an available world or 'Any World'.";
private const string NewRetainerTooltipEmpty = "Please enter a valid retainer name."; private const string NewRetainerTooltipEmpty = "Please enter a valid retainer name.";
@ -166,7 +166,7 @@ public partial class ConfigWindow
} }
} }
ImGui.Dummy( Vector2.Zero ); ImGui.Dummy( _window._defaultSpace );
DrawNewIndividualCollection(); DrawNewIndividualCollection();
} }
@ -243,11 +243,13 @@ public partial class ConfigWindow
var buttonWidth1 = new Vector2( 90 * ImGuiHelpers.GlobalScale, 0 ); var buttonWidth1 = new Vector2( 90 * ImGuiHelpers.GlobalScale, 0 );
var buttonWidth2 = new Vector2( 120 * ImGuiHelpers.GlobalScale, 0 ); var buttonWidth2 = new Vector2( 120 * ImGuiHelpers.GlobalScale, 0 );
var combo = GetNpcCombo( _newKind ); var change = DrawNewCurrentPlayerCollection();
var change = DrawNewPlayerCollection( buttonWidth1, width );
change |= DrawNewPlayerCollection( buttonWidth1, width );
ImGui.SameLine(); ImGui.SameLine();
change |= DrawNewRetainerCollection( buttonWidth2 ); change |= DrawNewRetainerCollection( buttonWidth2 );
var combo = GetNpcCombo( _newKind );
change |= DrawNewNpcCollection( combo, buttonWidth1, width ); change |= DrawNewNpcCollection( combo, buttonWidth1, width );
ImGui.SameLine(); ImGui.SameLine();
change |= DrawNewOwnedCollection( buttonWidth2 ); change |= DrawNewOwnedCollection( buttonWidth2 );
@ -258,6 +260,27 @@ public partial class ConfigWindow
} }
} }
private bool DrawNewCurrentPlayerCollection()
{
var player = Penumbra.Actors.GetCurrentPlayer();
var result = Penumbra.CollectionManager.Individuals.CanAdd( player );
var tt = result switch
{
IndividualCollections.AddResult.Valid => $"Assign a collection to {player}.",
IndividualCollections.AddResult.AlreadySet => AlreadyAssigned,
IndividualCollections.AddResult.Invalid => "No logged-in character detected.",
_ => string.Empty,
};
if( ImGuiUtil.DrawDisabledButton( "Assign Currently Played Character", _window._inputTextWidth, tt, result != IndividualCollections.AddResult.Valid ) )
{
Penumbra.CollectionManager.Individuals.Add( new[] { player }, Penumbra.CollectionManager.Default );
return true;
}
return false;
}
private void UpdateIdentifiers() private void UpdateIdentifiers()
{ {
var combo = GetNpcCombo( _newKind ); var combo = GetNpcCombo( _newKind );
@ -306,7 +329,9 @@ public partial class ConfigWindow
private void UpdateIdentifiers( CollectionType type, ModCollection? _1, ModCollection? _2, string _3 ) private void UpdateIdentifiers( CollectionType type, ModCollection? _1, ModCollection? _2, string _3 )
{ {
if( type == CollectionType.Individual ) if( type == CollectionType.Individual )
{
UpdateIdentifiers(); UpdateIdentifiers();
}
} }
} }
} }