muffin v6.15
This commit is contained in:
parent
84717c5024
commit
521c02e8b8
15 changed files with 71 additions and 65 deletions
|
@ -84,7 +84,7 @@ internal sealed class ItemUseModule : ICombatModule
|
|||
{
|
||||
_delegate.Update(nextTarget);
|
||||
}
|
||||
else if (_combatData.KillEnemyDataIds.Contains(nextTarget.DataId) || _combatData.ComplexCombatDatas.Any((ComplexCombatData x) => x.DataId == nextTarget.DataId && (!x.NameId.HasValue || (nextTarget is ICharacter character && x.NameId == character.NameId))))
|
||||
else if (_combatData.KillEnemyDataIds.Contains(nextTarget.BaseId) || _combatData.ComplexCombatDatas.Any((ComplexCombatData x) => x.DataId == nextTarget.BaseId && (!x.NameId.HasValue || (nextTarget is ICharacter character && x.NameId == character.NameId))))
|
||||
{
|
||||
if (_isDoingRotation)
|
||||
{
|
||||
|
|
|
@ -50,8 +50,8 @@ internal sealed class Mount128Module : ICombatModule
|
|||
|
||||
public bool CanAttack(IBattleNpc target)
|
||||
{
|
||||
uint dataId = target.DataId;
|
||||
if (dataId - 7504 <= 1 || dataId == 14107)
|
||||
uint baseId = target.BaseId;
|
||||
if (baseId - 7504 <= 1 || baseId == 14107)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -46,6 +46,6 @@ internal sealed class Mount147Module : ICombatModule
|
|||
|
||||
public bool CanAttack(IBattleNpc target)
|
||||
{
|
||||
return target.DataId == 8593;
|
||||
return target.BaseId == 8593;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue