Merge pull request #140 from DevilIris/develop

Emergency fix for crashes when load save

mod/thegreatwar/events/WW1_Belgium.txt

@@ -1,4 +1,4 @@
-add_namespace = ww1_belgium
+add_namespace = ww1_belgium
 country_event = {
 	title=ww1_belgium.1.t#Atrocities commited in Belgium
 	desc=ww1_belgium.1.d#After the German occupation of some Belgian cities there were reports of harsh treatment of civilians in retaliation to very active Belgian resistance fighters sabotage.
@@ -78,11 +78,11 @@ country_event = {
 		    ai_chance = { factor = 60 modifier = { factor = 50 BEL = { has_completed_focus = BEL_neutrality_focus } } modifier = { factor = 95 BEL = { has_completed_focus = BEL_ally_benilux } } }
 		    name = ww1_belgium.3.a
 			BEL = { annex_country = { target = ROOT transfer_troops = yes } }
-			if = { limit = { BEL = { has_completed_focus = BEL_unite_benilux } } every_state = { limit = { is_controlled_by = ROOT } add_core_of = BEL } }
+			if = { limit = { BEL = { has_completed_focus = BEL_unite_benilux } } every_state = { limit = { is_controlled_by = ROOT is_on_continent = europe } add_core_of = BEL } }
 		}
 		option = {
 		    ai_chance = { factor = 40 modifier = { factor = 50 BEL = { has_completed_focus = BEL_neutrality_focus } } modifier = { factor = 5 BEL = { has_completed_focus = BEL_ally_benilux } } }
-			every_state = { limit = { is_controlled_by = ROOT } add_core_of = BEL }
+			every_state = { limit = { is_controlled_by = ROOT is_on_continent = europe } add_core_of = BEL }
 			BEL = { create_wargoal = { target = ROOT type = annex_everything } }
 		    name = ww1_belgium.3.b
 		}
@@ -119,13 +119,13 @@ country_event = {
 		    ai_chance = { factor = 100 }
 			trigger = { OR = { country_exists = HOL country_exists = LUX } }
 		    name = ww1_belgium.5.a
-			if = { limit = { country_exists = HOL } HOL = { country_event = ww1_belgium.3 } }
-			if = { limit = { country_exists = LUX } LUX = { country_event = ww1_belgium.3 } }
+			if = { limit = { country_exists = HOL } HOL = { country_event = { id = ww1_belgium.3 } } }
+			if = { limit = { country_exists = LUX } LUX = { country_event = { id = ww1_belgium.3 } } }
 		}
 		option = {
 		    ai_chance = { factor = 100 }
 			trigger = { NOT = { country_exists = HOL country_exists = LUX } }
-			every_state = { limit = { is_controlled_by = ROOT } add_core_of = ROOT }
+			every_state = { limit = { is_controlled_by = ROOT is_on_continent = europe } add_core_of = ROOT }
 		    name = ww1_belgium.5.b
 		}
-	}
+	}

mod/thegreatwar/events/WW1_Russia.txt

@@ -197,6 +197,8 @@ news_event = {
 				add_state_claim = 253
 				add_state_claim = 254
 
+				load_oob = SOV_Revolt_01
+
 				country_event = { days = 1 id = ww1_soviet.999 }
 			}
 			RUS = {

mod/thegreatwar/events/WW1_SovietUnion.txt

@@ -86,6 +86,5 @@ country_event = {
 		ai_chance={
 			factor=100
 		}
-		load_oob = SOV_Revolt_01
 	}
 }

mod/thegreatwar/history/states/273-Italian Africa.txt

