ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2026-02-17 04:57:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue with cutscene actors.

Browse source
This commit is contained in:
Ottermandias 2023-09-23 00:41:17 +02:00
parent e2252066f1
commit fc275d584e
6 changed files with 37 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Glamourer/State/StateEditor.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Linq;
using Dalamud.Game.ClientState.Conditions;
using Glamourer.Customization;
using Glamourer.Events;
using Glamourer.Services;
@ -15,13 +16,15 @@ public class StateEditor
private readonly CustomizationService _customizations;
private readonly HumanModelList _humans;
private readonly GPoseService _gPose;
private readonly Condition _condition;
public StateEditor(CustomizationService customizations, HumanModelList humans, ItemManager items, GPoseService gPose)
public StateEditor(CustomizationService customizations, HumanModelList humans, ItemManager items, GPoseService gPose, Condition condition)
{
_customizations = customizations;
_humans = humans;
_items = items;
_gPose = gPose;
_condition = condition;
}
/// <summary> Change the model id. If the actor is changed from a human to another human, customize and equipData are unused. </summary>
@ -49,6 +52,9 @@ public class StateEditor
if (oldIsHuman)
return true;
if (!state.AllowsRedraw(_condition))
return false;
// Fix up everything else to make sure the result is a valid human.
state.ModelData.Customize = Customize.Default;
state.ModelData.SetDefaultEquipment(_items);
@ -73,6 +79,9 @@ public class StateEditor
}
else
{
if (!state.AllowsRedraw(_condition))
return false;
state.ModelData.LoadNonHuman(modelId, customize, equipData);
state[ActorState.MetaIndex.ModelId] = source;
}