games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +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

8
lib/spells/effects/RemoveObstacle.cpp
View File

@@ -49,7 +49,7 @@ bool RemoveObstacle::applicable(Problem & problem, const Mechanics * m, const Ef
return !getTargets(m, target, false).empty();
}
void RemoveObstacle::apply(BattleStateProxy * battleState, RNG & rng, const Mechanics * m, const EffectTarget & target) const
void RemoveObstacle::apply(ServerCallback * server, const Mechanics * m, const EffectTarget & target) const
{
BattleObstaclesChanged pack;
@@ -57,7 +57,7 @@ void RemoveObstacle::apply(BattleStateProxy * battleState, RNG & rng, const Mech
pack.changes.emplace_back(obstacle->uniqueID, BattleChanges::EOperation::REMOVE);
if(!pack.changes.empty())
battleState->apply(&pack);
server->apply(&pack);
}
void RemoveObstacle::serializeJsonEffect(JsonSerializeFormat & handler)
@@ -93,7 +93,7 @@ std::set<const CObstacleInstance *> RemoveObstacle::getTargets(const Mechanics *
std::set<const CObstacleInstance *> possibleTargets;
if(m->isMassive() || alwaysMassive)
{
for(const auto & obstacle : m->cb->battleGetAllObstacles())
for(const auto & obstacle : m->battle()->battleGetAllObstacles())
if(canRemove(obstacle.get()))
possibleTargets.insert(obstacle.get());
}
@@ -101,7 +101,7 @@ std::set<const CObstacleInstance *> RemoveObstacle::getTargets(const Mechanics *
{
for(const auto & destination : target)
if(destination.hexValue.isValid())
for(const auto & obstacle : m->cb->battleGetAllObstaclesOnPos(destination.hexValue, false))
for(const auto & obstacle : m->battle()->battleGetAllObstaclesOnPos(destination.hexValue, false))
if(canRemove(obstacle.get()))
possibleTargets.insert(obstacle.get());
}