Merge branch 'unstable' into develop

mod/thegreatwar/common/autonomous_states/dominion.txt

@@ -1,8 +1,7 @@
 autonomy_state = {
 	id = autonomy_dominion
 
-	min_freedom_level = 0.8
-
+	min_freedom_level = 0.8	
 	manpower_influence = 0.2
 
 	rule = {

mod/thegreatwar/common/bookmarks/schlieffen.txt

@@ -120,7 +120,7 @@ bookmarks = {
 			history = "TUR_SCHLIEFFEN_DESC"
 			ideology = democratic
 			ideas = {
-
+				ww1_Faith_Allah
 			}
 			focuses = {
 				TUR_russian_ports

mod/thegreatwar/common/bookmarks/the_aftermath_of_versailles.txt

@@ -0,0 +1,155 @@
+bookmarks = {
+	bookmark = {
+		name = "THE_AFTERMATH_OF_VERSAILLES_NAME"
+		desc = "THE_AFTERMATH_OF_VERSAILLES_DESC"
+		date = 1919.7.1.1
+		picture = "GFX_select_date_1919"
+		default_country = "POL"
+
+		GER = {
+			history = GER_THE_AFTERMATH_OF_VERSAILLES_DESC
+			ideology = democratic
+			ideas = {
+				GER_interwar_spirit_BannedConscription
+				interwar_spirit_TheGreatWar_Loser
+			}
+			focuses = {
+				GER_interwar_beer_AntiSpartacists
+				GER_interwar_beer_HelpSovietAgainstPoland
+				GER_interwar_beer_hall_putsch
+			}
+		}
+		SOV = {
+			history = SOV_THE_AFTERMATH_OF_VERSAILLES_DESC
+			ideology = democratic
+			ideas = {
+				home_of_revolution
+				SOV_interwar_spirit_LeninRedArmy
+			}
+			focuses = {
+				SOV_interwar_SpreadCommunism_ITA
+				SOV_interwar_WarUkraine
+				SOV_interwar_CeaseFirePoland
+			}
+		}
+		RUS = {
+			history = RUS_THE_AFTERMATH_OF_VERSAILLES_DESC
+			ideology = democratic
+			ideas = {
+				RUS_ww1_orthodox_church
+			}
+			focuses = {
+				RUS_ww1_interwar_HonorRussianImperialFamily
+				RUS_ww1_interwar_TraitorVladimirovich
+				RUS_ww1_interwar_AlexanderIV
+			}
+		}
+		POL = {
+			history = POL_THE_AFTERMATH_OF_VERSAILLES_DESC
+			ideology = democratic
+			ideas = {
+				POL_interwar_spirit_WielkopolskaUprising
+			}
+			focuses = {
+				POL_interwar_LithuaniaCoup
+				POL_interwar_Miedzymorze
+			}
+		}
+		TUR = {
+			history = TUR_THE_AFTERMATH_OF_VERSAILLES_DESC
+			ideology = democratic
+			ideas = {
+				ww1_Faith_Allah
+				interwar_spirit_TheGreatWar_Loser
+			}
+			focuses = {
+			}
+		}
+		TUK = {
+			history = TUK_THE_AFTERMATH_OF_VERSAILLES_DESC
+			ideology = neutrality
+			ideas = {
+				ww1_Faith_Allah
+				TUK_interwar_spirit_TurkishNationalMovement
+			}
+			focuses = {
+			}
+		}
+		ITA = {
+			history = ITA_THE_AFTERMATH_OF_VERSAILLES_DESC
+			ideology = democratic
+			ideas = {
+				ITA_ww1_Risorgimento
+				interwar_spirit_TGWWinner_Italy
+			}
+			focuses = {
+				ITA_interwar_FascistManifesto
+				ITA_interwar_march_on_rome
+			}
+		}
+
+		"---"={
+			history = "OTHER_THE_AFTERMATH_OF_VERSAILLES_DESC"
+		}
+
+		FRA = {
+			minor = yes
+			history = "FRA_THE_AFTERMATH_OF_VERSAILLES_DESC"
+			ideology = democratic
+			ideas = {
+				interwar_spirit_TheGreatWar_Winner
+			}
+			focuses = {
+				FRA_interwar_HelpPoland
+				FRA_interwar_WarWithSoviet
+			}
+		}
+
+		ENG = {
+			minor = yes
+			history = "ENG_THE_AFTERMATH_OF_VERSAILLES_DESC"
+			ideology = democratic
+			ideas = {
+				stiff_upper_lip
+				interwar_spirit_TheGreatWar_Winner
+			}
+			focuses = {
+				ENG_interwar_Allied_Intervention_in_Russia
+				ENG_interwar_Support_Kolchak_s_Armies
+				ENG_interwar_ASovietKing
+			}
+		}
+
+		USA = {
+			minor = yes
+			history = "USA_THE_AFTERMATH_OF_VERSAILLES_DESC"
+			ideology = democratic
+			ideas = {
+				USA_ww1_us_war_department
+				interwar_spirit_TheGreatWar_Winner
+			}
+			focuses = {
+				USA_interwar_AnnexDominicanRepublic
+				USA_interwar_LeaveDominicanRepublic
+			}
+		}
+
+		JAP = {
+			minor = yes
+			history = "JAP_THE_AFTERMATH_OF_VERSAILLES_DESC"
+			ideology = neutrality
+			ideas = {
+				state_shintoism
+				interwar_spirit_TheGreatWar_Winner
+			}
+			focuses = {
+				JAP_ww1_Fukoku_Kyohei
+			}
+		}
+
+		effect = {
+			randomize_weather = 12345 # <- Obligatory in every bookmark !
+			#123 = { rain_light = yes }
+		}
+	}
+}

mod/thegreatwar/common/countries/Constitutional Protection Movement.txt

@@ -0,0 +1,4 @@
+graphical_culture = asian_gfx
+graphical_culture_2d = asian_2d
+
+color = rgb { 20 20 90 }

mod/thegreatwar/common/countries/Hungarian Soviet Republic.txt

@@ -0,0 +1,2 @@
+graphical_culture = eastern_european_gfx
+color = { 0 5 5 }

mod/thegreatwar/common/countries/Tuk.txt

@@ -0,0 +1,4 @@
+
+graphical_culture = eastern_european_gfx
+
+color = { 171  240  152 }

mod/thegreatwar/common/countries/colors.txt

@@ -9,8 +9,8 @@ ENG = {
 	color_ui = rgb { 255 73 121 }
 }
 SOV = {
-	color = rgb { 125 13 24 }
-	color_ui = rgb { 163 17 31 }
+	color = rgb { 248 0 0 }
+	color_ui = rgb { 203 80 80 }
 }
 SWE = {
 	color = rgb { 36 132 247 }
@@ -113,6 +113,10 @@ HUN = {
 	color = rgb { 249 126 98 }
 	color_ui = rgb { 255 164 127 }
 }
+HSR = {
+	color = rgb { 224 0 0 }
+	color_ui = rgb { 193 80 80 }
+}
 AFG = {
 	color = rgb { 64 160 167 }
 	color_ui = rgb { 83 208 217 }

mod/thegreatwar/common/country_tags/00_countries.txt

@@ -238,4 +238,7 @@ TAH = "countries/Tahiti.txt"
 WUR = "countries/Wurtemberg.txt"
 BRI = "countries/Brittany.txt"
 OCC = "countries/Occitania.txt"
-COR = "countries/Corsica.txt"
+COR = "countries/Corsica.txt"
+TUK = "countries/Tuk.txt"
+HSR = "countries/Hungarian Soviet Republic.txt"
+CPM = "countries/Constitutional Protection Movement.txt"

mod/thegreatwar/common/decisions/ARM.txt

@@ -0,0 +1,30 @@
+ARM_CustomDecision = {
+	ARM_claim_armenia_wargoal = {
+		available = {
+			original_tag = ARM
+			date > 1920.9.1
+		}
+
+		ai_will_do = {
+			factor = 1
+		}
+
+		fire_only_once = yes
+
+		complete_effect = {
+			# Wargoals
+			ARM = {
+				create_wargoal = {
+					target = TUR
+					type = take_state_focus
+					generator = { 353 354 }
+				}
+				create_wargoal = {
+					target = TUK
+					type = take_state_focus
+					generator = { 353 354 }
+				}
+			}
+		}
+	}
+}

mod/thegreatwar/common/decisions/AST.txt

@@ -1,5 +1,4 @@
 political_actions = {
-
 	AST_move_capital_to_canberra = {
 
 		available = {

mod/thegreatwar/common/decisions/DOD_hungary.txt

@@ -1,36 +1,7 @@
-political_actions = {
-
-
-}
-
-economy_decisions = {
-
-
-}
-
-
-
-
-operations = {
-
-
-}
-
-
-
-war_measures = {
-
-
-}
-
-foreign_politics = {
-
-}
-
-economy_decisions = {
-
-}
-
-foreign_support = {
-
-}
+political_actions = {}
+economy_decisions = {}
+operations = {}
+war_measures = {}
+foreign_politics = {}
+economy_decisions = {}
+foreign_support = {}

mod/thegreatwar/common/decisions/_generic_decisions.txt

@@ -1,6 +1,5 @@
 political_actions = {
 
-
 	targeted_race_for_the_bomb = {
 
 		icon = generic_research
@@ -22,7 +21,7 @@ political_actions = {
             NOT = { has_idea = race_for_the_bomb }
 		}
 
-		#If this trigger matches a country.
+		#If this trigger matches a country
 		target_trigger = {
 			#Target is FROM
 			FROM = {

mod/thegreatwar/common/decisions/categories/ARM_decision_categories.txt

@@ -0,0 +1,6 @@
+
+ARM_CustomDecision = {
+	allowed = {
+		original_tag = ARM
+	}
+}

mod/thegreatwar/common/ideas/Armenia.txt

@@ -1,2 +1 @@
-ideas={
-	}
+ideas = {}

mod/thegreatwar/common/ideas/Asir.txt

@@ -1,2 +1 @@
-ideas={
-	}
+ideas = {}

mod/thegreatwar/common/ideas/Guizhou.txt

@@ -1,2 +1 @@
-ideas={
-	}
+ideas = {}

mod/thegreatwar/common/ideas/Hunan.txt

@@ -1,2 +1 @@
-ideas={
-	}
+ideas = {}

mod/thegreatwar/common/ideas/Jabal Shammar.txt

@@ -1,2 +1 @@
-ideas={
-	}
+ideas = {}

mod/thegreatwar/common/ideas/Morocco.txt

@@ -1,8 +1,8 @@
 ideas={
-	political_advisor={
+	political_advisor = {
 			MOR_sidi_mohamed_bin_mohamed={ allowed={ tag=MOR } traits={ compassionate_gentleman } ai_will_do={ factor=1 } }
 			}
-	industrial_concern={
+	industrial_concern = {
 			designer = yes 
 			moroccan_railways_company={ allowed={ TAG=MOR }    research_bonus = {
 							    industry = 0.10