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

fine tuning turn timers

Browse Source
This commit is contained in:
Laserlicht
2025-07-04 21:42:16 +02:00
parent e0ea7ca32b
commit 4aad60523c
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/adventureMap/TurnTimerWidget.cpp
View File

@@ -17,6 +17,8 @@
#include "../GameInstance.h" #include "../GameInstance.h"
#include "../media/ISoundPlayer.h" #include "../media/ISoundPlayer.h"
#include "../render/Graphics.h" #include "../render/Graphics.h"
#include "../render/IFont.h"
#include "../render/IRenderHandler.h"
#include "../widgets/Images.h" #include "../widgets/Images.h"
#include "../widgets/GraphicalPrimitiveCanvas.h" #include "../widgets/GraphicalPrimitiveCanvas.h"
#include "../widgets/TextControls.h" #include "../widgets/TextControls.h"
@@ -45,29 +47,28 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
const auto & timers = GAME->interface()->cb->getStartInfo()->turnTimerInfo; const auto & timers = GAME->interface()->cb->getStartInfo()->turnTimerInfo;
backgroundTexture = std::make_shared<CFilledTexture>(ImagePath::builtin("DiBoxBck"), pos); // 1 px smaller on all sides backgroundTexture = std::make_shared<CFilledTexture>(ImagePath::builtin("DiBoxBck"), pos); // 1 px smaller on all sides
backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BRIGHT_YELLOW);
if (isBattleMode) int bigFontHeight = ENGINE->renderHandler().loadFont(FONT_BIG)->getLineHeight();
backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BRIGHT_YELLOW);
else
backgroundBorder = std::make_shared<TransparentFilledRectangle>(pos, ColorRGBA(0, 0, 0, 128), Colors::BLACK);
pos.h += 6;
if (isBattleMode) if (isBattleMode)
{ {
pos.w = 76; pos.w = 77;
pos.h += 20; pos.h += bigFontHeight - 4;
playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], ""); playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
if (timers.battleTimer != 0) if (timers.battleTimer != 0)
{ {
pos.h += 20; pos.h += bigFontHeight;
playerLabelsBattle[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], ""); playerLabelsBattle[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
} }
if (!timers.accumulatingUnitTimer && timers.unitTimer != 0) if (!timers.accumulatingUnitTimer && timers.unitTimer != 0)
{ {
pos.h += 20; pos.h += bigFontHeight;
playerLabelsUnit[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], ""); playerLabelsUnit[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
} }
updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player)); updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player));
@@ -75,10 +76,10 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
else else
{ {
if (!timers.accumulatingTurnTimer && timers.baseTimer != 0) if (!timers.accumulatingTurnTimer && timers.baseTimer != 0)
pos.w = 120; pos.w = 130;
else else
pos.w = 60; pos.w = 70;
for(PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player) for(PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player)
{ {
if (GAME->interface()->cb->getStartInfo()->playerInfos.count(player) == 0) if (GAME->interface()->cb->getStartInfo()->playerInfos.count(player) == 0)
@@ -87,8 +88,8 @@ TurnTimerWidget::TurnTimerWidget(const Point & position, PlayerColor player)
if (!GAME->interface()->cb->getStartInfo()->playerInfos.at(player).isControlledByHuman()) if (!GAME->interface()->cb->getStartInfo()->playerInfos.at(player).isControlledByHuman())
continue; continue;
pos.h += 20; pos.h += bigFontHeight - 4;
playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 10, FONT_BIG, ETextAlignment::CENTER, graphics->playerColors[player.getNum()], ""); playerLabelsMain[player] = std::make_shared<CLabel>(pos.w / 2, pos.h - 2, FONT_BIG, ETextAlignment::BOTTOMCENTER, graphics->playerColors[player.getNum()], "");
updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player)); updateTextLabel(player, GAME->interface()->cb->getPlayerTurnTime(player));
} }

21
client/battle/BattleWindow.cpp
View File

