Merge pull request #11455 from patrikolesen/18_uruguay_interest_on_loans

[18Uruguay] Interest should not be paid for penalty loans

lib/engine/game/g_18_uruguay/loans.rb

@@ -65,20 +65,30 @@ def adjust_stock_market_loan_penalty(entity)
           end
         end
 
-        def take_loan_if_needed_for_interest!(entity)
+        def pay_interest!(entity)
           owed = interest_owed(entity)
-          return if owed.zero?
+          interest_paid[entity] = owed
 
-          remaining = owed - entity.cash
-          perform_ebuy_loans(entity, remaining + 10) if remaining.positive?
+          while owed > entity.cash &&
+              (loan = loans[0])
+            take_loan(entity, loan, ebuy: true)
+          end
+
+          if owed <= entity.cash
+            if owed.positive?
+              log_interest_payment(entity, owed)
+              entity.spend(owed, bank)
+            end
+            return
+          end
+          owed
         end
 
         def corps_pay_interest
           corps = @round.entities.select { |entity| entity.loans.size.positive? && entity != @rptla }
           corps.each do |corp|
             next if corp.closed?
 
-            take_loan_if_needed_for_interest!(corp)
             pay_interest!(corp)
           end
         end