From cb3d891676ee4cbdbaca01afb52673d1759f2af1 Mon Sep 17 00:00:00 2001 From: Wolferos Date: Mon, 11 Jun 2018 18:09:27 +0200 Subject: [PATCH 1/5] Fixed GUI --- mod/thegreatwar/interface/countrystateview.gui | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mod/thegreatwar/interface/countrystateview.gui b/mod/thegreatwar/interface/countrystateview.gui index d669e9ebd..1aff9502e 100755 --- a/mod/thegreatwar/interface/countrystateview.gui +++ b/mod/thegreatwar/interface/countrystateview.gui @@ -102,12 +102,13 @@ guiTypes = { instantTextboxType = { name = "claims" - position = { x = 35 y = 97 } + position = { x = 15 y = 97 } textureFile = "" font = "hoi_18mbs" text = "" - maxWidth = 100 + maxWidth = 140 maxHeight = 30 + fixedsize = yes format = center } @@ -127,13 +128,14 @@ guiTypes = { text = "" maxWidth = 140 maxHeight = 30 + fixedsize = yes format = center } buttonType = { name = "owner_flag" quadTextureSprite ="GFX_flag_small2" - position = { x= 34 y = 62 } + position = { x= 34 y = 63 } } iconType ={ @@ -146,7 +148,7 @@ guiTypes = { buttonType = { name = "controller_flag" quadTextureSprite = "GFX_flag_small2" - position = { x= 74 y = 62 } + position = { x= 74 y = 63 } } iconType ={ From ca5cd34184a217463296ddc11f248d095b82ea11 Mon Sep 17 00:00:00 2001 From: Wolferos Date: Mon, 11 Jun 2018 18:09:36 +0200 Subject: [PATCH 2/5] Updated Logo --- .../gfx/interface/pdx_int_logo.dds | Bin 184128 -> 184128 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mod/thegreatwar/gfx/interface/pdx_int_logo.dds b/mod/thegreatwar/gfx/interface/pdx_int_logo.dds index c1c16fff42d5632bab56535b6168875fb13bf9fd..70b66456f542ddad9b0ea55857d7a061d5d546c9 100644 GIT binary patch delta 975 zcmZvaUr3W-6vll|e6_MaijxUub9|bTi5ZxclMxC^NhY&0vz%0DB`FqlQy6R%brZGV z?V>j5!ix%AOgNDjGm5;ZSXY%8coSJj2tgT*vgdqjX5!$t@BMS0=e+NE&qyeJB$R$J zpoVBBk8{^iuL_Pd73g?E**NH=Pm04X3RsJ5nsik0{Q}A$3F6`P)TX$qm~xVH?*?j7 z9511@$@x^N%sb0cbALHCD^6^td}}}0|INl`1vMxRZlMBeO}FQejbmG>R&mjG@+ntk zT3Xs|FbY0`@8AuHf~#O-@L|&nZgh)HtQrZ846Md153bZ9q`gQ6sV1}>S&MR z%k_{|oW$1rTr+>e@v(j)pT95T&p5!aUUL&~F}PDM=xl&hrim>nLn=ISy*x|D2FR|R zm2?J~YuU3Kfy|AlM_wsH1E33J0}to{VGy@&I;XQPJJBSm8ohYj<(m+57yOX8qPaNk z*(?5&`@~&R?FXn%aepf;^mqr^4SCOMol!{6e;E*o435M2 z&wjRud$EoTkU1AG&MUdbhokGkRwkNdzp?uHh|Ell5KCx38L+5TOYsep0%`QMBj+b7F2y3^m9OoYJRpjV z9UQ$M$AtnD}WIsQ7kaccuV{+GG!i*qQ14Q-EGw?*%jcw>MN`yS*QTrLujp zKg7lpV1w@m!qjR9LjvH)_WV$o+QVT`wbSRvF!62|iDYtz*ccrJR5IP)hsglwpE=us zve3Zz91CK-aXSOj!L!{t0cL!EBFMEsiS6f;VIirW3KW~Ze-6`$i4H8=)6-!wa5w{^ p>&*85S&$%8*&d$*34t@yfzIRDK0gm8@jo9Dz9+Wp7cmLO0svk1$|V2* From c0b4dd562390bab474e95c02fa32b5528ba89333 Mon Sep 17 00:00:00 2001 From: Wolferos Date: Mon, 11 Jun 2018 18:10:08 +0200 Subject: [PATCH 3/5] Fixed Bulgarian NF --- mod/thegreatwar/common/national_focus/bulgaria.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/thegreatwar/common/national_focus/bulgaria.txt b/mod/thegreatwar/common/national_focus/bulgaria.txt index 5aef38ebd..5bb40aebc 100755 --- a/mod/thegreatwar/common/national_focus/bulgaria.txt +++ b/mod/thegreatwar/common/national_focus/bulgaria.txt @@ -476,7 +476,6 @@ add_extra_state_shared_building_slots=1 add_building_construction={ type=arms_fa 756 = { remove_claim_by = BUL } 757 = { remove_claim_by = BUL } 759 = { remove_claim_by = BUL } - 762 = { remove_claim_by = BUL } } ai_will_do = { factor = 0 } From 7fd58be49c50c66b0c1b1deba922426fff4510dd Mon Sep 17 00:00:00 2001 From: Wolferos Date: Mon, 11 Jun 2018 18:10:21 +0200 Subject: [PATCH 4/5] Fixed Tech Dates --- mod/thegreatwar/common/technologies/industry.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/thegreatwar/common/technologies/industry.txt b/mod/thegreatwar/common/technologies/industry.txt index 9e961505b..86c336a75 100755 --- a/mod/thegreatwar/common/technologies/industry.txt +++ b/mod/thegreatwar/common/technologies/industry.txt @@ -392,7 +392,7 @@ technologies = { } research_cost = 1.5 - start_year = 1936 + start_year = 1922 folder = { name = industry_folder @@ -416,7 +416,7 @@ technologies = { } research_cost = 1.5 - start_year = 1916 + start_year = 1936 folder = { name = industry_folder From 36cf40c3f2a52261c80f8807d7173a5f4629c689 Mon Sep 17 00:00:00 2001 From: Wolferos Date: Mon, 11 Jun 2018 18:10:34 +0200 Subject: [PATCH 5/5] Updated Localisation --- ...dditional.yml => additional_l_english.yml} | 2 +- .../ww1_belgiumstuff_l_english.yml | 26 +++++++++---------- .../localisation/ww1_opinion_l_english.yml | 2 +- .../localisation/ww1_states_l_english.yml | 4 +-- .../localisation/ww1_techs_l_english.yml | 2 -- 5 files changed, 17 insertions(+), 19 deletions(-) rename mod/thegreatwar/localisation/{additional.yml => additional_l_english.yml} (94%) diff --git a/mod/thegreatwar/localisation/additional.yml b/mod/thegreatwar/localisation/additional_l_english.yml similarity index 94% rename from mod/thegreatwar/localisation/additional.yml rename to mod/thegreatwar/localisation/additional_l_english.yml index 62973811a..55049cb1f 100644 --- a/mod/thegreatwar/localisation/additional.yml +++ b/mod/thegreatwar/localisation/additional_l_english.yml @@ -1,4 +1,4 @@ -l_english: +l_english: trench:0 "Trench" trench_plural:0 "Trenches" trench_desc:0 "Trenches are used to shelter troops. They provide a good defense bonus to the defender. When leading an assault, you should attack from multiple directions to reduce trenches effectiveness." \ No newline at end of file diff --git a/mod/thegreatwar/localisation/ww1_belgiumstuff_l_english.yml b/mod/thegreatwar/localisation/ww1_belgiumstuff_l_english.yml index 876a3d76c..4fc47cb8d 100644 --- a/mod/thegreatwar/localisation/ww1_belgiumstuff_l_english.yml +++ b/mod/thegreatwar/localisation/ww1_belgiumstuff_l_english.yml @@ -4,16 +4,16 @@ choose_wisely:0 "§GYour choice will affect target alliance. Choose wisely.§!" no_proceed_benilux_alliance:0 "§RYou cannot proceed with benilux alliance focus if you choose this focus.§!" fortify_belgium:0 "Build fortifications on borders" - greater_benilux:0 "Greater Benilux" - GBL_neutrality:0 "Greater Benilux" - GBL_democratic:0 "Greater Benilux" - GBL_fascism:0 "Greater Benilux" - GBL_communism:0 "Greater Benilux" + greater_benilux:0 "Greater Benelux" + GBL_neutrality:0 "Greater Benelux" + GBL_democratic:0 "Greater Benelux" + GBL_fascism:0 "Greater Benelux" + GBL_communism:0 "Greater Benelux" ##### Focuses ##### BEL_diplomatic_effort:0 "Diplomatic Effort" BEL_diplomatic_effort_desc:0 "TODO" - BEL_benilux_focus:0 "Benilux Focus" + BEL_benilux_focus:0 "Benelux Focus" BEL_benilux_focus_desc:0 "TODO" BEL_entente_focus:0 "Entente Friendship" BEL_entente_focus_desc:0 "TODO" @@ -21,9 +21,9 @@ BEL_germany_focus_desc:0 "TODO" BEL_neutrality_focus:0 "Neutrality Focus" BEL_neutrality_focus_desc:0 "TODO" - BEL_ally_benilux:0 "Benilux Alliance" + BEL_ally_benilux:0 "Benelux Alliance" BEL_ally_benilux_desc:0 "TODO" - BEL_conquer_benilux:0 "Conquer Benilux" + BEL_conquer_benilux:0 "Conquer Benelux" BEL_conquer_benilux_desc:0 "TODO" BEL_major_alliance:0 "Choose Side" BEL_major_alliance_desc:0 "TODO" @@ -31,12 +31,12 @@ BEL_fortify_borders_desc:0 "TODO" BEL_demand_eupen:0 "Demand Eupen" BEL_demand_eupen_desc:0 "TODO" - BEL_unite_benilux:0 "Unite Benilux" + BEL_unite_benilux:0 "Unite Benelux" BEL_unite_benilux_desc:0 "TODO" ##### Events ##### ww1_belgium.2.t:0 "Belgium proposes alliance" - ww1_belgium.2.d:0 "Today we recieved message that Belgium wants to invite us in their alliance. They propose unite Benilux and create new strong alliance. What should we do?" + ww1_belgium.2.d:0 "Today we recieved message that Belgium wants to invite us in their alliance. They propose unite Benelux and create new strong alliance. What should we do?" ww1_belgium.2.a:0 "That is good proposal" ww1_belgium.2.b:0 "No" ww1_belgium.3.t:0 "Belgium demands subjugation" @@ -47,10 +47,10 @@ ww1_belgium.4.d:0 "Eupen always was a Belgium territory. Now they demand their rightful lands. Belgium is not so strong, but should we start war for small piece of land?" ww1_belgium.4.a:0 "It is their historical land after all" ww1_belgium.4.b:0 "No, it is german territory" - ww1_belgium.5.t:0 "Unite Benilux" - ww1_belgium.5.d:0 "We think it's time for uniting Benilux. We will unite people of Benilux Region under our rule." + ww1_belgium.5.t:0 "Unite Benelux" + ww1_belgium.5.d:0 "We think it's time for uniting Benelux. We will unite people of Benelux Region under our rule." ww1_belgium.5.a:0 "We will send demand to our neighbours" - ww1_belgium.5.b:0 "We already control Benilux" + ww1_belgium.5.b:0 "We already control Benelux" BEL_ww1_army_effort:0 "Military Modernization" BEL_ww1_army_effort_desc:0 "Many of our rifles, cannons, tools, and, unfortunately, military leaders are relics of a bygone era. With the Maxim Gun now not only fabricated, but on a large scale, we simply have no choice but to get with the times. The quicker we bring these new weapons into circulation, and bring in experts who know how to use them, the quicker our military can become a modern, effective fighting force." diff --git a/mod/thegreatwar/localisation/ww1_opinion_l_english.yml b/mod/thegreatwar/localisation/ww1_opinion_l_english.yml index 3f9aa706e..8bd9fd3a7 100755 --- a/mod/thegreatwar/localisation/ww1_opinion_l_english.yml +++ b/mod/thegreatwar/localisation/ww1_opinion_l_english.yml @@ -53,6 +53,6 @@ HOI4TGW_Opinion_diplomats_malus:0 "Diplomatic Malus" # Remove -100 HOI4TGW_Opinion_Russia_Leave_Entente:0 "Russian Empire leaves Entente" -benilux_friendship:0 "Benilux Friendship" +benilux_friendship:0 "Benelux Friendship" entente_friendship:0 "Entente Friendship" germany_friendship:0 "Germany Friendship" diff --git a/mod/thegreatwar/localisation/ww1_states_l_english.yml b/mod/thegreatwar/localisation/ww1_states_l_english.yml index ed3ef7dc8..3609826a1 100755 --- a/mod/thegreatwar/localisation/ww1_states_l_english.yml +++ b/mod/thegreatwar/localisation/ww1_states_l_english.yml @@ -20,7 +20,7 @@ STATE_759:0 "East Macedonia" STATE_760:0 "South Serbia" STATE_761:0 "East Montenegro" - STATE_762:0 "Silesian Voivodeship" + STATE_762:0 "Silesia" STATE_763:0 "Walvis Bay" STATE_764:0 "Aegean Islands" STATE_765:0 "Jabal Shammar" @@ -36,4 +36,4 @@ STATE_776:0 "Hwanghae" STATE_777:0 "Northern Gangwon" STATE_778:0 "PyeongAn" - STATE_779:0 "Southern Bulgaria" + STATE_779:0 "East Rumelia" diff --git a/mod/thegreatwar/localisation/ww1_techs_l_english.yml b/mod/thegreatwar/localisation/ww1_techs_l_english.yml index 80e49ab75..54923e735 100644 --- a/mod/thegreatwar/localisation/ww1_techs_l_english.yml +++ b/mod/thegreatwar/localisation/ww1_techs_l_english.yml @@ -117,8 +117,6 @@ ww1_medicine5_desc:0 "Though our field surgeons are now all well and good, we ca - - trench:0 "Trench" MODIFIER_PRODUCTION_OIL_FACTOR:0 "Oil"