@@ -218,8 +218,8 @@ void BattleWindow::hideStickyQuickSpellWindow()
quickSpellWindow->disable(); quickSpellWindow->disable();
unitActionWindow->disable(); unitActionWindow->disable();
setPositionInfoWindow();
createTimerInfoWindows(); createTimerInfoWindows();
setPositionInfoWindow();
ENGINE->windows().totalRedraw(); ENGINE->windows().totalRedraw();
} }
@@ -236,8 +236,8 @@ void BattleWindow::showStickyQuickSpellWindow()
quickSpellWindow->setEnabled(quickSpellWindowVisible); quickSpellWindow->setEnabled(quickSpellWindowVisible);
unitActionWindow->setEnabled(unitActionWindowVisible); unitActionWindow->setEnabled(unitActionWindowVisible);
setPositionInfoWindow();
createTimerInfoWindows(); createTimerInfoWindows();
setPositionInfoWindow();
ENGINE->windows().totalRedraw(); ENGINE->windows().totalRedraw();
} }
@@ -256,7 +256,7 @@ void BattleWindow::createTimerInfoWindows()
if (attacker.isValidPlayer()) if (attacker.isValidPlayer())
{ {
if (ENGINE->screenDimensions().x >= 1000) if (ENGINE->screenDimensions().x >= 1000)
attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(-92 + xOffsetAttacker, 1), attacker); attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(-80 + xOffsetAttacker, 0), attacker);
else else
attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(1, 135), attacker); attackerTimerWidget = std::make_shared<TurnTimerWidget>(Point(1, 135), attacker);
} }
@@ -264,7 +264,7 @@ void BattleWindow::createTimerInfoWindows()
if (defender.isValidPlayer()) if (defender.isValidPlayer())
{ {
if (ENGINE->screenDimensions().x >= 1000) if (ENGINE->screenDimensions().x >= 1000)
defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w + 16 + xOffsetDefender, 1), defender); defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w + 4 + xOffsetDefender, 0), defender);
else else
defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w - 78, 135), defender); defenderTimerWidget = std::make_shared<TurnTimerWidget>(Point(pos.w - 78, 135), defender);
} }
@@ -386,31 +386,34 @@ void BattleWindow::setPositionInfoWindow()
int xOffsetAttacker = quickSpellWindow->isDisabled() ? 0 : -53; int xOffsetAttacker = quickSpellWindow->isDisabled() ? 0 : -53;
int xOffsetDefender = unitActionWindow->isDisabled() ? 0 : 53; int xOffsetDefender = unitActionWindow->isDisabled() ? 0 : 53;
int yOffsetAttacker = attackerTimerWidget ? attackerTimerWidget->pos.h + 9 : 0;
int yOffsetDefender = defenderTimerWidget ? defenderTimerWidget->pos.h + 9 : 0;
if(defenderHeroWindow) if(defenderHeroWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 1000) Point position = (ENGINE->screenDimensions().x >= 1000)
? Point(pos.x + pos.w + 3 + xOffsetDefender, pos.y + 60) ? Point(pos.x + pos.w + 3 + xOffsetDefender, pos.y - 1 + yOffsetDefender)
: Point(pos.x + pos.w -79, pos.y + 195); : Point(pos.x + pos.w -79, pos.y + 195);
defenderHeroWindow->moveTo(position); defenderHeroWindow->moveTo(position);
} }
if(attackerHeroWindow) if(attackerHeroWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 1000) Point position = (ENGINE->screenDimensions().x >= 1000)
? Point(pos.x - 81 + xOffsetAttacker, pos.y + 60) ? Point(pos.x - 81 + xOffsetAttacker, pos.y - 1 + yOffsetAttacker)
: Point(pos.x + 1, pos.y + 195); : Point(pos.x + 1, pos.y + 195);
attackerHeroWindow->moveTo(position); attackerHeroWindow->moveTo(position);
} }
if(defenderStackWindow) if(defenderStackWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 1000) Point position = (ENGINE->screenDimensions().x >= 1000)
? Point(pos.x + pos.w + 3 + xOffsetDefender, defenderHeroWindow ? defenderHeroWindow->pos.y + 210 : pos.y + 60) ? Point(pos.x + pos.w + 3 + xOffsetDefender, defenderHeroWindow ? defenderHeroWindow->pos.y + 210 : pos.y - 1 + yOffsetDefender)
: Point(pos.x + pos.w -79, defenderHeroWindow ? defenderHeroWindow->pos.y : pos.y + 195); : Point(pos.x + pos.w -79, defenderHeroWindow ? defenderHeroWindow->pos.y : pos.y + 195);
defenderStackWindow->moveTo(position); defenderStackWindow->moveTo(position);
} }
if(attackerStackWindow) if(attackerStackWindow)
{ {
Point position = (ENGINE->screenDimensions().x >= 1000) Point position = (ENGINE->screenDimensions().x >= 1000)
? Point(pos.x - 81 + xOffsetAttacker, attackerHeroWindow ? attackerHeroWindow->pos.y + 210 : pos.y + 60) ? Point(pos.x - 81 + xOffsetAttacker, attackerHeroWindow ? attackerHeroWindow->pos.y + 210 : pos.y - 1 + yOffsetAttacker)
: Point(pos.x + 1, attackerHeroWindow ? attackerHeroWindow->pos.y : pos.y + 195); : Point(pos.x + 1, attackerHeroWindow ? attackerHeroWindow->pos.y : pos.y + 195);
attackerStackWindow->moveTo(position); attackerStackWindow->moveTo(position);
} }
@@ -444,8 +447,8 @@ void BattleWindow::updateStackInfoWindow(const CStack * stack)
else else
attackerStackWindow = nullptr; attackerStackWindow = nullptr;
setPositionInfoWindow();
createTimerInfoWindows(); createTimerInfoWindows();
setPositionInfoWindow();
} }
void BattleWindow::heroManaPointsChanged(const CGHeroInstance * hero) void BattleWindow::heroManaPointsChanged(const CGHeroInstance * hero)