Merge pull request #307 from Cold-War-Project/dev

0.1.5. Hotfix Patch
Cold-War-Project · Jun 1, 2023 · acc6334 · acc6334
2 parents 855c1fd + 3e81d06
commit acc6334
Show file tree

Hide file tree

Showing 360 changed files with 90,520 additions and 352,983 deletions.
diff --git a/.metadata/metadata.json b/.metadata/metadata.json
@@ -2,7 +2,7 @@
   "name": "Cold War Project",
   "id": "",
   "version": "0.1.5",
-  "supported_game_version": "1.3.1",
+  "supported_game_version": "1.3.2",
   "short_description": "",
   "tags": [],
   "relationships": [],

diff --git a/common/character_traits/skill_traits.txt b/common/character_traits/skill_traits.txt
@@ -1137,114 +1137,6 @@ masterful_diplomat = {
 	value = 3
 }
 
-basic_colonial_administrator  = {
-	type = skill
-	texture = "gfx/interface/icons/character_trait_icons/basic_colonial_administrator.dds"
-
-	country_modifier = {
-		state_colony_growth_speed_mult = 0.1
-	}
-
-	possible = {
-		is_ruler = yes
-		NOT = { age < define:NCharacters|ADULT_AGE }
-		owner ?= {
-			has_colonial_growth = yes
-		}
-		NOR = {
-			has_trait = experienced_colonial_administrator
-			has_trait = expert_colonial_administrator
-		}
-	}
-
-	weight = {
-		value = 50
-		if = {
-			limit = {
-				OR = {
-					has_trait = ambitious
-					has_trait = persistent
-					has_trait = meticulous
-				}
-			}
-			multiply = 2
-		}
-	}
-
-	replace = {
-	}
-
-	value = 1
-}
-
-experienced_colonial_administrator  = {
-	type = skill
-	texture = "gfx/interface/icons/character_trait_icons/experienced_colonial_administrator.dds"
-
-	country_modifier = {
-		state_colony_growth_speed_mult = 0.2
-	}
-
-	possible = {
-		has_trait = basic_colonial_administrator
-		NOT = { age < define:NCharacters|ADULT_AGE }
-	}
-
-	weight = {
-		value = 50
-		if = {
-			limit = {
-				OR = {
-					has_trait = ambitious
-					has_trait = persistent
-					has_trait = meticulous
-				}
-			}
-			multiply = 2
-		}
-	}
-
-	replace = {
-		basic_colonial_administrator
-	}
-
-	value = 2
-}
-
-expert_colonial_administrator  = {
-	type = skill
-	texture = "gfx/interface/icons/character_trait_icons/expert_colonial_administrator.dds"
-
-	country_modifier = {
-		state_colony_growth_speed_mult = 0.4
-	}
-
-	possible = {
-		has_trait = experienced_colonial_administrator
-		NOT = { age < define:NCharacters|ADULT_AGE }
-	}
-
-	weight = {
-		value = 50
-		if = {
-			limit = {
-				OR = {
-					has_trait = ambitious
-					has_trait = persistent
-					has_trait = meticulous
-				}
-			}
-			multiply = 2
-		}
-	}
-
-	replace = {
-		experienced_colonial_administrator
-	}
-
-	value = 3
-}
-
 basic_political_operator = {
 	type = skill
 	texture = "gfx/interface/icons/character_trait_icons/basic_political_operator.dds"

diff --git a/common/customizable_localization/03_misc.txt b/common/customizable_localization/03_misc.txt
@@ -0,0 +1,224 @@
+enactment_phase_0 = {
+	type = country
+
+	text = {
+		localization_key = enactment_phase_0_tec
+		trigger = {
+			has_law = law_type:law_technocracy
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_0_courep
+		trigger = {
+			has_law = law_type:law_council_republic
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_0_autocracy
+		trigger = {
+			has_law = law_type:law_autocracy
+			NOT = {
+				has_law = law_type:law_council_republic
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_0_demrep
+		trigger = {
+			OR = {
+				has_law = law_type:law_parliamentary_republic
+				has_law = law_type:law_presidential_republic
+			}
+			OR = {
+				has_law = law_type:law_landed_voting
+				has_law = law_type:law_census_voting
+				has_law = law_type:law_wealth_voting
+				has_law = law_type:law_universal_suffrage
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_0_conmon
+		trigger = {
+			has_law = law_type:law_monarchy
+			OR = {
+				has_law = law_type:law_census_voting
+				has_law = law_type:law_wealth_voting
+				has_law = law_type:law_universal_suffrage
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_0_mon
+		trigger = {
+			has_law = law_type:law_monarchy
+			OR = {
+				has_law = law_type:law_landed_voting
+				has_law = law_type:law_oligarchy
+				has_law = law_type:law_single_party_state
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_0_generic
+		trigger = {
+			always = yes
+		}
+	}
+}
+
+enactment_phase_1 = {
+	type = country
+
+	text = {
+		localization_key = enactment_phase_1_tec
+		trigger = {
+			has_law = law_type:law_technocracy
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_1_courep
+		trigger = {
+			has_law = law_type:law_council_republic
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_1_autocracy
+		trigger = {
+			has_law = law_type:law_autocracy
+			NOT = {
+				has_law = law_type:law_council_republic
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_1_demrep
+		trigger = {
+			OR = {
+				has_law = law_type:law_parliamentary_republic
+				has_law = law_type:law_presidential_republic
+			}
+			OR = {
+				has_law = law_type:law_landed_voting
+				has_law = law_type:law_census_voting
+				has_law = law_type:law_wealth_voting
+				has_law = law_type:law_universal_suffrage
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_1_conmon
+		trigger = {
+			has_law = law_type:law_monarchy
+			OR = {
+				has_law = law_type:law_census_voting
+				has_law = law_type:law_wealth_voting
+				has_law = law_type:law_universal_suffrage
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_1_mon
+		trigger = {
+			has_law = law_type:law_monarchy
+			OR = {
+				has_law = law_type:law_landed_voting
+				has_law = law_type:law_oligarchy
+				has_law = law_type:law_single_party_state
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_1_generic
+		trigger = {
+			always = yes
+		}
+	}
+}
+
+enactment_phase_2 = {
+	type = country
+
+	text = {
+		localization_key = enactment_phase_2_tec
+		trigger = {
+			has_law = law_type:law_technocracy
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_2_courep
+		trigger = {
+			has_law = law_type:law_council_republic
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_2_autocracy
+		trigger = {
+			has_law = law_type:law_autocracy
+			NOT = {
+				has_law = law_type:law_council_republic
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_2_demrep
+		trigger = {
+			OR = {
+				has_law = law_type:law_parliamentary_republic
+				has_law = law_type:law_presidential_republic
+			}
+			OR = {
+				has_law = law_type:law_landed_voting
+				has_law = law_type:law_census_voting
+				has_law = law_type:law_wealth_voting
+				has_law = law_type:law_universal_suffrage
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_2_conmon
+		trigger = {
+			has_law = law_type:law_monarchy
+			OR = {
+				has_law = law_type:law_census_voting
+				has_law = law_type:law_wealth_voting
+				has_law = law_type:law_universal_suffrage
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_2_mon
+		trigger = {
+			has_law = law_type:law_monarchy
+			OR = {
+				has_law = law_type:law_landed_voting
+				has_law = law_type:law_oligarchy
+				has_law = law_type:law_single_party_state
+			}
+		}
+	}
+
+	text = {
+		localization_key = enactment_phase_2_generic
+		trigger = {
+			always = yes
+		}
+	}
+}
diff --git a/common/defines/cwp_graphics.txt b/common/defines/cwp_graphics.txt
@@ -9,19 +9,9 @@ NGraphics = {
 	FLATMAP_OVERLAY_LAND_OPACITY = 0.45
 	FLATMAP_EQUATOR_POSITION = 0.58 				# Position offset from top [ 0.0 - 1.0 ]
 	FLATMAP_EQUATOR_TILING = 24.0					# Tiling scale of equator texture (Effectively size)
-
-	STATE_REGION_COLOR_STRENGTH = 0.2 # In the Production Lens, how much should the color of the State be based of the State Color?
-	MAP_COLOR_SATURATION_LOW = 0.25 # Push up the saturation of Map Colors if below 25%
-	MAP_COLOR_SATURATION_HIGH = 0.75 # Push down the saturation of Map Colors if above 75%
-
-}
-
-NMapMode = {
-	@opacity = 1
 }
 
 NCamera = {
-	#						0	1	2	3		4		5		6		7		8		9		10		11		12		13		14		15
 	ZOOM_STEPS 			= { 14	32	40	50		75		100		200		300		400		600		800		1000	1200	1500	2500	4500	}
 }
 

diff --git a/common/government_types/01_monarchies.txt b/common/government_types/01_monarchies.txt
@@ -417,10 +417,7 @@ gov_bey = {
 	female_heir = ""	# Empty on purpose
 	possible = {
 		has_law = law_type:law_monarchy
-		OR = {
-			AND = { exists = c:TUN c:TUN = ROOT }
-			AND = { exists = c:CON c:CON = ROOT }
-		}
+		AND = { exists = c:TUN c:TUN = ROOT }
 	}
 
 	on_government_type_change = {

diff --git a/common/government_types/05_council_republics.txt b/common/government_types/05_council_republics.txt
@@ -57,7 +57,7 @@ gov_soviet_single_party_state = {
 		has_law = law_type:law_single_party_state
 		OR = {
 			root.capital.region = sr:region_russia
-			root.capital.region = sr:region_dnieper
+			root.capital.region = sr:region_eastern_europe
 		}
 	}
 

diff --git a/common/history/characters/abu - trucial states.txt b/common/history/characters/abu - trucial states.txt
@@ -8,7 +8,7 @@
 			ig_leader = yes
 			birth_date = 1905.6.1
 			interest_group = ig:ig_elites
-			ideology = ideology_absolutist
+			#ideology = ideology_absolutist
 			traits = {
 			}
 		}