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

Allow moving double-wide unit 1 tile backwards

Browse Source
This commit is contained in:
Ivan Savenko
2025-05-20 18:02:45 +03:00
parent 184e841b16
commit 797f8f06a6
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/battle/BattleActionsController.cpp
View File

@@ -723,14 +723,19 @@ void BattleActionsController::actionRealize(PossiblePlayerBattleAction action, c
case PossiblePlayerBattleAction::MOVE_TACTICS:
case PossiblePlayerBattleAction::MOVE_STACK:
{
if(owner.stacksController->getActiveStack()->doubleWide())
const auto * activeStack = owner.stacksController->getActiveStack();
const bool backwardsMove = activeStack->unitSide() == BattleSide::ATTACKER ?
targetHex.getX() < activeStack->getPosition().getX():
targetHex.getX() > activeStack->getPosition().getX();
if(activeStack->doubleWide() && backwardsMove)
{
BattleHexArray acc = owner.getBattle()->battleGetAvailableHexes(owner.stacksController->getActiveStack(), false);
BattleHex shiftedDest = targetHex.cloneInDirection(owner.stacksController->getActiveStack()->destShiftDir(), false);
if(acc.contains(targetHex))
owner.giveCommand(EActionType::WALK, targetHex);
else if(acc.contains(shiftedDest))
BattleHexArray acc = owner.getBattle()->battleGetAvailableHexes(activeStack, false);
BattleHex shiftedDest = targetHex.cloneInDirection(activeStack->destShiftDir(), false);
if(acc.contains(shiftedDest))
owner.giveCommand(EActionType::WALK, shiftedDest);
else
owner.giveCommand(EActionType::WALK, targetHex);
}
else
{

31
client/battle/BattleFieldController.cpp
View File

@@ -390,25 +390,28 @@ BattleHexArray BattleFieldController::getHighlightedHexesForMovementTarget()
}
}
if(availableHexes.contains(hoveredHex))
{
if (stack->doubleWide())
return {hoveredHex, stack->occupiedHex(hoveredHex)};
else
return {hoveredHex};
}
{
const bool backwardsMove = stack->unitSide() == BattleSide::ATTACKER ?
hoveredHex.getX() < stack->getPosition().getX():
hoveredHex.getX() > stack->getPosition().getX();
if(stack->doubleWide())
{
for(const auto & hex : availableHexes)
{
if(stack->occupiedHex(hex) == hoveredHex)
return {hoveredHex, hex};
}
}
if (backwardsMove && availableHexes.contains(hoveredHex.cloneInDirection(stack->destShiftDir())))
return {hoveredHex, hoveredHex.cloneInDirection(stack->destShiftDir())};
if (availableHexes.contains(hoveredHex))
return {hoveredHex, stack->occupiedHex(hoveredHex)};
return {};
}
else
{
if (availableHexes.contains(hoveredHex))
return {hoveredHex};
else
return {};
}
}
// Range limit highlight helpers