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

Cleanup. (3)

Browse source
This commit is contained in:
y2_ss 2023-08-01 12:26:54 -05:00
parent 43d305cc5a
commit cbbd2d77d1
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Glamourer/Automation/AutoDesignApplier.cs
View file

@ -130,7 +130,7 @@ public class AutoDesignApplier : IDisposable
Reduce(data.Objects[0], state, newSet, false, false); Reduce(data.Objects[0], state, newSet, false, false);
foreach (var actor in data.Objects) foreach (var actor in data.Objects)
{ {
_penumbra.SetCollection(actor, ReduceCollections(actor, set)); _penumbra.SetCollection(actor, ReduceCollections(actor, state, set));
_state.ReapplyState(actor); _state.ReapplyState(actor);
} }
} }
@ -142,7 +142,7 @@ public class AutoDesignApplier : IDisposable
var specificId = actor.GetIdentifier(_actors.AwaitedService); var specificId = actor.GetIdentifier(_actors.AwaitedService);
if (_state.GetOrCreate(specificId, actor, out var state)) if (_state.GetOrCreate(specificId, actor, out var state))
{ {
_penumbra.SetCollection(actor, ReduceCollections(actor, set)); _penumbra.SetCollection(actor, ReduceCollections(actor, state, set));
Reduce(actor, state, newSet, false, false); Reduce(actor, state, newSet, false, false);
_state.ReapplyState(actor); _state.ReapplyState(actor);
} }
@ -201,7 +201,7 @@ public class AutoDesignApplier : IDisposable
var respectManual = state.LastJob == newJob.Id; var respectManual = state.LastJob == newJob.Id;
state.LastJob = actor.Job; state.LastJob = actor.Job;
Reduce(actor, state, set, respectManual, true); Reduce(actor, state, set, respectManual, true);
_penumbra.SetCollection(actor, ReduceCollections(actor, set)); _penumbra.SetCollection(actor, ReduceCollections(actor, state, set));
_state.ReapplyState(actor); _state.ReapplyState(actor);
} }
@ -214,10 +214,10 @@ public class AutoDesignApplier : IDisposable
return; return;
Reduce(actor, state, set, false, false); Reduce(actor, state, set, false, false);
_penumbra.SetCollection(actor, ReduceCollections(actor, set)); _penumbra.SetCollection(actor, ReduceCollections(actor, state, set));
} }
public unsafe Collection ReduceCollections(Actor actor, AutoDesignSet set) public unsafe Collection ReduceCollections(Actor actor, ActorState state, AutoDesignSet set)
{ {
Collection collection = new Collection(); Collection collection = new Collection();
foreach (var design in set.Designs) foreach (var design in set.Designs)
@ -228,10 +228,10 @@ public class AutoDesignApplier : IDisposable
if (design.ApplicationType is 0) if (design.ApplicationType is 0)
continue; continue;
if (actor.AsCharacter->CharacterData.ModelCharaId != design?.Design?.DesignData.ModelId) if (actor.AsCharacter->CharacterData.ModelCharaId != design.GetDesignData(state).ModelId)
continue; continue;
if (design.Design.AssociatedCollection.IsAssociable()) if (design.Design!.AssociatedCollection.IsAssociable())
{ {
collection = design.Design.AssociatedCollection; collection = design.Design.AssociatedCollection;
} }