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

Mostly finished refactoring of BattleActionsController

Browse Source 
TODO: test actions
TODO: test casters
TODO: fix random casters
This commit is contained in:
Ivan Savenko
2023-01-21 19:42:44 +02:00
parent a2035122e1
commit 55a58596bc
5 changed files with 569 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
client/battle/BattleStacksController.cpp
View File

@ -73,8 +73,6 @@ BattleStacksController::BattleStacksController(BattleInterface & owner):
activeStack(nullptr),
stackToActivate(nullptr),
selectedStack(nullptr),
stackCanCastSpell(false),
creatureSpellToCast(uint32_t(-1)),
animIDhelper(0)
{
//preparing graphics for displaying amounts of creatures
@ -738,25 +736,6 @@ void BattleStacksController::activateStack()
const CStack * s = getActiveStack();
if(!s)
return;
//set casting flag to true if creature can use it to not check it every time
const auto spellcaster = s->getBonusLocalFirst(Selector::type()(Bonus::SPELLCASTER));
const auto randomSpellcaster = s->getBonusLocalFirst(Selector::type()(Bonus::RANDOM_SPELLCASTER));
if(s->canCast() && (spellcaster || randomSpellcaster))
{
stackCanCastSpell = true;
if(randomSpellcaster)
creatureSpellToCast = -1; //spell will be set later on cast
else
creatureSpellToCast = owner.curInt->cb->battleGetRandomStackSpell(CRandomGenerator::getDefault(), s, CBattleInfoCallback::RANDOM_AIMED); //faerie dragon can cast only one spell until their next move
//TODO: what if creature can cast BOTH random genie spell and aimed spell?
//TODO: faerie dragon type spell should be selected by server
}
else
{
stackCanCastSpell = false;
creatureSpellToCast = -1;
}
}
void BattleStacksController::setSelectedStack(const CStack *stack)
@ -779,18 +758,6 @@ bool BattleStacksController::facingRight(const CStack * stack) const
return stackFacingRight.at(stack->ID);
}
bool BattleStacksController::activeStackSpellcaster()
{
return stackCanCastSpell;
}
SpellID BattleStacksController::activeStackSpellToCast()
{
if (!stackCanCastSpell)
return SpellID::NONE;
return SpellID(creatureSpellToCast);
}
Point BattleStacksController::getStackPositionAtHex(BattleHex hexNum, const CStack * stack) const
{
Point ret(-500, -500); //returned value
@ -908,12 +875,12 @@ std::vector<const CStack *> BattleStacksController::selectHoveredStacks()
if(owner.actionsController->spellcastingModeActive())//hero casts spell
{
spell = owner.actionsController->selectedSpell().toSpell();
spell = owner.actionsController->getHeroSpellToCast();
caster = owner.getActiveHero();
}
else if(owner.stacksController->activeStackSpellToCast() != SpellID::NONE)//stack casts spell
else if(owner.actionsController->getStackSpellToCast(hoveredHex) != nullptr)//stack casts spell
{
spell = SpellID(owner.stacksController->activeStackSpellToCast()).toSpell();
spell = owner.actionsController->getStackSpellToCast(hoveredHex);
caster = owner.stacksController->getActiveStack();
mode = spells::Mode::CREATURE_ACTIVE;
}