Skip to content

Commit

Permalink
Merge pull request #35 from Hi-no-to-ri/release-2.1.10
Browse files Browse the repository at this point in the history 
Release 2.1.10
  • Loading branch information
@Hi-no-to-ri
Hi-no-to-ri committed May 30, 2023
2 parents 2b63900 + 3bb9ac5 commit 183ae9b
Show file tree
Hide file tree
Showing 5 changed files with 164 additions and 80 deletions.
200 changes: 142 additions & 58 deletions common/national_focus/germany.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6182,11 +6182,30 @@ focus_tree = {
}
}

focus = {
focus = { #Edited (hidden条件関連)
id = GER_secure_the_new_state
icon = GFX_focus_generic_support_the_left_right
prerequisite = { focus = GER_oppose_hitler }
mutually_exclusive = { focus = GER_reds_amnesty }

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_reds_amnesty
}
}
}
}

available = {
is_subject = no
has_war = no
Expand All @@ -6212,10 +6231,21 @@ focus_tree = {
idea = GER_clamp_down_on_fascism
days = 720
}
hidden_effect = {
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
mark_focus_tree_layout_dirty = yes
}
}
}
}

focus = {
focus = { #Edited (hidden条件関連)
id = GER_revive_the_kaiserreich
icon = GFX_focus_ger_revive_kaiserreich
prerequisite = { focus = GER_secure_the_new_state }
Expand All @@ -6238,6 +6268,7 @@ focus_tree = {
OR = {
has_completed_focus = GER_rhineland
has_completed_focus = GER_reestablish_free_elections
has_completed_focus = GER_reds_amnesty
}
}
}
Expand Down Expand Up @@ -6287,7 +6318,7 @@ focus_tree = {
}
}

focus = {
focus = { #Edited (hidden条件関連)
id = GER_rebuild_the_nation
icon = GFX_goal_generic_construction2
prerequisite = { focus = GER_revive_the_kaiserreich focus = GER_reestablish_free_elections }
Expand All @@ -6302,7 +6333,10 @@ focus_tree = {
}
}
NOT = {
has_completed_focus = GER_rhineland
OR = {
has_completed_focus = GER_rhineland
has_completed_focus = GER_reds_amnesty
}
}
}
}
Expand Down Expand Up @@ -8037,7 +8071,7 @@ focus_tree = {
}
}

focus = {
focus = { #Edited (hidden条件関連)
id = GER_reestablish_free_elections
icon = GFX_goal_support_democracy
prerequisite = { focus = GER_secure_the_new_state }
Expand All @@ -8056,6 +8090,7 @@ focus_tree = {
OR = {
has_completed_focus = GER_rhineland
has_completed_focus = GER_revive_the_kaiserreich
has_completed_focus = GER_reds_amnesty
}
}
}
Expand Down Expand Up @@ -9425,6 +9460,36 @@ focus_tree = {
prerequisite = { focus = GER_oppose_hitler }
mutually_exclusive = { focus = GER_secure_the_new_state }
search_filters = {FOCUS_FILTER_POLITICAL}

allow_branch = {
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
NOT = {
OR = {
has_completed_focus = GER_rhineland
has_completed_focus = GER_secure_the_new_state
}
}
}
}

offset = {
x = -20
y = 0
trigger = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
has_completed_focus = GER_reds_amnesty
}
}

