Merge branch 'pre0.5.4' into Release

Wolferos · Jun 28, 2018 · f3d6a18 · f3d6a18
2 parents d2d345d + 4bc8957
commit f3d6a18
Show file tree

Hide file tree

Showing 25 changed files with 471 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 **Project Lead:** Wolferos 
 
-**Current Version:** 0.5.3a
+**Current Version:** 0.5.4
 
 **Compatible with:** Hearts of Iron IV "Cornflakes" (with or without Paid DLC) 
 

diff --git a/mod/TheGreatWar.mod b/mod/TheGreatWar.mod
@@ -8,4 +8,4 @@ tags={
 }
 picture="tgw_picture.png"
 remote_file_id="699709023"
-supported_version="1.5"
+supported_version="1.5.4"
diff --git a/mod/thegreatwar/common/countries/Armenia.txt b/mod/thegreatwar/common/countries/Armenia.txt
@@ -1,5 +1,6 @@
 
 
 graphical_culture = eastern_european_gfx
+graphical_culture_2d = eastern_european_2d
 
-color = { 235  216  92 }
+color = { 176  102  136 } #
diff --git a/mod/thegreatwar/common/countries/BosniaHerzegovina.txt b/mod/thegreatwar/common/countries/BosniaHerzegovina.txt
@@ -3,4 +3,4 @@
 graphical_culture = western_european_gfx
 graphical_culture_2d = western_european_2d
 
