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

Merge branch 'main' into rework

Browse source 
# Conflicts:
#	Glamourer.GameData/CharacterEquipExtensions.cs
#	Glamourer.GameData/Customization/CharacterCustomization.cs
#	Glamourer.GameData/Customization/CustomizationOptions.cs
#	Glamourer.GameData/GameData.cs
#	Glamourer.zip
#	Glamourer/Glamourer.csproj
#	Glamourer/GlamourerConfig.cs
#	Glamourer/Gui/InterfaceActorPanel.cs
#	Glamourer/Gui/InterfaceConfig.cs
#	Glamourer/Gui/InterfaceEquipment.cs
#	Glamourer/Gui/InterfaceFixedDesigns.cs
#	Penumbra.PlayerWatch/CharacterEquipment.cs
#	Penumbra.PlayerWatch/Penumbra.PlayerWatch.csproj
This commit is contained in:
Ottermandias 2023-06-12 16:35:21 +02:00
commit f2f16c664c
1 changed files with 18 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

57
GlamourerOld/Util/CharacterExtensions.cs
View file

@ -6,7 +6,7 @@ namespace Glamourer.Util;
public static class CharacterExtensions
{
public static unsafe bool IsWet(this Character a)
=> (*((byte*)a.Address + Offsets.Character.Wetness) & Offsets.Character.Flags.IsWet) != 0;
=> ((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*) a.Address)->IsGPoseWet;
public static unsafe bool SetWetness(this Character a, bool value)
{
@ -14,17 +14,12 @@ public static class CharacterExtensions
if (current == value)
return false;
if (value)
*((byte*)a.Address + Offsets.Character.Wetness) =
(byte)(*((byte*)a.Address + Offsets.Character.Wetness) | Offsets.Character.Flags.IsWet);
else
*((byte*)a.Address + Offsets.Character.Wetness) =
(byte)(*((byte*)a.Address + Offsets.Character.Wetness) & ~Offsets.Character.Flags.IsWet);
((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->IsGPoseWet = value;
return true;
}
public static unsafe bool IsHatVisible(this Character a)
=> (*((byte*)a.Address + Offsets.Character.HatVisible) & Offsets.Character.Flags.IsHatHidden) == 0;
=> !((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->DrawData.IsHatHidden;
public static unsafe bool SetHatVisible(this Character a, bool visible)
{
@ -32,18 +27,12 @@ public static class CharacterExtensions
if (current == visible)
return false;
if (visible)
*((byte*)a.Address + Offsets.Character.HatVisible) =
(byte)(*((byte*)a.Address + Offsets.Character.HatVisible) & ~Offsets.Character.Flags.IsHatHidden);
else
*((byte*)a.Address + Offsets.Character.HatVisible) =
(byte)(*((byte*)a.Address + Offsets.Character.HatVisible) | Offsets.Character.Flags.IsHatHidden);
((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->DrawData.IsHatHidden = !visible;
return true;
}
public static unsafe bool IsVisorToggled(this Character a)
=> (*((byte*)a.Address + Offsets.Character.VisorToggled) & Offsets.Character.Flags.IsVisorToggled)
== Offsets.Character.Flags.IsVisorToggled;
=> ((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->DrawData.IsVisorToggled;
public static unsafe bool SetVisorToggled(this Character a, bool toggled)
{
@ -51,20 +40,13 @@ public static class CharacterExtensions
if (current == toggled)
return false;
if (toggled)
*((byte*)a.Address + Offsets.Character.VisorToggled) =
(byte)(*((byte*)a.Address + Offsets.Character.VisorToggled) | Offsets.Character.Flags.IsVisorToggled);
else
*((byte*)a.Address + Offsets.Character.VisorToggled) =
(byte)(*((byte*)a.Address + Offsets.Character.VisorToggled) & ~Offsets.Character.Flags.IsVisorToggled);
((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->DrawData.IsVisorToggled = toggled;
return true;
}
public static unsafe bool IsWeaponHidden(this Character a)
=> (*((byte*)a.Address + Offsets.Character.WeaponHidden1) & Offsets.Character.Flags.IsWeaponHidden1)
== Offsets.Character.Flags.IsWeaponHidden1
&& (*((byte*)a.Address + Offsets.Character.WeaponHidden2) & Offsets.Character.Flags.IsWeaponHidden2)
== Offsets.Character.Flags.IsWeaponHidden2;
=> ((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->DrawData.IsWeaponHidden
&& ((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->DrawData.IsMainHandHidden;
public static unsafe bool SetWeaponHidden(this Character a, bool value)
{
@ -72,22 +54,19 @@ public static class CharacterExtensions
if (hidden == value)
return false;
var val1 = *((byte*)a.Address + Offsets.Character.WeaponHidden1);
var val2 = *((byte*)a.Address + Offsets.Character.WeaponHidden2);
if (value)
{
*((byte*)a.Address + Offsets.Character.WeaponHidden1) = (byte)(val1 | Offsets.Character.Flags.IsWeaponHidden1);
*((byte*)a.Address + Offsets.Character.WeaponHidden2) = (byte)(val2 | Offsets.Character.Flags.IsWeaponHidden2);
}
else
{
*((byte*)a.Address + Offsets.Character.WeaponHidden1) = (byte)(val1 & ~Offsets.Character.Flags.IsWeaponHidden1);
*((byte*)a.Address + Offsets.Character.WeaponHidden2) = (byte)(val2 & ~Offsets.Character.Flags.IsWeaponHidden2);
}
var drawData = &((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->DrawData;
drawData->IsWeaponHidden = value;
drawData->IsMainHandHidden = value;
// TODO
if (value)
*(&drawData->MainHandState + ((long) &drawData->OffHandModel - (long) &drawData->MainHandModel)) |= 0x02;
else
*(&drawData->MainHandState + ((long) &drawData->OffHandModel - (long) &drawData->MainHandModel)) &= 0xFD;
return true;
}
public static unsafe ref float Alpha(this Character a)
=> ref *(float*)((byte*)a.Address + Offsets.Character.Alpha);
=> ref ((FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)a.Address)->Alpha;
}