available = {
is_subject = no
has_war = no
Expand All @@ -9435,8 +9500,9 @@ focus_tree = {
}
}
}
x = 67
x = 20
y = 2
relative_position_id = GER_oppose_hitler
cost = 10
ai_will_do = {
factor = 3
Expand All @@ -9451,6 +9517,17 @@ focus_tree = {
show_ideas_tooltip = walter_ulbricht
show_ideas_tooltip = karl_artelt
show_ideas_tooltip = erich_weinert
hidden_effect = {
if = {
limit = {
has_game_rule = {
rule = obsolete_focus_branches_visibility
option = HIDE
}
}
mark_focus_tree_layout_dirty = yes
}
}
}
}
focus = {
Expand All @@ -9461,8 +9538,9 @@ focus_tree = {
available = {

}
x = 62
y = 3
x = -5
y = 1
relative_position_id = GER_reds_amnesty

cost = 10
ai_will_do = {
Expand Down Expand Up @@ -9528,9 +9606,9 @@ focus_tree = {
available = {

}
x = 59
y = 5
# relative_position_id = GER_second_civil_war
x = -3
y = 1
relative_position_id = GER_second_civil_war

cost = 5
ai_will_do = {
Expand Down Expand Up @@ -9684,9 +9762,9 @@ focus_tree = {
available = {

}
x = 63
y = 5
# relative_position_id = GER_second_civil_war
x = 1
y = 1
relative_position_id = GER_second_civil_war

cost = 5
ai_will_do = {
Expand All @@ -9707,9 +9785,9 @@ focus_tree = {
available = {

}
x = -2
y = 0
relative_position_id = GER_nationalisation
x = -1
y = 1
relative_position_id = GER_second_civil_war

cost = 5
ai_will_do = {
Expand Down Expand Up @@ -9744,6 +9822,36 @@ focus_tree = {
add_ideas = GER_new_culture_idea
}
}
focus = {
id = GER_expand_the_revolution
icon = GFX_focus_ger_great_red_menace
prerequisite = { focus = GER_second_civil_war }
available = {
NOT = { has_civil_war = yes }
}
x = 4
y = 1
relative_position_id = GER_second_civil_war

search_filters = { FOCUS_FILTER_POLITICAL }
cost = 10
ai_will_do = {
factor = 3
}

completion_reward = {
every_other_country = {
limit = {
is_neighbor_of = GER
NOT = { has_government = communism }
}
add_timed_idea = {
idea = communist_pressure
days = 730
}
}
}
}
focus = {
id = GER_press_austria
icon = GFX_goal_generic_more_territorial_claims
Expand Down Expand Up @@ -9790,8 +9898,9 @@ focus_tree = {
}
}
}
x = 65
y = 6
x = -1
y = 1
relative_position_id = GER_expand_the_revolution

cost = 10
ai_will_do = {
Expand Down Expand Up @@ -9910,35 +10019,6 @@ focus_tree = {
}
}
}
focus = {
id = GER_expand_the_revolution
icon = GFX_focus_ger_great_red_menace
prerequisite = { focus = GER_second_civil_war }
available = {
NOT = { has_civil_war = yes }
}
x = 66
y = 5

search_filters = { FOCUS_FILTER_POLITICAL }
cost = 10
ai_will_do = {
factor = 3
}

completion_reward = {
every_other_country = {
limit = {
is_neighbor_of = GER
NOT = { has_government = communism }
}
add_timed_idea = {
idea = communist_pressure
days = 730
}
}
}
}
focus = {
id = GER_enter_comintern
icon = GFX_focus_GER_comintern
Expand Down Expand Up @@ -9970,8 +10050,9 @@ focus_tree = {
}
}
mutually_exclusive = { focus = GER_eurocommunism focus = GER_join_fourth_internationale focus = GER_establish_fifth_internationale }
x = 69
y = 6
x = 3
y = 1
relative_position_id = GER_expand_the_revolution

cost = 10
ai_will_do = {
Expand Down Expand Up @@ -10674,8 +10755,9 @@ focus_tree = {
}
has_completed_focus = GER_second_civil_war
}
x = 93
y = 3
x = 26
y = 1
relative_position_id = GER_reds_amnesty

cost = 5
ai_will_do = {
Expand Down Expand Up @@ -10875,8 +10957,8 @@ focus_tree = {
}
mutually_exclusive = { focus = GER_enter_comintern focus = GER_join_fourth_internationale focus = GER_establish_fifth_internationale }
x = 0
y = 3
relative_position_id = GER_right_wing
y = 1
relative_position_id = GER_foreign_capital
search_filters = { FOCUS_FILTER_POLITICAL }
cost = 10
ai_will_do = {
Expand Down Expand Up @@ -12180,8 +12262,9 @@ focus_tree = {

has_completed_focus = GER_second_civil_war
}
x = 80
y = 3
x = 13
y = 1
relative_position_id = GER_reds_amnesty

cost = 5
ai_will_do = {
Expand Down Expand Up @@ -13344,8 +13427,9 @@ focus_tree = {
is_in_faction_with = SOV
}
}
x = 75
y = 5
x = -5
y = 1
relative_position_id = GER_support_trotsky_coup

cost = 10
ai_will_do = {
Expand Down
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.9"
version="KPD2.1.10"
tags={
"Alternative History"
"Events"
Expand Down
8 changes: 4 additions & 4 deletions localisation/japanese/rot_events_l_japanese.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
rot_news.16.a:0 "世界革命万歳！"
rot_news.16.b:0 "大英帝国が崩壊しつつある！"
rot_news.17.t:0 "世界社会主義共和国発足宣言"
rot_news.17.d:3 "“Rising from ruins of the old society, The Socialist world republic!” - these words, which repeatedly sounded in the walls of the Berlin Opera, songs yesterday seemed like a dream, but today they have come true.\nAfter the recent events in the world and the strengthening of communism around the globe, today, in Berlin, the leader of KPD officially announced the creation of the World Republic!\nAs planned, all countries of the world should enter it! And some of the communist countries from [From.GetFactionName] have already announced their readiness to sign accession agreements.\nFormations of this magnitude have never been in the history of mankind!"
rot_news.17.a:0 "Dann blüht aus den Asche des letzten Krieges die sozialistische Weltrepublik!"
rot_news.17.d:3 "「旧社会の廃墟から立ち上がる、世界社会主義共和国！」－－ベルリン・オペラの壁に再三響き渡ったこの言葉は、昨日までは夢物語のように歌われたが、今日においては真実となった。\n近ごろの世界の出来事と、世界中での共産主義の強化の後、今日、ベルリンで、ドイツ共産党（KPD）の指導者は、世界共和国の創成を公式に告知した！\n計画されていたとおり、世界の全ての国はこれに参加するだろう！また、[From.GetFactionName]の共産主義国家のいくつかは、既に加盟協定への署名にむけた彼らの準備を公表している。\nこうした巨大さの形成は、人類の歴史でかつてなかったことだ！"
rot_news.17.a:0 "先の戦争の灰燼から花開く、世界社会主義共和国！（Dann blüht aus den Asche des letzten Krieges die sozialistische Weltrepublik!）"
rot_news.17.b:1 "世界社会主義共和国万歳！"
rot_news.17.c:0 "災厄だ！"
rot_news.17.e:0 "ひどい知らせだ"
Expand Down Expand Up @@ -215,7 +215,7 @@
rot_germany.37.desc:3 "「赤色戦線」の政治将校は、各々の将軍を確認して拘束された者を尋問した後、ついに陰謀の組織者にたどり着いた。それは、反乱を起こして政府転覆を図った数人の将軍である。彼らは全てを自白し、法廷で裁判を受けるのを待っている。\n\nどうやら、軍内の陰謀に対処することができたようだ……"
rot_germany.37.a:0 "ようやくだ。最大限の厳しさをもって奴らを非難せよ。"
rot_germany.39.t:0 "ヴィルマーの旗"
rot_germany.39.desc:3 "Yesterday we received the letter from the german lawyer and anti-fascist politician - Joseph Wirmer. There was the purpose to change our old Weimar flag to the new one, invented by him.\n\nThat flag has both of the Republican colors: black, red, and yellow, and the Christian cross. As he thinks, the new flag is going to cool down the Christians and combine the german people under a completely new flag. Yet, that change may create discussions in the party and weaken it.\n\nThe prototype of the flag was sent with the letter.\n\nYour opinion?"
rot_germany.39.desc:3 "昨日、我々はドイツの弁護士にして反ファシスト政治家－－ヨーゼフ・ヴィルマーからの手紙を受け取った。そこには我々の古いヴァイマルの旗を、彼の考案した新しいものに変える提案があった。\n\n件の旗は共和主義の色である黒、赤、黄と、キリスト教の十字の両方を有している。彼の考えるところでは、新しい旗はキリスト教徒を冷静にし、完全に新しい旗の下でドイツ国民を結びつけることになるだろうという。然れども、こうした変更は党内で議論を呼び、党を弱体化させるかもしれない。\n\nその旗の試作品は手紙に同封されていた。\n\nあなたの意見は？"
rot_germany.39.a:0 "この旗は我々に相応しくない。ヴァイマルの旗を使おう。"
rot_germany.39.b:1 "素晴らしい考えだ！新たな旗を手に入れる時が来た！"
tt_GER_wirmer_flag_declined:0 "何も起こらない"
Expand Down Expand Up @@ -270,4 +270,4 @@
rot_germany.32.b:0 "$political.22.b$"
GER_GetCurrentGermanRegime_nazis:0 "ナチス政権"
GER_GetCurrentGermanRegime_provisional:0 "臨時軍政府"
GER_GetCurrentGermanRegime_other:0 "現在の政権"
GER_GetCurrentGermanRegime_other:0 "現在の政権"
Loading

0 comments on commit 183ae9b

Please sign in to comment.