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

Fix an issue with retainer assignments using ownership wrongly for mannequins.

Browse source
This commit is contained in:
Ottermandias 2023-03-01 23:11:05 +01:00
parent e62b0155d4
commit c2ac745d72
7 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Penumbra.GameData/Actors/ActorIdentifier.cs
View file

@ -14,11 +14,19 @@ public readonly struct ActorIdentifier : IEquatable<ActorIdentifier>
public static readonly ActorIdentifier Invalid = new(IdentifierType.Invalid, 0, 0, 0, ByteString.Empty); public static readonly ActorIdentifier Invalid = new(IdentifierType.Invalid, 0, 0, 0, ByteString.Empty);
public enum RetainerType : ushort
{
Both = 0,
Bell = 1,
Mannequin = 2,
}
// @formatter:off // @formatter:off
[FieldOffset( 0 )] public readonly IdentifierType Type; // All [FieldOffset( 0 )] public readonly IdentifierType Type; // All
[FieldOffset( 1 )] public readonly ObjectKind Kind; // Npc, Owned [FieldOffset( 1 )] public readonly ObjectKind Kind; // Npc, Owned
[FieldOffset( 2 )] public readonly ushort HomeWorld; // Player, Owned [FieldOffset( 2 )] public readonly ushort HomeWorld; // Player, Owned
[FieldOffset( 2 )] public readonly ushort Index; // NPC [FieldOffset( 2 )] public readonly ushort Index; // NPC
[FieldOffset( 2 )] public readonly RetainerType Retainer; // Retainer
[FieldOffset( 2 )] public readonly ScreenActor Special; // Special [FieldOffset( 2 )] public readonly ScreenActor Special; // Special
[FieldOffset( 4 )] public readonly uint DataId; // Owned, NPC [FieldOffset( 4 )] public readonly uint DataId; // Owned, NPC
[FieldOffset( 8 )] public readonly ByteString PlayerName; // Player, Owned [FieldOffset( 8 )] public readonly ByteString PlayerName; // Player, Owned

18
Penumbra.GameData/Actors/ActorManager.Identifiers.cs
View file

