18NY - fix salvage rendering

tobymao · Apr 24, 2023 · bc2f862 · bc2f862
1 parent 4523b91
commit bc2f862
Show file tree

Hide file tree

Showing 6 changed files with 13,606 additions and 4 deletions.
diff --git a/assets/app/view/game/discard_trains.rb b/assets/app/view/game/discard_trains.rb
@@ -16,6 +16,8 @@ def render
         }
         step = @game.active_step
         overflow = step.crowded_corps.map do |corporation|
+          salvagable = step.trains(corporation)&.any?(&:salvage)
+          @verb = salvagable ? 'Salvage' : 'Discard'
           trains = step.trains(corporation).map do |train|
             train_props = {
               style: {

diff --git a/lib/engine/game/g_18_ny_1e/game.rb b/lib/engine/game/g_18_ny_1e/game.rb
@@ -60,14 +60,15 @@ class Game < G18NY::Game
         ].freeze
 
         TRAINS = [
-          { name: '2H', num: 11, distance: 2, price: 100, rusts_on: '6H' },
-          { name: '4H', num: 6, distance: 4, price: 200, rusts_on: '5DE', events: [{ 'type' => 'float_30' }] },
-          { name: '6H', num: 4, distance: 6, price: 300, rusts_on: 'D', events: [{ 'type' => 'float_40' }] },
+          { name: '2H', num: 11, distance: 2, price: 100, rusts_on: '6H', salvage: 25 },
+          { name: '4H', num: 6, distance: 4, price: 200, rusts_on: '5DE', salvage: 50, events: [{ 'type' => 'float_30' }] },
+          { name: '6H', num: 4, distance: 6, price: 300, rusts_on: 'D', salvage: 75, events: [{ 'type' => 'float_40' }] },
           {
             name: '12H',
             num: 3,
             distance: 12,
             price: 600,
+            salvage: 150,
             events: [{ 'type' => 'float_50' }, { 'type' => 'close_companies' }, { 'type' => 'nyc_formation' },
                      { 'type' => 'capitalization_round', 'when' => 3 }],
           },
@@ -76,9 +77,10 @@ class Game < G18NY::Game
             num: 2,
             distance: [{ 'nodes' => %w[city offboard town], 'pay' => 5, 'visit' => 99, 'multiplier' => 2 }],
             price: 800,
+            salvage: 200,
             events: [{ 'type' => 'float_60' }],
           },
-          { name: 'D', num: 20, distance: 99, price: 1000 },
+          { name: 'D', num: 20, distance: 99, price: 1000, salvage: 250 },
         ].freeze
 
         def second_edition?

diff --git a/spec/assets_spec.rb b/spec/assets_spec.rb
@@ -199,6 +199,15 @@
     [nil,
      'endgame',
      ['1860: Phase 9 - Operating Round 8.4 (Nationalization) - Game Over - Nationalization complete']]]],
+  ['18NY',
+   118_662,
+   [[524,
+     'discard_train',
+     ['!!<div>Salvage Trains']],
+    120_048,
+    [277,
+     'scrap_train',
+     ['!!<div>Trains to Scrap']]]],
 ].freeze
 
 AUTO_ACTIONS_TEST_CASES = [