Fixed cannons spamming chat about how you're already in combat or that they can't attack your familiar

Improved nechryaels' death spawn multicombat handling
DFS now works on skeletal wyverns' ice breath
This commit is contained in:
Avi Weinstock
2022-02-23 13:32:56 +00:00
committed by Ryan
parent 22c5417403
commit ccdadf1dab
44 changed files with 150 additions and 107 deletions
@@ -78,10 +78,10 @@ class ChronozonNPC(id: Int, location: Location?) : AbstractNPC(667, Location(308
}
}
override fun isAttackable(entity: Entity, style: CombatStyle?): Boolean {
override fun isAttackable(entity: Entity, style: CombatStyle?, message: Boolean): Boolean {
return entity == m_targetPlayer &&
m_targetPlayer.questRepository.getQuest("Family Crest").getStage(m_targetPlayer) == 19 &&
super.isAttackable(entity, style)
super.isAttackable(entity, style, message)
}
override fun clear() {
@@ -129,7 +129,7 @@ class CombatPulse(
if (handler == null) {
handler = entity.getSwingHandler(true)
}
if (!v.isAttackable(entity, handler!!.type)) {
if (!v.isAttackable(entity, handler!!.type, true)) {
return true
}
if (!swing(entity, victim, handler)) {
@@ -318,7 +318,7 @@ class PitfallNPC : AbstractNPC {
return BEAST_IDS
}
override fun isAttackable(entity: Entity, style: CombatStyle): Boolean {
override fun isAttackable(entity: Entity, style: CombatStyle, message: Boolean): Boolean {
return false
}