Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[18Uruguay] Also add FCE shares to secondary corps #11209

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[18Uruguay] Also add FCE shares to secondary corps #11209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15c5cac
[18Uruguay] Also add FCE shares to secondary corps
patrikolesen Sep 12, 2024
c91d3c1
[18Uruguay] Simplify acquire_shares
patrikolesen Sep 27, 2024
e51d38f
[18Uruguay] Rubocop
patrikolesen Sep 27, 2024
96dd924
[18Uruguay] Rubocop
patrikolesen Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/engine/game/g_18_uruguay/game.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ def next_round!
when 1
start_merge(current_entity.owner)
when 2
acquire_shares
decrease_stock_value
retreive_home_tokens
close_companies
Expand Down
69 changes: 20 additions & 49 deletions lib/engine/game/g_18_uruguay/nationalization.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,60 +23,29 @@ def affected_shares(entity, corps)
affected
end

def find_president(holders, corps)
president_candidate = nil
candidate_sum = 0
holders.each do |holder|
entity_shares = affected_shares(holder, corps)
sum = entity_shares.sum(&:percent)
if sum > candidate_sum
president_candidate = holder
candidate_sum = sum
end
end
president_candidate
end
def acquire_shares
ollybh marked this conversation as resolved.
Show resolved Hide resolved
@merge_data[:holders].each do |holder|
entity_shares = affected_shares(holder, @merge_data[:corps])

def transfer_share(share, new_owner)
corp = share.corporation
corp.share_holders[share.owner] -= share.percent
corp.share_holders[new_owner] += share.percent
share.owner.shares_by_corporation[corp].delete(share)
new_owner.shares_by_corporation[corp] << share
share.owner = new_owner
end

def transfer_pres_share(corporation, owner)
pres_share = corporation.presidents_share
transfer_share(pres_share, owner)
corporation.owner = owner
end

def acquire_shares_in_fce(corp_fce, merge_data)
new_president = find_president(merge_data[:holders], merge_data[:corps])
transfer_pres_share(corp_fce, new_president)

merge_data[:holders].each do |holder|
aquired = 0
aquired = 20 if holder == new_president
entity_shares = affected_shares(holder, merge_data[:corps])
total_percent = entity_shares.sum(&:percent)
aquire_percent = (total_percent / 20).to_i * 10
while aquired < aquire_percent
share = corp_fce.shares.first
aquired += share.percent
transfer_share(share, holder)
num_shares = (total_percent / 20).to_i
odd_share = num_shares * 20 != total_percent
Comment on lines +31 to +32
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
num_shares = (total_percent / 20).to_i
odd_share = num_shares * 20 != total_percent
num_shares, odd_shares = (total_percent / 10).divmod(2)

from_secondary = @merge_data[:secondary_corps].reduce(0) do |sum, secondary_corps|
sum + (secondary_corps.president?(holder) ? 1 : 0)
end
Comment on lines +33 to 35
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're trying to find how many of the secondary corporations the player is president of, right? This might be simpler:

Suggested change
from_secondary = @merge_data[:secondary_corps].reduce(0) do |sum, secondary_corps|
sum + (secondary_corps.president?(holder) ? 1 : 0)
end
from_secondary = @merge_data[:secondary_corps].count { |corp| corp.president?(holder) }

number = aquire_percent
@log << "#{holder.name} receives #{number}% in FCE in exchange to the nationalized shares"
odd_share = aquired * 2 != total_percent
num_shares += from_secondary
bundle = Engine::ShareBundle.new(@fce.shares.take(9)) if num_shares == 10
bundle = Engine::ShareBundle.new(@fce.shares.reject(&:president).take(num_shares)) unless num_shares == 10
Comment on lines +37 to +38
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The if/unless modifiers are testing the same thing, so this would be clearer structured using an if/else statement.

Suggested change
bundle = Engine::ShareBundle.new(@fce.shares.take(9)) if num_shares == 10
bundle = Engine::ShareBundle.new(@fce.shares.reject(&:president).take(num_shares)) unless num_shares == 10
bundle =
if num_shares == 10
Engine::ShareBundle.new(@fce.shares.take(9))
else
Engine::ShareBundle.new(@fce.shares.reject(&:president).take(num_shares))
end

@share_pool.transfer_shares(bundle, holder, allow_president_change: true)
@log << "#{holder.name} receives #{num_shares * 10}% in FCE in exchange to the nationalized shares"

next unless odd_share

price = corp_fce.share_price.price / 2
price = @fce.share_price.price / 2
@bank.spend(price, holder)
@log << "#{holder.name} receives #{price} from half share"
end
@log << "#{new_president.name} becomes new president of #{corp_fce.name}"
@log << "#{@fce.presidents_share.owner.name} becomes new president of #{@fce.name}"
end

def compute_merger_share_price(corps)
Expand Down Expand Up @@ -134,12 +103,13 @@ def start_merge(originatior)
candidates = corps_to_nationalize
corps = candidates.take(2)
@merge_data = {
holders: share_holder_list(originatior, corps),
holders: share_holder_list(originatior, candidates),
corps: corps,
secondary_corps: [],
home_tokens: [],
tokens: [],
candidates: candidates,
corp_share_sum: 0,
}

if corps.empty?
Expand All @@ -153,8 +123,9 @@ def start_merge(originatior)
@fce.floatable = true
@stock_market.set_par(@fce, fce_share_price)
after_par(@fce)

acquire_shares_in_fce(@fce, @merge_data)
@merge_data[:corp_share_sum] = @merge_data[:holders].reduce(0) do |sum, holder|
sum + ((affected_shares(holder, @merge_data[:corps]).sum(&:percent) / 20).to_i * 10)
end
Comment on lines +126 to +128
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to use reduce here? Would sum be simpler?

Suggested change
@merge_data[:corp_share_sum] = @merge_data[:holders].reduce(0) do |sum, holder|
sum + ((affected_shares(holder, @merge_data[:corps]).sum(&:percent) / 20).to_i * 10)
end
@merge_data[:corp_share_sum] = @merge_data[:holders].sum do |holder|
(affected_shares(holder, @merge_data[:corps]).sum(&:percent) / 20).to_i * 10
end

end

def nationalization_final_export!
Expand Down
1 change: 1 addition & 0 deletions lib/engine/game/g_18_uruguay/step/nationalize_corporation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def actions(entity)
return [] if @game.merge_data[:corps].include?(entity)
return [] unless entity.loans.size.positive?
return [] if @game.maximum_loans(entity) < entity.loans.size
return [] if @game.merge_data[:corp_share_sum] + (10 * @game.merge_data[:secondary_corps].size) >= 100

actions = []
actions << 'choose'
Expand Down
Loading