Skip to content

Commit

Permalink
Merge pull request #30 from Hi-no-to-ri/develop
Browse files Browse the repository at this point in the history 
Develop KPD2.1.9
  • Loading branch information
@Hi-no-to-ri
Hi-no-to-ri committed Apr 29, 2023
2 parents 77c34cd + d9dcb9f commit 2b63900
Show file tree
Hide file tree
Showing 15 changed files with 273 additions and 5,859 deletions.
3,916 changes: 0 additions & 3,916 deletions common/characters/SOV.txt
View file

This file was deleted.

6 changes: 0 additions & 6 deletions common/game_rules/00_game_rules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,6 @@ SOV_ai_behavior = {
desc = "RULE_OPTION_HISTORICAL_SOV_AI_DESC"
allow_achievements = yes
}
option = {
name = ALTERNATE
text = "RULE_OPTION_ALTERNATE"
desc = "RULE_OPTION_ALTERNATE_SOV_AI_DESC"
}
option = {
name = LEFT_OPPOSITION
text = "RULE_OPTION_LEFT_OPPOSITION"
Expand Down Expand Up @@ -2220,7 +2215,6 @@ ita_fragmentation_status = {

obsolete_focus_branches_visibility = {
name = "OBSOLETE_FOCUS_BRANCHES_VISIBILITY"
required_dlc = "No Step Back"
group = "RULE_GROUP_GENERAL_UI"
default = {
name = HIDE
Expand Down
212 changes: 208 additions & 4 deletions common/national_focus/germany.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2735,6 +2735,21 @@ focus_tree = {
x = 25
y = 0
cost = 10

allow_branch = {
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
NOT = {
has_completed_focus = GER_oppose_hitler
}
}
}

available = {
is_subject = no
}
Expand All @@ -2761,6 +2776,17 @@ focus_tree = {
custom_effect_tooltip = may_provoke_hostility
}
}
hidden_effect = {
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
mark_focus_tree_layout_dirty = yes
}
}
}
}

Expand Down Expand Up @@ -3156,6 +3182,13 @@ focus_tree = {
available = {
is_subject = no
has_army_manpower = { size > 499999 }

check_variable = { num_equipment_in_armies_k@infantry_equipment > 40 }
custom_trigger_tooltip = {
tooltip = GER_anschluss_eq_trigger_tt
check_variable = { num_equipment_in_armies_k@infantry_equipment > 40 }
}

NOT = { has_idea = rhineland_challenge_met }
if = {
limit = {
Expand Down Expand Up @@ -4718,6 +4751,19 @@ focus_tree = {
icon = GFX_goal_generic_build_navy
x = 35
y = 1

offset = {
x = -8
y = 0
trigger = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
has_completed_focus = GER_oppose_hitler
}
}

cost = 5
ai_will_do = {
factor = 1
Expand Down Expand Up @@ -6038,6 +6084,17 @@ focus_tree = {

allow_branch = { # ENABLE HERE FOR RELEASE!!! - KPD2 KPDModUpdated / You may comment out here for display in VSCode with CWTools while debugging.
has_dlc = "Waking the Tiger"
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
NOT = {
has_completed_focus = GER_rhineland
}
}
}

available = {
Expand All @@ -6046,6 +6103,42 @@ focus_tree = {
}
x = 47
y = 0

offset = {
x = -8
y = 0
trigger = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
has_completed_focus = GER_oppose_hitler
}
}
offset = {
x = -8
y = 0
trigger = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
has_completed_focus = GER_reestablish_free_elections
}
}

offset = {
x = -1
y = 0
trigger = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
has_completed_focus = GER_revive_the_kaiserreich
}
}

cost = 10
ai_will_do = {
factor = 7
Expand Down Expand Up @@ -6075,6 +6168,17 @@ focus_tree = {
add_political_power = 120
add_named_threat = { threat = 5 name = GER_oppose_hitler }
country_event = { id = wtt_germany.1 }
hidden_effect = {
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
mark_focus_tree_layout_dirty = yes
}
}
}
}

Expand Down Expand Up @@ -6120,6 +6224,37 @@ focus_tree = {
has_country_flag = GER_mackensen_dead
NOT = { has_government = democratic }
}

allow_branch = {
has_dlc = "Waking the Tiger"
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
NOT = {
OR = {
has_completed_focus = GER_rhineland
has_completed_focus = GER_reestablish_free_elections
}
}
}
}

offset = {
x = 1
y = 0
trigger = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
has_completed_focus = GER_revive_the_kaiserreich
}
}

