master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
Showing only changes of commit 145a989a07 - Show all commits

View File

@ -142,7 +142,7 @@ internal sealed class ItemUseModule : ICombatModule
{ {
BattleChara* battleChara = (BattleChara*)gameObject.Address; BattleChara* battleChara = (BattleChara*)gameObject.Address;
if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.Incapacitated) if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.Incapacitated)
return (*(byte*)((nint)battleChara + 0x1C68) & 0x40) != 0; return (battleChara->ActorControlFlags & 0x40) != 0;
if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.HealthPercent) if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.HealthPercent)
return (100f * battleChara->Health / battleChara->MaxHealth) < _combatData.CombatItemUse.Value; return (100f * battleChara->Health / battleChara->MaxHealth) < _combatData.CombatItemUse.Value;