@ -33,7 +33,7 @@ public partial class ActorManager
case IdentifierType.Retainer: case IdentifierType.Retainer:
{ {
var name = ByteString.FromStringUnsafe(data[nameof(ActorIdentifier.PlayerName)]?.ToObject<string>(), false); var name = ByteString.FromStringUnsafe(data[nameof(ActorIdentifier.PlayerName)]?.ToObject<string>(), false);
return CreateRetainer(name); return CreateRetainer(name, 0);
} }
case IdentifierType.Owned: case IdentifierType.Owned:
{ {
@ -318,8 +318,9 @@ public partial class ActorManager
if (!actualName.Equals(retainerName)) if (!actualName.Equals(retainerName))
{ {
var ident = check var ident = check
? CreateRetainer(retainerName) ? CreateRetainer(retainerName, ActorIdentifier.RetainerType.Mannequin)
: CreateIndividualUnchecked(IdentifierType.Retainer, retainerName, actor->ObjectIndex, ObjectKind.EventNpc, dataId); : CreateIndividualUnchecked(IdentifierType.Retainer, retainerName, (ushort)ActorIdentifier.RetainerType.Mannequin,
ObjectKind.EventNpc, dataId);
if (ident.IsValid) if (ident.IsValid)
return ident; return ident;
} }
@ -349,8 +350,9 @@ public partial class ActorManager
{ {
var name = new ByteString(actor->Name); var name = new ByteString(actor->Name);
return check return check
? CreateRetainer(name) ? CreateRetainer(name, ActorIdentifier.RetainerType.Bell)
: CreateIndividualUnchecked(IdentifierType.Retainer, name, 0, ObjectKind.None, uint.MaxValue); : CreateIndividualUnchecked(IdentifierType.Retainer, name, (ushort)ActorIdentifier.RetainerType.Bell, ObjectKind.None,
uint.MaxValue);
} }
default: default:
{ {
@ -388,7 +390,7 @@ public partial class ActorManager
=> type switch => type switch
{ {
IdentifierType.Player => CreatePlayer(name, homeWorld), IdentifierType.Player => CreatePlayer(name, homeWorld),
IdentifierType.Retainer => CreateRetainer(name), IdentifierType.Retainer => CreateRetainer(name, (ActorIdentifier.RetainerType)homeWorld),
IdentifierType.Owned => CreateOwned(name, homeWorld, kind, dataId), IdentifierType.Owned => CreateOwned(name, homeWorld, kind, dataId),
IdentifierType.Special => CreateSpecial((ScreenActor)homeWorld), IdentifierType.Special => CreateSpecial((ScreenActor)homeWorld),
IdentifierType.Npc => CreateNpc(kind, dataId, homeWorld), IdentifierType.Npc => CreateNpc(kind, dataId, homeWorld),
@ -410,12 +412,12 @@ public partial class ActorManager
return new ActorIdentifier(IdentifierType.Player, ObjectKind.Player, homeWorld, 0, name); return new ActorIdentifier(IdentifierType.Player, ObjectKind.Player, homeWorld, 0, name);
} }
public ActorIdentifier CreateRetainer(ByteString name) public ActorIdentifier CreateRetainer(ByteString name, ActorIdentifier.RetainerType type)
{ {
if (!VerifyRetainerName(name.Span)) if (!VerifyRetainerName(name.Span))
return ActorIdentifier.Invalid; return ActorIdentifier.Invalid;
return new ActorIdentifier(IdentifierType.Retainer, ObjectKind.Retainer, 0, 0, name); return new ActorIdentifier(IdentifierType.Retainer, ObjectKind.Retainer, (ushort)type, 0, name);
} }
public ActorIdentifier CreateSpecial(ScreenActor actor) public ActorIdentifier CreateSpecial(ScreenActor actor)

2
Penumbra/Collections/IndividualCollections.Access.cs
View file

@ -41,7 +41,7 @@ public sealed partial class IndividualCollections : IReadOnlyList< (string Displ
return true; return true;
} }
if( Penumbra.Config.UseOwnerNameForCharacterCollection ) if( identifier.Retainer is not ActorIdentifier.RetainerType.Mannequin && Penumbra.Config.UseOwnerNameForCharacterCollection )
{ {
return CheckWorlds( _actorManager.GetCurrentPlayer(), out collection ); return CheckWorlds( _actorManager.GetCurrentPlayer(), out collection );
} }

2
Penumbra/Collections/IndividualCollections.cs
View file

@ -70,7 +70,7 @@ public sealed partial class IndividualCollections
return AddResult.Invalid; return AddResult.Invalid;
} }
identifiers = new[] { _actorManager.CreateRetainer( retainerName ) }; identifiers = new[] { _actorManager.CreateRetainer( retainerName, 0 ) };
break; break;
case IdentifierType.Owned: case IdentifierType.Owned:
if( !ByteString.FromString( name, out var ownerName ) ) if( !ByteString.FromString( name, out var ownerName ) )

2
Penumbra/UI/Classes/ModEditWindow.FileEditor.cs
View file

@ -175,7 +175,7 @@ public partial class ModEditWindow
} }
private static T? DefaultParseFile( byte[] bytes ) private static T? DefaultParseFile( byte[] bytes )
=> Activator.CreateInstance( typeof( T ), BindingFlags.CreateInstance | BindingFlags.OptionalParamBinding, bytes ) as T; => Activator.CreateInstance( typeof( T ), bytes ) as T;
private void UpdateCurrentFile( Mod.Editor.FileRegistry path ) private void UpdateCurrentFile( Mod.Editor.FileRegistry path )
{ {

2
Penumbra/UI/Classes/ModEditWindow.cs
View file

@ -584,7 +584,7 @@ public partial class ModEditWindow : Window, IDisposable
() => _editor?.ShpkFiles ?? Array.Empty< Editor.FileRegistry >(), () => _editor?.ShpkFiles ?? Array.Empty< Editor.FileRegistry >(),
DrawShaderPackagePanel, DrawShaderPackagePanel,
() => _mod?.ModPath.FullName ?? string.Empty, () => _mod?.ModPath.FullName ?? string.Empty,
bytes => new ShpkTab( bytes ) ); null );
_center = new CombinedTexture( _left, _right ); _center = new CombinedTexture( _left, _right );
} }

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

@ -322,7 +322,7 @@ public partial class ConfigWindow
IndividualCollections.AddResult.AlreadySet => AlreadyAssigned, IndividualCollections.AddResult.AlreadySet => AlreadyAssigned,
_ => string.Empty, _ => string.Empty,
}; };
_newRetainerTooltip = Penumbra.CollectionManager.Individuals.CanAdd( IdentifierType.Retainer, _newCharacterName, _worldCombo.CurrentSelection.Key, ObjectKind.None, _newRetainerTooltip = Penumbra.CollectionManager.Individuals.CanAdd( IdentifierType.Retainer, _newCharacterName, 0, ObjectKind.None,
Array.Empty< uint >(), out _newRetainerIdentifiers ) switch Array.Empty< uint >(), out _newRetainerIdentifiers ) switch
{ {
_ when _newCharacterName.Length == 0 => NewRetainerTooltipEmpty, _ when _newCharacterName.Length == 0 => NewRetainerTooltipEmpty,