games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Summon effect fixes.

Browse Source
This commit is contained in:
AlexVinS
2018-03-03 20:37:49 +03:00
parent 44d653b835
commit 5ea1888a14
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/spells/effects/Summon.cpp
View File

@@ -37,7 +37,8 @@ Summon::Summon()
creature(),
permanent(false),
exclusive(true),
summonByHealth(false)
summonByHealth(false),
summonSameUnit(false)
{
}
@@ -162,6 +163,7 @@ void Summon::serializeJsonEffect(JsonSerializeFormat & handler)
handler.serializeBool("permanent", permanent, false);
handler.serializeBool("exclusive", exclusive, true);
handler.serializeBool("summonByHealth", summonByHealth, false);
handler.serializeBool("summonSameUnit", summonSameUnit, false);
}
EffectTarget Summon::transformTarget(const Mechanics * m, const Target & aimPoint, const Target & spellTarget) const
@@ -177,7 +179,7 @@ EffectTarget Summon::transformTarget(const Mechanics * m, const Target & aimPoin
EffectTarget effectTarget;
if(sameSummoned.empty())
if(sameSummoned.empty() || !summonSameUnit)
{
BattleHex hex = m->cb->getAvaliableHex(creature, m->casterSide);
if(!hex.isValid())
@@ -193,6 +195,5 @@ EffectTarget Summon::transformTarget(const Mechanics * m, const Target & aimPoin
return effectTarget;
}
}
}