available = {
is_subject = no
}
Expand All @@ -6138,13 +6273,40 @@ focus_tree = {
set_party_name = { ideology = neutrality long_name = GER_neutrality_party_kaiserreich_long name = GER_neutrality_party_kaiserreich }
set_rule = { can_send_volunteers = yes }
add_named_threat = { threat = 5 name = GER_revive_the_kaiserreich }
hidden_effect = {
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
mark_focus_tree_layout_dirty = yes
}
}
}
}

focus = {
id = GER_rebuild_the_nation
icon = GFX_goal_generic_construction2
prerequisite = { focus = GER_revive_the_kaiserreich focus = GER_reestablish_free_elections }

allow_branch = {
has_dlc = "Waking the Tiger"
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
NOT = {
has_completed_focus = GER_rhineland
}
}
}

available = {
}
x = 1
Expand Down Expand Up @@ -6799,9 +6961,9 @@ focus_tree = {
}
}
cancel_if_invalid = yes
x = -2
y = 1
relative_position_id = GER_break_the_anglo_french_colonial_hegemony
x = -1
y = 3
relative_position_id = GER_modular_construction
cost = 10
ai_will_do = {
factor = 10
Expand Down Expand Up @@ -7049,7 +7211,7 @@ focus_tree = {
add_popularity = { ideology = neutrality popularity = 0.1 }
effect_tooltip = {
create_country_leader = {
name = "vittorio Emanuele III"
name = "Vittorio Emanuele III"
desc = "POLITICS_VITTORIO_EMANUELE_III_DESC"
picture = "GFX_portrait_italy_vittorio_emanuele_iii"
expire = "1965.1.1"
Expand Down Expand Up @@ -7880,6 +8042,37 @@ focus_tree = {
icon = GFX_goal_support_democracy
prerequisite = { focus = GER_secure_the_new_state }
mutually_exclusive = { focus = GER_revive_the_kaiserreich }

allow_branch = {
has_dlc = "Waking the Tiger"
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
NOT = {
OR = {
has_completed_focus = GER_rhineland
has_completed_focus = GER_revive_the_kaiserreich
}
}
}
}

offset = {
x = -1
y = 0
trigger = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
has_completed_focus = GER_reestablish_free_elections
}
}

available = {
is_subject = no
}
Expand All @@ -7898,6 +8091,17 @@ focus_tree = {
days = 720
}
set_party_name = { ideology = neutrality long_name = GER_neutrality_party_kaiserreich_long name = GER_neutrality_party_kaiserreich }
hidden_effect = {
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
mark_focus_tree_layout_dirty = yes
}
}
}
}

Expand Down
19 changes: 19 additions & 0 deletions common/scripted_localisation/ROT_germany_scripted_loc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,23 @@ defined_text = {
text = {
localization_key = GER_GetTheyOrTheGovernment_government
}
}

defined_text = {
name = GetCurrentGermanRegime
text = {
trigger = {
GER = { has_government = fascism }
}
localization_key = GER_GetCurrentGermanRegime_nazis
}
text = {
trigger = {
GER = { has_cosmetic_tag = GER_provisional_gvt }
}
localization_key = GER_GetCurrentGermanRegime_provisional
}
text = {
localization_key = GER_GetCurrentGermanRegime_other
}
}
2 changes: 1 addition & 1 deletion descriptor.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version="KPD2.1.8"
version="KPD2.1.9"
tags={
"Alternative History"
"Events"
Expand Down
1 change: 1 addition & 0 deletions events/rot_debug.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ country_event = {
option = {
name = wtt_britain.24.a
# recruit_character = SOV_ivan_konev
set_global_flag = flag_trotsky_dead
}
option = {
name = news.332.a
Expand Down
Loading

0 comments on commit 2b63900

Please sign in to comment.