Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
RisaDev committed Oct 26, 2024
1 parent 650e8fb commit 77e8f78
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 50 deletions.
20 changes: 0 additions & 20 deletions CustomizePlus/Armatures/Services/ArmatureManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -497,22 +497,6 @@ type is not ProfileChanged.Type.ChangedDefaultProfile &&

if (type == ProfileChanged.Type.TemporaryProfileAdded)
{
//todo: remove this later
/*Armature? armature = null;
foreach(var kvPair in Armatures)
{
//todo: check mount/companion
if(kvPair.Key.CompareIgnoringOwnership(profile.Character) &&
(kvPair.Key.Type != IdentifierType.Owned || kvPair.Key.IsOwnedByLocalPlayer()))
{
armature = kvPair.Value;
break;
}
}
if (armature == null)
return;*/

foreach(var character in profile.Characters)
{
if (!character.IsValid || !Armatures.ContainsKey(character))
Expand Down Expand Up @@ -588,10 +572,6 @@ private IEnumerable<Armature> GetArmaturesForCharacter(ActorIdentifier actorIden
{
(var armatureActorIdentifier, _) = _gameObjectService.GetTrueActorForSpecialTypeActor(kvPair.Key);

//warn: side-effect: for Type = Owned will ignore owner.
//This isn't a particularly huge issue as this is only used for profile rebinding, but this probably should be handled better later.
/*if (actorIdentifier.IsValid && armatureActorIdentifier.MatchesIgnoringOwnership(actorIdentifier))
yield return kvPair.Value;*/
if (actorIdentifier.IsValid && armatureActorIdentifier.MatchesIgnoringOwnership(actorIdentifier) &&
(armatureActorIdentifier.Type != IdentifierType.Owned || armatureActorIdentifier.IsOwnedByLocalPlayer()))
yield return kvPair.Value;
Expand Down
14 changes: 0 additions & 14 deletions CustomizePlus/Profiles/Data/Profile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,10 @@ public sealed class Profile : ISavable

public List<Armature> Armatures = new();

/* [Obsolete("To be removed in the future versions")]
public LowerString CharacterName { get; set; } = LowerString.Empty;*/

//public ActorIdentifier Character { get; set; } = ActorIdentifier.Invalid;
public List<ActorIdentifier> Characters { get; set; } = new();

public LowerString Name { get; set; } = LowerString.Empty;

/// <summary>
/// Whether to search only through local player owned characters or all characters when searching for game object by name
/// </summary>
//public bool LimitLookupToOwnedObjects { get; set; } = false;

public bool Enabled { get; set; }
public DateTimeOffset CreationDate { get; set; } = DateTime.UtcNow;
public DateTimeOffset ModifiedDate { get; set; } = DateTime.UtcNow;
Expand All @@ -66,11 +57,6 @@ public sealed class Profile : ISavable
/// </summary>
public bool IsTemporary => ProfileType == ProfileType.Temporary;

/* /// <summary>
/// Identificator specifying specific actor this profile applies to, only works for temporary profiles
/// </summary>
public ActorIdentifier TemporaryActor { get; set; } = ActorIdentifier.Invalid;*/

public string Incognito
=> UniqueId.ToString()[..8];

Expand Down
9 changes: 1 addition & 8 deletions CustomizePlus/Profiles/Events/ProfileChanged.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public enum Type
PriorityChanged,
AddedCharacter,
RemovedCharacter,
//ChangedCharacter,
AddedTemplate,
RemovedTemplate,
MovedTemplate,
Expand All @@ -28,13 +27,7 @@ public enum Type
ChangedDefaultProfile,
ChangedDefaultLocalPlayerProfile,
TemporaryProfileAdded,
TemporaryProfileDeleted,
/*
ToggledProfile,
AddedTemplate,
RemovedTemplate,
MovedTemplate,
ChangedTemplate*/
TemporaryProfileDeleted
}

public enum Priority
Expand Down
6 changes: 0 additions & 6 deletions CustomizePlus/Profiles/ProfileManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -373,12 +373,6 @@ public void AddTemporaryProfile(Profile profile, Actor actor)
if (!actor.Identifier(_actorManager, out var identifier))
throw new ActorNotFoundException();

/* if (identifier.Type != IdentifierType.Player)
{
_logger.Warning($"Tried applying temporary profile to actor {identifier.Incognito(null)}. Temporary profiles can only be applied to players right now.");
return; //do not return error code as I plan to eventually fix this
}*/

profile.Enabled = true;
profile.ProfileType = ProfileType.Temporary;
profile.Priority = int.MaxValue; //Make sure temporary profile is always at max priority
Expand Down
1 change: 0 additions & 1 deletion CustomizePlus/Templates/TemplateEditorManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ public bool IsCharacterFound
{
get
{
//todo: check with mounts/companions
var playerName = _gameObjectService.GetCurrentPlayerName();
return _gameObjectService.FindActorsByIdentifierIgnoringOwnership(Character)
.Where(x => x.Item1.Type != Penumbra.GameData.Enums.IdentifierType.Owned || x.Item1.IsOwnedByLocalPlayer())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private HeaderDrawer.Button ExportToClipboardButton()

private void DrawHeader()
=> HeaderDrawer.Draw(SelectionName, 0, ImGui.GetColorU32(ImGuiCol.FrameBg),
1, /*SetFromClipboardButton(),*/ ExportToClipboardButton(), LockButton(),
1, ExportToClipboardButton(), LockButton(),
HeaderDrawer.Button.IncognitoButton(_selector.IncognitoMode, v => _selector.IncognitoMode = v));

private void DrawMultiSelection()
Expand Down

0 comments on commit 77e8f78

Please sign in to comment.