From 431ffa341cc77ac9d57893f8c157c07a37e89c72 Mon Sep 17 00:00:00 2001 From: George King <98261225+GeorgeK1ng@users.noreply.github.com> Date: Tue, 26 Aug 2025 20:42:11 +0200 Subject: [PATCH] New luck / morale / stack exp / stack artifact positions --- client/windows/CCreatureWindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/windows/CCreatureWindow.cpp b/client/windows/CCreatureWindow.cpp index a0e17d52c..d131c70a5 100644 --- a/client/windows/CCreatureWindow.cpp +++ b/client/windows/CCreatureWindow.cpp @@ -612,8 +612,8 @@ CStackWindow::MainSection::MainSection(CStackWindow * owner, int yOffset, bool s icons = std::make_shared(ImagePath::builtin("stackWindow/icons"), 117, 32); - morale = std::make_shared(true, Rect(Point(321, 110), Point(42, 42) )); - luck = std::make_shared(false, Rect(Point(375, 110), Point(42, 42) )); + morale = std::make_shared(true, Rect(Point(321, 32), Point(42, 42) )); + luck = std::make_shared(false, Rect(Point(375, 32), Point(42, 42) )); if(battleStack != nullptr) // in battle { @@ -655,7 +655,7 @@ CStackWindow::MainSection::MainSection(CStackWindow * owner, int yOffset, bool s if(showExp) { const CStackInstance * stack = parent->info->stackNode; - Point pos = showArt ? Point(321, 32) : Point(347, 32); + Point pos = showArt ? Point(321, 111) : Point(349, 111); if(parent->info->commander) { const CCommanderInstance * commander = parent->info->commander; @@ -671,7 +671,7 @@ CStackWindow::MainSection::MainSection(CStackWindow * owner, int yOffset, bool s } else { - expRankIcon = std::make_shared(AnimationPath::builtin("stackWindow/levels"), stack->getExpRank(), 0, pos.x, pos.y); + expRankIcon = std::make_shared(AnimationPath::builtin("stackWindow/levels"), stack->getExpRank(), 0, pos.x, pos.y - 2); expArea = std::make_shared(Rect(pos.x, pos.y, 44, 44)); expArea->text = parent->generateStackExpDescription(); } @@ -682,7 +682,7 @@ CStackWindow::MainSection::MainSection(CStackWindow * owner, int yOffset, bool s if(showArt) { - Point pos = showExp ? Point(375, 32) : Point(347, 32); + Point pos = showExp ? Point(373, 109) : Point(347, 109); // ALARMA: do not refactor this into a separate function // otherwise, artifact icon is drawn near the hero's portrait // this is really strange @@ -697,7 +697,7 @@ CStackWindow::MainSection::MainSection(CStackWindow * owner, int yOffset, bool s if(parent->info->owner) { parent->stackArtifactButton = std::make_shared( - Point(pos.x - 2 , pos.y + 46), AnimationPath::builtin("stackWindow/cancelButton"), + Point(pos.x , pos.y + 47), AnimationPath::builtin("stackWindow/cancelButton"), CButton::tooltipLocalized("vcmi.creatureWindow.returnArtifact"), [this]() { parent->removeStackArtifact(ArtifactPosition::CREATURE_SLOT);