@@ -4,7 +4,7 @@ state={
 	manpower = 42633
 	state_category=wasteland
 	# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
-	# impassable = yes
+	impassable = yes
 	provinces={ 1060 1140 4962 5004 7985 10754 10785 10884 11951 12022 12082 12866 }
 	resources={
 		wood=0

mod/thegreatwar/history/states/514-North Africa.txt

@@ -4,7 +4,7 @@ state={
 	manpower = 207733
 	state_category=wasteland
 	# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
-	# impassable = yes
+        impassable = yes
 	provinces={ 1043 1095 1901 1958 2049 4903 5035 5095 7041 8061 8077 8088 10731 10749 12711 12842 12849 }
 	resources={
 		wood=0

mod/thegreatwar/history/states/515-Central Africa.txt

@@ -4,7 +4,7 @@ state={
 	manpower=1482744
 	state_category=wasteland
 	# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
-	# impassable = yes
+	impassable = yes
 	buildings_max_level_factor=1.000
 	#provinces={ 1473 1956 2068 3123 4897 4902 4913 4978 5136 7939 8028 8128 10758 10780 10805 10893 10917 13138 }
 	provinces={ 1956 2068 4902 4913 5136 7939 8028 8128 10758 10780 10805 10893 10917 13138 }

mod/thegreatwar/history/states/552-Western Egypt.txt

@@ -4,7 +4,7 @@ state={
 	manpower = 26539
 	state_category=wasteland
 	# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
-	# impassable = yes
+	impassable = yes
 	provinces={ 992 1143 2064 4138 4961 5078 7117 7148 7216 7987 8103 10127 10869 10900 10907 12033 12091 12099 12733 12764 12816 12836 }
 	resources={
 		wood=0

mod/thegreatwar/history/states/557-Dakar.txt

@@ -4,7 +4,7 @@ state={
 	manpower = 429200
 	state_category=wasteland
 	# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
-	# impassable = yes
+	impassable = yes
 	provinces={ 1115 1897 1962 5034 5077 7943 7992 8035 8058 10725 10779 10814 10838 10868 }
 	resources={
 		wood=0

mod/thegreatwar/history/states/754-BritishLibya.txt

@@ -4,7 +4,7 @@ state={
 	manpower=10000
 	state_category=wasteland
 	# Open Beta 0.3.1 - Removed temporary due to bugs - Waiting an answer/fix from Paradox
-	# impassable = yes
+	impassable = yes
 	provinces={ 4191 1994 1057 10104 }
 	resources={
 		wood=0

mod/thegreatwar/history/states/771 - victory_points.txt

@@ -3,8 +3,9 @@ state={
 		name="STATE_771"
 
 		# By Wolferos, just to keep the log quiet
-		state_category = city
-		manpower = 1
+		# Thanks, Wolferos, but this breaks saves. NOT ADD THIS WILL BVREAK THE SAVES GAMES AND BUG THE MOD AF tested. This is the problem
+		#state_category = city
+		#manpower = 1
 
 		history={
 		victory_points = { 9620 15 }

mod/thegreatwar/localisation/loading_tips_l_english.yml

@@ -155,3 +155,17 @@
  LOADING_TIP_76:0 "Don't you think I'll be back?\n- Manfred von Richthofen, 21st April 1918"
 
  LOADING_TIP_77:0 "The main thing is to always have a plan; if it is not the best plan, it is at least better than no plan at all.\n- Sir John Monash"
+
+ LOADING_TIP_78:0 "Poor Mexico, so far from God and to close too the US.\n- Porfirio Diaz"
+
+ LOADING_TIP_79:0 "Madero has released the tiger, let's see. if he can tame him.\n- Porfirio Diaz in Exile"
+
+ LOADING_TIP_80:0 "Armies are the greatest supporters of tyranny.\n- Pancho Villa"
+
+ LOADING_TIP_81:0 "If you want to be a bird, fly, if you want to be a worm, crawl, but do not scream when you are crushed..\n- Emiliano Zapata-"
+
+ LOADING_TIP_82:0 "Patriots always talk of dying for their country, and never of killing for their country.\n- Bertrand Russell-"
+
+ LOADING_TIP_83:0 "If the women in the factories stopped work for twenty minutes, the Allies would lose the war.\n- French Field Marshal Joffre"
+
+

mod/thegreatwar/map/buildings.txt

@@ -39990,23 +39990,7 @@
 515;industrial_complex;2972.00;10.70;979.00;5.69;0
 515;industrial_complex;2992.00;10.60;984.00;3.52;0
 515;nuclear_reactor;2950.00;10.70;902.00;3.63;0
-525;arms_factory;4782.00;9.60;1262.00;1.98;0
-525;arms_factory;4796.00;12.15;1243.00;4.64;0
-525;arms_factory;4789.00;9.78;1230.00;1.02;0
-525;arms_factory;4784.00;9.60;1226.00;3.69;0
-525;arms_factory;4800.00;9.98;1232.00;0.43;0
-525;arms_factory;4797.00;12.18;1249.00;1.63;0
-525;industrial_complex;4793.00;11.80;1245.00;5.76;0
-525;industrial_complex;4785.00;9.73;1259.00;1.03;0
-525;industrial_complex;4799.00;12.55;1241.00;3.69;0
-525;industrial_complex;4791.00;9.70;1229.00;0.08;0
-525;industrial_complex;4781.00;9.70;1237.00;4.20;0
-525;industrial_complex;4780.00;9.55;1200.00;5.76;0
 525;air_base;4798.00;12.43;1248.00;2.14;0
-525;naval_base;4785.00;9.68;1263.00;-2.03;2781
-525;bunker;4783.00;9.70;1265.00;1.19;0
-525;trench;4784.00;9.53;1266.00;4.20;0
-525;coastal_bunker;4784.00;9.68;1265.00;-2.03;0
 525;anti_air_building;4783.00;9.70;1233.00;4.71;0
 525;anti_air_building;4806.00;11.45;1236.00;5.92;0
 525;anti_air_building;4797.00;12.40;1245.00;2.65;0
@@ -40455,4 +40439,20 @@
 778;synthetic_refinery;4779.00;12.05;1307.00;6.15;0
 778;radar_station;4770.00;11.70;1328.00;1.37;0
 778;rocket_site;4754.00;10.20;1321.00;5.20;0
-778;nuclear_reactor;4782.00;12.70;1343.00;3.04;0
+778;nuclear_reactor;4782.00;12.70;1343.00;3.04;0
+525;arms_factory;4786.00;9.73;1229.00;1.04;0
+525;arms_factory;4802.00;12.45;1239.00;5.16;0
+525;arms_factory;4791.00;11.55;1244.00;0.09;0
+525;arms_factory;4788.00;9.70;1229.00;3.11;0
+525;arms_factory;4800.00;11.55;1236.00;5.77;0
+525;arms_factory;4804.00;9.70;1231.00;2.16;0
+525;industrial_complex;4796.00;11.25;1239.00;6.28;0
+525;industrial_complex;4800.00;12.00;1253.00;1.55;0
+525;industrial_complex;4789.00;10.85;1238.00;4.22;0
+525;industrial_complex;4804.00;11.32;1235.00;0.60;0
+525;industrial_complex;4798.00;9.57;1231.00;4.72;0
+525;industrial_complex;4790.00;9.88;1231.00;4.83;0
+773;naval_base;4781.00;9.53;1260.00;-2.03;2781
+773;bunker;4784.00;9.70;1261.00;2.68;0
+773;trench;4786.00;9.70;1262.00;0.52;0
+773;coastal_bunker;4779.00;9.50;1263.00;-2.03;0