[Core] Add subsidies to dividend step

assets/app/view/game/dividend.rb

@@ -35,7 +35,7 @@ def render
               @step.respond_to?(:dividend_name) ? @step.dividend_name(type) : type
             end
 
-          corp_income = option[:corporation] + option[:divs_to_corporation]
+          corp_income = option[:corporation] + option[:divs_to_corporation] + @step.total_subsidy
 
           direction =
             if (new_share_price = entity.share_price) && option[:share_direction]

lib/engine/action/run_routes.rb

@@ -6,12 +6,13 @@
 module Engine
   module Action
     class RunRoutes < Base
-      attr_reader :routes, :extra_revenue
+      attr_reader :routes, :extra_revenue, :subsidy
 
-      def initialize(entity, routes:, extra_revenue: 0)
+      def initialize(entity, routes:, extra_revenue: 0, subsidy: 0)
         super(entity)
         @routes = routes
         @extra_revenue = extra_revenue
+        @subsidy = subsidy
       end
 
       def self.h_to_args(h, game)
@@ -41,6 +42,7 @@ def self.h_to_args(h, game)
         {
           routes: routes,
           extra_revenue: h['extra_revenue'],
+          subsidy: h['subsidy'],
         }
       end
 
@@ -62,6 +64,7 @@ def args_to_h
         {
           'routes' => routes,
           'extra_revenue' => extra_revenue,
+          'subsidy' => subsidy,
         }
       end
     end

lib/engine/step/dividend.rb

@@ -67,6 +67,7 @@ def variable_max
       def process_dividend(action)
         entity = action.entity
         revenue = total_revenue
+        subsidy = total_subsidy
         kind = action.kind.to_sym
         payout = dividend_options(entity)[kind]
 
@@ -85,9 +86,9 @@ def process_dividend(action)
         @round.routes = []
         @round.extra_revenue = 0
 
-        log_run_payout(entity, kind, revenue, action, payout)
+        log_run_payout(entity, kind, revenue, subsidy, action, payout)
 
-        payout_corporation(payout[:corporation], entity)
+        payout_corporation(payout[:corporation] + subsidy, entity)
 
         payout_shares(entity, revenue - payout[:corporation]) if payout[:per_share].positive?
 
@@ -100,7 +101,7 @@ def payout_corporation(amount, entity)
         @game.bank.spend(amount, entity) if amount.positive?
       end
 
-      def log_run_payout(entity, kind, revenue, action, payout)
+      def log_run_payout(entity, kind, revenue, subsidy, action, payout)
         unless Dividend::DIVIDEND_TYPES.include?(kind)
           @log << "#{entity.name} runs for #{@game.format_currency(revenue)} and pays #{action.kind}"
         end
@@ -110,6 +111,7 @@ def log_run_payout(entity, kind, revenue, action, payout)
         elsif payout[:per_share].zero?
           @log << "#{entity.name} does not run"
         end
+        @log << "#{entity.name} earns subsidy of #{@game.format_currency(subsidy)}" if subsidy.positive?
       end
 
       def share_price_change(_entity, revenue)
@@ -217,6 +219,10 @@ def total_revenue
         @game.routes_revenue(routes) + extra_revenue
       end
 
+      def total_subsidy
+        @game.routes_subsidy(routes)
+      end
+
       def rust_obsolete_trains!(entity, log: true)
         rusted_trains = entity.trains.select(&:obsolete).each do |train|
           @game.rust(train)