games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Entities redesign and a few ERM features

Browse Source 
* Made most Handlers derived from CHandlerBase and moved service API there.
* Declared existing Entity APIs.
* Added basic script context caching
* Started Lua script module
* Started Lua spell effect API
* Started script state persistence
* Started battle info callback binding
* CommitPackage removed
* Extracted spells::Caster to own header; Expanded Spell API.
* implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C
* !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented
* Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key)
* Re-enabled VERM macros.
* !?GM0 added
* !?TM implemented
* Added !!MF:N
* Started !?OB, !!BM, !!HE, !!OW, !!UN
* Added basic support of w-variables
* Added support for ERM indirect variables
* Made !?FU regular trigger
* !!re (ERA loop receiver) implemented
* Fixed ERM receivers with zero args.
This commit is contained in:
AlexVinS
2018-03-17 17:58:30 +03:00
committed by AlexVinS
parent 11bb46780a
commit ecaa9f5d0b
475 changed files with 22491 additions and 7123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ bool Summon::applicable(Problem & problem, const Mechanics * m) const
{
//check if there are summoned creatures of other type
auto otherSummoned = m->cb->battleGetUnitsIf([m, this](const battle::Unit * unit)
auto otherSummoned = m->battle()->battleGetUnitsIf([m, this](const battle::Unit * unit)
{
return (unit->unitOwner() == m->getCasterColor())
&& (unit->unitSlot() == SlotID::SUMMONED_SLOT_PLACEHOLDER)
@@ -96,7 +96,7 @@ bool Summon::applicable(Problem & problem, const Mechanics * m) const
return true;
}
void Summon::apply(BattleStateProxy * battleState, RNG & rng, const Mechanics * m, const EffectTarget & target) const
void Summon::apply(ServerCallback * server, const Mechanics * m, const EffectTarget & target) const
{
//new feature - percentage bonus
auto valueWithBonus = m->applySpecificSpellBonus(m->calculateRawEffectValue(0, m->getEffectPower()));//TODO: consider use base power too
@@ -120,8 +120,8 @@ void Summon::apply(BattleStateProxy * battleState, RNG & rng, const Mechanics *
if(summonByHealth)
{
auto creatureType = creature.toCreature();
auto creatureMaxHealth = creatureType->MaxHealth();
auto creatureType = creature.toCreature(m->creatures());
auto creatureMaxHealth = creatureType->getMaxHealth();
amount = static_cast<int32_t>(valueWithBonus / creatureMaxHealth);
}
else
@@ -131,12 +131,12 @@ void Summon::apply(BattleStateProxy * battleState, RNG & rng, const Mechanics *
if(amount < 1)
{
battleState->complain("Summoning didn't summon any!");
server->complain("Summoning didn't summon any!");
continue;
}
battle::UnitInfo info;
info.id = m->cb->battleNextUnitId();
info.id = m->battle()->battleNextUnitId();
info.count = amount;
info.type = creature;
info.side = m->casterSide;
@@ -149,7 +149,7 @@ void Summon::apply(BattleStateProxy * battleState, RNG & rng, const Mechanics *
}
if(!pack.changedStacks.empty())
battleState->apply(&pack);
server->apply(&pack);
}
EffectTarget Summon::filterTarget(const Mechanics * m, const EffectTarget & target) const
@@ -168,7 +168,7 @@ void Summon::serializeJsonEffect(JsonSerializeFormat & handler)
EffectTarget Summon::transformTarget(const Mechanics * m, const Target & aimPoint, const Target & spellTarget) const
{
auto sameSummoned = m->cb->battleGetUnitsIf([m, this](const battle::Unit * unit)
auto sameSummoned = m->battle()->battleGetUnitsIf([m, this](const battle::Unit * unit)
{
return (unit->unitOwner() == m->getCasterColor())
&& (unit->unitSlot() == SlotID::SUMMONED_SLOT_PLACEHOLDER)
@@ -181,7 +181,7 @@ EffectTarget Summon::transformTarget(const Mechanics * m, const Target & aimPoin
if(sameSummoned.empty() || !summonSameUnit)
{
BattleHex hex = m->cb->getAvaliableHex(creature, m->casterSide);
BattleHex hex = m->battle()->getAvaliableHex(creature, m->casterSide);
if(!hex.isValid())
logGlobal->error("No free space to summon creature!");
else