diff --git a/Mods/vcmi/Content/Sprites/stackWindow/button-panel.png b/Mods/vcmi/Content/Sprites/stackWindow/button-panel.png index 3a75239d8..7e0f999cb 100644 Binary files a/Mods/vcmi/Content/Sprites/stackWindow/button-panel.png and b/Mods/vcmi/Content/Sprites/stackWindow/button-panel.png differ diff --git a/Mods/vcmi/Content/config/english.json b/Mods/vcmi/Content/config/english.json index 745c366c9..9c2128a08 100644 --- a/Mods/vcmi/Content/config/english.json +++ b/Mods/vcmi/Content/config/english.json @@ -32,7 +32,7 @@ "vcmi.bonusSource.creature" : "Ability", "vcmi.bonusSource.spell" : "Spell", "vcmi.bonusSource.hero" : "Hero", - "vcmi.bonusSource.commander" : "Commander", + "vcmi.bonusSource.commander" : "Command.", "vcmi.bonusSource.other" : "Other", "vcmi.capitalColors.0" : "Red", diff --git a/Mods/vcmi/Content/config/german.json b/Mods/vcmi/Content/config/german.json index 903f4315f..7ecb859a2 100644 --- a/Mods/vcmi/Content/config/german.json +++ b/Mods/vcmi/Content/config/german.json @@ -30,7 +30,7 @@ "vcmi.bonusSource.creature" : "Fähigkeit", "vcmi.bonusSource.spell" : "Zauber", "vcmi.bonusSource.hero" : "Held", - "vcmi.bonusSource.commander" : "Commander", + "vcmi.bonusSource.commander" : "Command.", "vcmi.bonusSource.other" : "Anderes", "vcmi.capitalColors.0" : "Rot", diff --git a/client/widgets/MiscWidgets.cpp b/client/widgets/MiscWidgets.cpp index 192cceb38..ceb9d247d 100644 --- a/client/widgets/MiscWidgets.cpp +++ b/client/widgets/MiscWidgets.cpp @@ -624,9 +624,9 @@ void MoraleLuckBox::set(const AFactionMember * node) imageName = morale ? "IMRL42" : "ILCK42"; image = std::make_shared(AnimationPath::builtin(imageName), *component.value + 3); - image->moveBy(Point(pos.w/2 - image->pos.w/2, pos.h/2 - image->pos.h/2));//center icon + image->moveBy(Point(pos.w/2 - image->pos.w/2, pos.h/2 - image->pos.h/2)); //center icon if(settings["general"]["enableUiEnhancements"].Bool()) - label = std::make_shared(small ? 30 : 42, small ? 20 : 38, EFonts::FONT_TINY, ETextAlignment::BOTTOMRIGHT, Colors::WHITE, std::to_string(modifierList->totalValue())); + label = std::make_shared((image->pos.topLeft() - pos.topLeft()).x + (small ? 28 : 40), (image->pos.topLeft() - pos.topLeft()).y + (small ? 20 : 38), EFonts::FONT_TINY, ETextAlignment::BOTTOMRIGHT, Colors::WHITE, std::to_string(modifierList->totalValue())); } MoraleLuckBox::MoraleLuckBox(bool Morale, const Rect &r, bool Small) diff --git a/client/windows/CCreatureWindow.cpp b/client/windows/CCreatureWindow.cpp index 8973c19f9..05149ce94 100644 --- a/client/windows/CCreatureWindow.cpp +++ b/client/windows/CCreatureWindow.cpp @@ -668,7 +668,7 @@ CStackWindow::MainSection::MainSection(CStackWindow * owner, int yOffset, bool s expArea->text = parent->generateStackExpDescription(); } expLabel = std::make_shared( - pos.x + 21, pos.y + 52, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE, + pos.x + 21, pos.y + 55, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE, TextOperations::formatMetric(stack->experience, 6)); }