Merge pull request #739 from noudess/master

Changes to make Harmony work.
This commit is contained in:
Michael Cook (mackal) 2018-06-24 14:38:33 -04:00 committed by GitHub
commit 0558b1bc48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -244,8 +244,7 @@ bool IsBeneficialSpell(uint16 spell_id)
} else {
// If the resisttype is not magic and spell is Bind Sight or Cast Sight
// It's not beneficial
if (sai == SAI_Dispell_Sight && spells[spell_id].skill == 18 &&
!IsEffectInSpell(spell_id, SE_VoiceGraft))
if ((sai == SAI_Calm && IsEffectInSpell(spell_id, SE_Harmony)) || (sai == SAI_Calm_Song && IsEffectInSpell(spell_id, SE_BindSight)) || (sai == SAI_Dispell_Sight && spells[spell_id].skill == 18 && !IsEffectInSpell(spell_id, SE_VoiceGraft)))
return false;
}
}