-color = { 254 182 180 }
+color = { 224 152 150 }
diff --git a/mod/thegreatwar/common/national_focus/austria.txt b/mod/thegreatwar/common/national_focus/austria.txt
@@ -320,10 +320,17 @@ focus_tree = {
 
 		completion_reward = { 
 			random_owned_state = {
+				limit = {
+					#is_in_home_area = yes
+					free_building_slots = {
+						building = dockyard
+						size > 1
+						include_locked = yes
+					}
+				}
 				add_building_construction = {
 					type = coastal_bunker
 					level = 3
-					province = 12299
 					instant_build = yes
 				}
 			}

diff --git a/mod/thegreatwar/common/national_focus/belgium.txt b/mod/thegreatwar/common/national_focus/belgium.txt
@@ -337,10 +337,17 @@ focus_tree = {
 
 		completion_reward = { 
 			random_owned_state = {
+				limit = {
+					#is_in_home_area = yes
+					free_building_slots = {
+						building = dockyard
+						size > 1
+						include_locked = yes
+					}
+				}
 				add_building_construction = {
 					type = coastal_bunker
 					level = 3
-					province = 12299
 					instant_build = yes
 				}
 			}

diff --git a/mod/thegreatwar/common/national_focus/generic.txt b/mod/thegreatwar/common/national_focus/generic.txt
@@ -340,10 +340,17 @@ focus_tree = {
 
 		completion_reward = { 
 			random_owned_state = {
+				limit = {
+					#is_in_home_area = yes
+					free_building_slots = {
+						building = dockyard
+						size > 1
+						include_locked = yes
+					}
+				}
 				add_building_construction = {
 					type = coastal_bunker
 					level = 3
-					province = 12299
 					instant_build = yes
 				}
 			}

diff --git a/mod/thegreatwar/common/national_focus/germany.txt b/mod/thegreatwar/common/national_focus/germany.txt
@@ -494,10 +494,17 @@ focus_tree = {
 
 		completion_reward = { 
 			random_owned_state = {
+				limit = {
+					#is_in_home_area = yes
+					free_building_slots = {
+						building = dockyard
+						size > 1
+						include_locked = yes
+					}
+				}
 				add_building_construction = {
 					type = coastal_bunker
 					level = 3
-					province = 12299
 					instant_build = yes
 				}
 			}

diff --git a/mod/thegreatwar/common/national_focus/hungary.txt b/mod/thegreatwar/common/national_focus/hungary.txt
@@ -173,10 +173,17 @@ focus_tree = {
 
 		completion_reward = { 
 			random_owned_state = {
+				limit = {
+					#is_in_home_area = yes
+					free_building_slots = {
+						building = dockyard
+						size > 1
+						include_locked = yes
+					}
+				}
 				add_building_construction = {
 					type = coastal_bunker
 					level = 3
-					province = 12299
 					instant_build = yes
 				}
 			}

diff --git a/mod/thegreatwar/common/national_focus/mexico.txt b/mod/thegreatwar/common/national_focus/mexico.txt
@@ -521,16 +521,23 @@ focus = {
   mutually_exclusive = { focus=mex_ww1_fortify_city }
   cost = 10
 
-  completion_reward = {
-    random_owned_state = {
-      add_building_construction = {
-        type = coastal_bunker
-        level = 3
-        province = 12299
-        instant_build = yes
+  completion_reward = { 
+      random_owned_state = {
+        limit = {
+          #is_in_home_area = yes
+          free_building_slots = {
+            building = dockyard
+            size > 1
+            include_locked = yes
+          }
+        }
+        add_building_construction = {
+          type = coastal_bunker
+          level = 3
+          instant_build = yes
+        }
       }
     }
-  }
   ai_will_do = { factor = 10 }
 }
 

diff --git a/mod/thegreatwar/common/national_focus/ottoman.txt b/mod/thegreatwar/common/national_focus/ottoman.txt
@@ -466,10 +466,17 @@ focus_tree = {
 
 		completion_reward = { 
 			random_owned_state = {
+				limit = {
+					#is_in_home_area = yes
+					free_building_slots = {
+						building = dockyard
+						size > 1
+						include_locked = yes
+					}
+				}
 				add_building_construction = {
 					type = coastal_bunker
 					level = 3
-					province = 12299
 					instant_build = yes
 				}
 			}

diff --git a/mod/thegreatwar/gfx/interface/pdx_int_logo.dds b/mod/thegreatwar/gfx/interface/pdx_int_logo.dds
diff --git a/mod/thegreatwar/history/countries/GER - Germany.txt b/mod/thegreatwar/history/countries/GER - Germany.txt
@@ -29,14 +29,14 @@ create_country_leader={ name = "Karl Liebknecht" desc=GER_karl_liebknecht_DESC p
 create_country_leader={ name = "Wilhelm II" desc=GER_wilhelm_ii_DESC picture="gfx/leaders/GER_wilhelm_ii.dds" expire="1935.1.1" ideology=autocracy traits={  } }
 
 #ARMY
-create_field_marshal={  name = "Bock" id=34013 portrait_path="gfx/fieldmarshal/GER_bock.dds" traits={   } skill=2 }
+# create_field_marshal={  name = "Bock" id=34013 portrait_path="gfx/fieldmarshal/GER_bock.dds" traits={   } skill=2 }
 create_field_marshal={  name = "von Gallwitz" id=34038 portrait_path="gfx/fieldmarshal/GER_von_gallwitz.dds" traits={ thorough_planner  } skill=3 }
 create_field_marshal={  name = "Duke Albrecht of Wurttemberg" id=34337 portrait_path="gfx/fieldmarshal/GER_duke_albrecht_of_wurttemberg.dds" traits={ thorough_planner  } skill=3 }
 create_field_marshal={  name = "Crown Prince Rupprecht of Bavaria" id=34547 portrait_path="gfx/fieldmarshal/GER_crown_prince_rupprecht_of_bavaria.dds" traits={   } skill=3 }
 create_field_marshal={  name = "Crown Prince Wilhelm of Prussia" id=34548 portrait_path="gfx/fieldmarshal/GER_crown_prince_wilhelm_of_prussia.dds" traits={   } skill=2 }
 
 create_corps_commander={  name = "Maximilian von Prittwitz und Gaffron" id=34036 portrait_path="gfx/fieldmarshal/GER_von_prittwitz_und_gaffron_m.dds" traits={ old_guard } skill=3 }
-create_corps_commander={  name = "Blaskowitz" id=34012 portrait_path="gfx/generals/GER_blaskowitz.dds" traits={   } skill=3 }
+# create_corps_commander={  name = "Blaskowitz" id=34012 portrait_path="gfx/generals/GER_blaskowitz.dds" traits={   } skill=3 }
 create_corps_commander={  name = "von Hellingrath" id=34025 portrait_path="gfx/generals/GER_von_hellingrath.dds" traits={   } skill=3 }
 create_corps_commander={  name = "von Kluck" id=34029 portrait_path="gfx/generals/GER_von_kluck.dds" traits={   } skill=3 }
 create_corps_commander={  name = "von Preußen W." id=34032 portrait_path="gfx/generals/GER_von_preussen_w.dds" traits={   } skill=3 }

diff --git a/mod/thegreatwar/history/states/230-Armenia.txt b/mod/thegreatwar/history/states/230-Armenia.txt
@@ -3,14 +3,15 @@ state={
 	name="STATE_230"
 	manpower = 1250082
 	state_category=town
-	provinces={ 3564 4660 6642 6997 11708 12320 12380 12450 13123 }
+	provinces={ 3564 4660 6642 6997 11708 12320 12380 12450 13123 10472}
 	resources={
 		wood=0
 		}
 	history={
 		victory_points={ 12320 1 }
 		owner=RUS
 		add_core_of=RUS
+		add_core_of=ARM
 		1936.1.1={ 
 			owner=SOV
 			add_core_of=SOV

diff --git a/mod/thegreatwar/history/states/231-Georgia.txt b/mod/thegreatwar/history/states/231-Georgia.txt
@@ -3,7 +3,7 @@ state={
 	name="STATE_231"
 	manpower = 2949413
 	state_category=town
-	provinces={ 772 1599 3653 3656 3658 6669 6671 9702 11599 12441 }
+	provinces={ 772 1599 3653 3656 3658 6669 6671 9702 11599 12441 7454 10403}
 	resources={
 		wood=0
 		}
@@ -12,6 +12,7 @@ state={
 		victory_points={ 3653 3 }
 		owner=RUS
 		add_core_of=RUS
+		add_core_of=ARM
 		1936.1.1={ 
 			owner=SOV
 			add_core_of=SOV

diff --git a/mod/thegreatwar/history/states/353-Erzurum.txt b/mod/thegreatwar/history/states/353-Erzurum.txt
@@ -10,6 +10,7 @@ state={
 	history={
 		owner=TUR
 		add_core_of=TUR
+		add_core_of=ARM
 		1936.1.1={ 
 			owner=TUR
 			add_core_of=TUR

diff --git a/mod/thegreatwar/history/states/354-Trabzon.txt b/mod/thegreatwar/history/states/354-Trabzon.txt
@@ -3,14 +3,15 @@ state={
 	name="STATE_354"
 	manpower = 1031129
 	state_category=rural
-	provinces={ 789 3714 3979 6976 6991 7454 9886 9932 10403 10472 11753 }
+	provinces={ 789 3714 3979 6976 6991 9886 9932 11753 }
 	resources={
 		wood=0
 		}
 	history={
 		victory_points={ 9932 3 }
 		owner=TUR
 		add_core_of=TUR
+		add_core_of=ARM
 		1936.1.1={ 
 			owner=TUR
 			add_core_of=TUR

diff --git a/mod/thegreatwar/history/states/96-Wilno.txt b/mod/thegreatwar/history/states/96-Wilno.txt
@@ -12,6 +12,7 @@ state={
 		owner=RUS
 		#add_core_of=POL
 		add_core_of=RUS
+		add_core_of=LIT
 		1936.1.1={ 
 			owner=POL
 			#add_core_of=POL

diff --git a/mod/thegreatwar/history/units/BEL_1910.txt b/mod/thegreatwar/history/units/BEL_1910.txt
@@ -139,14 +139,6 @@ units = {
         start_manpower_factor = 0.3
     }
 
-
-    division = {
-        name = "1er Division d'Armee"
-        location = 6560#Gent
-        division_template = "Infantry Division"
-        start_experience_factor = 0.1
-    }
-
     division = {
         name = "3eme Division d'Armee"
         location = 11519#Liège
@@ -162,15 +154,6 @@ units = {
         start_experience_factor = 0.1
     }
 
-
-    division = {
-        name = "6eme Division d'Armee"
-        location = 516#Bruxelles
-        division_template = "Infantry Division"
-        start_experience_factor = 0.1
-    }
-
-
     division = {
         name = "Division de Cavalerie"
         location = 516#Bruxelles

diff --git a/mod/thegreatwar/interface/frontendmainview.gui b/mod/thegreatwar/interface/frontendmainview.gui
@@ -4,8 +4,10 @@ guiTypes = {
 		name ="frontend_background"
 		position = { x=0 y =0 }	
 		size = { 
-			width = 1920 height = 1440 
-			min = { width = 100% height = 133% }
+			width = 1920 
+			height = 1440 
+			min = { width = 100% height = 100% }
+			preserve_aspect_ratio = yes
 		}
 		Orientation = center
 		Origo = center
@@ -276,23 +278,23 @@ guiTypes = {
 		# facebook etc.
 		ButtonType = {
 			name = "homepage_button"
-			position = { x = 79 y = 309 }
+			position = { x = 69 y = 309 }
 			quadTextureSprite ="homepage"
 			clicksound = click_default
 			pdx_tooltip = "MENU_HOMEPAGE_WOLFEROS"
 			web_link = "http://www.wolferos.com"
 		}
 		ButtonType = {
 			name = "forum_button"
-			position = { x = 119 y = 309 }
+			position = { x = 109 y = 309 }
 			quadTextureSprite ="forum"
 			clicksound = click_default
 			pdx_tooltip = "MENU_FORUM"
 			web_link = "http://forum.paradoxplaza.com/forum/forumdisplay.php?844-Hearts-of-Iron-IV"
 		}
 		ButtonType = {
 			name = "facebook_button"
-			position = { x = 159 y = 309 }
+			position = { x = 149 y = 309 }
 			quadTextureSprite ="facebook"
 			clicksound = click_default
 			pdx_tooltip = "MENU_FACEBOOK_WOLFEROS"
@@ -301,13 +303,18 @@ guiTypes = {
 
 		ButtonType = {
 			name = "twitter_button"
-			position = { x = 199 y = 309 }
+			position = { x = 189 y = 309 }
 			quadTextureSprite ="twitter"
 			clicksound = click_default
 			pdx_tooltip = "MENU_TWITTER_WOLFEROS"
 			web_link = "https://twitter.com/WolferosProd"
 		}
 
-
-	}
+		ButtonType = {
+			name = "privacy_policy_button"
+			position = { x = 229 y = 309 }
+			quadTextureSprite ="privacy"
+			#clicksound = click_default
+			pdx_tooltip = "MENU_PRIVACY_POLICY"
+		}
 }
diff --git a/mod/thegreatwar/localisation/countries_l_english.yml b/mod/thegreatwar/localisation/countries_l_english.yml
@@ -1239,14 +1239,14 @@
  AZR_democratic_ADJ:0 "Azerbaijani"
  AZR_neutrality_ADJ:0 "Azerbaijani"
  AZR_communism_ADJ:0 "Azerbaijani"
- ARM_fascism:0 "Greater Armenia"
- ARM_fascism_DEF:0 "Greater Armenia"
- ARM_democratic:0 "Republic of Armenia"
- ARM_democratic_DEF:0 "The Republic of Armenia"
- ARM_neutrality:0 "Armenian Independent Territories"
- ARM_neutrality_DEF:0 "The Armenian Independent Territories"
- ARM_communism:1 "Armenian Socialist Republic"
- ARM_communism_DEF:1 "The Armenian Socialist Republic"
+ ARM_fascism:0 "Armenia"
+ ARM_fascism_DEF:0 "Armenia"
+ ARM_democratic:0 "Armenia"
+ ARM_democratic_DEF:0 "Armenia"
+ ARM_neutrality:0 "Armenia"
+ ARM_neutrality_DEF:0 "Armenia"
+ ARM_communism:1 "Armenia"
+ ARM_communism_DEF:1 "Armenia"
  ARM_fascism_ADJ:0 "Armenian"
  ARM_democratic_ADJ:0 "Armenian"
  ARM_neutrality_ADJ:0 "Armenian"

diff --git a/mod/thegreatwar/map/airports.txt b/mod/thegreatwar/map/airports.txt
@@ -227,7 +227,7 @@
 227={6474 }
 228={6519 }
 229={1610 }
-230={6642 }
+230={3564 }
 231={6669 }
 232={3682 }
 233={6674 }