diff --git a/mod/thegreatwar/events/Interwar_NewsEvents.txt b/mod/thegreatwar/events/Interwar_NewsEvents.txt index 2300d42ca..d5e3fb4f9 100644 --- a/mod/thegreatwar/events/Interwar_NewsEvents.txt +++ b/mod/thegreatwar/events/Interwar_NewsEvents.txt @@ -313,7 +313,7 @@ news_event = { } #____________________________________________________________ -# The Turkish National Movement # Open Beta 0.5 +# The Turkish National Movement (Turkey declares war on Greece and the Ottoman Empire) # Open Beta 0.5 #____________________________________________________________ news_event = { id = interwar_news.8 @@ -321,11 +321,11 @@ news_event = { desc = interwar_news.8.d picture = EVENT_hoi4tgw_turkish_national_movement major = yes + is_triggered_only = yes trigger = { - date > 1919.5.5 - has_global_flag = kis_treaty_of_versailles NOT = { has_global_flag = interwar_turkish_national_movement + has_global_flag = interwar_greco_turkish_war } } mean_time_to_happen = { @@ -333,12 +333,31 @@ news_event = { } immediate = { set_global_flag = interwar_turkish_national_movement + set_global_flag = interwar_greco_turkish_war hidden_effect = { - # Started in 1910 or 1914 - if = { - limit = { - has_start_date < 1919.1.1 + TUK = { + kill_country_leader = yes + create_country_leader = { + name = TUR_mustafa_kemal + desc = TUR_mustafa_kemal_DESC + picture = "gfx/hoi4tgw_portraits/TUR/country_leaders/TUR_mustafa_kemal.dds" + expire = "1935.1.1" + ideology = autocracy + traits = { } } + set_politics = { + ruling_party = neutrality + last_election = "1919.7.1" + election_frequency = 48 + elections_allowed = yes + } + set_popularities = { + democratic = 14 + fascism = 6 + communism = 12 + neutrality = 68 + } + } # Territorial changes if = { limit = { @@ -374,27 +393,26 @@ news_event = { TUK = { load_oob = "TUK_1919" } - # Start of the War + # Start of the War against Ottoman Empire TUK = { declare_war_on = { target = TUR - type = annex_everything + type = annex_everything # https://en.wikipedia.org/wiki/Turkish_War_of_Independence } } - # For the Greco-Turkish War - GRE = { - country_event = { - days = 13 - id = ww1_greece.6 + # Start of the War against Greece + TUK = { + declare_war_on = { + target = GRE + type = take_state + generator = { 339 } # https://en.wikipedia.org/wiki/Greco-Turkish_War_(1919%E2%80%931922) } } - } - else = { - news_event = { - days = 4 - id = interwar_news.9 + + add_named_threat = { + threat = 7 + name = interwar_news.8.t } - } } } option = { @@ -406,7 +424,7 @@ news_event = { } #____________________________________________________________ -# The Greco-Turkish War # Open Beta 0.5 +# Occupation of Smyrna #____________________________________________________________ news_event = { id = interwar_news.9 @@ -415,13 +433,12 @@ news_event = { picture = EVENT_hoi4tgw_greco_turkish_war major = yes is_triggered_only = yes - trigger = { - NOT = { - has_global_flag = interwar_greco_turkish_war - } - } immediate = { - set_global_flag = interwar_greco_turkish_war + hidden_effect = { + GRE = { + transfer_state = 339 # Smyrna # https://en.wikipedia.org/wiki/Occupation_of_Smyrna + } + } } option = { name = interwar_news.9.a diff --git a/mod/thegreatwar/events/WW1_Greece.txt b/mod/thegreatwar/events/WW1_Greece.txt index 2bf655f0c..08ebaca4b 100755 --- a/mod/thegreatwar/events/WW1_Greece.txt +++ b/mod/thegreatwar/events/WW1_Greece.txt @@ -54,66 +54,38 @@ country_event = { } #____________________________________________________________ -# GRE can attack TUR for the Greco-Turkish War +# GRE can occupy Smyrna (without declaring war on the Ottoman Empire) #____________________________________________________________ country_event = { id = ww1_greece.6 title = ww1_greece.6.t desc = ww1_greece.6.d #picture = ww1_greece.6 + fire_only_once = yes + mean_time_to_happen = { + days = 2 + } - is_triggered_only = yes + trigger = { + tag = GRE + has_global_flag = kis_treaty_of_versailles + NOT = { + has_global_flag = occupation_of_smyrna + } + TUR = { + owns_state = 339 # Smyrna + } + } # GRE Yes option = { name = ww1_greece.6.a ai_chance = { factor = 100 } - - if = { - limit = { - TUR = { - exists = yes - } - } - GRE = { - declare_war_on = { - target = TUR - type = take_state - generator = { 340 341 342 347 } - } - } - } - - if = { - limit = { - TUK = { - exists = yes - } - } - GRE = { - declare_war_on = { - target = TUK - type = take_state - generator = { 340 341 342 347 } - } - } - } - - if = { - limit = { - OR = { - country_exists = TUR - country_exists = TUK - } - } - add_named_threat = { - threat = 7 - name = ww1_greece.6.t - } - } + set_global_flag = occupation_of_smyrna hidden_effect = { - news_event = { days = 4 id = interwar_news.9 } + news_event = { hours = 3 random_hours = 3 id = interwar_news.9 } # Occupation of Smyrna + news_event = { days = 4 id = interwar_news.8 } # The Turkish National Movement, start the Greco-Turkish War } } diff --git a/mod/thegreatwar/localisation/ww1_events_l_english.yml b/mod/thegreatwar/localisation/ww1_events_l_english.yml index cc8257e79..ffd978426 100644 --- a/mod/thegreatwar/localisation/ww1_events_l_english.yml +++ b/mod/thegreatwar/localisation/ww1_events_l_english.yml @@ -241,9 +241,9 @@ ww1_greece.5.a:0 "This Army will help us!" ww1_greece.5.d:0 "France sends us an army to help us fight" ww1_greece.5.t:0 "France sends l'Armée d'Orient" - ww1_greece.6.t:0 "Greco-Turkish War" - ww1_greece.6.d:0 "We have the opportunity to extend our country and follow our Megáli Idéa by declaring war to the dying Ottoman Empire. Thus making a strong Greek State that would make our ancestors proud!" - ww1_greece.6.a:0 "To War" + ww1_greece.6.t:0 "Occupation of Smyrna" + ww1_greece.6.d:0 "We have the opportunity to extend our country and follow our Megáli Idéa by landing in Smyrna at the suggestion of the Entente. Thus making a strong Greek State that would make our ancestors proud!" + ww1_greece.6.a:0 "Yes" ww1_greece.6.b:0 "We'd rather not" ww1_greekbulgarian.6.a:0 "Accept the plan" ww1_greekbulgarian.6.b:0 "Reject the plan" diff --git a/mod/thegreatwar/localisation/ww1_events_l_french.yml b/mod/thegreatwar/localisation/ww1_events_l_french.yml index 5c92bd02b..3a21f4412 100644 --- a/mod/thegreatwar/localisation/ww1_events_l_french.yml +++ b/mod/thegreatwar/localisation/ww1_events_l_french.yml @@ -241,9 +241,9 @@ ww1_greece.5.a:0 "Cette armée nous aidera !" ww1_greece.5.d:0 "La France nous envoie une armée pour nous aider à combattre" ww1_greece.5.t:0 "La France envoie l'Armée d'Orient" - ww1_greece.6.t:0 "Guerre gréco-turque" - ww1_greece.6.d:0 "Nous avons la possibilité d'étendre notre pays et de suivre notre Megáli Idéa en déclarant la guerre à l'Empire ottoman qui se meurt. Ainsi, nous créerons un État grec fort qui fera la fierté de nos ancêtres !" - ww1_greece.6.a:0 "A la Guerre" + ww1_greece.6.t:0 "Occupation de Smyrne" + ww1_greece.6.d:0 "Nous avons la possibilité d'étendre notre pays et de suivre notre Megáli Idéa en débarquant à Smyrne sur suggestion de l'Entente. Ainsi, nous créerons un État grec fort qui fera la fierté de nos ancêtres !" + ww1_greece.6.a:0 "Oui" ww1_greece.6.b:0 "Nous ne préférons pas" ww1_greekbulgarian.6.a:0 "Accepter le plan" ww1_greekbulgarian.6.b:0 "Rejeter le plan" diff --git a/mod/thegreatwar/localisation/ww1_events_l_german.yml b/mod/thegreatwar/localisation/ww1_events_l_german.yml index 617c6f481..c4b07f5bc 100644 --- a/mod/thegreatwar/localisation/ww1_events_l_german.yml +++ b/mod/thegreatwar/localisation/ww1_events_l_german.yml @@ -241,9 +241,9 @@ ww1_greece.5.a:0 "Die Armee wird uns helfen!" ww1_greece.5.d:0 "Frankreich schickt uns eine Armee, um uns im Kampf zu unterstützen" ww1_greece.5.t:0 "Frankreich sendet die Armée d'Orient" - ww1_greece.6.t:0 "Griechisch-Türkischer Krieg" - ww1_greece.6.d:0 "Wir haben die Möglichkeit, unser Land zu erweitern und unserer Megáli Idéa zu folgen, indem wir dem sterbenden Osmanischen Reich den Krieg erklären. So schaffen wir einen starken griechischen Staat, der unsere Vorfahren stolz machen würde!" - ww1_greece.6.a:0 "In den Krieg" + ww1_greece.6.t:0 "Besetzung von Izmir" + ww1_greece.6.d:0 "Wir haben die Möglichkeit, unser Land zu erweitern und unserer Megáli Idéa zu folgen, indem wir auf Anregung der Entente in Izmir landen. So schaffen wir einen starken griechischen Staat, der unsere Vorfahren stolz machen würde!" + ww1_greece.6.a:0 "Ja" ww1_greece.6.b:0 "Wir wollen lieber nicht" ww1_greekbulgarian.6.a:0 "Den Plan akzeptieren" ww1_greekbulgarian.6.b:0 "Den Plan ablehnen" diff --git a/mod/thegreatwar/localisation/ww1_events_l_polish.yml b/mod/thegreatwar/localisation/ww1_events_l_polish.yml index f138b2719..a0536dbe4 100755 --- a/mod/thegreatwar/localisation/ww1_events_l_polish.yml +++ b/mod/thegreatwar/localisation/ww1_events_l_polish.yml @@ -241,9 +241,9 @@ ww1_greece.5.a:0 "This Army will help us!" ww1_greece.5.d:0 "France sends us an army to help us fight" ww1_greece.5.t:0 "France sends l'Armée d'Orient" - ww1_greece.6.t:0 "Greco-Turkish War" - ww1_greece.6.d:0 "We have the opportunity to extend our country and follow our Megáli Idéa by declaring war to the dying Ottoman Empire. Thus making a strong Greek State that would make our ancestors proud!" - ww1_greece.6.a:0 "To War" + ww1_greece.6.t:0 "Occupation of Smyrna" + ww1_greece.6.d:0 "We have the opportunity to extend our country and follow our Megáli Idéa by landing in Smyrna at the suggestion of the Entente. Thus making a strong Greek State that would make our ancestors proud!" + ww1_greece.6.a:0 "Yes" ww1_greece.6.b:0 "We'd rather not" ww1_greekbulgarian.6.a:0 "Accept the plan" ww1_greekbulgarian.6.b:0 "Reject the plan" diff --git a/mod/thegreatwar/localisation/ww1_events_l_russian.yml b/mod/thegreatwar/localisation/ww1_events_l_russian.yml index a265cef34..6b4f035dc 100644 --- a/mod/thegreatwar/localisation/ww1_events_l_russian.yml +++ b/mod/thegreatwar/localisation/ww1_events_l_russian.yml @@ -397,8 +397,8 @@ ww1_greece.5.d:0 "Франция посылает нам армию, чтобы помочь нам сражаться" ww1_greece.5.t:0 "Франция посылает Восточный экспедиционный корпус" - ww1_greece.6.t:0 "Греко-турецкая война" - ww1_greece.6.d:0 "У нас есть возможность расширить нашу страну и следовать нашей Великой идее, объявив войну умирающей Османской империи. Таким образом, мы бы создали сильное греческое государство, которым могли гордиться наши предки!" + ww1_greece.6.t:0 "Оккупация Смирны" + ww1_greece.6.d:0 "У нас есть возможность расширить нашу страну, следуя нашей Великой идее, высадившись в Смирне по предложению Антанты. Таким образом, мы бы создали сильное греческое государство, которым могли гордиться наши предки!" ww1_greece.6.a:0 "Конечно!" ww1_greece.6.b:0 "Лучше не надо" diff --git a/mod/thegreatwar/localisation/ww1_interwar_events_l_english.yml b/mod/thegreatwar/localisation/ww1_interwar_events_l_english.yml index 18875d235..fb67a3f3a 100644 --- a/mod/thegreatwar/localisation/ww1_interwar_events_l_english.yml +++ b/mod/thegreatwar/localisation/ww1_interwar_events_l_english.yml @@ -32,13 +32,13 @@ interwar_news.7.t:0 "The Second Spanish Republic is Proclaimed" interwar_news.7.d:0 "The Second Spanish Republic was proclaimed when King Alfonso XIII left the country following municipal elections where anti-monarchist candidates won the majority of votes." interwar_news.7.a:0 "¡Viva el Presidente!" - # The Turkish National Movement - interwar_news.8.t:0 "Nationalist Movement in Turkey" + # The Turkish National Movement + The Greco-Turkish War + interwar_news.8.t:0 "Turkish War of Independence" interwar_news.8.d:0 "As a consequence of the defeat of the Ottoman Empire in The Great War and the subsequent occupation of Constantinople and partitioning of the Ottoman Empire by the Allies. The Ottomans saw the movement as part of an international conspiracy against them. Some Turkish revolutionaries rebelled against this partitioning!" interwar_news.8.a:0 "Wiil Mustafa Kemal succeed?" - # The Greco-Turkish War + # Occupation of Smyrna interwar_greco_turkish_war:0 "Greco-Turkish War" - interwar_news.9.t:0 "Greco-Turkish War" + interwar_news.9.t:0 "Occupation of Smyrna" interwar_news.9.d:0 "The Greeks received an order to land in Smyrna by the Triple Entente as part of the partition of the Ottoman Empire. The Ottoman Empire is on its knees but still alive!" interwar_news.9.a:0 "Can the Greeks win alone?" # Treaty of Lausanne diff --git a/mod/thegreatwar/localisation/ww1_interwar_events_l_french.yml b/mod/thegreatwar/localisation/ww1_interwar_events_l_french.yml index af49338b9..4e9e392d7 100644 --- a/mod/thegreatwar/localisation/ww1_interwar_events_l_french.yml +++ b/mod/thegreatwar/localisation/ww1_interwar_events_l_french.yml @@ -32,13 +32,13 @@ interwar_news.7.t:0 "La deuxième République espagnole est proclamée" interwar_news.7.d:0 "La deuxième République espagnole a été proclamée lorsque le roi Alphonse XIII a quitté le pays à la suite des élections municipales où les candidats anti-monarchistes ont remporté la majorité des voix." interwar_news.7.a:0 "¡Viva el Presidente!" - # The Turkish National Movement - interwar_news.8.t:0 "Mouvement nationaliste en Turquie" + # The Turkish National Movement + The Greco-Turkish War + interwar_news.8.t:0 "Guerre d'indépendance turque" interwar_news.8.d:0 "En conséquence de la défaite de l'Empire ottoman dans la Grande Guerre et l'occupation subséquente de Constantinople et la partition de l'Empire ottoman par les Alliés, les Ottomans ont vu le mouvement comme une partie d'une conspiration internationale contre eux. Certains révolutionnaires turcs se sont rebellés contre ce cloisonnement !" interwar_news.8.a:0 "Est-ce que Mustafa Kemal va réussir ?" - # The Greco-Turkish War + # Occupation de Smyrne interwar_greco_turkish_war:0 "Guerre gréco-turque" - interwar_news.9.t:0 "Guerre gréco-turque" + interwar_news.9.t:0 "Occupation de Smyrne" interwar_news.9.d:0 "Les Grecs ont reçu l'ordre d'occuper Smyrne par la Triple Entente dans le cadre de la partition de l'Empire ottoman. L'Empire ottoman est à genoux mais toujours vivant !" interwar_news.9.a:0 "Les Grecs peuvent-ils gagner seuls ?" # Treaty of Lausanne diff --git a/mod/thegreatwar/localisation/ww1_interwar_events_l_german.yml b/mod/thegreatwar/localisation/ww1_interwar_events_l_german.yml index caf01272d..ba8523a4d 100644 --- a/mod/thegreatwar/localisation/ww1_interwar_events_l_german.yml +++ b/mod/thegreatwar/localisation/ww1_interwar_events_l_german.yml @@ -33,13 +33,13 @@ interwar_news.7.t:0 "Die Zweite Spanische Republik wird proklamiert" interwar_news.7.d:0 "Die Zweite Spanische Republik wurde proklamiert, weil König Alfons XIII. das Land nach den Kommunalwahlen verließ, bei denen antimonarchistische Kandidaten die Mehrheit der Stimmen erhielten." interwar_news.7.a:0 "¡Viva el Presidente!" - # Die Türkische Nationale Bewegung - interwar_news.8.t:0 "Nationalistische Bewegung in der Türkei" + # Die Türkische Nationale Bewegung + Der Griechisch-Türkische Krieg + interwar_news.8.t:0 "Türkischer Befreiungskrieg" interwar_news.8.d:0 "Als Folge der Niederlage des Osmanischen Reiches im Ersten Weltkrieg und der anschließenden Besetzung Konstantinopels und der Aufteilung des Osmanischen Reiches durch die Alliierten. Die Osmanen betrachteten die Bewegung als Teil einer internationalen Verschwörung gegen sie. Einige türkische Revolutionäre lehnten sich gegen diese Aufteilung auf!" interwar_news.8.a:0 "Wird Mustafa Kemal erfolgreich sein?" - # Der Griechisch-Türkische Krieg + # Besetzung von Izmir interwar_greco_turkish_war:0 "Griechisch-Türkische Krieg" - interwar_news.9.t:0 "Griechisch-Türkische Krieg" + interwar_news.9.t:0 "Besetzung von Izmir" interwar_news.9.d:0 "Im Rahmen der Teilung des Osmanischen Reiches erhalten die Griechen von der Triple Entente den Befehl, in Smyrna zu landen. Das Osmanische Reich liegt auf den Knien, aber es lebt noch!" interwar_news.9.a:0 "Können die Griechen allein gewinnen?" # Vertrag von Lausanne diff --git a/mod/thegreatwar/localisation/ww1_interwar_events_l_polish.yml b/mod/thegreatwar/localisation/ww1_interwar_events_l_polish.yml index 5672c4dee..9ad184a40 100755 --- a/mod/thegreatwar/localisation/ww1_interwar_events_l_polish.yml +++ b/mod/thegreatwar/localisation/ww1_interwar_events_l_polish.yml @@ -32,13 +32,13 @@ interwar_news.7.t:0 "Druga Republika Hiszpańska została powołana" interwar_news.7.d:0 "The Second Spanish Republic was proclaimed when King Alfonso XIII left the country following municipal elections where anti-monarchist candidates won the majority of votes." interwar_news.7.a:0 "¡Viva el Presidente!" - # The Turkish National Movement - interwar_news.8.t:0 "Nationalist Movement in Turkey" + # The Turkish National Movement + The Greco-Turkish War + interwar_news.8.t:0 "Turkish War of Independence" interwar_news.8.d:0 "As a consequence of the defeat of the Ottoman Empire in The Great War and the subsequent occupation of Constantinople and partitioning of the Ottoman Empire by the Allies. The Ottomans saw the movement as part of an international conspiracy against them. Some Turkish revolutionaries rebelled against this partitioning!" interwar_news.8.a:0 "Wiil Mustafa Kemal succeed?" - # The Greco-Turkish War + # Occupation of Smyrna interwar_greco_turkish_war:0 "Greco-Turkish War" - interwar_news.9.t:0 "Greco-Turkish War" + interwar_news.9.t:0 "Occupation of Smyrna" interwar_news.9.d:0 "The Greeks received an order to land in Smyrna by the Triple Entente as part of the partition of the Ottoman Empire. The Ottoman Empire is on its knees but still alive!" interwar_news.9.a:0 "Can the Greeks win alone?" # Treaty of Lausanne diff --git a/mod/thegreatwar/localisation/ww1_interwar_events_l_russian.yml b/mod/thegreatwar/localisation/ww1_interwar_events_l_russian.yml index 5a8d4c61b..422f7db88 100644 --- a/mod/thegreatwar/localisation/ww1_interwar_events_l_russian.yml +++ b/mod/thegreatwar/localisation/ww1_interwar_events_l_russian.yml @@ -41,16 +41,16 @@ interwar_news.7.d:0 "Вторая испанская республика была провозглашена, когда король Альфонсо XIII покинул страну после муниципальных выборов, где большинство голосов было подавлено кандидатами против монархистов." interwar_news.7.a:0 "Вива Эль-президенте!" - # The Turkish National Movement - interwar_news.8.t:0 "Националистическое движение в Турции" - interwar_news.8.d:0 "В результате поражения Османской империи в Великой войне, последующей оккупации Константинополя и разделения Османской империи союзниками появилось националистическое движение. Османы видели это движение как часть международного заговора против них. Некоторые турецкие революционеры восстали против этого раздела!" - interwar_news.8.a:0 "Преуспеет ли Мустафа Кемаль Ататюрк?" + # The Turkish National Movement + The Greco-Turkish War + interwar_news.8.t:0 "Война за независимость Турции" + interwar_news.8.d:0 "В результате поражения в Великой войне и последующего разделения Османской империи союзниками, в Турции началась вооружённая борьба против султанского правительства и иностранной военной интервенции. Сопротивление возглавил генерал Мустафа Кемаль-паша, объявивший о создании Турецкого национального движения." + interwar_news.8.a:0 "Справится ли Мустафа Кемаль-паша?" - # The Greco-Turkish War + # Occupation of Smyrna interwar_greco_turkish_war:0 "Греко-турецкая война" - interwar_news.9.t:0 "Греко-турецкая война" - interwar_news.9.d:0 "Греки получили приказ высадиться в Смирне с Антантой для раздела Османской империи. Османская империя на коленях, но всё еще жива!" - interwar_news.9.a:0 "Могут ли греки побеждать в одиночестве?" + interwar_news.9.t:0 "Оккупация Смирны" + interwar_news.9.d:0 "Греки согласились выполнить приказ Антанты и высадились в Смирне в рамках раздела Османской империи. Османская империя на коленях, но всё еще жива!" + interwar_news.9.a:0 "Смогут ли греки удержать контроль?" # Treaty of Lausanne interwar_treaty_of_lausanne:0 "Подписан Лозаннский договор"