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

Fix some more stupid fist weapon shit.

Browse source
This commit is contained in:
Ottermandias 2023-07-24 13:28:37 +02:00
parent eea7396946
commit 3a4fe524d9
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Glamourer/State/StateListener.cs
View file

@ -214,10 +214,7 @@ public class StateListener : IDisposable
{ {
// Fist weapon gauntlet hack. // Fist weapon gauntlet hack.
if (slot is EquipSlot.OffHand && weapon.Value.Variant == 0 && weapon.Value.Set.Value != 0 && _lastFistOffhand.Set.Value != 0) if (slot is EquipSlot.OffHand && weapon.Value.Variant == 0 && weapon.Value.Set.Value != 0 && _lastFistOffhand.Set.Value != 0)
{ weapon.Value = _lastFistOffhand;
weapon.Value = _lastFistOffhand;
_lastFistOffhand = CharacterWeapon.Empty;
}
if (!actor.Identifier(_actors.AwaitedService, out var identifier) if (!actor.Identifier(_actors.AwaitedService, out var identifier)
|| !_manager.TryGetValue(identifier, out var state)) || !_manager.TryGetValue(identifier, out var state))
@ -266,10 +263,19 @@ public class StateListener : IDisposable
/// <summary> Update base data for a single changed equipment slot. </summary> /// <summary> Update base data for a single changed equipment slot. </summary>
private UpdateState UpdateBaseData(Actor actor, ActorState state, EquipSlot slot, CharacterArmor armor) private UpdateState UpdateBaseData(Actor actor, ActorState state, EquipSlot slot, CharacterArmor armor)
{ {
bool FistWeaponGauntletHack()
{
if (slot is not EquipSlot.Hands)
return false;
var offhand = actor.GetOffhand();
return offhand.Variant == 0 && armor.Set.Value == offhand.Set.Value;
}
var actorArmor = actor.GetArmor(slot); var actorArmor = actor.GetArmor(slot);
// The actor armor does not correspond to the model armor, thus the actor is transformed. // The actor armor does not correspond to the model armor, thus the actor is transformed.
// This also prevents it from changing values due to hat state. // This also prevents it from changing values due to hat state.
if (actorArmor.Value != armor.Value && armor.Set.Value != actor.GetOffhand().Set.Value) if (actorArmor.Value != armor.Value && !FistWeaponGauntletHack())
return UpdateState.Transformed; return UpdateState.Transformed;
var baseData = state.BaseData.Armor(slot); var baseData = state.BaseData.Armor(slot);