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

Fix 6.1 offsets.

Browse source
This commit is contained in:
Ottermandias 2022-04-14 16:01:06 +02:00
parent 18384a9386
commit 8865ff5e79
4 changed files with 131 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Penumbra.GameData/Structs/CharacterEquipment.cs
View file

@ -4,14 +4,14 @@ using Dalamud.Game.ClientState.Objects.Types;
// Read the customization data regarding weapons and displayable equipment from an actor struct.
// Stores the data in a 56 bytes, i.e. 7 longs for easier comparison.
namespace Penumbra.GameData.Structs
namespace Penumbra.GameData.Structs;
[StructLayout( LayoutKind.Sequential, Pack = 1 )]
public class CharacterEquipment
{
[StructLayout( LayoutKind.Sequential, Pack = 1 )]
public class CharacterEquipment
{
public const int MainWeaponOffset = 0x0C78;
public const int OffWeaponOffset = 0x0CE0;
public const int EquipmentOffset = 0xDB0;
public const int MainWeaponOffset = 0x6D0;
public const int OffWeaponOffset = 0x738;
public const int EquipmentOffset = 0x808;
public const int EquipmentSlots = 10;
public const int WeaponSlots = 2;
@ -145,5 +145,4 @@ namespace Penumbra.GameData.Structs
Marshal.Copy( array, offset, new IntPtr( data ), 56 );
}
}
}
}

4
Penumbra.PlayerWatch/PlayerWatchBase.cs
View file

@ -26,7 +26,7 @@ internal readonly struct WatchedPlayer
internal class PlayerWatchBase : IDisposable
{
public const int GPosePlayerIdx = 201;
public const int GPoseTableEnd = GPosePlayerIdx + 48;
public const int GPoseTableEnd = GPosePlayerIdx + 40;
private const int ObjectsPerFrame = 32;
private readonly Framework _framework;
@ -301,7 +301,7 @@ internal class PlayerWatchBase : IDisposable
var id = GetId( character );
SeenActors.Add( id );
PluginLog.Verbose( "Comparing Gear for {PlayerName} ({Id}) at {Address}...", character.Name, id, character.Address );
PluginLog.Verbose( "Comparing Gear for {PlayerName:l} ({Id}) at 0x{Address:X}...", character.Name, id, character.Address.ToInt64() );
if( !watch.FoundActors.TryGetValue( id, out var equip ) )
{
equip = new CharacterEquipment( character );

2
Penumbra/Penumbra.json
View file

@ -7,7 +7,7 @@
"RepoUrl": "https://github.com/xivdev/Penumbra",
"ApplicableVersion": "any",
"Tags": [ "modding" ],
"DalamudApiLevel": 5,
"DalamudApiLevel": 6,
"LoadPriority": 69420,
"IconUrl": "https://raw.githubusercontent.com/xivdev/Penumbra/master/images/icon.png"
}

2
base_repo.json
View file

@ -8,7 +8,7 @@
"TestingAssemblyVersion": "1.0.0.0",
"RepoUrl": "https://github.com/xivdev/Penumbra",
"ApplicableVersion": "any",
"DalamudApiLevel": 5,
"DalamudApiLevel": 6,
"IsHide": "False",
"IsTestingExclusive": "False",
"DownloadCount": 0,