Skip to content

Commit

Permalink
Merge pull request #11441 from ollybh/1807-public-companies
Browse files Browse the repository at this point in the history 
[1807] Change terminology: public companies, not majors
  • Loading branch information
@bentziaxl
bentziaxl authored Jan 16, 2025
2 parents 18d75e8 + 5f30197 commit cf061d6
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
28 changes: 14 additions & 14 deletions lib/engine/game/g_1807/entities.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -757,7 +757,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -768,7 +768,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -779,7 +779,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -790,7 +790,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -801,7 +801,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -812,7 +812,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -823,7 +823,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -834,7 +834,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -845,7 +845,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand All @@ -856,7 +856,7 @@ module Entities
float_percent: 20,
always_market_price: true,
tokens: [0, 20, 20, 20],
type: 'major',
type: 'public',
shares: [20, 10, 10, 10, 10, 10, 10, 10, 10],
color: '#3c7b5c',
},
Expand Down Expand Up @@ -934,10 +934,10 @@ def company_header(company)
def unstarted_corporation_summary
unipoed = (@corporations + @future_corporations).reject(&:ipoed)
minor = unipoed.select { |c| c.type == :minor }
major = unipoed.select { |c| c.type == :major }
major = unipoed.select { |c| c.type == :public }
system = unipoed.select { |c| c.type == :system }
summary = "#{minor.size} #{minor.one? ? 'minor' : 'minors'}, " \
"#{major.size} #{major.one? ? 'major' : 'majors'}, " \
"#{major.size} public, " \
"#{system.size} #{system.one? ? 'system' : 'systems'}"
[summary, unipoed]
end
Expand All @@ -946,7 +946,7 @@ def maximum_loans(entity)
case entity.type
when :minor
2
when :major
when :public
5
when :system
10
Expand Down
18 changes: 9 additions & 9 deletions lib/engine/game/g_1807/trains.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Trains
'minors_convert' => ['Minors convert',
'Minor companies may merge, convert or be taken over.'],
'systems_form' => ['Systems form',
'Systems may form by merging major companies.'],
'Systems may form by merging public companies.'],
'double_jump' => ['Double jumps',
'Systems may double-jump.'],
'train_export' => ['Train exported',
Expand All @@ -41,47 +41,47 @@ module Trains
},
{
name: '3',
train_limit: { minor: 2, major: 4 },
train_limit: { minor: 2, public: 4 },
tiles: %i[yellow green],
status: %w[minors_start can_buy_companies minors_convert],
on: '3',
operating_rounds: 2,
},
{
name: '4',
train_limit: { minor: 1, major: 3 },
train_limit: { minor: 1, public: 3 },
tiles: %i[yellow green],
status: %w[minors_start can_buy_companies minors_convert train_export],
on: '4',
operating_rounds: 2,
},
{
name: '5',
train_limit: { minor: 1, major: 3 },
train_limit: { minor: 1, public: 3 },
tiles: %i[yellow green brown],
status: %w[can_buy_companies minors_convert train_export],
on: %w[5 3G],
operating_rounds: 2,
},
{
name: '6',
train_limit: { minor: 1, major: 2, system: 4 },
train_limit: { minor: 1, public: 2, system: 4 },
tiles: %i[yellow green brown],
status: %w[can_buy_companies minors_convert systems_form train_export],
on: %w[6 4G],
operating_rounds: 2,
},
{
name: '7',
train_limit: { minor: 1, major: 2, system: 4 },
train_limit: { minor: 1, public: 2, system: 4 },
tiles: %i[yellow green brown gray],
status: %w[can_buy_companies minors_convert systems_form train_export],
on: %w[3+3 5G],
operating_rounds: 2,
},
{
name: '8',
train_limit: { minor: 0, major: 2, system: 4 },
train_limit: { minor: 0, public: 2, system: 4 },
tiles: %i[yellow green brown gray],
status: %w[can_buy_companies minors_convert systems_form double_jump],
on: %w[4+4 6G],
Expand Down Expand Up @@ -269,8 +269,8 @@ def timeline
'Twelve minor companies are available from the first stock round.',
'Another six minor companies become available for purchase in stock round 2.',
'The last six minor companes are available once the first 3-train is bought.',
'Minors can be merged or converted into major companies from phase 3.',
'Majors can be merged to form systems from phase 6.',
'Minor companies can be merged or converted into public companies from phase 3.',
'Public companies can be merged to form systems from phase 6.',
'2+2 and 5+5E trains are available after a 4+4 or 6G train has been purchased.',
]
end
Expand Down

0 comments on commit cf061d6

Please sign in to comment.