Quick monster upgrade in towns

src/fheroes2/army/army_bar.cpp

@@ -27,7 +27,9 @@
 #include "dialog_selectitems.h"
 #include "game.h"
 #include "icn.h"
+#include "image_tool.h"
 #include "race.h"
+#include "screen.h"
 #include "text.h"
 #include "tools.h"
 #include "translations.h"
@@ -37,6 +39,8 @@
 
 namespace
 {
+    const int32_t upgradeButtonMargin = 2;
+
     void RedistributeArmy( ArmyTroop & troopFrom, ArmyTroop & troopTarget, Army * armyTarget )
     {
         const Army * armyFrom = troopFrom.GetArmy();
@@ -155,6 +159,44 @@ namespace
 
         return false;
     }
+
+    fheroes2::Sprite DrawUpgradeButton( const bool pressed )
+    {
+        const fheroes2::Sprite & original = fheroes2::AGG::GetICN( ICN::LISTBOX, pressed ? 4 : 3 );
+
+        fheroes2::Sprite result( original.width() - 4, original.height() - 3 );
+        const fheroes2::Point offset = pressed ? fheroes2::Point( 1, 3 ) : fheroes2::Point( 2, 2 );
+
+        fheroes2::Copy( original, offset.x, offset.y, result, 0, 0, result.width(), result.height() );
+        // remove black background
+        fheroes2::AddTransparency( result, 36 );
+
+        return result;
+    }
+
+    fheroes2::Sprite DrawMiniButton( const fheroes2::Sprite & original )
+    {
+        fheroes2::Sprite result( original.width() / 2, original.height() / 2 );
+        fheroes2::Resize( original, 0, 0, original.width(), original.height(), result, 0, 0, result.width(), result.height(), true );
+        return result;
+    }
+
+    const fheroes2::Sprite & GetUpgradeButton( const bool useMiniIcon, const bool pressed = false )
+    {
+        static const fheroes2::Sprite & btnReleased = DrawUpgradeButton( false );
+        static const fheroes2::Sprite & btnPressed = DrawUpgradeButton( true );
+        if ( useMiniIcon ) {
+            static const fheroes2::Sprite & btnReleasedMini = DrawMiniButton( btnReleased );
+            static const fheroes2::Sprite & btnPressedMini = DrawMiniButton( btnPressed );
+            return pressed ? btnPressedMini : btnReleasedMini;
+        }
+        return pressed ? btnPressed : btnReleased;
+    }
+
+    fheroes2::Rect getUpgradeButtonPos( const fheroes2::Sprite & upButton, const fheroes2::Rect & itemPos )
+    {
+        return { itemPos.x, itemPos.y, upButton.width() + 2 * upgradeButtonMargin, upButton.height() + 2 * upgradeButtonMargin };
+    }
 }
 
 ArmyBar::ArmyBar( Army * ptr, bool mini, bool ro, bool change /* false */ )
@@ -199,6 +241,38 @@ bool ArmyBar::isValid() const
     return _army != nullptr;
 }
 
