games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

vcmi: setup moats using MoatAbility

Browse Source 
Setup moats using moat ability, need playtest for now.
-3 to defence not added for now.
This commit is contained in:
Konstantin
2023-03-20 14:02:09 +03:00
parent 6c5f5dba75
commit aab5b47038
23 changed files with 784 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
server/CGameHandler.cpp
View File

@ -5222,12 +5222,9 @@ bool CGameHandler::handleDamageFromObstacle(const CStack * curStack, bool stackI
{
if(!curStack->alive())
return false;
bool containDamageFromMoat = false;
bool movementStopped = false;
for(auto & obstacle : getAllAffectedObstaclesByStack(curStack, passed))
{
if(obstacle->obstacleType == CObstacleInstance::SPELL_CREATED)
{
//helper info
const SpellCreatedObstacle * spellObstacle = dynamic_cast<const SpellCreatedObstacle *>(obstacle.get());
const ui8 side = curStack->side;
@ -5262,7 +5259,7 @@ bool CGameHandler::handleDamageFromObstacle(const CStack * curStack, bool stackI
};
auto shouldReveal = !spellObstacle->hidden || !gs->curB->battleIsObstacleVisibleForSide(*obstacle, (BattlePerspective::BattlePerspective)side);
const auto * hero = gs->curB->battleGetFightingHero(spellObstacle->casterSide);
auto caster = spells::ObstacleCasterProxy(gs->curB->sides.at(spellObstacle->casterSide).color, hero, spellObstacle);
auto caster = spells::ObstacleCasterProxy(gs->curB->sides.at(spellObstacle->casterSide).color, hero, *spellObstacle);
const auto * sp = SpellID(spellObstacle->ID).toSpell();
if(sp)
{
@ -5279,27 +5276,6 @@ bool CGameHandler::handleDamageFromObstacle(const CStack * curStack, bool stackI
}
else if(shouldReveal)
revealObstacles(*spellObstacle);
}
}
else if(obstacle->obstacleType == CObstacleInstance::MOAT)
{
auto town = gs->curB->town;
int damage = (town == nullptr) ? 0 : town->town->moatDamage;
if(!containDamageFromMoat)
{
containDamageFromMoat = true;
BattleStackAttacked bsa;
bsa.damageAmount = damage;
bsa.stackAttacked = curStack->ID;
bsa.attackerID = -1;
curStack->prepareAttacked(bsa, getRandomGenerator());
StacksInjured si;
si.stacks.push_back(bsa);
sendAndApply(&si);
sendGenericKilledLog(curStack, bsa.killedAmount, false);
}
}
if(!curStack->alive())
@ -6347,6 +6323,17 @@ void CGameHandler::runBattle()
assert(gs->curB);
//TODO: pre-tactic stuff, call scripts etc.
//Moat should be initialized here, because only here we can use spellcasting
if (gs->curB->town && gs->curB->town->fortLevel() >= CGTownInstance::CITADEL)
{
const auto * h = gs->curB->battleGetFightingHero(BattleSide::DEFENDER);
const auto * actualCaster = h ? static_cast<const spells::Caster*>(h) : nullptr;
auto moatCaster = spells::SilentCaster(gs->curB->getSidePlayer(BattleSide::DEFENDER), actualCaster);
auto cast = spells::BattleCast(gs->curB, &moatCaster, spells::Mode::PASSIVE, gs->curB->town->town->moatAbility.toSpell());
auto target = spells::Target();
cast.cast(spellEnv, target);
}
//tactic round
{
while (gs->curB->tacticDistance && !battleResult.get())