Skip to content

Commit

Permalink
MEFO Free baby
Browse files Browse the repository at this point in the history
- Canceling and Renewing MEFO's is free now (simpy fucked himself, might as well make it free)
- Once more fixed "Democratic Socialism" being borked. Imagine making a focus name that has overlap with ideology. Wunderbar.
  • Loading branch information
Warlider committed Oct 20, 2023
1 parent d0629e2 commit 8ef61ad
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
5 changes: 3 additions & 2 deletions common/decisions/GER.txt
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ GER_mefo_bills_category = {
icon = ger_mefo_bills

available = {
is_ai = no
hidden_trigger = {
NOT = { has_country_flag = ger_has_cancelled_mefo }
NOT = {
Expand All @@ -239,7 +240,7 @@ GER_mefo_bills_category = {
}
}

cost = 50
cost = 0

fire_only_once = no

Expand Down Expand Up @@ -282,7 +283,7 @@ GER_mefo_bills_category = {
}
}

cost = 50
cost = 0

fire_only_once = no

Expand Down
16 changes: 8 additions & 8 deletions common/national_focus/usa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ focus_tree = {
}

focus = {
id = USA_democratic_socialism
id = USA_democratic_socialism_focus
icon = GFX_goal_generic_red_freedom
x = 1
y = 1
Expand Down Expand Up @@ -377,14 +377,14 @@ focus_tree = {
cost = 10
text = POR_communist_secret_police
prerequisite = {
focus = USA_democratic_socialism
focus = USA_democratic_socialism_focus
}
available = {
NOT = {
has_completed_focus = USA_office_of_strategic_services
}
}
relative_position_id = USA_democratic_socialism
relative_position_id = USA_democratic_socialism_focus
x = -2
y = 1
ai_will_do = {
Expand Down Expand Up @@ -464,7 +464,7 @@ focus_tree = {
focus = {
id = r56_USA_join_the_mexican_revolutionaries
icon = GFX_goal_mexico_mexico_for_mexicans
prerequisite = { focus = USA_democratic_socialism }
prerequisite = { focus = USA_democratic_socialism_focus }
available = {
has_government = communism
is_puppet = no
Expand Down Expand Up @@ -498,7 +498,7 @@ focus_tree = {

x = -1
y = 3
relative_position_id = USA_democratic_socialism
relative_position_id = USA_democratic_socialism_focus
cost = 5
ai_will_do = {
factor = 1
Expand Down Expand Up @@ -697,7 +697,7 @@ focus_tree = {
icon = GFX_goal_philippines_post_independence_stabilization
x = 1
y = 2
prerequisite = { focus = USA_democratic_socialism }
prerequisite = { focus = USA_democratic_socialism_focus }
#prerequisite = { focus = USA_full_desegregation }
relative_position_id = USA_desegregate_the_armed_forces
cost = 10
Expand Down Expand Up @@ -968,7 +968,7 @@ focus_tree = {
icon = GFX_focus_usa_guarantee_the_american_dream
x = 0
y = 2
#prerequisite = { focus = USA_democratic_socialism }
#prerequisite = { focus = USA_democratic_socialism_focus }
prerequisite = { focus = USA_old_age_pension_act }
prerequisite = { focus = USA_accumulated_wealth_tax_act }
relative_position_id = USA_union_representation_act
Expand Down Expand Up @@ -1338,7 +1338,7 @@ focus_tree = {
icon = GFX_focus_rom_abdicate
x = -2
y = 2
prerequisite = { focus = USA_reach_out_to_the_ware_group focus = USA_democratic_socialism }
prerequisite = { focus = USA_reach_out_to_the_ware_group focus = USA_democratic_socialism_focus }
relative_position_id = USA_reach_out_to_the_ware_group
cost = 10

Expand Down
4 changes: 2 additions & 2 deletions localisation/english/replace/r56rp_USA_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ l_english:
USA_combating_jim_crow_map: "These states currently have 'Jim Crow' laws"

# Political Focuses
USA_democratic_socialism: "Democratic Socialism"
USA_democratic_socialism_desc: "No right-thinking person can deny that socialism is the future of human civilization. At the same time, no proud and patriotic citizen of this republic could possibly support a system where government is no longer made by the people and of the people. Like our proud forefathers, we will create a new form of government that combines both."
USA_democratic_socialism_focus: "Democratic Socialism"
USA_democratic_socialism_focus_desc: "No right-thinking person can deny that socialism is the future of human civilization. At the same time, no proud and patriotic citizen of this republic could possibly support a system where government is no longer made by the people and of the people. Like our proud forefathers, we will create a new form of government that combines both."
USA_office_of_strategic_services_desc: "Forming a dedicated department of our intelligence agency to assist foreign resistance organisations and infiltrate enemy institutions will greatly help us gain the upper hand and also in our future operations."
USA_defense_contractors_desc: "Involving public and private arms manufacturers in our military materiel acquisition process is a great way to ensure quality arms for our soldiers at competitive prices."
USA_us_war_economy_desc: "The Giant may not be allowed to slumber any more. Our people are willing and able to carry the torch of freedom abroad and we shall ensure they are equipped for the task."
Expand Down

0 comments on commit 8ef61ad

Please sign in to comment.