Follow up fix for TARGET_TYPE

[thokkat]

#682 allowed focus only if npc guild matches the spell's TARGET_TYPE. But that spell could still hit and cause damage.

Tested both G1&G2. Projectile spells hit only if TARGET_TYPE allows for, while spells like firerain ignore type and always hit.

I guess in theory there's same behavior for items and interactives but they can't be damaged anyway so ignore them.

[Try]

#682 allowed focus only if npc guild matches the spell's TARGET_TYPE. But that spell could still hit and cause damage.

Are you sure, that engine also need to check target type on collision? To me checking only C_CanNpcCollideWithSpell makes more sense, and TARGET_TYPE is essentially a hint for game-interface.

[thokkat]

This is how fireball looks with undead type.

6.mp4

In contrast firerain with undead type makes everyone angry

7.mp4

Other reason I found for preventing collision for projectile spells is that AssessDamage perc is not sent. Undead priest in G1 orc temple triggers a dialog after some hits but those spells with non-matching target type never trigger it.

[Try]

This is how fireball looks with undead type.

Hm, yeah. Still in case of G2 this feel-like leftover from G1, that wasn't intended to be in game:

• in G2-scripts targetCollectType is effectively unused
• G2 has C_CanNpcCollideWithSpell api to achieve same purpose
  While change is vital for G1, for G2 it falls into "bug reproduction" category.

Can we instead make no change to current G2 implementation, and provide a default implementation of GameScript::canNpcCollideWithSpell for G1?

[Try]

Nitpick: isSpellTargetType -> isTargetableBySpell

[thokkat]

Can we instead make no change to current G2 implementation, and provide a default implementation of GameScript::canNpcCollideWithSpell for G1?

Done. Just wasn't getting what you were up to initially :)

[Try]

Merged, thanks!