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

10
lib/spells/effects/UnitEffect.cpp
View File

@@ -51,7 +51,7 @@ bool UnitEffect::applicable(Problem & problem, const Mechanics * m) const
auto mainFilter = std::bind(&UnitEffect::getStackFilter, this, m, true, _1);
auto predicate = std::bind(&UnitEffect::eraseByImmunityFilter, this, m, _1);
auto targets = m->cb->battleGetUnitsIf(mainFilter);
auto targets = m->battle()->battleGetUnitsIf(mainFilter);
vstd::erase_if(targets, predicate);
if(targets.empty())
{
@@ -123,7 +123,7 @@ EffectTarget UnitEffect::transformTargetByRange(const Mechanics * m, const Targe
if(m->isMassive())
{
//ignore spellTarget and add all stacks
auto units = m->cb->battleGetUnitsIf(mainFilter);
auto units = m->battle()->battleGetUnitsIf(mainFilter);
for(auto unit : units)
targets.insert(unit);
}
@@ -147,7 +147,7 @@ EffectTarget UnitEffect::transformTargetByRange(const Mechanics * m, const Targe
return unit->coversPos(dest.hexValue) && mainFilter(unit);
};
auto units = m->cb->battleGetUnitsIf(predicate);
auto units = m->battle()->battleGetUnitsIf(predicate);
for(auto unit : units)
{
@@ -209,7 +209,7 @@ EffectTarget UnitEffect::transformTargetByChain(const Mechanics * m, const Targe
std::set<BattleHex> possibleHexes;
auto possibleTargets = m->cb->battleGetUnitsIf([&](const battle::Unit * unit) -> bool
auto possibleTargets = m->battle()->battleGetUnitsIf([&](const battle::Unit * unit) -> bool
{
return isValidTarget(m, unit);
});
@@ -225,7 +225,7 @@ EffectTarget UnitEffect::transformTargetByChain(const Mechanics * m, const Targe
for(int32_t targetIndex = 0; targetIndex < chainLength; ++targetIndex)
{
auto unit = m->cb->battleGetUnitByPos(destHex, true);
auto unit = m->battle()->battleGetUnitByPos(destHex, true);
if(!unit)
break;