+fheroes2::Rect ArmyBar::GetUpgradeButtonPos( const fheroes2::Rect & itemPos ) const
+{
+    return getUpgradeButtonPos( GetUpgradeButton( use_mini_sprite ), itemPos );
+}
+
+void ArmyBar::DrawUpgadeButton( const bool pressed, const fheroes2::Rect & pos, fheroes2::Image & outputImage ) const
+{
+    const fheroes2::Sprite & upgradeButton = GetUpgradeButton( use_mini_sprite, pressed );
+    const fheroes2::Rect upButtonPos = getUpgradeButtonPos( upgradeButton, pos );
+    fheroes2::Blit( upgradeButton, outputImage, upButtonPos.x + upgradeButtonMargin, upButtonPos.y + upgradeButtonMargin );
+}
+
+bool ArmyBar::CanUpgradeNow( const ArmyTroop & troop ) const
+{
+    const Castle * castle = _army->inCastle();
+    return troop.isAllowUpgrade() && castle && castle->GetRace() == troop.GetRace() && castle->isBuild( troop.GetUpgrade().GetDwelling() );
+}
+
+bool ArmyBar::CanAffordUpgrade( const ArmyTroop & troop ) const
+{
+    return world.GetKingdom( _army->GetColor() ).AllowPayment( troop.GetUpgradeCost() );
+}
+
+void ArmyBar::UpgradeTroop( ArmyTroop & troop )
+{
+    assert( CanUpgradeNow( troop ) );
+    assert( CanAffordUpgrade( troop ) );
+
+    world.GetKingdom( _army->GetColor() ).OddFundsResource( troop.GetUpgradeCost() );
+    troop.Upgrade();
+}
+
 void ArmyBar::SetBackground( const fheroes2::Size & sz, const uint8_t fillColor )
 {
     if ( use_mini_sprite ) {
@@ -274,6 +348,10 @@ void ArmyBar::RedrawItem( ArmyTroop & troop, const fheroes2::Rect & pos, bool se
             fheroes2::Blit( spmonh, dstsf, pos.x + spmonh.x(), pos.y + spmonh.y() );
         }
 
+        if ( CanUpgradeNow( troop ) ) {
+            DrawUpgadeButton( false, pos, dstsf );
+        }
+
         if ( use_mini_sprite ) {
             text.Blit( pos.x + pos.width - text.w() - 3, pos.y + pos.height - text.h(), dstsf );
         }
@@ -300,7 +378,7 @@ void ArmyBar::Redraw( fheroes2::Image & dstsf )
     Interface::ItemsActionBar<ArmyTroop>::Redraw( dstsf );
 }
 
-bool ArmyBar::ActionBarCursor( ArmyTroop & troop )
+bool ArmyBar::ActionBarCursor( const fheroes2::Point & cursor, ArmyTroop & troop, const fheroes2::Rect & pos )
 {
     if ( troop.isValid() && !read_only && LocalEvent::Get().MouseClickMiddle() ) {
         RedistributeTroopByOne( troop, _army );
@@ -334,8 +412,14 @@ bool ArmyBar::ActionBarCursor( ArmyTroop & troop )
         }
     }
     else if ( troop.isValid() ) {
-        msg = _( "Select %{name}" );
-        StringReplace( msg, "%{name}", troop.GetName() );
+        if ( CanUpgradeNow( troop ) && ( GetUpgradeButtonPos( pos ) & cursor ) ) {
+            msg = _( "Upgrade %{name}" );
+            StringReplace( msg, "%{name}", troop.GetName() );
+        }
+        else {
+            msg = _( "Select %{name}" );
+            StringReplace( msg, "%{name}", troop.GetName() );
+        }
     }
 
     return false;
@@ -368,8 +452,15 @@ bool ArmyBar::ActionBarCursor( ArmyTroop & destTroop, ArmyTroop & selectedTroop
     return false;
 }
 
-bool ArmyBar::ActionBarLeftMouseSingleClick( ArmyTroop & troop )
+bool ArmyBar::ActionBarLeftMouseSingleClick( const fheroes2::Point & cursor, ArmyTroop & troop, const fheroes2::Rect & pos )
 {
+    if ( !read_only ) {
+        // redraw upgrade button as released
+        if ( CanUpgradeNow( troop ) ) {
+            DrawUpgadeButton( false, pos, fheroes2::Display::instance() );
+        }
+    }
+
     if ( isSelected() ) {
         if ( read_only ) {
             return false; // reset cursor
@@ -410,6 +501,13 @@ bool ArmyBar::ActionBarLeftMouseSingleClick( ArmyTroop & troop )
     else if ( troop.isValid() ) {
         if ( !read_only ) // select
         {
+            if ( CanUpgradeNow( troop ) && ( GetUpgradeButtonPos( pos ) & cursor ) ) {
+                if ( Dialog::YES == Dialog::TroopUpgrade( troop, !CanAffordUpgrade( troop ) ) ) {
+                    UpgradeTroop( troop );
+                }
+                return false;
+            }
+
             if ( IsSplitHotkeyUsed( troop, _army ) )
                 return false;
 
@@ -515,7 +613,7 @@ bool ArmyBar::ActionBarLeftMouseSingleClick( ArmyTroop & destTroop, ArmyTroop &
     return false; // reset cursor
 }
 
-bool ArmyBar::ActionBarLeftMouseDoubleClick( ArmyTroop & troop )
+bool ArmyBar::ActionBarLeftMouseDoubleClick( const fheroes2::Point & /*cursor*/, ArmyTroop & troop, const fheroes2::Rect & /*pos*/ )
 {
     if ( troop.isValid() && !read_only && IsSplitHotkeyUsed( troop, _army ) ) {
         ResetSelected();
@@ -527,21 +625,17 @@ bool ArmyBar::ActionBarLeftMouseDoubleClick( ArmyTroop & troop )
 
     if ( &troop == troop2 ) {
         int flags = ( read_only || _army->SaveLastTroop() ? Dialog::READONLY | Dialog::BUTTONS : Dialog::BUTTONS );
-        const Castle * castle = _army->inCastle();
 
-        if ( troop.isAllowUpgrade() &&
-             // allow upgrade
-             castle && castle->GetRace() == troop.GetRace() && castle->isBuild( troop.GetUpgrade().GetDwelling() ) ) {
+        if ( CanUpgradeNow( troop ) ) {
             flags |= Dialog::UPGRADE;
 
-            if ( !world.GetKingdom( _army->GetColor() ).AllowPayment( troop.GetUpgradeCost() ) )
+            if ( !CanAffordUpgrade( troop ) )
                 flags |= Dialog::UPGRADE_DISABLE;
         }
 
         switch ( Dialog::ArmyInfo( troop, flags ) ) {
         case Dialog::UPGRADE:
-            world.GetKingdom( _army->GetColor() ).OddFundsResource( troop.GetUpgradeCost() );
-            troop.Upgrade();
+            UpgradeTroop( troop );
             break;
 
         case Dialog::DISMISS:
@@ -558,6 +652,16 @@ bool ArmyBar::ActionBarLeftMouseDoubleClick( ArmyTroop & troop )
     return true;
 }
 
+bool ArmyBar::ActionBarLeftMouseHold( const fheroes2::Point & cursor, ArmyTroop & troop, const fheroes2::Rect & pos )
+{
+    if ( !read_only ) {
+        if ( CanUpgradeNow( troop ) && ( GetUpgradeButtonPos( pos ) & cursor ) ) {
+            DrawUpgadeButton( true, pos, fheroes2::Display::instance() );
+        }
+    }
+    return false;
+}
+
 bool ArmyBar::ActionBarLeftMouseRelease( ArmyTroop & troop )
 {
     if ( !read_only ) {

src/fheroes2/army/army_bar.h

@@ -42,19 +42,27 @@ class ArmyBar : public Interface::ItemsActionBar<ArmyTroop>
 
     bool isValid( void ) const;
 
+    fheroes2::Rect GetUpgradeButtonPos( const fheroes2::Rect & itemPos ) const;
+    void DrawUpgadeButton( const bool pressed, const fheroes2::Rect & pos, fheroes2::Image & outputImage ) const;
+
+    bool CanUpgradeNow( const ArmyTroop & troop ) const;
+    bool CanAffordUpgrade( const ArmyTroop & troop ) const;
+    void UpgradeTroop( ArmyTroop & troop );
+
     void ResetSelected( void );
     void Redraw( fheroes2::Image & dstsf = fheroes2::Display::instance() );
 
-    bool ActionBarLeftMouseSingleClick( ArmyTroop & troop ) override;
+    bool ActionBarLeftMouseSingleClick( const fheroes2::Point & cursor, ArmyTroop & troop, const fheroes2::Rect & pos ) override;
     bool ActionBarLeftMouseSingleClick( ArmyTroop & destTroop, ArmyTroop & selectedTroop ) override;
-    bool ActionBarLeftMouseDoubleClick( ArmyTroop & troop ) override;
+    bool ActionBarLeftMouseDoubleClick( const fheroes2::Point & /*cursor*/, ArmyTroop & troop, const fheroes2::Rect & /*pos*/ ) override;
     bool ActionBarLeftMouseRelease( ArmyTroop & troop ) override;
+    bool ActionBarLeftMouseHold( const fheroes2::Point & cursor, ArmyTroop & troop, const fheroes2::Rect & pos ) override;
     bool ActionBarLeftMouseRelease( ArmyTroop & destTroop, ArmyTroop & troop ) override;
     bool ActionBarRightMouseHold( ArmyTroop & troop ) override;
     bool ActionBarRightMouseSingleClick( ArmyTroop & troop ) override;
     bool ActionBarRightMouseSingleClick( ArmyTroop & destTroop, ArmyTroop & selectedTroop ) override;
 
-    bool ActionBarCursor( ArmyTroop & ) override;
+    bool ActionBarCursor( const fheroes2::Point & cursor, ArmyTroop & troop, const fheroes2::Rect & pos ) override;
     bool ActionBarCursor( ArmyTroop &, ArmyTroop & ) override;
 
     bool QueueEventProcessing( std::string * = nullptr );

src/fheroes2/castle/buildinginfo.cpp

@@ -728,7 +728,7 @@ void DwellingsBar::RedrawItem( DwellingItem & dwl, const fheroes2::Rect & pos, f
         fheroes2::Blit( fheroes2::AGG::GetICN( ICN::CSLMARKER, 0 ), dstsf, pos.x + pos.width - 10, pos.y + 4 );
 }
 
-bool DwellingsBar::ActionBarLeftMouseSingleClick( DwellingItem & dwl )
+bool DwellingsBar::ActionBarLeftMouseSingleClick( const fheroes2::Point & /*unused*/, DwellingItem & dwl, const fheroes2::Rect & /*unused*/ )
 {
     if ( castle.isBuild( dwl.type ) ) {
         castle.RecruitMonster( Dialog::RecruitMonster( dwl.mons, castle.getMonstersInDwelling( dwl.type ), true, 0 ) );

src/fheroes2/castle/buildinginfo.h

@@ -72,7 +72,7 @@ class DwellingsBar : public Interface::ItemsBar<DwellingItem>
     void RedrawBackground( const fheroes2::Rect &, fheroes2::Image & ) override;
     void RedrawItem( DwellingItem &, const fheroes2::Rect &, fheroes2::Image & ) override;
 
-    bool ActionBarLeftMouseSingleClick( DwellingItem & dwelling ) override;
+    bool ActionBarLeftMouseSingleClick( const fheroes2::Point & /*unused*/, DwellingItem & dwl, const fheroes2::Rect & /*unused*/ ) override;
     bool ActionBarRightMouseHold( DwellingItem & dwelling ) override;
 
 protected:

src/fheroes2/castle/castle_dialog.cpp

@@ -765,6 +765,12 @@ Castle::CastleDialogReturnValue Castle::OpenDialog( const bool readOnly, const b
                 BuyBuilding( build );
                 if ( BUILD_CAPTAIN == build )
                     RedrawIcons( *this, heroes, cur_pt );
+
+                // may render new quick upgrade possibilities
+                topArmyBar.Redraw();
+                if ( bottomArmyBar.isValid() && alphaHero >= 255 )
+                    bottomArmyBar.Redraw();
+
                 fheroes2::drawCastleName( *this, display, cur_pt );
                 fheroes2::drawResourcePanel( GetKingdom().GetFunds(), display, cur_pt );
                 display.render();

src/fheroes2/dialog/dialog.h

@@ -108,6 +108,7 @@ namespace Dialog
     Troop RecruitMonster( const Monster & monster0, u32 available, const bool allowDowngradedMonster, const int32_t windowOffsetY );
     void DwellingInfo( const Monster &, u32 available );
     bool SetGuardian( Heroes &, Troop &, CapturedObject &, bool readonly );
+    int TroopUpgrade( const Troop & troop, const bool cannotAfford );
     int ArmyInfo( const Troop & troop, int flags, bool isReflected = false );
     int ArmyJoinFree( const Troop &, Heroes & );
     int ArmyJoinWithCost( const Troop &, u32 join, u32 gold, Heroes & );

src/fheroes2/dialog/dialog_armyinfo.cpp

@@ -116,6 +116,17 @@ void DrawMonsterInfo( const fheroes2::Point & dst, const Troop & troop );
 void DrawMonster( fheroes2::RandomMonsterAnimation & monsterAnimation, const Troop & troop, const fheroes2::Point & offset, bool isReflected, bool isAnimated,
                   const fheroes2::Rect & roi );
 
+int Dialog::TroopUpgrade( const Troop & troop, const bool cannotAfford )
+{
+    const payment_t cost = troop.GetUpgradeCost();
+
+    if ( cannotAfford ) {
+        return Dialog::ResourceInfo( "", _( "You can't afford to upgrade your troops!" ), cost, Dialog::OK );
+    }
+
+    return Dialog::ResourceInfo( "", _( "Your troops can be upgraded, but it will cost you dearly. Do you wish to upgrade them?" ), cost, Dialog::YES | Dialog::NO );
+}
+
 int Dialog::ArmyInfo( const Troop & troop, int flags, bool isReflected )
 {
     // The active size of the window is 520 by 256 pixels
@@ -216,20 +227,10 @@ int Dialog::ArmyInfo( const Troop & troop, int flags, bool isReflected )
 
             // upgrade
             if ( buttonUpgrade.isEnabled() && ( le.MouseClickLeft( buttonUpgrade.area() ) || Game::HotKeyPressEvent( Game::EVENT_UPGRADE_TROOP ) ) ) {
-                if ( UPGRADE_DISABLE & flags ) {
-                    const std::string msg( _( "You can't afford to upgrade your troops!" ) );
-                    if ( Dialog::YES == Dialog::ResourceInfo( "", msg, troop.GetUpgradeCost(), Dialog::OK ) ) {
-                        result = Dialog::UPGRADE;
-                        break;
-                    }
-                }
-                else {
-                    const std::string msg = _( "Your troops can be upgraded, but it will cost you dearly. Do you wish to upgrade them?" );
-
-                    if ( Dialog::YES == Dialog::ResourceInfo( "", msg, troop.GetUpgradeCost(), Dialog::YES | Dialog::NO ) ) {
-                        result = Dialog::UPGRADE;
-                        break;
-                    }
+                const bool cannotAfford = UPGRADE_DISABLE == ( UPGRADE_DISABLE & flags );
+                if ( Dialog::YES == Dialog::TroopUpgrade( troop, cannotAfford ) ) {
+                    result = Dialog::UPGRADE;
+                    break;
                 }
             }
             // dismiss