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

Fixes.

Browse source
This commit is contained in:
Ottermandias 2024-11-17 14:27:14 +01:00
parent 2ce8076e9a
commit fe028e5ec7
9 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Automation/AutoDesignApplier.cs
View file

@ -277,7 +277,7 @@ public sealed class AutoDesignApplier : IDisposable
} }
forcedRedraw = false; forcedRedraw = false;
if (!_humans.IsHuman((uint)actor.AsCharacter->CharacterData.ModelCharaId)) if (!_humans.IsHuman((uint)actor.AsCharacter->ModelContainer.ModelCharaId))
return; return;
if (actor.IsTransformed) if (actor.IsTransformed)

2
Glamourer/GameData/CustomizeSetFactory.cs
View file

@ -166,7 +166,7 @@ internal class CustomizeSetFactory(
continue; continue;
// Hair Row from CustomizeSheet might not be set in case of unlockable hair. // Hair Row from CustomizeSheet might not be set in case of unlockable hair.
if (_customizeSheet.TryGetRow(customizeIdx, out var hairRow)) if (!_customizeSheet.TryGetRow(customizeIdx, out var hairRow))
hairList.Add(new CustomizeData(CustomizeIndex.Hairstyle, (CustomizeValue)i, customizeIdx)); hairList.Add(new CustomizeData(CustomizeIndex.Hairstyle, (CustomizeValue)i, customizeIdx));
else if (_icons.IconExists(hairRow.Icon)) else if (_icons.IconExists(hairRow.Icon))
hairList.Add(new CustomizeData(CustomizeIndex.Hairstyle, (CustomizeValue)hairRow.FeatureID, hairRow.Icon, hairList.Add(new CustomizeData(CustomizeIndex.Hairstyle, (CustomizeValue)hairRow.FeatureID, hairRow.Icon,

6
Glamourer/Gui/Tabs/DebugTab/ModelEvaluationPanel.cs
View file

@ -52,11 +52,11 @@ public unsafe class ModelEvaluationPanel(
ImGui.TableNextColumn(); ImGui.TableNextColumn();
if (actor.IsCharacter) if (actor.IsCharacter)
{ {
ImGui.TextUnformatted(actor.AsCharacter->CharacterData.ModelCharaId.ToString()); ImGui.TextUnformatted(actor.AsCharacter->ModelContainer.ModelCharaId.ToString());
if (actor.AsCharacter->CharacterData.TransformationId != 0) if (actor.AsCharacter->CharacterData.TransformationId != 0)
ImGui.TextUnformatted($"Transformation Id: {actor.AsCharacter->CharacterData.TransformationId}"); ImGui.TextUnformatted($"Transformation Id: {actor.AsCharacter->CharacterData.TransformationId}");
if (actor.AsCharacter->CharacterData.ModelCharaId_2 != -1) if (actor.AsCharacter->ModelContainer.ModelCharaId_2 != -1)
ImGui.TextUnformatted($"ModelChara2 {actor.AsCharacter->CharacterData.ModelCharaId_2}"); ImGui.TextUnformatted($"ModelChara2 {actor.AsCharacter->ModelContainer.ModelCharaId_2}");
ImGuiUtil.DrawTableColumn("Character Mode"); ImGuiUtil.DrawTableColumn("Character Mode");
ImGuiUtil.DrawTableColumn($"{actor.AsCharacter->Mode}"); ImGuiUtil.DrawTableColumn($"{actor.AsCharacter->Mode}");

2
Glamourer/Interop/MetaService.cs
View file

@ -50,7 +50,7 @@ public unsafe class MetaService : IDisposable
// The function seems to not do anything if the head is 0, but also breaks for carbuncles turned human, sometimes? // The function seems to not do anything if the head is 0, but also breaks for carbuncles turned human, sometimes?
var old = actor.AsCharacter->DrawData.Equipment(DrawDataContainer.EquipmentSlot.Head).Id; var old = actor.AsCharacter->DrawData.Equipment(DrawDataContainer.EquipmentSlot.Head).Id;
if (old == 0 && actor.AsCharacter->CharacterData.ModelCharaId == 0) if (old == 0 && actor.AsCharacter->ModelContainer.ModelCharaId == 0)
actor.AsCharacter->DrawData.Equipment(DrawDataContainer.EquipmentSlot.Head).Id = 1; actor.AsCharacter->DrawData.Equipment(DrawDataContainer.EquipmentSlot.Head).Id = 1;
_hideHatGearHook.Original(&actor.AsCharacter->DrawData, 0, (byte)(value ? 0 : 1)); _hideHatGearHook.Original(&actor.AsCharacter->DrawData, 0, (byte)(value ? 0 : 1));
actor.AsCharacter->DrawData.Equipment(DrawDataContainer.EquipmentSlot.Head).Id = old; actor.AsCharacter->DrawData.Equipment(DrawDataContainer.EquipmentSlot.Head).Id = old;

2
Glamourer/Interop/ScalingService.cs
View file

@ -19,7 +19,7 @@ public unsafe class ScalingService : IDisposable
_setupMountHook = _setupMountHook =
interop.HookFromAddress<SetupMount>((nint)MountContainer.MemberFunctionPointers.SetupMount, SetupMountDetour); interop.HookFromAddress<SetupMount>((nint)MountContainer.MemberFunctionPointers.SetupMount, SetupMountDetour);
_calculateHeightHook = _calculateHeightHook =
interop.HookFromAddress<CalculateHeight>((nint)HeightContainer.MemberFunctionPointers.CalculateHeight, CalculateHeightDetour); interop.HookFromAddress<CalculateHeight>((nint)Character.MemberFunctionPointers.CalculateHeight, CalculateHeightDetour);
_setupMountHook.Enable(); _setupMountHook.Enable();
_updateOrnamentHook.Enable(); _updateOrnamentHook.Enable();

2
Glamourer/State/FunModule.cs
View file

@ -333,7 +333,7 @@ public unsafe class FunModule : IDisposable
=> actor.IsCharacter => actor.IsCharacter
&& actor.AsObject->ObjectKind is ObjectKind.Pc && actor.AsObject->ObjectKind is ObjectKind.Pc
&& !actor.IsTransformed && !actor.IsTransformed
&& actor.AsCharacter->CharacterData.ModelCharaId == 0; && actor.AsCharacter->ModelContainer.ModelCharaId == 0;
private static void KeepOldArmor(Actor actor, EquipSlot slot, ref CharacterArmor armor) private static void KeepOldArmor(Actor actor, EquipSlot slot, ref CharacterArmor armor)
=> armor = actor.Model.Valid ? actor.Model.GetArmor(slot) : armor; => armor = actor.Model.Valid ? actor.Model.GetArmor(slot) : armor;

2
Glamourer/State/StateListener.cs
View file

@ -593,7 +593,7 @@ public class StateListener : IDisposable
private unsafe UpdateState UpdateBaseData(Actor actor, ActorState state, uint modelId, nint customizeData, nint equipData) private unsafe UpdateState UpdateBaseData(Actor actor, ActorState state, uint modelId, nint customizeData, nint equipData)
{ {
// Model ID does not agree between game object and new draw object => Transformation. // Model ID does not agree between game object and new draw object => Transformation.
if (modelId != (uint)actor.AsCharacter->CharacterData.ModelCharaId) if (modelId != (uint)actor.AsCharacter->ModelContainer.ModelCharaId)
return UpdateState.Transformed; return UpdateState.Transformed;
// Model ID did not change to stored state. // Model ID did not change to stored state.

6
Glamourer/State/StateManager.cs
View file

@ -114,14 +114,14 @@ public sealed class StateManager(
// Model ID is only unambiguously contained in the game object. // Model ID is only unambiguously contained in the game object.
// The draw object only has the object type. // The draw object only has the object type.
// TODO reverse search model data to get model id from model. // TODO reverse search model data to get model id from model.
if (!_humans.IsHuman((uint)actor.AsCharacter->CharacterData.ModelCharaId)) if (!_humans.IsHuman((uint)actor.AsCharacter->ModelContainer.ModelCharaId))
{ {
ret.LoadNonHuman((uint)actor.AsCharacter->CharacterData.ModelCharaId, *(CustomizeArray*)&actor.AsCharacter->DrawData.CustomizeData, ret.LoadNonHuman((uint)actor.AsCharacter->ModelContainer.ModelCharaId, *(CustomizeArray*)&actor.AsCharacter->DrawData.CustomizeData,
(nint)Unsafe.AsPointer(ref actor.AsCharacter->DrawData.EquipmentModelIds[0])); (nint)Unsafe.AsPointer(ref actor.AsCharacter->DrawData.EquipmentModelIds[0]));
return ret; return ret;
} }
ret.ModelId = (uint)actor.AsCharacter->CharacterData.ModelCharaId; ret.ModelId = (uint)actor.AsCharacter->ModelContainer.ModelCharaId;
ret.IsHuman = true; ret.IsHuman = true;
CharacterWeapon main; CharacterWeapon main;

2
OtterGui

@ -1 +1 @@
Subproject commit 8ba88eff15326bb28ed5e6157f5252c114d40b5f Subproject commit 95b8d177883b03f804d77434f45e9de97fdb9adf