games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +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
Show Stats 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(), creature(),
permanent(false), permanent(false),
exclusive(true), exclusive(true),
summonByHealth(false) summonByHealth(false),
summonSameUnit(false)
{ {
} }
@ -162,6 +163,7 @@ void Summon::serializeJsonEffect(JsonSerializeFormat & handler)
handler.serializeBool("permanent", permanent, false); handler.serializeBool("permanent", permanent, false);
handler.serializeBool("exclusive", exclusive, true); handler.serializeBool("exclusive", exclusive, true);
handler.serializeBool("summonByHealth", summonByHealth, false); handler.serializeBool("summonByHealth", summonByHealth, false);
handler.serializeBool("summonSameUnit", summonSameUnit, false);
} }
EffectTarget Summon::transformTarget(const Mechanics * m, const Target & aimPoint, const Target & spellTarget) const 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; EffectTarget effectTarget;
if(sameSummoned.empty()) if(sameSummoned.empty() || !summonSameUnit)
{ {
BattleHex hex = m->cb->getAvaliableHex(creature, m->casterSide); BattleHex hex = m->cb->getAvaliableHex(creature, m->casterSide);
if(!hex.isValid()) if(!hex.isValid())
@ -193,6 +195,5 @@ EffectTarget Summon::transformTarget(const Mechanics * m, const Target & aimPoin
return effectTarget; return effectTarget;
} }
} }
} }

1
lib/spells/effects/Summon.h
View File

@ -44,6 +44,7 @@ private:
bool permanent; bool permanent;
bool exclusive; bool exclusive;
bool summonByHealth; bool summonByHealth;
bool summonSameUnit;
}; };
} }

16
test/spells/effects/SummonTest.cpp
View File

@ -24,12 +24,13 @@ using namespace ::testing;
static const CreatureID creature1(CreatureID::AIR_ELEMENTAL); static const CreatureID creature1(CreatureID::AIR_ELEMENTAL);
static const CreatureID creature2(CreatureID::FIRE_ELEMENTAL); static const CreatureID creature2(CreatureID::FIRE_ELEMENTAL);
class SummonTest : public TestWithParam<::testing::tuple<bool, CreatureID>>, public EffectFixture class SummonTest : public TestWithParam<::testing::tuple<CreatureID, bool, bool>>, public EffectFixture
{ {
public: public:
bool exclusive;
CreatureID toSummon; CreatureID toSummon;
CreatureID otherSummoned; CreatureID otherSummoned;
bool exclusive;
bool summonSameUnit;
const battle::Unit * otherSummonedUnit; const battle::Unit * otherSummonedUnit;
@ -65,14 +66,16 @@ protected:
{ {
EffectFixture::setUp(); EffectFixture::setUp();
exclusive = ::testing::get<0>(GetParam()); otherSummoned = ::testing::get<0>(GetParam());
otherSummoned = ::testing::get<1>(GetParam()); exclusive = ::testing::get<1>(GetParam());
summonSameUnit = ::testing::get<2>(GetParam());
toSummon = creature1; toSummon = creature1;
JsonNode options(JsonNode::JsonType::DATA_STRUCT); JsonNode options(JsonNode::JsonType::DATA_STRUCT);
options["id"].String() = "airElemental"; options["id"].String() = "airElemental";
options["exclusive"].Bool() = exclusive; options["exclusive"].Bool() = exclusive;
options["summonSameUnit"].Bool() = summonSameUnit;
EffectFixture::setupEffect(options); EffectFixture::setupEffect(options);
} }
@ -112,7 +115,7 @@ TEST_P(SummonTest, Transform)
EffectTarget expected; EffectTarget expected;
if(otherSummoned == toSummon) if(otherSummoned == toSummon && summonSameUnit)
{ {
expected.emplace_back(otherSummonedUnit); expected.emplace_back(otherSummonedUnit);
} }
@ -130,8 +133,9 @@ INSTANTIATE_TEST_CASE_P
SummonTest, SummonTest,
Combine Combine
( (
Values(CreatureID(), creature1, creature2),
Values(false, true), Values(false, true),
Values(CreatureID(), creature1, creature2) Values(false, true)
) )
); );