1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00

Merge pull request #463 from dydzio0614/skel_transformer_fix

Fix bone/ghost dragon handling in skeleton transformer
This commit is contained in:
Alexander Shishkin 2018-07-19 00:03:32 +03:00 committed by GitHub
commit 84be667363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3668,7 +3668,8 @@ bool CGameHandler::transformInUndead(const IMarket *market, const CGHeroInstance
//resulting creature - bone dragons or skeletons
CreatureID resCreature = CreatureID::SKELETON;
if (s.hasBonusOfType(Bonus::DRAGON_NATURE)
if ((s.hasBonusOfType(Bonus::DRAGON_NATURE)
&& !(s.hasBonusOfType(Bonus::UNDEAD)))
|| (s.getCreatureID() == CreatureID::HYDRA)
|| (s.getCreatureID() == CreatureID::CHAOS_HYDRA))
resCreature = CreatureID::BONE_DRAGON;