From 57cf68d688d5f2fc3c69938afc01701dfb5e3f59 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 01:00:36 +0800
Subject: [PATCH 01/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=E7=9A=84=E9=9D=9E=E5=85=A8=E5=9B=BD=E7=9A=84?=
 =?UTF-8?q?=E8=B4=B8=E6=98=93=E9=A2=9D=E4=BA=A7=E5=87=BA=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8A=A0=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                           | 7 +++++++
 common/pop_jobs/01_ruler_jobs.txt      | 2 +-
 common/pop_jobs/02_specialist_jobs.txt | 4 ++--
 common/pop_jobs/03_worker_jobs.txt     | 4 ++--
 common/pop_jobs/ethic_rebuild_jobs.txt | 4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..1d0900cfd
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,7 @@
+# Changelog
+
+## By Windea
+
+### 2023/1/2
+
+* 所有职业的非全国的贸易额产出改为加算
\ No newline at end of file
diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index 4efd9b831..8bf7868e3 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -683,7 +683,7 @@ executive = {
 	
 	triggered_planet_modifier = {
 		potential = { always = yes }
-		trade_value_mult = 0.01
+		trade_value_add = 2
 		mult = planet.value:count_job|JOB|manager|
 	}
 	country_modifier = {
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index c6795f69d..e7bfb8129 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -79,7 +79,7 @@ merchant = {
 
 	planet_modifier = {
 		job_clerk_add = 1
-		trade_value_mult = 0.03
+		trade_value_add = 6
 	}
 
 	triggered_planet_modifier = {
@@ -2341,7 +2341,7 @@ manager = {
 		}
 	}
 	planet_modifier = {
-		trade_value_mult = 0.02
+		trade_value_add = 4
 		planet_amenities_add = -2
 		planet_bureaucrats_upkeep_mult = 0.01
 	}
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index c60a1354a..61eee0f92 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -157,7 +157,7 @@ clerk = {
 	}
 
 	planet_modifier = {
-		trade_value_mult = 0.01
+		trade_value_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -255,7 +255,7 @@ clerk = {
 			exists = owner
 			owner = { has_tradition = tr_mercantile_trickle_up_economics }
 		}
-		trade_value_mult = 0.01
+		trade_value_add = 2
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
 
diff --git a/common/pop_jobs/ethic_rebuild_jobs.txt b/common/pop_jobs/ethic_rebuild_jobs.txt
index ff5ef11b2..5327a29e4 100644
--- a/common/pop_jobs/ethic_rebuild_jobs.txt
+++ b/common/pop_jobs/ethic_rebuild_jobs.txt
@@ -2885,7 +2885,7 @@ PR_manager = {
 	}
 	possible_precalc = can_fill_specialist_job
 	planet_modifier = {
-		trade_value_mult = 0.02
+		trade_value_add = 4
 	}
 	planet_modifier = {
 		planet_amenities_add = -3
@@ -5711,7 +5711,7 @@ vanguard = {
 			}
 		}
 		modifier = {
-			trade_value_mult = 0.075
+			trade_value_add = 15
 		}
 	}
 

From d45de15c33bb4116d844782c9b6b82159db60a90 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 01:15:38 +0800
Subject: [PATCH 02/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E8=81=8C=E5=91=98?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=88=92=E9=80=82=E5=BA=A6=E4=BA=A7=E5=87=BA?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                       | 3 ++-
 common/pop_jobs/03_worker_jobs.txt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d0900cfd..933400ee6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,4 +4,5 @@
 
 ### 2023/1/2
 
-* 所有职业的非全国的贸易额产出改为加算
\ No newline at end of file
+* 所有职业的非全国的贸易额产出改为加算
+* 职员基础舒适度产出改为1
\ No newline at end of file
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index 61eee0f92..8a31704f8 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -152,7 +152,7 @@ clerk = {
 	}
 	triggered_planet_modifier = {
 		potential = { always = yes }
-		planet_amenities_add = 0.5
+		planet_amenities_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 

From 6b8545973809c3746097103f5e3d640a838e70fe Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 01:36:44 +0800
Subject: [PATCH 03/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E8=87=AA=E7=94=B1?=
 =?UTF-8?q?=E4=B8=BB=E4=B9=89=E5=9B=BD=E5=AE=B6=E4=B9=9F=E8=83=BD=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E4=B8=8A=E5=B1=B1=E4=B8=8B=E4=B9=A1=E6=B3=95=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                           | 3 ++-
 common/edicts/00_communists_edicts.txt | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 933400ee6..ae295515d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,4 +5,5 @@
 ### 2023/1/2
 
 * 所有职业的非全国的贸易额产出改为加算
-* 职员基础舒适度产出改为1
\ No newline at end of file
+* 职员基础舒适度产出改为1
+* 自由主义国家也能使用上山下乡法令
\ No newline at end of file
diff --git a/common/edicts/00_communists_edicts.txt b/common/edicts/00_communists_edicts.txt
index ecac4573a..ea5ddbd2c 100644
--- a/common/edicts/00_communists_edicts.txt
+++ b/common/edicts/00_communists_edicts.txt
@@ -216,9 +216,6 @@ to_the_countryside = {
 		    has_valid_civic = "civic_peoples_republic"
 			has_ethic = ethic_fanatic_socialism
 		}
-		NOR = {
-		    has_ethic = ethic_fanatic_egalitarian
-		}
 	}
 
 	ai_weight = {

From 9655e7ea855b79bc202b89d04df31f2e56eb7b3a Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 02:26:00 +0800
Subject: [PATCH 04/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E7=BB=9F=E6=B2=BB?=
 =?UTF-8?q?=E8=80=85=E8=81=8C=E4=B8=9A=E6=95=B0=E5=80=BC=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E6=B6=88=E8=B4=B9=E5=93=81=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=B4=B9=E6=94=B9=E4=B8=BA2=EF=BC=8C=E5=8F=82?=
 =?UTF-8?q?=E7=85=A7=E5=8E=9F=E7=89=88=E6=96=87=E4=BB=B6=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                           |   3 +-
 common/pop_jobs/01_ruler_jobs.txt      | 191 ++++++++++++++++---------
 common/pop_jobs/02_specialist_jobs.txt |   8 +-
 3 files changed, 133 insertions(+), 69 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae295515d..881b90d0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,4 +6,5 @@
 
 * 所有职业的非全国的贸易额产出改为加算
 * 职员基础舒适度产出改为1
-* 自由主义国家也能使用上山下乡法令
\ No newline at end of file
+* 自由主义国家也能使用上山下乡法令
+* 统治者职业数值调整，基础消费品维护费改为2，参照原版文件进行调整
\ No newline at end of file
diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index 8bf7868e3..c11fa805d 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -31,20 +31,23 @@ head_researcher = {
 				exists = owner
 				owner = { NOT = { has_valid_civic = civic_science_knight } }
 			}
-			physics_research = 5
-			engineering_research = 5
-			society_research = 5
+			physics_research = 6
+			engineering_research = 6
+			society_research = 6
 		}
 		produces = {
 			trigger = {
 				exists = owner
 				owner = { has_valid_civic = civic_science_knight }
 			}
-			physics_research = 5
-			engineering_research = 5
-			society_research = 5
+			physics_research = 6
+			engineering_research = 6
+			society_research = 6
 			mult = value:knight_commander_unity_output_modifier
 		}
+		produces = { 
+			unity = 2
+		}
 		produces = {
 			trigger = {
 				exists = owner
@@ -68,6 +71,14 @@ head_researcher = {
 			unity = 3
 		}
 		upkeep = {
+			consumer_goods = 2
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_science_ministry
+				}
+			}
 			consumer_goods = 1
 		}
 		upkeep = {
@@ -80,6 +91,21 @@ head_researcher = {
 			consumer_goods = 1
 		}
 	}
+	
+	overlord_resources = {
+		category = planet_requisitioned_research
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_science_ministry
+				}
+			}
+			physics_research = 3
+			engineering_research = 3
+			society_research = 3
+		}
+	}
+	
 	planet_modifier = {
 		planet_jobs_physics_research_produces_mult = 0.05
 		planet_jobs_society_research_produces_mult = 0.05
@@ -164,25 +190,36 @@ head_researcher = {
 
 	weight = {
 		weight = @ruler_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_research_modifier|JOB|head_researcher|
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|head_researcher|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:job_weights_modifier|JOB|head_researcher|RESOURCE|unity|FACTOR|0.25|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_living_standard = { type = living_standard_academic_privilege }
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = head_researcher
 		}
 		modifier = {
-			factOR = 0.01
+			factor = 0.01
 			exists = planet
 			exists = planet.controller
 			planet.controller = {
@@ -221,8 +258,7 @@ high_priest = {
 	resources = {
 		category = planet_priests
 		produces = {
-			unity = 5
-			society_research = 2
+			unity = 6
 		}
 		produces = {
 			trigger = {
@@ -299,9 +335,10 @@ high_priest = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = 2
 		}
 	}
+	
 	triggered_planet_modifier = {
 		potential = { always = yes }
 		planet_amenities_add = 5
@@ -345,31 +382,37 @@ high_priest = {
 
 	weight = {
 		weight = @ruler_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|high_priest|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|high_priest|RESOURCE|unity|
+			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.1
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.1
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 1.2
+			factor = 1.2
 			has_ethic = ethic_spiritualist
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			has_ethic = ethic_materialist
 			NOT = { has_job = high_priest }
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = high_priest
 		}
 		# crisis purge
 		modifier = {
-			factOR = 0.01
+			factor = 0.01
 			exists = planet
 			exists = planet.controller
 			planet.controller = {
@@ -408,15 +451,16 @@ politician = {
 	resources = {
 		category = planet_politicians
 		produces = {
-			unity = 3
+			unity = 4
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = 2
 		}
 	}
 	country_modifier = {
 		country_edict_fund_add = 5
 	}
+	
 	triggered_planet_modifier = {
 		potential = { always = yes }
 		planet_amenities_add = 8
@@ -486,22 +530,28 @@ politician = {
 
 	weight = {
 		weight = @ruler_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|politician|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|politician|RESOURCE|unity|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = politician
 		}
 		# crisis purge
 		modifier = {
-			factOR = 0.01
+			factor = 0.01
 			exists = planet
 			exists = planet.controller
 			planet.controller = {
@@ -539,15 +589,17 @@ noble = {
 	resources = {
 		category = planet_nobles
 		produces = {
-			unity = 3
+			unity = 4
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = 2
 		}
 	}
+	
 	planet_modifier = {
 		job_slave_overseer_add = 1
 	}
+	
 	triggered_pop_modifier = {
 		potential = { always = yes }
 		modifier = {
@@ -565,12 +617,6 @@ noble = {
 			pop_cat_specialist_happiness = -0.05
 		}
 	}
-
-	
-	planet_modifier = {
-		
-	}
-
 	triggered_planet_modifier = {
 		potential = { 
 			exists = owner
@@ -588,27 +634,28 @@ noble = {
 
 	weight = {
 		weight = @ruler_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|noble|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|noble|RESOURCE|unity|
+			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			is_egalitarian = yes
 			NOT = { has_job = noble }
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = noble
 		}
 		# crisis purge
 		modifier = {
-			factOR = 0.01
+			factor = 0.01
 			exists = planet
 			exists = planet.controller
 			planet.controller = {
@@ -649,6 +696,17 @@ executive = {
 			owner = { has_valid_civic = civic_du_contrat_social }
 		}
 	}
+	
+	resources = {
+		category = planet_executives
+		produces = {
+			unity = 2
+		}
+		upkeep = {
+			consumer_goods = 2
+		}
+	}
+	
 	triggered_pop_modifier = {
 		potential = {
 			owner = {
@@ -659,7 +717,6 @@ executive = {
 			pop_cat_ruler_political_power = 3
 		}
 	}
-	
 	triggered_pop_modifier = {
 		potential = {
 			owner = {
@@ -670,17 +727,6 @@ executive = {
 			pop_cat_ruler_political_power = 1
 		}
 	}
-
-	resources = {
-		category = planet_executives
-		produces = {
-			unity = 2
-		}
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	
 	triggered_planet_modifier = {
 		potential = { always = yes }
 		trade_value_add = 2
@@ -722,17 +768,28 @@ executive = {
 
 	weight = {
 		weight = @ruler_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|executive|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|executive|RESOURCE|unity|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 5
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 5
 			has_job = executive
 		}
 		# crisis purge
 		modifier = {
-			factOR = 0.01
+			factor = 0.01
 			exists = planet
 			exists = planet.controller
 			planet.controller = {
@@ -758,17 +815,20 @@ knight_commander = {
 	condition_string = RULER_JOB_TRIGGER
 	building_icon = building_order_keep
 	clothes_texture_index = 1
-
+	can_set_priority = no
+	
 	possible_pre_triggers = {
 		has_owner = yes
-		is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_ruler_job
 	possible = {
+		OR = {
+			is_enslaved = no
+			owner = { has_valid_civic = civic_du_contrat_social }
+		}
 		hidden_trigger = { exists = owner }
 		owner = {
 			is_gestalt = no
@@ -834,12 +894,15 @@ knight_commander = {
 	weight = {
 		weight = @high_prio_specialist_job_weight
 		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|executive|RESOURCE|unity|
+			mult = value:job_weights_modifier|JOB|executive|RESOURCE|unity|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
 			mult = value:job_weights_research_modifier|JOB|researcher|
-			owner = { has_country_flag = toxoids_7011_b }
+			owner = { 
+				has_country_flag = toxoids_7011_b
+				has_edict = dynamic_weight
+			}
 		}
 	}
 }
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index e7bfb8129..91d892f38 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -20,7 +20,7 @@ merchant = {
 		OR = {
 			is_enslaved = no
 			exists = owner
-				owner = { has_valid_civic = civic_du_contrat_social }
+			owner = { has_valid_civic = civic_du_contrat_social }
 		}
 	}
 
@@ -111,9 +111,9 @@ merchant = {
 		}
 	}
 	triggered_planet_modifier = {
-		potential = {
-							exists = owner
-				owner = { has_valid_civic = civic_internet_market }
+		potential = { 
+			exists = owner
+			owner = { has_valid_civic = civic_internet_market }
 		}
 		modifier = {
 			trade_value_add = 1

From 39ca98db8e61c1fdc66d755e4c2d7cf0e1b33d98 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 16:25:10 +0800
Subject: [PATCH 05/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E4=B8=93=E5=AE=B6?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=EF=BC=9A=E6=95=B0=E5=80=BC=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E6=B6=88=E8=B4=B9=E5=93=81=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=B4=B9=E6=94=B9=E4=B8=BA1=EF=BC=8C=E6=89=A7?=
 =?UTF-8?q?=E6=B3=95=E8=80=85=E7=94=9F=E6=88=902=E9=98=B2=E5=BE=A1?=
 =?UTF-8?q?=E9=83=A8=E9=98=9F=EF=BC=8C=E5=8F=82=E7=85=A7=E5=8E=9F=E7=89=88?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |   5 +-
 common/pop_jobs/01_ruler_jobs.txt             |  19 +-
 common/pop_jobs/02_specialist_jobs.txt        | 930 +++++++++++-------
 common/pop_jobs/ethic_rebuild_jobs.txt        |   2 +-
 .../ethic_scripted_variables.txt              |  17 +
 .../english/ethic_civics_l_english.yml        |   2 +-
 .../ethic_civics_l_simp_chinese.yml           |   2 +-
 .../ethic_jobs_l_simp_chinese.yml             |   2 +-
 8 files changed, 618 insertions(+), 361 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 881b90d0d..8681eb455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,4 +7,7 @@
 * 所有职业的非全国的贸易额产出改为加算
 * 职员基础舒适度产出改为1
 * 自由主义国家也能使用上山下乡法令
-* 统治者职业数值调整，基础消费品维护费改为2，参照原版文件进行调整
\ No newline at end of file
+* 统治者职业：数值调整，基础消费品维护费改为2，参照原版文件的调整
+* 专家职业：数值调整，基础消费品维护费改为1，执法者生成2防御部队，参照原版文件的调整
+* 工人职业：数值调整，参照原版文件进行调整 *
+* 其他职业：数值调整，参照原版文件进行调整 *
\ No newline at end of file
diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index c11fa805d..86af1ada0 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -71,7 +71,7 @@ head_researcher = {
 			unity = 3
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 		upkeep = {
 			trigger = {
@@ -335,7 +335,7 @@ high_priest = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
 	
@@ -454,7 +454,7 @@ politician = {
 			unity = 4
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
 	country_modifier = {
@@ -592,7 +592,7 @@ noble = {
 			unity = 4
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
 	
@@ -703,7 +703,7 @@ executive = {
 			unity = 2
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
 	
@@ -854,7 +854,7 @@ knight_commander = {
 		}
 		upkeep = {
 			alloys = 1
-			consumer_goods = 1
+			consumer_goods = @ruler_job_consumer_goods_upkeep_half
 		}
 	}
 
@@ -893,16 +893,13 @@ knight_commander = {
 
 	weight = {
 		weight = @high_prio_specialist_job_weight
-		modifier = { # 可控的动态权重
+		modifier = {
 			mult = value:job_weights_modifier|JOB|executive|RESOURCE|unity|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
 			mult = value:job_weights_research_modifier|JOB|researcher|
-			owner = { 
-				has_country_flag = toxoids_7011_b
-				has_edict = dynamic_weight
-			}
+			owner = { has_country_flag = toxoids_7011_b has_edict = dynamic_weight }
 		}
 	}
 }
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 91d892f38..281faa2cc 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -27,7 +27,7 @@ merchant = {
 	resources = {
 		category = planet_merchants
 		produces = {
-			trigger = {		
+			trigger = {
 				exists = owner
 				owner = {
 					has_civic = civic_corporate_dominion
@@ -36,7 +36,7 @@ merchant = {
 			unity = 1
 		}
 		produces = {
-			trigger = {		
+			trigger = {
 				exists = owner
 				owner = {
 					has_tradition = tr_mercantile_marketplace_of_better_ideas
@@ -73,25 +73,29 @@ merchant = {
 			consumer_goods = 1
 		}
 		upkeep = {
-			consumer_goods = 0.5
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 	}
 
 	planet_modifier = {
 		job_clerk_add = 1
-		trade_value_add = 6
 	}
 
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		trade_value_add = 6
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
 	triggered_planet_modifier = {
 		potential = { always = yes }
 		planet_amenities_add = 2
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
-	
+
 	triggered_pop_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_policy_flag = market_operation
 			}
 		}
@@ -102,7 +106,7 @@ merchant = {
 	triggered_pop_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_valid_civic = civic_triple_the_profit
 			}
 		}
@@ -111,7 +115,7 @@ merchant = {
 		}
 	}
 	triggered_planet_modifier = {
-		potential = { 
+		potential = {
 			exists = owner
 			owner = { has_valid_civic = civic_internet_market }
 		}
@@ -122,18 +126,17 @@ merchant = {
 	}
 	triggered_planet_modifier = {
 		potential = {
-				exists = owner
-				owner = { has_valid_civic = civic_internet_market }
+			exists = owner
+			owner = { has_valid_civic = civic_internet_market }
 		}
 		modifier = {
-			trade_value_add = 1
 			planet_crime_add = 1
 		}
 	}
 	triggered_planet_modifier = {
 		potential = {
-				exists = owner
-				owner = { has_tradition = tr_mercantile_marketplace_of_better_ideas }
+			exists = owner
+			owner = { has_tradition = tr_mercantile_marketplace_of_better_ideas }
 		}
 		modifier = {
 			pop_lifestyle_trade_mult = 0.02
@@ -142,15 +145,20 @@ merchant = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
 			exists = owner
-				owner = { has_edict = dynamic_weight }
+			owner = { has_edict = dynamic_weight }
 		}
 		modifier = { #限制条件的sv mult
-			factOR = 10
+			factor = 10
 			exists = owner
-				owner = {
+			owner = {
 				OR = {
 					is_capitalism = yes
 					has_tradition = tr_mercantile_marketplace_of_better_ideas
@@ -159,17 +167,17 @@ merchant = {
 			}
 		}
 		modifier = {
-			factOR = 10
+			factor = 10
 			exists = owner
-				owner = { is_capitalism = yes }
+			owner = { is_capitalism = yes }
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = merchant
 		}
 		# crisis purge
 		modifier = {
-			factOR = 0.01
+			factor = 0.01
 			exists = planet
 			exists = planet.controller
 			planet.controller = {
@@ -213,7 +221,7 @@ soldier = {
 		category = planet_soldiers
 		produces = {
 			trigger = {
-				is_lithoid = no		
+				is_lithoid = no
 				exists = owner
 				owner = {
 					has_valid_civic = civic_army_production
@@ -225,7 +233,7 @@ soldier = {
 		}
 		produces = {
 			trigger = {
-				is_lithoid = yes		
+				is_lithoid = yes
 				exists = owner
 				owner = {
 					has_valid_civic = civic_army_production
@@ -268,7 +276,7 @@ soldier = {
 			engineering_research = 1.5
 		}
 		produces = {
-			trigger = {		
+			trigger = {
 				exists = owner
 				owner = {
 					OR = {
@@ -300,7 +308,7 @@ soldier = {
 		}
 
 		upkeep = {
-			consumer_goods = 0.5
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 	}
 	country_modifier = {
@@ -349,97 +357,97 @@ soldier = {
 	weight = {
 		weight = @soldier_job_weight
 		modifier = {
-			factOR = 10
+			factor = 10
 			exists = planet
 			planet = { has_modifier = martial_law }
 		}
 		modifier = {
-			factOR = 10		
+			factor = 10
 			exists = owner
 			owner = { is_militarist = yes }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_resilient
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_very_strong
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_trait = trait_strong
 		}
 		modifier = {
-			factOR = 0.5
+			factor = 0.5
 			has_trait = trait_weak
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			is_enslaved = yes
 			NOT = { has_slavery_type = { type = slavery_military } }
 		}
 		modifier = {
-			factOR = 10
+			factor = 10
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_military }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_cybernetic
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_presapient_earthbound
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_limited_regeneration
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_presapient_proles
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_brainslug
 		}
 		modifier = {
-			factOR = 1.05
+			factor = 1.05
 			has_trait = trait_presapient_natural_intellectuals
 		}
 		modifier = {
-			factOR = 1.05
+			factor = 1.05
 			OR = {
 				has_trait = trait_robust
 				has_trait = trait_robot_efficient_processors
 			}
 		}
 		modifier = {
-			factOR = 1.05
+			factor = 1.05
 			has_trait = trait_nerve_stapled
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			OR = {
 				has_trait = trait_robot_propaganda_machines
 				has_trait = trait_traditional
 			}
 		}
 		modifier = {
-			factOR = 0.9
+			factor = 0.9
 			has_trait = trait_quarrelsome
 		}
 		modifier = {
-			factOR = 0
+			factor = 0
 			species = { can_be_soldier = no }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_lithoid
 		}
 	}
@@ -451,7 +459,7 @@ researcher = {
 	condition_string = SPECIALIST_JOB_TRIGGER
 	building_icon = building_research_lab_1
 	clothes_texture_index = 3
-	
+
 	possible_pre_triggers = {
 		has_owner = yes
 		is_being_purged = no
@@ -518,7 +526,15 @@ researcher = {
 			engineering_research = 1.5
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @specialist_job_consumer_goods_upkeep_scientist
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_science_ministry
+				}
+			}
+			consumer_goods = 1
 		}
 		upkeep = {
 			trigger = {
@@ -557,7 +573,7 @@ researcher = {
 	triggered_pop_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_valid_civic = civic_science_knight
 			}
 		}
@@ -568,7 +584,7 @@ researcher = {
 	triggered_pop_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_edict = commercializing_academic_resources
 			}
 		}
@@ -579,7 +595,7 @@ researcher = {
 	triggered_pop_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_edict = academic_resources_open_access
 			}
 		}
@@ -590,7 +606,7 @@ researcher = {
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				NOR = {
 					has_valid_civic = civic_knowledge_seeker
 					has_policy_flag = dogma_bottom_line
@@ -604,7 +620,7 @@ researcher = {
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				OR = {
 					has_valid_civic = civic_technocracy
 					has_valid_civic = civic_cyber_demos_cratos
@@ -620,7 +636,7 @@ researcher = {
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				OR = {
 					has_valid_civic = civic_industrial_automatation
 					has_valid_civic = civic_industrial_automatation_corporate
@@ -635,7 +651,7 @@ researcher = {
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_edict = commercializing_academic_resources
 			}
 		}
@@ -647,7 +663,7 @@ researcher = {
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				OR = {
 					has_valid_civic = civic_futuristic_art
 				}
@@ -661,37 +677,51 @@ researcher = {
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-				owner = { has_valid_civic = civic_science_knight }
+			owner = { has_valid_civic = civic_science_knight }
 		}
 		job_squire_add = 2
 	}
-
+	
+	overlord_resources = {
+		category = planet_requisitioned_research
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_science_ministry
+				}
+			}
+			physics_research = 2
+			engineering_research = 2
+			society_research = 2
+		}
+	}
+	
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_research_modifier|JOB|researcher|
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|researcher|
 			exists = owner
-				owner = { has_edict = dynamic_weight }
+			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_living_standard = { type = living_standard_academic_privilege }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = researcher
 		}
 		modifier = {
-			factOR = 0.8
+			factor = 0.8
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
@@ -794,7 +824,7 @@ priest = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @specialist_job_consumer_goods_upkeep_priest
 		}
 		produces = {
 			trigger = {
@@ -810,10 +840,16 @@ priest = {
 			sr_zro = 0.1
 		}
 	}
+
 	triggered_planet_modifier = {
-		potential = {			
+		potential = { always = yes }
+		planet_amenities_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_valid_civic = civic_exalted_priesthood
 			}
 		}
@@ -828,16 +864,11 @@ priest = {
 		}
 		planet_priests_upkeep_mult = 0.01
 	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 3
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
 	
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				NOT = { has_valid_civic = civic_knowledge_seeker }
 			}
 		}
@@ -857,124 +888,129 @@ priest = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|priest|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|priest|RESOURCE|unity|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			exists = owner
-				owner = { has_edict = dynamic_weight }
+			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 2			
+			factor = 2
 			exists = owner
-				owner = { has_civic = civic_exalted_priesthood }
+			owner = { has_civic = civic_exalted_priesthood }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			OR = {
 				has_trait = trait_robot_domestic_protocols
 				has_trait = trait_charismatic
 			}
 		}
 		modifier = {
-			factOR = 0.5
+			factor = 0.5
 			has_trait = trait_repugnant
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			OR = {
 				has_trait = trait_robot_propaganda_machines
 				has_trait = trait_traditional
 			}
 		}
 		modifier = {
-			factOR = 1.2
+			factor = 1.2
 			has_ethic = ethic_spiritualist
 		}
 		modifier = {
-			factOR = 0.5
+			factor = 0.5
 			has_trait = trait_quarrelsome
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_natural_sociologists
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			has_ethic = ethic_materialist
 			NOT = { has_job = priest }
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = priest
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_trait = trait_brainslug
 		}
 		modifier = {
-			factOR = 1.3
+			factor = 1.3
 			has_trait = trait_presapient_natural_intellectuals
 		}
 		modifier = {
-			factOR = 1.3
+			factor = 1.3
 			OR = {
 				has_trait = trait_robust
 				has_trait = trait_robot_efficient_processors
 			}
 		}
 		modifier = {
-			factOR = 1.05
+			factor = 1.05
 			OR = {
 				has_trait = trait_robot_logic_engines
 				has_trait = trait_intelligent
 			}
 		}
 		modifier = {
-			factOR = 0.9
+			factor = 0.9
 			has_trait = trait_presapient_proles
 		}
 		modifier = {
-			factOR = 1.05
+			factor = 1.05
 			has_trait = trait_psionic
 		}
 		modifier = {
-			factOR = 0.7
+			factor = 0.7
 			has_trait = trait_enigmatic_intelligence_failed
 		}
 		modifier = {
-			factOR = 1.05
+			factor = 1.05
 			OR = {
 				has_trait = trait_enigmatic_intelligence
 				has_trait = trait_enigmatic_intelligence_poor
 			}
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_trait = trait_void_dweller_1
 			exists = planet
 			planet = { is_planet_class = pc_habitat }
 		}
 		modifier = {
-			factOR = 0.85
+			factor = 0.85
 			has_trait = trait_void_dweller_1
 			exists = planet
 			planet = { is_artificial = no }
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_trait = trait_necrophage
 		}
 	}
@@ -1003,8 +1039,15 @@ death_priest = {
 			unity = 4
 			society_research = 2
 		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = { has_sacrificial_edict = yes }
+			}
+			unity = 2
+		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @specialist_job_consumer_goods_upkeep_priest
 		}
 		produces = {
 			trigger = {
@@ -1018,46 +1061,51 @@ death_priest = {
 	}
 	triggered_planet_modifier = {
 		potential = { always = yes }
-		planet_amenities_add = 5
+		planet_amenities_add = 3
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|death_priest|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|death_priest|RESOURCE1|unity|WEIGHT1|0.75|RESOURCE2|society_research|WEIGHT2|0.25|
 			exists = owner
-				owner = { has_edict = dynamic_weight }
+			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 2			
+			factor = 2
 			exists = owner
 			owner = { has_civic = civic_exalted_priesthood }
 		}
 		modifier = {
-			factOR = 1.2
+			factor = 1.2
 			has_ethic = ethic_spiritualist
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			has_ethic = ethic_materialist
 			NOT = { has_job = death_priest }
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = death_priest
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
@@ -1090,9 +1138,6 @@ enforcer = {
 		produces = {
 			unity = 1
 		}
-		upkeep = {
-			consumer_goods = 0.5
-		}
 		produces = {
 			trigger = {
 				exists = owner
@@ -1131,7 +1176,7 @@ enforcer = {
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_active_tradition = tr_domination_judgment_corps
 			}
 		}
@@ -1166,7 +1211,7 @@ enforcer = {
 		weight = @specialist_job_weight
 
 		modifier = {
-			factOR = 10
+			factor = 10
 			OR = {
 				has_ethic = ethic_militarist
 				has_ethic = ethic_fanatic_militarist
@@ -1174,81 +1219,86 @@ enforcer = {
 		}
 
 		modifier = {
-			factOR = 10
+			mult = value:job_weights_modifier|JOB|enforcer|RESOURCE|unity|FACTOR|0.25|
+			owner = { has_active_tradition = tr_domination_judgment_corps }
+		}
+
+		modifier = {
+			factor = 10
 			has_job = enforcer
 		}
 		modifier = {
-			factOR = 10
-			planet = { planet_crime > 15}
+			factor = 10
+			planet = { planet_crime > 15 }
 			NOT = { has_job = enforcer }
 		}
 		modifier = {
-			factOR = 0.01
-			planet = { planet_crime <= 15}
+			factor = 0.01
+			planet = { planet_crime <= 15 }
 			NOT = { has_job = enforcer }
 		}
 
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_resilient
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_very_strong
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_trait = trait_strong
 		}
 		modifier = {
-			factOR = 10
+			factor = 10
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_military }
 		}
 		modifier = {
-			factOR = 0.50
+			factor = 0.50
 			has_trait = trait_weak
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_cybernetic
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_presapient_earthbound
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_limited_regeneration
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_presapient_proles
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_brainslug
-			
+
 			exists = owner
-				owner = { has_valid_civic = civic_police_state }
+			owner = { has_valid_civic = civic_police_state }
 		}
 		modifier = {
-			factOR = 1.05
+			factor = 1.05
 			has_trait = trait_presapient_natural_intellectuals
 			exists = owner
 			owner = { has_valid_civic = civic_police_state }
 		}
 		modifier = {
-			factOR = 20
+			factor = 20
 			has_job = enforcer
 			OR = {
 				has_trait = trait_robust
@@ -1256,7 +1306,7 @@ enforcer = {
 			}
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			OR = {
 				has_trait = trait_robot_propaganda_machines
 				has_trait = trait_traditional
@@ -1265,28 +1315,28 @@ enforcer = {
 			owner = { has_valid_civic = civic_police_state }
 		}
 		modifier = {
-			factOR = 0.9
+			factor = 0.9
 			has_trait = trait_quarrelsome
 		}
 		modifier = {
-			factOR = 0.8
+			factor = 0.8
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_trait = trait_void_dweller_1
 			exists = planet
 			planet = { is_planet_class = pc_habitat }
 		}
 		modifier = {
-			factOR = 0.85
+			factor = 0.85
 			has_trait = trait_void_dweller_1
 			exists = planet
 			planet = { is_artificial = no }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_lithoid
 		}
 	}
@@ -1327,9 +1377,33 @@ telepath = {
 			}
 			unity = 1
 		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = { has_active_tradition = tr_domination_judgment_corps }
+			}
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = { has_country_flag = whisperers_covenant_confirmed }
+			}
+			physics_research = 3
+			engineering_research = 3
+			society_research = 3
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = { has_country_flag = whisperers_covenant_rank_1 }
+			}
+			physics_research = 3
+			engineering_research = 3
+			society_research = 3
+		}
 		upkeep = {
 			energy = 1
-			consumer_goods = 0.5
 		}
 		upkeep = {
 			trigger = {
@@ -1342,7 +1416,7 @@ telepath = {
 		}
 	}
 	planet_modifier = {
-		planet_crime_add = -35
+		planet_crime_add = -30
 		planet_jobs_produces_mult = 0.05
 		species_empire_size_mult = -0.1
 	}
@@ -1370,42 +1444,79 @@ telepath = {
 		}
 	}
 	triggered_planet_modifier = {
-		potential = {	
+		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_edict = thought_enforcement
 			}
 		}
 		modifier = {
-			planet_crime_add = -5
+			planet_crime_add = -10
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_country_flag = composer_covenant_confirmed }
+		}
+		modifier = {
+			pop_growth_speed = 0.02
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_country_flag = composer_covenant_rank_1 }
+		}
+		modifier = {
+			pop_growth_speed = 0.03
+		}
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_country_flag = eater_covenant_confirmed }
 		}
+		country_naval_cap_add = 5
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_country_flag = eater_covenant_rank_1 }
+		}
+		country_naval_cap_add = 7
 	}
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|telepath|RESOURCE|unity|
+		mult = 2
+		modifier = {
+			mult = value:job_weights_modifier|JOB|telepath|RESOURCE|unity|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_resilient
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = telepath
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
@@ -1428,10 +1539,14 @@ entertainer = {
 	possible = {
 		OR = {
 			entertainer_job_check_trigger = yes
-			exists = owner
-			owner = { has_valid_civic = civic_triple_the_profit }
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
+			AND = {
+				exists = owner
+				owner = { has_valid_civic = civic_triple_the_profit }
+			}
+			AND = {
+				exists = owner
+				owner = { has_valid_civic = civic_du_contrat_social }
+			}
 		}
 	}
 
@@ -1470,7 +1585,7 @@ entertainer = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 	}
 	triggered_planet_modifier = {
@@ -1478,6 +1593,17 @@ entertainer = {
 		planet_amenities_add = 10
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { is_pleasure_seeker = yes }
+		}
+		modifier = {
+			pop_growth_speed = 0.01
+		}
+	}
+	
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1504,23 +1630,28 @@ entertainer = {
 
 	weight = {
 		weight = @high_prio_specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|entertainer|RESOURCE|unity|FACTOR|0.25|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
-		modifier = { # 可控的动态权重
-			factOR = 100
+		modifier = {
+			factor = 100
 			exists = owner
 			owner = { has_valid_civic = civic_eternal_jihad }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 3
+			factor = 3
 			has_trait = trait_robot_domestic_protocols
 			OR = {
 				is_non_sapient_robot = yes
@@ -1528,15 +1659,15 @@ entertainer = {
 			}
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = entertainer
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			is_domestic_servant = yes
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			NOT = { has_job = entertainer }
 			exists = planet
 			planet = {
@@ -1544,7 +1675,7 @@ entertainer = {
 			}
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			NOT = { has_job = entertainer }
 			exists = planet
 			planet = {
@@ -1571,8 +1702,10 @@ duelist = {
 	possible = {
 		OR = {
 			battle_thrall_job_check_trigger = yes
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
+			AND = {
+				exists = owner
+				owner = { has_valid_civic = civic_du_contrat_social }
+			}
 		}
 	}
 
@@ -1582,12 +1715,12 @@ duelist = {
 			unity = 3
 		}
 		upkeep = {
-			alloys = 0.5
+			alloys = 1
 		}
 	}
 	triggered_planet_modifier = {
 		potential = { always = yes }
-		planet_amenities_add = 12
+		planet_amenities_add = 10
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 	country_modifier = {
@@ -1596,36 +1729,41 @@ duelist = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|duelist|RESOURCE|unity|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.1
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.1
 			has_ethic = ethic_pacifist
 			NOT = { has_job = duelist }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 10
+			factor = 10
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_military }
 		}
 		modifier = {
-			factOR = 1.20
+			factor = 1.20
 			has_ethic = ethic_militarist
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = duelist
 		}
 		modifier = {
-			factOR = 0.5
+			factor = 0.5
 			NOT = { has_job = duelist }
 			exists = planet
 			planet = {
@@ -1657,14 +1795,15 @@ culture_worker = {
 			unity = 4
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @specialist_job_consumer_goods_upkeep_culture_worker
 		}
 	}
 
 	planet_modifier = {
-		POP_GOVERNMENT_ETHIC_ATTRACTION = 0.1
+		pop_government_ethic_attraction = 0.1
 	}
 
+	#region inline_script:jobs/culture_worker_outputs
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1676,7 +1815,6 @@ culture_worker = {
 			planet_stability_add = 2.5
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1695,7 +1833,6 @@ culture_worker = {
 			pop_category_rulers_consumer_goods_upkeep_add = -0.25
 		}
 	}
-
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
@@ -1714,7 +1851,6 @@ culture_worker = {
 			pop_cat_worker_happiness = 0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1726,7 +1862,6 @@ culture_worker = {
 			pop_citizen_happiness = 0.025
 		}
 	}
-
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
@@ -1738,7 +1873,6 @@ culture_worker = {
 			add_base_country_intel = 1
 		}
 	}
-
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
@@ -1750,7 +1884,6 @@ culture_worker = {
 			country_naval_cap_add = 1
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1762,7 +1895,6 @@ culture_worker = {
 			pop_growth_speed_reduction = -0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1774,7 +1906,6 @@ culture_worker = {
 			planet_pops_upkeep_mult = -0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1786,7 +1917,6 @@ culture_worker = {
 			pop_amenities_usage_mult = -0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1798,7 +1928,6 @@ culture_worker = {
 			pop_lifestyle_trade_mult = 0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1810,7 +1939,6 @@ culture_worker = {
 			pop_cat_worker_political_power = 0.25
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1823,25 +1951,32 @@ culture_worker = {
 		}
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
+	#endregion
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|culture_worker|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|culture_worker|RESOURCE|unity|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = { has_valid_civic = civic_art_country has_edict = dynamic_weight }
+		}
+		# We deliberately don't weight the ethics-based modifiers
+		modifier = {
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = culture_worker
 		}
 	}
@@ -1866,7 +2001,7 @@ bureaucrat = {
 	resources = {
 		category = planet_bureaucrats
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @specialist_job_consumer_goods_upkeep_bureaucrat
 		}
 		upkeep = {
 			trigger = {
@@ -1881,10 +2016,13 @@ bureaucrat = {
 			consumer_goods = 1
 		}
 	}
-
 	country_modifier = {
 		country_admin_cap_add = 10
 	}
+	planet_modifier = {
+		planet_amenities_add = -2
+		planet_bureaucrats_upkeep_mult = 0.01
+	}
 
 	triggered_country_modifier = {
 		potential = {
@@ -1898,7 +2036,6 @@ bureaucrat = {
 		}
 		country_admin_cap_add = 10
 	}
-
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
@@ -1911,11 +2048,6 @@ bureaucrat = {
 		}
 		country_admin_cap_add = -5
 	}
-
-	planet_modifier = {
-		planet_amenities_add = -2
-		planet_bureaucrats_upkeep_mult = 0.01
-	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1946,16 +2078,16 @@ bureaucrat = {
 	weight = {
 		weight = @specialist_job_weight
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = bureaucrat
 		}
 	}
@@ -1989,22 +2121,22 @@ chemist = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|chemist|RESOURCE|volatile_motes|
+		modifier = {
+			factor = value:job_weights_modifier|JOB|chemist|RESOURCE|volatile_motes|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 7
+			factor = 7
 			has_job = chemist
 		}
 	}
@@ -2038,26 +2170,26 @@ translucer = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|translucer|RESOURCE|rare_crystals|
+		modifier = {
+			factor = value:job_weights_modifier|JOB|translucer|RESOURCE|rare_crystals|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 7
+			factor = 7
 			has_job = translucer
 		}
 		modifier = {
-			factOR = 1.2
+			factor = 1.2
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
@@ -2092,26 +2224,26 @@ gas_refiner = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|gas_refiner|RESOURCE|exotic_gases|
+		modifier = {
+			factor = value:job_weights_modifier|JOB|gas_refiner|RESOURCE|exotic_gases|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 7
+			factor = 7
 			has_job = gas_refiner
 		}
 		modifier = {
-			factOR = 1.2
+			factor = 1.2
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
@@ -2131,23 +2263,47 @@ roboticist = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_specialist_job
-
-	planet_modifier = {
-		planet_pop_assembly_add = 2
-	}
-
+	
 	resources = {
 		category = planet_pop_assemblers
 		upkeep = {
-			minerals = 6
-			consumer_goods = 0.5
+			alloys = 2
+			consumer_goods = @specialist_job_consumer_goods_upkeep_assembly
 		}
 	}
 
+	triggered_planet_modifier = {
+		potential = {
+			OR = {
+				AND = {
+					exists = owner
+					owner = {
+						NOT = { has_policy_flag = roboticist_output_build_cyborgs }
+					}
+				}
+				NOT = { exists = owner }
+			}
+		}
+		planet_pop_assembly_add = 2
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = roboticist_output_build_cyborgs
+			}
+			can_assemble_cyborg_pop = yes
+		}
+		planet_pop_assembly_organic_add = 2.25
+	}
+	
 	weight = {
 		weight = 500
+		modifier = {
+			factor = 10
+			owner = { is_synthetic_empire = yes }
+		}
 	}
 }
 
@@ -2187,7 +2343,7 @@ healthcare = {
 			society_research = 1.5
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 		upkeep = {
 			trigger = {
@@ -2210,17 +2366,18 @@ healthcare = {
 			consumer_goods = 0.5
 		}
 	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 5
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
+
 	planet_modifier = {
 		pop_growth_speed_reduction = -0.05
 		planet_pop_assembly_organic_mult = 0.05
 		pop_environment_tolerance = 0.025
 	}
-
+	
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2244,7 +2401,6 @@ healthcare = {
 			pop_growth_speed = -0.05
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2263,31 +2419,31 @@ healthcare = {
 
 	weight = {
 		weight = @high_prio_specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = healthcare
 		}
 		modifier = {
-			factOR = 0.5
+			factor = 0.5
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
 		modifier = {
-			factOR = 10
+			factor = 10
 			NOT = { has_job = healthcare }
 			planet = {
 				free_amenities < 0
@@ -2325,7 +2481,10 @@ manager = {
 			unity = 3
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @specialist_job_consumer_goods_upkeep_bureaucrat
+		}
+		upkeep = {
+			society_research = 2
 		}
 		upkeep = {
 			trigger = {
@@ -2356,20 +2515,20 @@ manager = {
 	weight = {
 		weight = @specialist_job_weight
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = manager
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
@@ -2404,7 +2563,7 @@ necromancer = {
 			society_research = 6
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 	}
 	country_modifier = {
@@ -2443,50 +2602,50 @@ necromancer = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_resources_modifier|JOB|necromancer|RESOURCE1|physics_research|WEIGHT1|0.5|RESOURCE2|society_research|WEIGHT2|0.5|
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|necromancer|RESOURCE1|physics_research|WEIGHT1|0.5|RESOURCE2|society_research|WEIGHT2|0.5|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 10
+			factor = 10
 			exists = planet
 			planet = { has_modifier = martial_law }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_resilient
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_very_strong
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_trait = trait_strong
 		}
 		modifier = {
-			factOR = 0.5
+			factor = 0.5
 			has_trait = trait_weak
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_cybernetic
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_presapient_earthbound
 		}
 		modifier = {
-			factOR = 1.1
+			factor = 1.1
 			has_trait = trait_limited_regeneration
 		}
 		modifier = {
-			factOR = 0
+			factor = 0
 			species = { can_be_soldier = no }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			has_trait = trait_lithoid
 		}
 	}
@@ -2516,9 +2675,8 @@ bluelotus_technician = {
 
 		upkeep = {
 			trigger = {
-				is_organic_species = yes
+				has_food_upkeep = yes
 				is_phototrophic = no
-				is_lithoid = no
 			}
 			food = @living_standard_food_normal
 		}
@@ -2530,46 +2688,55 @@ bluelotus_technician = {
 		}
 		upkeep = {
 			trigger = {
+				has_food_upkeep = yes
 				is_phototrophic = yes
 			}
 			food = @living_standard_phototrophic_normal
 		}
 		upkeep = {
 			trigger = {
-				is_lithoid = yes
+				has_mineral_upkeep = yes
+				is_phototrophic = no
 			}
 			minerals = @living_standard_food_normal
 		}
 		upkeep = {
 			trigger = {
-				is_robotic_species = yes
+				has_mineral_upkeep = yes
+				is_phototrophic = yes
+			}
+			minerals = @living_standard_phototrophic_normal
+		}
+		upkeep = {
+			trigger = {
+				is_robotic_or_voidspawn_species = yes
 			}
 			energy = @living_standard_energy_normal
 		}
 	}
-	
+
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|bluelotus_technician|RESOURCE|alloys|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|bluelotus_technician|RESOURCE|alloys|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 			NOT = { has_trait = trait_mechanical }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = bluelotus_technician
 		}
 		modifier = {
-			factOR = 1.2
+			factor = 1.2
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
@@ -2591,7 +2758,7 @@ death_chronicler = {
 	}
 	possible_precalc = can_fill_specialist_job
 	possible = { complex_specialist_job_check_trigger = yes }
-	
+
 	resources = {
 		category = planet_culture_workers
 		produces = {
@@ -2599,13 +2766,14 @@ death_chronicler = {
 			society_research = 2
 		}
 		upkeep = {
-			consumer_goods = 0.5
+			consumer_goods = @specialist_job_consumer_goods_upkeep_culture_worker
 		}
 	}
 	planet_modifier = {
 		planet_stability_add = 2.5
 	}
 
+	#region inline_script:jobs/culture_worker_outputs
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2617,7 +2785,6 @@ death_chronicler = {
 			planet_stability_add = 2.5
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2636,7 +2803,6 @@ death_chronicler = {
 			pop_category_rulers_consumer_goods_upkeep_add = -0.25
 		}
 	}
-
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
@@ -2655,7 +2821,6 @@ death_chronicler = {
 			pop_cat_worker_happiness = 0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2667,7 +2832,6 @@ death_chronicler = {
 			pop_citizen_happiness = 0.025
 		}
 	}
-
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
@@ -2679,7 +2843,6 @@ death_chronicler = {
 			add_base_country_intel = 1
 		}
 	}
-
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
@@ -2691,7 +2854,6 @@ death_chronicler = {
 			country_naval_cap_add = 1
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2700,10 +2862,9 @@ death_chronicler = {
 			}
 		}
 		modifier = {
-			pop_growth_speed_reduction = 0.025
+			pop_growth_speed_reduction = -0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2715,7 +2876,6 @@ death_chronicler = {
 			planet_pops_upkeep_mult = -0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2727,7 +2887,6 @@ death_chronicler = {
 			pop_amenities_usage_mult = -0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2739,7 +2898,6 @@ death_chronicler = {
 			pop_lifestyle_trade_mult = 0.025
 		}
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -2751,22 +2909,42 @@ death_chronicler = {
 			pop_cat_worker_political_power = 0.25
 		}
 	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_art_country
+			}
+		}
+		modifier = {
+			planet_amenities_add = 5
+		}
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	#endregion
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		mult = 2
+		modifier = {
+			mult = value:job_weights_modifier|JOB|death_chronicler|RESOURCE|unity|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
+		mult = value:job_weights_modifier|JOB|death_chronicler|RESOURCE|unity|
+		# We deliberately don't weight the ethics-based modifiers
 		modifier = {
-			factOR = 0.2
+			factor = 0.2
 			has_citizenship_rights = no
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
+		modifier = {
+			factor = 1.5
+			has_job = death_chronicler
+		}
 	}
 }
 
@@ -2782,7 +2960,7 @@ necro_apprentice = {
 	desc = { #Note: planet-scope
 		trigger = {
 			OR = {
-				NOT = { exists = owner }		
+				NOT = { exists = owner }
 				owner = { is_hive_empire = no }
 			}
 		}
@@ -2823,13 +3001,12 @@ necro_apprentice = {
 				exists = owner
 				owner = { is_hive_empire = no }
 			}
-			consumer_goods = 0.5
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 		upkeep = {
 			trigger = {
-				is_organic_species = yes
+				has_food_upkeep = yes
 				is_phototrophic = no
-				is_lithoid = no
 			}
 			food = @living_standard_food_normal
 		}
@@ -2837,9 +3014,8 @@ necro_apprentice = {
 			trigger = {
 				exists = owner
 				owner = { is_hive_empire = yes }
-				is_organic_species = yes
+				has_food_upkeep = yes
 				is_phototrophic = no
-				is_lithoid = no
 			}
 			food = @living_standard_food_normal
 		}
@@ -2851,6 +3027,7 @@ necro_apprentice = {
 		}
 		upkeep = {
 			trigger = {
+				has_food_upkeep = yes
 				is_phototrophic = yes
 			}
 			food = @living_standard_phototrophic_normal
@@ -2867,13 +3044,15 @@ necro_apprentice = {
 			trigger = {
 				exists = owner
 				owner = { is_hive_empire = yes }
+				has_food_upkeep = yes
 				is_phototrophic = yes
 			}
 			food = @living_standard_phototrophic_normal
 		}
 		upkeep = {
 			trigger = {
-				is_lithoid = yes
+				has_mineral_upkeep = yes
+				is_phototrophic = no
 			}
 			minerals = @living_standard_food_normal
 		}
@@ -2881,37 +3060,63 @@ necro_apprentice = {
 			trigger = {
 				exists = owner
 				owner = { is_hive_empire = yes }
-				is_lithoid = yes
+				has_mineral_upkeep = yes
+				is_phototrophic = no
 			}
 			minerals = @living_standard_food_normal
 		}
+		upkeep = {
+			trigger = {
+				has_mineral_upkeep = yes
+				is_phototrophic = yes
+			}
+			minerals = @living_standard_phototrophic_normal
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = { is_hive_empire = yes }
+				has_mineral_upkeep = yes
+				is_phototrophic = yes
+			}
+			minerals = @living_standard_phototrophic_normal
+		}
+		upkeep = {
+			trigger = {
+				is_robotic_or_voidspawn_species = yes
+			}
+			energy = @living_standard_energy_normal
+		}
 	}
 
 	triggered_planet_modifier = {
-		potential = {
-			always = yes
-		}
+		potential = { always = yes }
 		planet_amenities_add = 5
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 
 	weight = {
 		weight = @ruler_job_weight #deliberate
-		modifier = { # 可控的动态权重
-			factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|necro_apprentice|RESOURCE|unity|FACTOR|0.5|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.75
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.75
 			is_enslaved = yes #willing apprentices first, please
 		}
 		modifier = {
-			factOR = 0.75
+			factor = 0.75
 			pop_has_happiness = no
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			exists = owner
 			owner = { is_ai = yes }
 			exists = planet
@@ -2953,7 +3158,7 @@ pearl_diver = {
 	resources = {
 		category = planet_artisans
 		produces = {
-			consumer_goods = 3
+			consumer_goods = 4
 		}
 		produces = {
 			trigger = {
@@ -2973,6 +3178,7 @@ pearl_diver = {
 		}
 		upkeep = {
 			food = 3
+			minerals = 2
 		}
 		produces = {
 			trigger = {
@@ -2999,11 +3205,9 @@ pearl_diver = {
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-				owner = {
+			owner = {
 				has_valid_civic = civic_anglers
-				NOT = {
-					has_ethic = ethic_fanatic_socialism
-				}
+				NOT = { has_ethic = ethic_fanatic_socialism }
 			}
 		}
 		modifier = {
@@ -3012,6 +3216,15 @@ pearl_diver = {
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
 
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	
 	overlord_resources = {
 		category = planet_requisitioned_consumer_goods
 		produces = {
@@ -3028,13 +3241,18 @@ pearl_diver = {
 
 	weight = {
 		weight = @worker_job_weight #deliberate
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|pearl_diver|RESOURCE|consumer_goods|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|pearl_diver|RESOURCE|consumer_goods|FACTOR|0.75|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = { #限制条件的sv mult
-			factOR = 5
+			factor = 5
 			exists = owner
 			owner = {
 				has_valid_civic = civic_anglers
@@ -3044,16 +3262,24 @@ pearl_diver = {
 			}
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 1.1
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		modifier = {
+			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_valid_civic = civic_agrarian_idyll has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			NOT = { has_job = pearl_diver }
 			exists = owner
 			owner = {
@@ -3064,7 +3290,7 @@ pearl_diver = {
 			}
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = pearl_diver
 		}
 	}
@@ -3092,14 +3318,14 @@ reassigner = {
 			trigger = {
 				is_lithoid = no
 			}
-			consumer_goods = 0.75
+			consumer_goods = @specialist_job_consumer_goods_upkeep_assembly
 			food = 2
 		}
 		upkeep = {
 			trigger = {
 				is_lithoid = yes
 			}
-			consumer_goods = 0.75
+			consumer_goods = @specialist_job_consumer_goods_upkeep_assembly
 			minerals = 2
 		}
 	}
@@ -3154,21 +3380,29 @@ bath_attendant = {
 	resources = {
 		category = planet_bath_attendants
 		upkeep = {
-			consumer_goods = 0.5
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 	}
 
 	weight = {
 		weight = @specialist_job_weight
-		mult = value:job_weights_multiple_resources_modifier|JOB|artificer|RESOURCE1|consumer_goods|WEIGHT1|0.8|RESOURCE2|engineering_research|WEIGHT2|0.2|
-		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
 		modifier = {
-			factOR = 2
+			mult = value:job_weights_multiple_resources_modifier|JOB|artificer|RESOURCE1|consumer_goods|WEIGHT1|0.8|RESOURCE2|engineering_research|WEIGHT2|0.2|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 2
 			is_enslaved = yes
 			can_take_servant_job = no
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = bath_attendant
 		}
 	}
@@ -3204,17 +3438,24 @@ knight = {
 			mult = value:knights_unity_output_modifier
 		}
 		produces = {
-			trigger = { exists = owner }
+			trigger = {
+				exists = owner
+				owner = { has_origin = origin_toxic_knights }
+			}
 			physics_research = 2
 			engineering_research = 2
 			society_research = 2
 			mult = value:knights_research_output_modifier
 		}
 		upkeep = {
-			alloys = 0.5
+			alloys = 1
 		}
 	}
 
+	planet_modifier = {
+		job_squire_add = 2
+	}
+
 	triggered_pop_modifier = {
 		potential = {
 			always = yes
@@ -3240,25 +3481,24 @@ knight = {
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
-			owner = { has_country_flag = toxoids_7165_a }
+			owner = { 
+				has_country_flag = toxoids_7165_a
+				has_modifier = alloy_producing_knights
+			}
 		}
 		country_alloys_produces_mult = 0.015
 	}
 
-	planet_modifier = {
-		job_squire_add = 2
-	}
-
 	weight = {
 		weight = @high_prio_specialist_job_weight
-		factOR = 1.2
+		factor = 1.2
 		modifier = {
 			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
-			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
 			mult = value:job_weights_research_modifier|JOB|researcher|
+			owner = { has_country_flag = toxoids_7011_b has_edict = dynamic_weight }
 		}
 	}
 }
diff --git a/common/pop_jobs/ethic_rebuild_jobs.txt b/common/pop_jobs/ethic_rebuild_jobs.txt
index 5327a29e4..884c1b4d0 100644
--- a/common/pop_jobs/ethic_rebuild_jobs.txt
+++ b/common/pop_jobs/ethic_rebuild_jobs.txt
@@ -3638,7 +3638,7 @@ death_knight = {
 			owner = { has_valid_civic = civic_reanimated_armies }
 		}
 		modifier = {
-			pop_defense_armies_add = 3
+			pop_defense_armies_add = 2
 		}
 	}
 
diff --git a/common/scripted_variables/ethic_scripted_variables.txt b/common/scripted_variables/ethic_scripted_variables.txt
index bf9ca7750..d7e6d9be4 100644
--- a/common/scripted_variables/ethic_scripted_variables.txt
+++ b/common/scripted_variables/ethic_scripted_variables.txt
@@ -1,2 +1,19 @@
+### JOB UPKEEPS
+
+@ruler_job_consumer_goods_upkeep_base = 2
+@ruler_job_consumer_goods_upkeep_half = 1
+
+@specialist_job_consumer_goods_upkeep_base = 0
+@ruler_job_consumer_goods_upkeep_half = 0.5
+@specialist_job_consumer_goods_upkeep = 1
+@specialist_job_consumer_goods_upkeep_scientist = 2
+@specialist_job_consumer_goods_upkeep_culture_worker = 2
+@specialist_job_consumer_goods_upkeep_priest = 2
+@specialist_job_consumer_goods_upkeep_bureaucrat = 1
+@specialist_job_consumer_goods_upkeep_assembly = 0.5
+
+@worker_job_consumer_goods_upkeep_base = 0
+
+### OTEHRS
 
 @living_standard_luxuries_shared_burden = 0.7
\ No newline at end of file
diff --git a/localisation/replace/english/ethic_civics_l_english.yml b/localisation/replace/english/ethic_civics_l_english.yml
index fc88800aa..e14ff0c40 100644
--- a/localisation/replace/english/ethic_civics_l_english.yml
+++ b/localisation/replace/english/ethic_civics_l_english.yml
@@ -248,7 +248,7 @@
  civic_tooltip_futuristic_art_effects:2 "£job_researcher£ $job_researcher_plural$ and £job_head_researcher£ $job_head_researcher_plural$also produce §Y1§! £unity£ Unity and §Y3§! £amenities£ Amenities, and additional consumption of §Y1§! £consumer_goods£ consumer goods\n - §Y$building_galactic_memorial_1$§! and §Y$building_art_club$§! generates additional £physics£ £society£ £engineering£ \n"
  civic_anglers:0 "Anglers"
  civic_anglers_desc:0 "§PNational Culture§!\nAdept at utilizing nature's bounty, this society provides for itself a stable influx of sustenance and economic value."
- civic_tooltip_anglers_effects:1 "On §HOcean Worlds§!, §HAgriculture Districts§! are uncapped.\nOn §YWet§! worlds, £job_farmer£ §Y$job_farmer_plural$§! are replaced by £job_angler£ §Y$job_angler_plural$§! and £job_pearl_diver£ §Y$job_pearl_diver_plural$§!.\n§Y$job_angler_plural$§! produce §Y8§! £food£ §Y$food$§! and §Y0.5§! £trade_value£ §Y$TRADE_VALUE$§!.\n§Y$job_pearl_diver_plural$§! produce §Y3§! £consumer_goods£ §Y$consumer_goods$§! and §Y1§! £trade_value£ §Y$TRADE_VALUE$§!.\nAdds the §H$trait_aquatic$§! trait.\n - Under §YMarket Economy§!, provide §Y-0.1§! $economic_crisis_accumulate$."
+ civic_tooltip_anglers_effects:1 "On §HOcean Worlds§!, §HAgriculture Districts§! are uncapped.\nOn §YWet§! worlds, £job_farmer£ §Y$job_farmer_plural$§! are replaced by £job_angler£ §Y$job_angler_plural$§! and £job_pearl_diver£ §Y$job_pearl_diver_plural$§!.\n§Y$job_angler_plural$§! produce §Y8§! £food£ §Y$food$§! and §Y0.5§! £trade_value£ §Y$TRADE_VALUE$§!.\n§Y$job_pearl_diver_plural$§! produce §Y4§! £consumer_goods£ §Y$consumer_goods$§! and §Y1§! £trade_value£ §Y$TRADE_VALUE$§!.\nAdds the §H$trait_aquatic$§! trait.\n - Under §YMarket Economy§!, provide §Y-0.1§! $economic_crisis_accumulate$."
  civic_anglers_socialism:0 "$civic_anglers$"
  civic_anglers_socialism_desc:0 "$civic_anglers_desc$"
  civic_tooltip_anglers_socialism_effects:1 "On §HOcean Worlds§!, §HAgriculture Districts§! are uncapped.\nOn §YWet§! worlds, £job_farmer£ §Y$job_farmer_plural$§! are replaced by £job_angler£ §Y$job_angler_plural$§! and £job_pearl_diver£ §Y$job_pearl_diver_plural$§!.\n§Y$job_angler_plural$§! produce §Y8§! £food£ §Y$food$§! and §Y2§! £mod_planet_amenities_add£ §Y$PLANET_AMENITIES_TITLE$§!.\n§Y$job_pearl_diver_plural$§! produce §Y3§! £consumer_goods£ §Y$consumer_goods$§! and §Y0.25§! £unity£ §Y$unity$§!.\nAdds the §H$trait_aquatic$§! trait.\n - Under §YMarket Economy§!, provide §Y-0.1§! $economic_crisis_accumulate$."
diff --git a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
index a210f821d..2f09abd2b 100644
--- a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
@@ -318,7 +318,7 @@
  
  civic_anglers:0 "渔夫"
  civic_anglers_desc:0 "§P国民文化§!\n这个社会善于利用大自然的恩惠，为自己提供稳定的生活资料和经济价值。"
- civic_tooltip_anglers_effects:1 "在§H海洋星球§!上，§H农业区划§!没有上限限制。\n在§Y潮湿§!星球上，£job_farmer£ §Y$job_farmer_plural$§!被替换为£job_angler£ §Y$job_angler_plural$§!和£job_pearl_diver£ §Y$job_pearl_diver_plural$§!。\n£job_angler£ §Y$job_angler_plural$§! 生产 §Y8§! £food£ §Y$food$§! 和 §Y0.5§! £trade_value£ §Y$TRADE_VALUE$§!。\n£job_pearl_diver£ §Y$job_pearl_diver_plural$§! 生产 §Y3§! £consumer_goods£ §Y$consumer_goods$§! 和 §Y1§! £trade_value£ §Y$TRADE_VALUE$§!。\n增加 §H$trait_aquatic$§! 特质。\n - §Y市场经济§!下, 提供§Y-0.1§!$economic_crisis_accumulate$。"
+ civic_tooltip_anglers_effects:1 "在§H海洋星球§!上，§H农业区划§!没有上限限制。\n在§Y潮湿§!星球上，£job_farmer£ §Y$job_farmer_plural$§!被替换为£job_angler£ §Y$job_angler_plural$§!和£job_pearl_diver£ §Y$job_pearl_diver_plural$§!。\n£job_angler£ §Y$job_angler_plural$§! 生产 §Y8§! £food£ §Y$food$§! 和 §Y0.5§! £trade_value£ §Y$TRADE_VALUE$§!。\n£job_pearl_diver£ §Y$job_pearl_diver_plural$§! 生产 §Y4§! £consumer_goods£ §Y$consumer_goods$§! 和 §Y1§! £trade_value£ §Y$TRADE_VALUE$§!。\n增加 §H$trait_aquatic$§! 特质。\n - §Y市场经济§!下, 提供§Y-0.1§!$economic_crisis_accumulate$。"
  
  civic_anglers_socialism:0 "$civic_anglers$"
  civic_anglers_socialism_desc:0 "$civic_anglers_desc$"
diff --git a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
index fd087432b..f34c23c57 100644
--- a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
@@ -216,7 +216,7 @@
  job_pearl_diver_plural:0 "深潜者"
  job_pearl_diver_desc:0 "他们享受深潜，并热衷于在无尽汪洋之中寻找旧日人们所遗弃的物件。"
  mod_job_pearl_diver_add:0 "深潜者岗位"
- job_pearl_diver_effect_desc:0 "£job_pearl_diver£ $job_pearl_diver_plural$ 生产 £consumer_goods£ §Y$consumer_goods$§! 和 £trade_value£ §Y$TRADE_VALUE$§!"
+ job_pearl_diver_effect_desc:0 "£job_pearl_diver£ $job_pearl_diver_plural$将$r_food$和$r_minerals$转化为£consumer_goods£ §Y$consumer_goods$§! 和 £trade_value£ §Y$TRADE_VALUE$§!"
  
  job_PR_manager:0 "公关经理"
  job_PR_manager_plural:0 "公关经理"

From f774acc6de5268b2811e1a36ee399cb12d48c8ca Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 17:09:00 +0800
Subject: [PATCH 06/30] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20=E8=81=8C?=
 =?UTF-8?q?=E4=B8=9A=EF=BC=9A=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?`modifier=20=3D=20{...}`=E5=AD=90=E5=8F=A5=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96`scripted=5Ftrigger`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  15 +-
 common/pop_jobs/01_ruler_jobs.txt             | 195 ++++++++----------
 common/pop_jobs/02_specialist_jobs.txt        |  43 +---
 .../ut_scripted_triggers.txt                  |  52 +++++
 .../ethic_scripted_variables.txt              |  18 --
 .../ut_scripted_variables.txt                 |  15 ++
 6 files changed, 162 insertions(+), 176 deletions(-)
 create mode 100644 common/scripted_triggers/ut_scripted_triggers.txt
 create mode 100644 common/scripted_variables/ut_scripted_variables.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8681eb455..56b863f53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,11 @@
 
 ### 2023/1/2
 
-* 所有职业的非全国的贸易额产出改为加算
-* 职员基础舒适度产出改为1
-* 自由主义国家也能使用上山下乡法令
-* 统治者职业：数值调整，基础消费品维护费改为2，参照原版文件的调整
-* 专家职业：数值调整，基础消费品维护费改为1，执法者生成2防御部队，参照原版文件的调整
-* 工人职业：数值调整，参照原版文件进行调整 *
-* 其他职业：数值调整，参照原版文件进行调整 *
\ No newline at end of file
+* 调整 所有职业的非全国的贸易额产出改为加算
+* 调整 职员基础舒适度产出改为1
+* 调整 自由主义国家也能使用上山下乡法令
+* 调整 统治者职业：数值调整，基础消费品维护费改为2，参照原版文件的调整
+* 调整 专家职业：数值调整，基础消费品维护费改为1，执法者生成2防御部队，参照原版文件的调整
+* 调整 工人职业：数值调整，参照原版文件进行调整 *
+* 调整 其他职业：数值调整，参照原版文件进行调整 *
+* 格式化 职业：去除多余的`modifier = {...}`子句，提取`scripted_trigger`
\ No newline at end of file
diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index 86af1ada0..00d283644 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -18,10 +18,7 @@ head_researcher = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
 
 	resources = {
@@ -29,7 +26,9 @@ head_researcher = {
 		produces = {
 			trigger = {
 				exists = owner
-				owner = { NOT = { has_valid_civic = civic_science_knight } }
+				owner = { 
+					NOT = { has_valid_civic = civic_science_knight }
+				}
 			}
 			physics_research = 6
 			engineering_research = 6
@@ -38,23 +37,23 @@ head_researcher = {
 		produces = {
 			trigger = {
 				exists = owner
-				owner = { has_valid_civic = civic_science_knight }
+				owner = { 
+					has_valid_civic = civic_science_knight
+				}
 			}
 			physics_research = 6
 			engineering_research = 6
 			society_research = 6
 			mult = value:knight_commander_unity_output_modifier
 		}
-		produces = { 
+		produces = {
 			unity = 2
 		}
 		produces = {
 			trigger = {
 				exists = owner
 				owner = {
-					OR = {
-						has_valid_civic = civic_futuristic_art
-					}
+					has_valid_civic = civic_futuristic_art
 				}
 			}
 			unity = 1
@@ -63,9 +62,7 @@ head_researcher = {
 			trigger = {
 				exists = owner
 				owner = {
-					OR = {
-						has_valid_civic = civic_zhaowen_dao
-					}
+					has_valid_civic = civic_zhaowen_dao
 				}
 			}
 			unity = 3
@@ -91,7 +88,7 @@ head_researcher = {
 			consumer_goods = 1
 		}
 	}
-	
+
 	overlord_resources = {
 		category = planet_requisitioned_research
 		produces = {
@@ -105,7 +102,7 @@ head_researcher = {
 			society_research = 3
 		}
 	}
-	
+
 	planet_modifier = {
 		planet_jobs_physics_research_produces_mult = 0.05
 		planet_jobs_society_research_produces_mult = 0.05
@@ -119,13 +116,12 @@ head_researcher = {
 
 	triggered_pop_modifier = {
 		potential = {
+			exists = owner
 			owner = {
 				has_valid_civic = civic_science_knight
 			}
 		}
-		modifier = {
-			pop_cat_ruler_political_power = 5
-		}
+		pop_cat_ruler_political_power = 5
 	}
 	triggered_country_modifier = {
 		potential = {
@@ -139,9 +135,7 @@ head_researcher = {
 				}
 			}
 		}
-		modifier = {
-			country_edict_fund_add = 5
-		}
+		country_edict_fund_add = 5
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -150,40 +144,34 @@ head_researcher = {
 				has_origin = origin_mechanists
 			}
 		}
-		modifier = {
-			planet_pops_robotics_upkeep_mult = -0.05
-			planet_jobs_engineering_research_produces_mult = 0.05
-		}
+		planet_pops_robotics_upkeep_mult = -0.05
+		planet_jobs_engineering_research_produces_mult = 0.05
 	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_futuristic_art
-				}
+				has_valid_civic = civic_futuristic_art
 			}
 		}
-		modifier = {
-			planet_amenities_add = 3
-		}
+		planet_amenities_add = 3
 	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
-
 			owner = {
 				has_valid_civic = civic_anarchism
 			}
 		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
+		pop_cat_specialist_happiness = -0.05
 	}
 
 	triggered_planet_modifier = {
 		potential = {
-			owner = { has_valid_civic = civic_science_knight }
+			exists = owner
+			owner = { 
+				has_valid_civic = civic_science_knight
+			}
 		}
 		job_researcher_add = 2
 	}
@@ -249,12 +237,9 @@ high_priest = {
 	possible_precalc = can_fill_ruler_job
 	possible = {
 		NOT = { has_ethic = ethic_materialist }
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
-	
+
 	resources = {
 		category = planet_priests
 		produces = {
@@ -338,7 +323,7 @@ high_priest = {
 			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
-	
+
 	triggered_planet_modifier = {
 		potential = { always = yes }
 		planet_amenities_add = 5
@@ -352,10 +337,8 @@ high_priest = {
 				has_origin = origin_machine_cult
 			}
 		}
-		modifier = {
-			planet_pops_robotics_upkeep_mult = -0.05
-			planet_jobs_engineering_research_produces_mult = 0.05
-		}
+		planet_pops_robotics_upkeep_mult = -0.05
+		planet_jobs_engineering_research_produces_mult = 0.05
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -364,9 +347,7 @@ high_priest = {
 				has_valid_civic = civic_spiritual_democracy
 			}
 		}
-		modifier = {
-			planet_amenities_add = 2
-		}
+		planet_amenities_add = 2
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -375,9 +356,7 @@ high_priest = {
 				has_valid_civic = civic_anarchism
 			}
 		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
+		pop_cat_specialist_happiness = -0.05
 	}
 
 	weight = {
@@ -442,10 +421,7 @@ politician = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
 
 	resources = {
@@ -460,16 +436,15 @@ politician = {
 	country_modifier = {
 		country_edict_fund_add = 5
 	}
-	
+
 	triggered_planet_modifier = {
 		potential = { always = yes }
 		planet_amenities_add = 8
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}	
+	}
 	#triggered_planet_modifier = {
 	#	potential = {
-	#
-	#		owner = { NOT = { has_civic = civic_coalition_government } }
+	#		owner = { NOT = { has_valid_civic = civic_coalition_government } }
 	#	}
 	#	species_empire_size_mult = -0.1
 	#}
@@ -495,22 +470,16 @@ politician = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_welfare_state
-				}
+				has_valid_civic = civic_welfare_state
 			}
 		}
-		modifier = {
-			planet_amenities_add = 2
-		}
+		planet_amenities_add = 2
 	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_cultural_review_department
-				}
+				has_valid_civic = civic_cultural_review_department
 			}
 		}
 		modifier = {
@@ -519,6 +488,7 @@ politician = {
 	}
 	triggered_planet_modifier = {
 		potential = {
+			exists = owner
 			owner = {
 				has_valid_civic = civic_anarchism
 			}
@@ -580,10 +550,7 @@ noble = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
 
 	resources = {
@@ -595,16 +562,14 @@ noble = {
 			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
-	
+
 	planet_modifier = {
 		job_slave_overseer_add = 1
 	}
-	
+
 	triggered_pop_modifier = {
 		potential = { always = yes }
-		modifier = {
-			pop_cat_ruler_political_power = 5
-		}
+		pop_cat_ruler_political_power = 5
 	}
 
 	triggered_planet_modifier = {
@@ -613,21 +578,23 @@ noble = {
 				has_valid_civic = civic_anarchism
 			}
 		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
+		pop_cat_specialist_happiness = -0.05
 	}
 	triggered_planet_modifier = {
-		potential = { 
+		potential = {
 			exists = owner
-			owner = { has_civic = civic_eternal_kingship }
+			owner = { 
+				has_valid_civic = civic_eternal_kingship
+			}
 		}
 		planet_stability_add = 5
 	}
 	triggered_country_modifier = {
-		potential = { 
+		potential = {
 			exists = owner
-			owner = { has_civic = civic_feudal_realm }
+			owner = { 
+				has_valid_civic = civic_feudal_realm
+			}
 		}
 		country_admin_cap_add = 10
 	}
@@ -664,7 +631,8 @@ noble = {
 					is_country_type = ai_empire
 				}
 			}
-			OR = { # contingency won't purge itself
+			OR = {
+				# contingency won't purge itself
 				NOT = { exists = event_target:custodian_bot }
 				AND = {
 					exists = event_target:custodian_bot
@@ -691,12 +659,9 @@ executive = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
-	
+
 	resources = {
 		category = planet_executives
 		produces = {
@@ -706,16 +671,14 @@ executive = {
 			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
-	
+
 	triggered_pop_modifier = {
 		potential = {
 			owner = {
 				has_valid_civic = civic_triple_the_profit
 			}
 		}
-		modifier = {
-			pop_cat_ruler_political_power = 3
-		}
+		pop_cat_ruler_political_power = 3
 	}
 	triggered_pop_modifier = {
 		potential = {
@@ -723,9 +686,7 @@ executive = {
 				has_policy_flag = market_operation
 			}
 		}
-		modifier = {
-			pop_cat_ruler_political_power = 1
-		}
+		pop_cat_ruler_political_power = 1
 	}
 	triggered_planet_modifier = {
 		potential = { always = yes }
@@ -739,14 +700,18 @@ executive = {
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
-			owner = { has_technology = tech_colonial_bureaucracy }
+			owner = { 
+				has_technology = tech_colonial_bureaucracy
+			}
 		}
 		country_admin_cap_add = 4
 	}
 	triggered_country_modifier = {
 		potential = {
 			exists = owner
-			owner = { has_technology = tech_galactic_bureaucracy }
+			owner = { 
+				has_technology = tech_galactic_bureaucracy
+			}
 		}
 		country_admin_cap_add = 4
 	}
@@ -761,9 +726,7 @@ executive = {
 				has_valid_civic = civic_anarchism
 			}
 		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
+		pop_cat_specialist_happiness = -0.05
 	}
 
 	weight = {
@@ -798,7 +761,8 @@ executive = {
 					is_country_type = ai_empire
 				}
 			}
-			OR = { # contingency won't purge itself
+			OR = {
+				# contingency won't purge itself
 				NOT = { exists = event_target:custodian_bot }
 				AND = {
 					exists = event_target:custodian_bot
@@ -816,7 +780,7 @@ knight_commander = {
 	building_icon = building_order_keep
 	clothes_texture_index = 1
 	can_set_priority = no
-	
+
 	possible_pre_triggers = {
 		has_owner = yes
 		is_being_purged = no
@@ -825,10 +789,7 @@ knight_commander = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 		hidden_trigger = { exists = owner }
 		owner = {
 			is_gestalt = no
@@ -845,7 +806,9 @@ knight_commander = {
 		produces = {
 			trigger = {
 				exists = owner
-				owner = { has_origin = origin_toxic_knights }
+				owner = {
+					has_origin = origin_toxic_knights
+				}
 			}
 			physics_research = 2
 			engineering_research = 2
@@ -864,16 +827,20 @@ knight_commander = {
 	}
 
 	triggered_planet_modifier = {
-		potential = { 
+		potential = {
 			exists = owner
-			owner = { has_civic = civic_eternal_kingship }
+			owner = {
+				has_valid_civic = civic_eternal_kingship
+			}
 		}
 		planet_stability_add = 5
 	}
 	triggered_country_modifier = {
-		potential = { 
+		potential = {
 			exists = owner
-			owner = { has_civic = civic_feudal_realm }
+			owner = {
+				has_valid_civic = civic_feudal_realm
+			}
 		}
 		country_admin_cap_add = 10
 	}
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 281faa2cc..60dbab9ef 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -17,11 +17,7 @@ merchant = {
 	}
 	possible_precalc = can_fill_specialist_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
 
 	resources = {
@@ -279,10 +275,7 @@ soldier = {
 			trigger = {
 				exists = owner
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			society_research = 0.25
@@ -1126,11 +1119,7 @@ enforcer = {
 		is_sapient = yes
 	}
 	possible = {
-		OR = {
-			battle_thrall_job_check_trigger = yes
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_battle_thrall_job_check_trigger = yes
 	}
 
 	resources = {
@@ -1537,17 +1526,7 @@ entertainer = {
 		is_sapient = yes
 	}
 	possible = {
-		OR = {
-			entertainer_job_check_trigger = yes
-			AND = {
-				exists = owner
-				owner = { has_valid_civic = civic_triple_the_profit }
-			}
-			AND = {
-				exists = owner
-				owner = { has_valid_civic = civic_du_contrat_social }
-			}
-		}
+		ethic_entertainer_job_check_trigger = yes
 	}
 
 	resources = {
@@ -1700,13 +1679,7 @@ duelist = {
 		is_sapient = yes
 	}
 	possible = {
-		OR = {
-			battle_thrall_job_check_trigger = yes
-			AND = {
-				exists = owner
-				owner = { has_valid_civic = civic_du_contrat_social }
-			}
-		}
+		ethic_battle_thrall_job_check_trigger = yes
 	}
 
 	resources = {
@@ -2549,11 +2522,7 @@ necromancer = {
 		is_sapient = yes
 	}
 	possible = {
-		OR = {
-			battle_thrall_job_check_trigger = yes
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_battle_thrall_job_check_trigger = yes
 	}
 
 	resources = {
diff --git a/common/scripted_triggers/ut_scripted_triggers.txt b/common/scripted_triggers/ut_scripted_triggers.txt
new file mode 100644
index 000000000..c0f669b0f
--- /dev/null
+++ b/common/scripted_triggers/ut_scripted_triggers.txt
@@ -0,0 +1,52 @@
+### CIVIC CHECK
+
+# 是科学社会主义
+is_scientific_socialism = {
+	OR = {
+		has_valid_civic = civic_shared_burden
+		has_valid_civic = civic_socialistic
+	}
+}
+
+# 拥有和平主义主题理念
+has_pacifist_topic_civic = {
+	OR = {
+		has_valid_civic = civic_executive_committee
+		has_valid_civic = civic_peaceful_republic
+	}
+}
+
+### CIVIC RELATED
+
+# 未被奴役（兼容特殊国策）
+ethic_is_not_enslaved = {
+	OR = {
+		is_enslaved = no
+		exists = owner
+		owner = { has_valid_civic = civic_du_contrat_social }
+	}
+}
+
+# 可以担任艺人职业（兼容特殊国策）
+ethic_entertainer_job_check_trigger = {
+	OR = {
+		entertainer_job_check_trigger = yes
+		AND = {
+			exists = owner
+			owner = { has_valid_civic = civic_triple_the_profit }
+		}
+		AND = {
+			exists = owner
+			owner = { has_valid_civic = civic_du_contrat_social }
+		}
+	}
+}
+
+# 可以担任战斗职业（兼容特殊国策）
+ethic_battle_thrall_job_check_trigger = {
+	OR = {
+		battle_thrall_job_check_trigger = yes
+		exists = owner
+		owner = { has_valid_civic = civic_du_contrat_social }
+	}
+}
\ No newline at end of file
diff --git a/common/scripted_variables/ethic_scripted_variables.txt b/common/scripted_variables/ethic_scripted_variables.txt
index d7e6d9be4..4787c1c01 100644
--- a/common/scripted_variables/ethic_scripted_variables.txt
+++ b/common/scripted_variables/ethic_scripted_variables.txt
@@ -1,19 +1 @@
-### JOB UPKEEPS
-
-@ruler_job_consumer_goods_upkeep_base = 2
-@ruler_job_consumer_goods_upkeep_half = 1
-
-@specialist_job_consumer_goods_upkeep_base = 0
-@ruler_job_consumer_goods_upkeep_half = 0.5
-@specialist_job_consumer_goods_upkeep = 1
-@specialist_job_consumer_goods_upkeep_scientist = 2
-@specialist_job_consumer_goods_upkeep_culture_worker = 2
-@specialist_job_consumer_goods_upkeep_priest = 2
-@specialist_job_consumer_goods_upkeep_bureaucrat = 1
-@specialist_job_consumer_goods_upkeep_assembly = 0.5
-
-@worker_job_consumer_goods_upkeep_base = 0
-
-### OTEHRS
-
 @living_standard_luxuries_shared_burden = 0.7
\ No newline at end of file
diff --git a/common/scripted_variables/ut_scripted_variables.txt b/common/scripted_variables/ut_scripted_variables.txt
new file mode 100644
index 000000000..a8933d96e
--- /dev/null
+++ b/common/scripted_variables/ut_scripted_variables.txt
@@ -0,0 +1,15 @@
+### JOB UPKEEPS
+
+@ruler_job_consumer_goods_upkeep_base = 2
+@ruler_job_consumer_goods_upkeep_half = 1
+
+@specialist_job_consumer_goods_upkeep_base = 0
+@specialist_job_consumer_goods_upkeep_half = 0.5
+@specialist_job_consumer_goods_upkeep = 1
+@specialist_job_consumer_goods_upkeep_scientist = 2
+@specialist_job_consumer_goods_upkeep_culture_worker = 2
+@specialist_job_consumer_goods_upkeep_priest = 2
+@specialist_job_consumer_goods_upkeep_bureaucrat = 1
+@specialist_job_consumer_goods_upkeep_assembly = 0.5
+
+@worker_job_consumer_goods_upkeep_base = 0
\ No newline at end of file

From 3d26e0a694a341a45bea0c735e9d67ccb70cf61a Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 18:43:23 +0800
Subject: [PATCH 07/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=B7=A5=E4=BA=BA?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=EF=BC=9A=E6=95=B0=E5=80=BC=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=82=E7=85=A7=E5=8E=9F=E7=89=88=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |   2 +-
 .../ethic_common_categories.txt               |  12 +
 common/pop_jobs/02_specialist_jobs.txt        |  20 +-
 common/pop_jobs/03_worker_jobs.txt            | 983 ++++++++++++------
 .../ut_scripted_triggers.txt                  |  12 +-
 .../ut_scripted_variables.txt                 |  15 +-
 6 files changed, 716 insertions(+), 328 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56b863f53..b1bc1188b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,6 @@
 * 调整 自由主义国家也能使用上山下乡法令
 * 调整 统治者职业：数值调整，基础消费品维护费改为2，参照原版文件的调整
 * 调整 专家职业：数值调整，基础消费品维护费改为1，执法者生成2防御部队，参照原版文件的调整
-* 调整 工人职业：数值调整，参照原版文件进行调整 *
+* 调整 工人职业：数值调整，参照原版文件进行调整
 * 调整 其他职业：数值调整，参照原版文件进行调整 *
 * 格式化 职业：去除多余的`modifier = {...}`子句，提取`scripted_trigger`
\ No newline at end of file
diff --git a/common/economic_categories/ethic_common_categories.txt b/common/economic_categories/ethic_common_categories.txt
index 6672233b8..3f58238d8 100644
--- a/common/economic_categories/ethic_common_categories.txt
+++ b/common/economic_categories/ethic_common_categories.txt
@@ -310,6 +310,18 @@ planet_livestock = {
 	}
 }
 
+planet_clerk = {
+	parent = planet_jobs_productive
+	generate_add_modifiers = {
+		produces
+		upkeep
+	}
+	generate_mult_modifiers = {
+		produces
+		upkeep
+	}
+}
+
 planet_technician = {
 	parent = planet_jobs_productive
 	generate_add_modifiers = {
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 60dbab9ef..66aa0dddd 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -1795,10 +1795,7 @@ culture_worker = {
 				is_egalitarian = yes
 				NOR = {
 					has_valid_civic = civic_anarchism
-					AND = {
-						has_valid_civic = civic_shared_burden
-						has_ascension_perk = ap_future_society
-					}
+					is_community_society = yes
 				}
 			}
 		}
@@ -1813,10 +1810,7 @@ culture_worker = {
 				is_egalitarian = yes
 				OR = {
 					has_valid_civic = civic_anarchism
-					AND = {
-						has_valid_civic = civic_shared_burden
-						has_ascension_perk = ap_future_society
-					}
+					is_community_society = yes
 				}
 			}
 		}
@@ -2761,10 +2755,7 @@ death_chronicler = {
 				is_egalitarian = yes
 				NOR = {
 					has_valid_civic = civic_anarchism
-					AND = {
-						has_valid_civic = civic_shared_burden
-						has_ascension_perk = ap_future_society
-					}
+					is_community_society = yes
 				}
 			}
 		}
@@ -2779,10 +2770,7 @@ death_chronicler = {
 				is_egalitarian = yes
 				OR = {
 					has_valid_civic = civic_anarchism
-					AND = {
-						has_valid_civic = civic_shared_burden
-						has_ascension_perk = ap_future_society
-					}
+					is_community_society = yes
 				}
 			}
 		}
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index 8a31704f8..9d1f7be1c 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -29,7 +29,7 @@ colonist = {
 			trigger = {
 				is_lithoid = yes
 			}
-			minerals = 1
+			minerals = 2
 		}
 		produces = {
 			trigger = {		
@@ -55,21 +55,20 @@ colonist = {
 
 	weight = {
 		weight = @colonist_job_weight # Higher prio
-		modifier = { # 可控的动态权重
-			factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-			exists = owner
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 0.1
+			factor = 0.1
 			can_take_servant_job = yes
 		}
 		modifier = {
-			factOR = 1.5
+			factor = 1.5
 			has_job = colonist
 		}
 		modifier = {
-			factOR = 0
+			factor = 0
 			NOT = { has_job = colonist }
 			exists = planet
 			planet = {		
@@ -82,7 +81,7 @@ colonist = {
 			}
 		}
 		modifier = {
-			factOR = 0.8
+			factor = 0.8
 			is_enslaved = yes
 			has_slavery_type = { type = slavery_indentured }
 		}
@@ -106,31 +105,26 @@ clerk = {
 
 	resources = {
 		category = planet_clerk
+		# 科学社会主义
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			society_research = 0.25
 		}
+		# 道德主义主题
 		produces = {
 			trigger = {
 				exists = owner
 				owner = {
-					OR = {
-						has_valid_civic = civic_executive_committee
-						has_valid_civic = civic_peaceful_republic
-					}
+					has_pacifist_topic_civic = yes
 				}
 			}
 			unity = 0.5
 		}
-		#资本主义
+		# 资本主义
 		produces = {
 			trigger = {
 			    happiness >= 0.4
@@ -140,6 +134,7 @@ clerk = {
 			}
 			unity = 0.5
 		}
+		# 竞争主义
 		produces = {
 			trigger = {
 			    happiness >= 0.4
@@ -150,24 +145,18 @@ clerk = {
 			unity = 0.25
 		}
 	}
+
 	triggered_planet_modifier = {
 		potential = { always = yes }
-		planet_amenities_add = 1
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	planet_modifier = {
 		trade_value_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
-
 	triggered_planet_modifier = {
-		potential = {
-			planet = {
-				has_planet_flag = has_franchise_headquarters
-			}
-		}
-		pop_lifestyle_trade_mult = -0.01
+		potential = { always = yes }
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
+	
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -182,15 +171,13 @@ clerk = {
 			species_empire_size_mult = -0.02
 		}
 	}
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
 				OR = {
-					AND = {
-						has_valid_civic = civic_shared_burden
-						has_ascension_perk = ap_future_society
-					}
+					is_community_society = yes
 					has_valid_civic = civic_democracy_and_clean_government
 					has_valid_civic = civic_business_reporting_administration
 				}
@@ -241,24 +228,45 @@ clerk = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_executive_committee
-					has_valid_civic = civic_peaceful_republic
-				}
+				has_pacifist_topic_civic = yes
 			}
 		}
 		planet_stability_add = 10
 		mult = planet.society_factor_pops
 	}
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_planet_flag = has_franchise_headquarters
+			}
+		}
+		pop_lifestyle_trade_mult = -0.01
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				exists = orbital_defence
+				orbital_defence = {
+					exists = starbase
+					starbase = {
+						has_starbase_building = ring_trade_hub
+					}
+				}
+			}
+		}
+		planet_amenities_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
 			owner = { has_tradition = tr_mercantile_trickle_up_economics }
 		}
-		trade_value_add = 2
+		trade_value_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
-
+	
 	overlord_resources = {
 		category = planet_corporate_franchising_meddling
 		produces = {
@@ -270,11 +278,15 @@ clerk = {
 			unity = 0.25
 		}
 	}
-
+	
 	weight = {
 		weight = @clerk_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -348,12 +360,19 @@ technician = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
+	
 	possible_precalc = can_fill_worker_job
+	possible = {
+		hidden_trigger = { exists = owner }
+		owner = {
+			is_gestalt = no
+		}
+	}
 
 	resources = {
 		category = planet_technician
 		produces = {
-			energy = 6
+			energy = @job_technician_energy_produce_base
 		}
 		produces = {
 			trigger = {
@@ -365,26 +384,23 @@ technician = {
 		}
 		produces = {
 			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+				planet = {
+					has_planet_flag = has_energy_requisitorium
 				}
 			}
-			physics_research = 0.25
+			energy = @requisitorium_energy_reduction
 		}
+
+		# 科学社会主义
 		produces = {
 			trigger = {
-				planet = {
-					has_planet_flag = has_energy_requisitorium
+				owner = {
+					is_scientific_socialism = yes
 				}
 			}
-			energy = @requisitorium_energy_reduction
+			physics_research = 0.25
 		}
-		
-		#社会主义
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -394,6 +410,7 @@ technician = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -405,13 +422,11 @@ technician = {
 		}
 	}
 
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
+			is_community_society = yes
 		}
 		modifier = {
 			country_admin_cap_add = 0.5
@@ -442,8 +457,8 @@ technician = {
 
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|technician|RESOURCE|energy|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|technician|RESOURCE|energy|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -510,23 +525,17 @@ miner = {
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_worker_job
+	possible = {
+		hidden_trigger = { exists = owner }
+		owner = {
+			is_gestalt = no
+		}
+	}
 
 	resources = {
 		category = planet_miners
 		produces = {
-			minerals = 4
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
+			minerals = @job_miner_minerals_produce_base
 		}
 		produces = {
 			trigger = {
@@ -548,22 +557,33 @@ miner = {
 			}
 			rare_crystals = 0.25
 		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			minerals = @requisitorium_minerals_reduction
+		}
+		
+		# 灵网裂隙
 		produces = {
 			trigger = {
 				planet = { has_modifier = "ley_rift" }
 			}
 			sr_zro = 0.1
 		}
+		
+		# 科学社会主义
 		produces = {
 			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
+				owner = {
+					is_scientific_socialism = yes
 				}
 			}
-			minerals = @requisitorium_minerals_reduction
+			engineering_research = 0.25
 		}
-		
-		#社会主义
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -573,6 +593,7 @@ miner = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -583,18 +604,16 @@ miner = {
 			unity = 0.25
 		}
 	}
-	
-	triggered_country_modifier = { # 共产主义社会
+
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	overlord_resources = {
@@ -611,8 +630,8 @@ miner = {
 	
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|miner|RESOURCE|minerals|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|miner|RESOURCE|minerals|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -681,28 +700,27 @@ crystal_miner = {
 	resources = {
 		category = planet_miners
 		produces = {
-			rare_crystals = 2
+			rare_crystals = @job_crystal_miner_rare_crystals_produce_base
 		}
+		
+		# 灵网裂隙
 		produces = {
 			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
+				planet = { has_modifier = "ley_rift" }
 			}
-			engineering_research = 0.25
+			sr_zro = 0.1
 		}
+		
+		# 科学社会主义
 		produces = {
 			trigger = {
-				planet = { has_modifier = "ley_rift" }
+				owner = {
+					is_scientific_socialism = yes
+				}
 			}
-			sr_zro = 0.1
+			engineering_research = 0.25
 		}
-		
-		#社会主义
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -712,6 +730,7 @@ crystal_miner = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -722,13 +741,13 @@ crystal_miner = {
 			unity = 0.25
 		}
 	}
-
-	triggered_country_modifier = { # 共产主义社会
+	
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
 		modifier = {
@@ -738,8 +757,8 @@ crystal_miner = {
 	
 	weight = {
 		weight = @specialist_job_weight # Important job
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|crystal_miner|RESOURCE|rare_crystals|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|crystal_miner|RESOURCE|rare_crystals|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -791,28 +810,27 @@ gas_extractor = {
 	resources = {
 		category = planet_miners
 		produces = {
-			exotic_gases = 2
+			exotic_gases = @job_gas_extractor_exotic_gases_produce_base
 		}
+		
+		# 灵网裂隙
 		produces = {
 			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
+				planet = { has_modifier = "ley_rift" }
 			}
-			engineering_research = 0.25
+			sr_zro = 0.1
 		}
+		
+		# 科学社会主义
 		produces = {
 			trigger = {
-				planet = { has_modifier = "ley_rift" }
+				owner = {
+					is_scientific_socialism = yes
+				}
 			}
-			sr_zro = 0.1
+			engineering_research = 0.25
 		}
-		
-		#社会主义
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -822,6 +840,7 @@ gas_extractor = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -837,19 +856,16 @@ gas_extractor = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 	
 	weight = {
 		weight = @specialist_job_weight # Important job
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|gas_extractor|RESOURCE|exotic_gases|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|gas_extractor|RESOURCE|exotic_gases|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -901,28 +917,27 @@ mote_harvester = {
 	resources = {
 		category = planet_miners
 		produces = {
-			volatile_motes = 2
+			volatile_motes = @job_mote_harvester_volatile_motes_produce_base
 		}
+
+		# 灵网裂隙
 		produces = {
 			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
+				planet = { has_modifier = "ley_rift" }
 			}
-			engineering_research = 0.25
+			sr_zro = 0.1
 		}
+		
+		# 科学社会主义
 		produces = {
 			trigger = {
-				planet = { has_modifier = "ley_rift" }
+				owner = {
+					is_scientific_socialism = yes
+				}
 			}
-			sr_zro = 0.1
+			engineering_research = 0.25
 		}
-		
-		#社会主义
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -932,6 +947,7 @@ mote_harvester = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -943,23 +959,21 @@ mote_harvester = {
 		}
 	}
 
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	weight = {
 		weight = @specialist_job_weight # Important job
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|mote_harvester|RESOURCE|volatile_motes|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|mote_harvester|RESOURCE|volatile_motes|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1011,8 +1025,9 @@ farmer = {
 	resources = {
 		category = planet_farmers
 		produces = {
-			food = 6
+			food = @job_farmer_food_produce_base
 		}
+		
 		produces = {
 			trigger = {
 				exists = owner
@@ -1024,32 +1039,31 @@ farmer = {
 		}
 		produces = {
 			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+				planet = {
+					has_planet_flag = has_produce_requisitorium
 				}
 			}
-			society_research = 0.25
+			food = @requisitorium_food_reduction
 		}
+		
+		# 灵网裂隙
 		produces = {
 			trigger = {
 				planet = { has_modifier = "ley_rift" }
 			}
 			sr_zro = 0.1
 		}
+		
+		# 科学社会主义
 		produces = {
 			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
+				owner = {
+					is_scientific_socialism = yes
 				}
 			}
-			food = @requisitorium_food_reduction
+			society_research = 0.25
 		}
-		
-		#社会主义
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -1059,6 +1073,7 @@ farmer = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -1070,6 +1085,7 @@ farmer = {
 		}
 	}
 	
+	# 田园牧歌
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -1077,9 +1093,7 @@ farmer = {
 				has_valid_civic = civic_agrarian_idyll
 			}
 		}
-		modifier = {
-			planet_amenities_add = 2
-		}
+		planet_amenities_add = 2
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 	triggered_planet_modifier = {
@@ -1089,22 +1103,18 @@ farmer = {
 				has_valid_civic = civic_agrarian_idyll
 			}
 		}
-		modifier = {
-			trade_value_add = 2
-		}
+		trade_value_add = 2
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	overlord_resources = {
@@ -1121,8 +1131,8 @@ farmer = {
 	
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|farmer|RESOURCE|food|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|farmer|RESOURCE|food|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1217,7 +1227,7 @@ foundry = {
 	resources = {
 		category = planet_metallurgists
 		produces = {
-			alloys = 3
+			alloys = @job_foundry_alloys_produce_base
 		}
 		produces = {
 			trigger = {
@@ -1228,18 +1238,6 @@ foundry = {
 			}
 			society_research = 1
 		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
 		produces = {
 			trigger = {
 				planet = {
@@ -1248,6 +1246,9 @@ foundry = {
 			}
 			alloys = @requisitorium_alloys_reduction
 		}
+		upkeep = {
+			minerals = @worker_job_minerals_upkeep_foundry
+		}
 		upkeep = {
 			trigger = {
 				planet = {
@@ -1256,9 +1257,6 @@ foundry = {
 			}
 			minerals = 2
 		}
-		upkeep = {
-			minerals = 6
-		}
 		upkeep = {
 			trigger = {
 				exists = owner
@@ -1270,7 +1268,16 @@ foundry = {
 			food = 6
 		}
 		
-		#社会主义
+		# 科学社会主义
+		produces = {
+			trigger = {
+				owner = {
+					is_scientific_socialism = yes
+				}
+			}
+			engineering_research = 0.25
+		}
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -1280,6 +1287,7 @@ foundry = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -1291,17 +1299,15 @@ foundry = {
 		}
 	}
 
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	overlord_resources = {
@@ -1318,8 +1324,8 @@ foundry = {
 
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|foundry|RESOURCE|alloys|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|foundry|RESOURCE|alloys|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1357,7 +1363,7 @@ artisan = {
 	resources = {
 		category = planet_artisans
 		produces = {
-			consumer_goods = 7
+			consumer_goods = @job_artisan_consumer_goods_produce_base
 		}
 		produces = {
 			trigger = {
@@ -1368,20 +1374,8 @@ artisan = {
 			}
 			engineering_research = 1
 		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
 		upkeep = {
-			minerals = 8
+			minerals = @worker_job_minerals_upkeep_artisan
 		}
 		produces = {
 			trigger = {
@@ -1404,7 +1398,18 @@ artisan = {
 			minerals = 1
 		}
 		
-		#社会主义
+		# 科学社会主义
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						is_scientific_socialism = yes
+					}
+				}
+			}
+			engineering_research = 0.25
+		}
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -1414,6 +1419,7 @@ artisan = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -1425,6 +1431,7 @@ artisan = {
 		}
 	}
 
+	# 奢侈消费主义
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
@@ -1434,7 +1441,8 @@ artisan = {
 		trade_value_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
@@ -1442,9 +1450,7 @@ artisan = {
 				has_ascension_perk = ap_future_society
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	overlord_resources = {
@@ -1463,8 +1469,8 @@ artisan = {
 
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|artisan|RESOURCE|consumer_goods|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|artisan|RESOURCE|consumer_goods|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1559,18 +1565,17 @@ catalytic_technician = {
 
 	weight = {
 		weight = @specialist_job_weight # Fairly important job
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|catalytic_technician|RESOURCE|alloys|
-			exists = owner
+		modifier = {
+			mult = value:job_weights_modifier|JOB|catalytic_technician|RESOURCE|alloys|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			is_enslaved = yes
 			can_take_servant_job = no
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = catalytic_technician
 		}
 	}
@@ -1655,17 +1660,16 @@ artificer = {
 	weight = {
 		weight = @specialist_job_weight
 		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|artificer|RESOURCE|consumer_goods|
-			exists = owner
+			mult = value:job_weights_modifier|JOB|artificer|RESOURCE|consumer_goods|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			factOR = 2
+			factor = 2
 			is_enslaved = yes
 			can_take_servant_job = no
 		}
 		modifier = {
-			factOR = 5
+			factor = 5
 			has_job = artificer
 		}
 	}
@@ -1695,11 +1699,7 @@ preacher = {
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			society_research = 0.25
@@ -1714,7 +1714,8 @@ preacher = {
 		pop_lifestyle_trade_mult = 0.03
 	}
 
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
@@ -1729,8 +1730,8 @@ preacher = {
 	
 	weight = {
 		weight = @specialist_job_weight # Important job
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1777,14 +1778,12 @@ mortal_initiate = {
 			unity = 2
 			society_research = 1
 		}
+		
+		# 科学社会主义
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			society_research = 0.25
@@ -1796,23 +1795,21 @@ mortal_initiate = {
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 	
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1863,20 +1860,17 @@ scrap_miner = {
 			minerals = 2
 			alloys = 1
 		}
+		
+		# 科学社会主义
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			engineering_research = 0.25
 		}
-		
-		#社会主义
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -1886,6 +1880,7 @@ scrap_miner = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -1897,23 +1892,21 @@ scrap_miner = {
 		}
 	}
 
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_multiple_resources_modifier|JOB|scrap_miner|RESOURCE1|minerals|WEIGHT1|0.7|RESOURCE2|alloys|WEIGHT2|0.3|
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|scrap_miner|RESOURCE1|minerals|WEIGHT1|0.7|RESOURCE2|alloys|WEIGHT2|0.3|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1992,32 +1985,30 @@ angler = {
 		}
 		produces = {
 			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+				planet = {
+					has_planet_flag = has_produce_requisitorium
 				}
 			}
-			society_research = 0.25
+			food = @requisitorium_food_reduction
 		}
+
+		# 灵网裂隙
 		produces = {
 			trigger = {
 				planet = { has_modifier = "ley_rift" }
 			}
 			sr_zro = 0.1
 		}
+		# 科学社会主义
 		produces = {
 			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
+				owner = {
+					is_scientific_socialism = yes
 				}
 			}
-			food = @requisitorium_food_reduction
+			society_research = 0.25
 		}
-		
-		#社会主义
+		# 社会主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -2027,6 +2018,7 @@ angler = {
 			}
 			unity = 0.5
 		}
+		# 合作主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -2045,36 +2037,28 @@ angler = {
 				has_ethic = ethic_fanatic_socialism
 			}
 		}
-		modifier = {
-			planet_amenities_add = 2
-		}
+		planet_amenities_add = 2
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
 				has_valid_civic = civic_anglers
-				NOT = {
-					has_ethic = ethic_fanatic_socialism
-				}
+				NOT = { has_ethic = ethic_fanatic_socialism }
 			}
 		}
-		modifier = {
-			trade_value_add = 2
-		}
+		trade_value_add = 2
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 	
 	overlord_resources = {
@@ -2091,10 +2075,26 @@ angler = {
 
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|angler|RESOURCE|food|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|angler|RESOURCE|food|
 			owner = { has_edict = dynamic_weight }
 		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = {
+				has_valid_civic = civic_anglers
+				has_ethic = ethic_fanatic_socialism
+				has_edict = dynamic_weight
+			}
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
+			owner = {
+				has_valid_civic = civic_anglers
+				NOT = { has_ethic = ethic_fanatic_socialism }
+				has_edict = dynamic_weight
+			}
+		}
 		modifier = { #限制条件的sv mult
 			factor = 5
 			owner = {
@@ -2153,23 +2153,25 @@ ranger = {
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|ranger|RESOURCE|society_research|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|culture_worker|RESOURCE|society_research|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -2366,10 +2368,373 @@ squire = {
 
 	weight = {
 		weight = @worker_job_weight
-		modifier = { factor = 3.6 }
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|technician|RESOURCE|energy|
+		factor = 1.2
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|researcher|
+			owner = { 
+				has_valid_civic = civic_science_knight
+				has_edict = dynamic_weight
+			}
+		}
+	}
+}
+
+puddle_technician = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_food_processing_facility
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+	possible = {
+		hidden_trigger = { exists = owner }
+		owner = {
+			is_gestalt = no
+		}
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			food = 6
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_robot_empire = yes
+				}
+			}
+			food = -1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+				}
+			}
+			food = @requisitorium_food_reduction
+		}
+
+		# 灵网裂隙
+		produces = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			sr_zro = 0.1
+		}
+		
+		# 科学社会主义
+		produces = {
+			trigger = {
+				owner = {
+					is_scientific_socialism = yes
+				}
+			}
+			society_research = 0.25
+		}
+		# 社会主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_socialism
+				}
+			}
+			unity = 0.5
+		}
+		# 合作主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_socialism
+				}
+			}
+			unity = 0.25
+		}
+	}
+
+	# 田园牧歌
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_agrarian_idyll
+			}
+		}
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_agrarian_idyll
+			}
+		}
+		trade_value_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	# 共产主义社会
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_community_society = yes
+			}
+		}
+		country_admin_cap_add = 0.5
+	}
+	
+	overlord_resources = {
+		category = planet_requisitioned_food
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+				}
+			}
+			food = @requisitorium_food_overlord
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			mult = value:job_weights_modifier|JOB|farmer|RESOURCE|food|
 			owner = { has_edict = dynamic_weight }
 		}
+		modifier = {
+			factor = 1.1
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			can_take_servant_job = no
+			NOT = {
+				has_slavery_type = { type = slavery_indentured }
+			}
+		}
+		modifier = {
+			factor = 3
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = { has_technology = tech_droid_workers }
+		}
+		modifier = {
+			factor = 200
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = {
+				NOT = { has_technology = tech_droid_workers }
+			}
+		}
+		modifier = {
+			factor = 0.25
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		# low income modifier
+		modifier = {
+			factor = 1.2
+			exists = planet
+			planet = {
+				has_available_jobs = farmer
+			}
+			exists = owner
+			owner = {
+				is_ai = yes
+				has_monthly_income = {
+					resource = food
+					value < 10
+				}
+			}
+		}
+
+		modifier = {
+			factor = 0.5
+			has_trait = trait_lithoid
+
+			owner = {
+				is_lithoid_empire = yes
+				has_monthly_income = {
+					resource = food
+					value >= 0
+				}
+			}
+		}
 	}
 }
+
+puddle_technician_drone = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_food_processing_facility
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+	possible = {
+		hidden_trigger = { exists = owner }
+		owner = {
+			is_gestalt = yes
+		}
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			food = 6
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_robot_empire = yes
+				}
+			}
+			food = -1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+				}
+			}
+			food = @requisitorium_food_reduction
+		}
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_food
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+				}
+			}
+			food = @requisitorium_food_overlord
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			mult = value:job_weights_modifier|JOB|farmer|RESOURCE|food|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 1.1
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			can_take_servant_job = no
+			NOT = {
+				has_slavery_type = { type = slavery_indentured }
+			}
+		}
+		modifier = {
+			factor = 3
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = { has_technology = tech_droid_workers }
+		}
+		modifier = {
+			factor = 200
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = {
+				NOT = { has_technology = tech_droid_workers }
+			}
+		}
+		modifier = {
+			factor = 0.25
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		# low income modifier
+		modifier = {
+			factor = 1.2
+			exists = planet
+			planet = {
+				has_available_jobs = farmer
+			}
+			exists = owner
+			owner = {
+				is_ai = yes
+				has_monthly_income = {
+					resource = food
+					value < 10
+				}
+			}
+		}
+
+		modifier = {
+			factor = 0.5
+			has_trait = trait_lithoid
+
+			owner = {
+				is_lithoid_empire = yes
+				has_monthly_income = {
+					resource = food
+					value >= 0
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/scripted_triggers/ut_scripted_triggers.txt b/common/scripted_triggers/ut_scripted_triggers.txt
index c0f669b0f..42af72e35 100644
--- a/common/scripted_triggers/ut_scripted_triggers.txt
+++ b/common/scripted_triggers/ut_scripted_triggers.txt
@@ -1,14 +1,24 @@
 ### CIVIC CHECK
 
+# 是共产主义社会
+is_community_society = {
+	has_valid_civic = civic_shared_burden
+	has_ascension_perk = ap_future_society
+}
+
 # 是科学社会主义
 is_scientific_socialism = {
 	OR = {
 		has_valid_civic = civic_shared_burden
 		has_valid_civic = civic_socialistic
+		AND = {
+			has_valid_civic = civic_forever_with_us
+			has_ethic = ethic_fanatic_socialism
+		}
 	}
 }
 
-# 拥有和平主义主题理念
+# 拥有道德主义主题理念
 has_pacifist_topic_civic = {
 	OR = {
 		has_valid_civic = civic_executive_committee
diff --git a/common/scripted_variables/ut_scripted_variables.txt b/common/scripted_variables/ut_scripted_variables.txt
index a8933d96e..d9b3f3a40 100644
--- a/common/scripted_variables/ut_scripted_variables.txt
+++ b/common/scripted_variables/ut_scripted_variables.txt
@@ -1,3 +1,14 @@
+### JOB PRODUCES
+
+@job_technician_energy_produce_base = 6
+@job_miner_minerals_produce_base = 4
+@job_crystal_miner_rare_crystals_produce_base = 2
+@job_gas_extractor_exotic_gases_produce_base = 2
+@job_mote_harvester_volatile_motes_produce_base = 2
+@job_farmer_food_produce_base = 6
+@job_foundry_alloys_produce_base = 3
+@job_artisan_consumer_goods_produce_base = 7
+
 ### JOB UPKEEPS
 
 @ruler_job_consumer_goods_upkeep_base = 2
@@ -12,4 +23,6 @@
 @specialist_job_consumer_goods_upkeep_bureaucrat = 1
 @specialist_job_consumer_goods_upkeep_assembly = 0.5
 
-@worker_job_consumer_goods_upkeep_base = 0
\ No newline at end of file
+@worker_job_consumer_goods_upkeep_base = 0
+@worker_job_minerals_upkeep_foundry = 6
+@worker_job_minerals_upkeep_artisan = 8
\ No newline at end of file

From 2a0d5f0b5a6755562be111046cea299bb939c114 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 18:54:36 +0800
Subject: [PATCH 08/30] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=20=E8=81=8C?=
 =?UTF-8?q?=E4=B8=9A=EF=BC=9A=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?`modifier=20=3D=20{...}`=E5=AD=90=E5=8F=A5=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96`scripted=5Ftrigger`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pop_jobs/01_ruler_jobs.txt      |   9 +-
 common/pop_jobs/02_specialist_jobs.txt | 264 ++++++++-----------------
 common/pop_jobs/03_worker_jobs.txt     |  24 +--
 3 files changed, 92 insertions(+), 205 deletions(-)

diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index 00d283644..1a8876fdc 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -493,9 +493,7 @@ politician = {
 				has_valid_civic = civic_anarchism
 			}
 		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
+		pop_cat_specialist_happiness = -0.05
 	}
 
 	weight = {
@@ -866,7 +864,10 @@ knight_commander = {
 		}
 		modifier = {
 			mult = value:job_weights_research_modifier|JOB|researcher|
-			owner = { has_country_flag = toxoids_7011_b has_edict = dynamic_weight }
+			owner = { 
+				has_country_flag = toxoids_7011_b
+				has_edict = dynamic_weight 
+			}
 		}
 	}
 }
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 66aa0dddd..842dde970 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -95,9 +95,7 @@ merchant = {
 				has_policy_flag = market_operation
 			}
 		}
-		modifier = {
-			pop_cat_specialist_political_power = 0.5
-		}
+		pop_cat_specialist_political_power = 0.5
 	}
 	triggered_pop_modifier = {
 		potential = {
@@ -106,18 +104,14 @@ merchant = {
 				has_valid_civic = civic_triple_the_profit
 			}
 		}
-		modifier = {
-			pop_cat_specialist_political_power = 3
-		}
+		pop_cat_specialist_political_power = 3
 	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
 			owner = { has_valid_civic = civic_internet_market }
 		}
-		modifier = {
-			trade_value_add = 1
-		}
+		trade_value_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
 	triggered_planet_modifier = {
@@ -125,18 +119,14 @@ merchant = {
 			exists = owner
 			owner = { has_valid_civic = civic_internet_market }
 		}
-		modifier = {
-			planet_crime_add = 1
-		}
+		planet_crime_add = 1
 	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
 			owner = { has_tradition = tr_mercantile_marketplace_of_better_ideas }
 		}
-		modifier = {
-			pop_lifestyle_trade_mult = 0.02
-		}
+		pop_lifestyle_trade_mult = 0.02
 	}
 
 	weight = {
@@ -317,9 +307,7 @@ soldier = {
 				}
 			}
 		}
-		modifier = {
-			country_naval_cap_add = 2
-		}
+		country_naval_cap_add = 2
 	}
 	pop_modifier = {
 		pop_defense_armies_add = 1
@@ -330,9 +318,7 @@ soldier = {
 				has_building = building_automated_defense_system
 			}
 		}
-		modifier = {
-			pop_defense_armies_add = 2
-		}
+		pop_defense_armies_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -570,9 +556,7 @@ researcher = {
 				has_valid_civic = civic_science_knight
 			}
 		}
-		modifier = {
-			pop_cat_specialist_political_power = 3
-		}
+		pop_cat_specialist_political_power = 3
 	}
 	triggered_pop_modifier = {
 		potential = {
@@ -581,9 +565,7 @@ researcher = {
 				has_edict = commercializing_academic_resources
 			}
 		}
-		modifier = {
-			pop_happiness = -0.1
-		}
+		pop_happiness = -0.1
 	}
 	triggered_pop_modifier = {
 		potential = {
@@ -592,9 +574,7 @@ researcher = {
 				has_edict = academic_resources_open_access
 			}
 		}
-		modifier = {
-			pop_happiness = 0.1
-		}
+		pop_happiness = 0.1
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -606,9 +586,7 @@ researcher = {
 				}
 			}
 		}
-		modifier = {
-			planet_priests_produces_mult = -0.01
-		}
+		planet_priests_produces_mult = -0.01
 	}
 	triggered_country_modifier = {
 		potential = {
@@ -622,9 +600,7 @@ researcher = {
 				}
 			}
 		}
-		modifier = {
-			country_fund_add = 2
-		}
+		country_fund_add = 2
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -636,9 +612,7 @@ researcher = {
 				}
 			}
 		}
-		modifier = {
-			trade_value_add = 0.5
-		}
+		trade_value_add = 0.5
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
 	triggered_planet_modifier = {
@@ -648,9 +622,7 @@ researcher = {
 				has_edict = commercializing_academic_resources
 			}
 		}
-		modifier = {
-			trade_value_add = 1
-		}
+		trade_value_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
 	triggered_planet_modifier = {
@@ -662,9 +634,7 @@ researcher = {
 				}
 			}
 		}
-		modifier = {
-			planet_amenities_add = 0.5
-		}
+		planet_amenities_add = 0.5
 	}
 
 	triggered_planet_modifier = {
@@ -846,9 +816,7 @@ priest = {
 				has_valid_civic = civic_exalted_priesthood
 			}
 		}
-		modifier = {
-			species_empire_size_mult = -0.02
-		}
+		species_empire_size_mult = -0.02
 	}
 	triggered_planet_modifier = { # 民主廉政取消维护费
 		potential = {
@@ -865,18 +833,14 @@ priest = {
 				NOT = { has_valid_civic = civic_knowledge_seeker }
 			}
 		}
-		modifier = {
-			planet_research_produces_mult = -0.01
-		}
+		planet_research_produces_mult = -0.01
 	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
 			owner = { has_valid_civic = civic_liberation_theology }
 		}
-		modifier = {
-			planet_amenities_add = 1
-		}
+		planet_amenities_add = 1
 	}
 
 	weight = {
@@ -1169,9 +1133,7 @@ enforcer = {
 				has_active_tradition = tr_domination_judgment_corps
 			}
 		}
-		modifier = {
-			planet_crime_add = -5
-		}
+		planet_crime_add = -5
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1180,9 +1142,7 @@ enforcer = {
 				has_modifier = anticrime_campaign
 			}
 		}
-		modifier = {
-			planet_crime_add = -10
-		}
+		planet_crime_add = -10
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1191,9 +1151,7 @@ enforcer = {
 				has_valid_civic = civic_anarchism
 			}
 		}
-		modifier = {
-			pop_cat_worker_happiness = -0.05
-		}
+		pop_cat_worker_happiness = -0.05
 	}
 
 	weight = {
@@ -1417,9 +1375,7 @@ telepath = {
 				has_active_tradition = tr_domination_judgment_corps
 			}
 		}
-		modifier = {
-			planet_crime_add = -5
-		}
+		planet_crime_add = -5
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1428,9 +1384,7 @@ telepath = {
 				has_modifier = anticrime_campaign
 			}
 		}
-		modifier = {
-			planet_crime_add = -10
-		}
+		planet_crime_add = -10
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1439,9 +1393,7 @@ telepath = {
 				has_edict = thought_enforcement
 			}
 		}
-		modifier = {
-			planet_crime_add = -10
-		}
+		planet_crime_add = -10
 	}
 
 	triggered_planet_modifier = {
@@ -1449,9 +1401,7 @@ telepath = {
 			exists = owner
 			owner = { has_country_flag = composer_covenant_confirmed }
 		}
-		modifier = {
-			pop_growth_speed = 0.02
-		}
+		pop_growth_speed = 0.02
 	}
 
 	triggered_planet_modifier = {
@@ -1459,9 +1409,7 @@ telepath = {
 			exists = owner
 			owner = { has_country_flag = composer_covenant_rank_1 }
 		}
-		modifier = {
-			pop_growth_speed = 0.03
-		}
+		pop_growth_speed = 0.03
 	}
 
 	triggered_country_modifier = {
@@ -1578,9 +1526,7 @@ entertainer = {
 			exists = owner
 			owner = { is_pleasure_seeker = yes }
 		}
-		modifier = {
-			pop_growth_speed = 0.01
-		}
+		pop_growth_speed = 0.01
 	}
 	
 	triggered_planet_modifier = {
@@ -1590,9 +1536,7 @@ entertainer = {
 				has_valid_civic = civic_eternal_jihad
 			}
 		}
-		modifier = {
-			job_professional_star_fans_add = 2
-		}
+		job_professional_star_fans_add = 2
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1601,10 +1545,8 @@ entertainer = {
 				has_valid_civic = civic_eternal_jihad
 			}
 		}
-		modifier = {
-			job_professional_star_fans_add = 1
-			mult = planet.value:count_job|JOB|manager|
-		}
+		job_professional_star_fans_add = 1
+		mult = planet.value:count_job|JOB|manager|
 	}
 
 	weight = {
@@ -1784,9 +1726,7 @@ culture_worker = {
 				is_authoritarian = yes
 			}
 		}
-		modifier = {
-			planet_stability_add = 2.5
-		}
+		planet_stability_add = 2.5
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1799,9 +1739,7 @@ culture_worker = {
 				}
 			}
 		}
-		modifier = {
-			pop_category_rulers_consumer_goods_upkeep_add = -0.25
-		}
+		pop_category_rulers_consumer_goods_upkeep_add = -0.25
 	}
 	triggered_country_modifier = {
 		potential = {
@@ -1814,9 +1752,7 @@ culture_worker = {
 				}
 			}
 		}
-		modifier = {
-			pop_cat_worker_happiness = 0.025
-		}
+		pop_cat_worker_happiness = 0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1825,9 +1761,7 @@ culture_worker = {
 				is_xenophobe = yes
 			}
 		}
-		modifier = {
-			pop_citizen_happiness = 0.025
-		}
+		pop_citizen_happiness = 0.025
 	}
 	triggered_country_modifier = {
 		potential = {
@@ -1836,9 +1770,7 @@ culture_worker = {
 				is_xenophile = yes
 			}
 		}
-		modifier = {
-			add_base_country_intel = 1
-		}
+		add_base_country_intel = 1
 	}
 	triggered_country_modifier = {
 		potential = {
@@ -1847,9 +1779,7 @@ culture_worker = {
 				is_militarist = yes
 			}
 		}
-		modifier = {
-			country_naval_cap_add = 1
-		}
+		country_naval_cap_add = 1
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1858,9 +1788,7 @@ culture_worker = {
 				is_pacifist = yes
 			}
 		}
-		modifier = {
-			pop_growth_speed_reduction = -0.025
-		}
+		pop_growth_speed_reduction = -0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1869,9 +1797,7 @@ culture_worker = {
 				is_spiritualist = yes
 			}
 		}
-		modifier = {
-			planet_pops_upkeep_mult = -0.025
-		}
+		planet_pops_upkeep_mult = -0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1880,9 +1806,7 @@ culture_worker = {
 				is_materialist = yes
 			}
 		}
-		modifier = {
-			pop_amenities_usage_mult = -0.025
-		}
+		pop_amenities_usage_mult = -0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1891,9 +1815,7 @@ culture_worker = {
 				is_capitalism = yes
 			}
 		}
-		modifier = {
-			pop_lifestyle_trade_mult = 0.025
-		}
+		pop_lifestyle_trade_mult = 0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1902,9 +1824,7 @@ culture_worker = {
 				is_socialism = yes
 			}
 		}
-		modifier = {
-			pop_cat_worker_political_power = 0.25
-		}
+		pop_cat_worker_political_power = 0.25
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -1913,9 +1833,7 @@ culture_worker = {
 				has_valid_civic = civic_art_country
 			}
 		}
-		modifier = {
-			planet_amenities_add = 5
-		}
+		planet_amenities_add = 5
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 	#endregion
@@ -1930,7 +1848,10 @@ culture_worker = {
 		modifier = {
 			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			exists = owner
-			owner = { has_valid_civic = civic_art_country has_edict = dynamic_weight }
+			owner = {
+				has_valid_civic = civic_art_country
+				has_edict = dynamic_weight
+			}
 		}
 		# We deliberately don't weight the ethics-based modifiers
 		modifier = {
@@ -2037,9 +1958,7 @@ bureaucrat = {
 				has_valid_civic = civic_anarchism
 			}
 		}
-		modifier = {
-			pop_cat_worker_happiness = -0.05
-		}
+		pop_cat_worker_happiness = -0.05
 	}
 
 	weight = {
@@ -2352,9 +2271,7 @@ healthcare = {
 				has_policy_flag = public_healthcare
 			}
 		}
-		modifier = {
-			planet_amenities_add = 1
-		}
+		planet_amenities_add = 1
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2363,10 +2280,8 @@ healthcare = {
 				has_policy_flag = private_healthcare
 			}
 		}
-		modifier = {
-			pop_lifestyle_trade_mult = 0.02
-			pop_growth_speed = -0.05
-		}
+		pop_lifestyle_trade_mult = 0.02
+		pop_growth_speed = -0.05
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2547,9 +2462,7 @@ necromancer = {
 				}
 			}
 		}
-		modifier = {
-			country_naval_cap_add = 2
-		}
+		country_naval_cap_add = 2
 	}
 	triggered_pop_modifier = {
 		potential = {
@@ -2558,9 +2471,7 @@ necromancer = {
 				has_modifier = martial_law
 			}
 		}
-		modifier = {
-			pop_defense_armies_add = 2
-		}
+		pop_defense_armies_add = 2
 	}
 
 	weight = {
@@ -2759,9 +2670,7 @@ death_chronicler = {
 				}
 			}
 		}
-		modifier = {
-			pop_category_rulers_consumer_goods_upkeep_add = -0.25
-		}
+		pop_category_rulers_consumer_goods_upkeep_add = -0.25
 	}
 	triggered_country_modifier = {
 		potential = {
@@ -2774,9 +2683,7 @@ death_chronicler = {
 				}
 			}
 		}
-		modifier = {
-			pop_cat_worker_happiness = 0.025
-		}
+		pop_cat_worker_happiness = 0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2785,9 +2692,7 @@ death_chronicler = {
 				is_xenophobe = yes
 			}
 		}
-		modifier = {
-			pop_citizen_happiness = 0.025
-		}
+		pop_citizen_happiness = 0.025
 	}
 	triggered_country_modifier = {
 		potential = {
@@ -2796,9 +2701,7 @@ death_chronicler = {
 				is_xenophile = yes
 			}
 		}
-		modifier = {
-			add_base_country_intel = 1
-		}
+		add_base_country_intel = 1
 	}
 	triggered_country_modifier = {
 		potential = {
@@ -2807,9 +2710,7 @@ death_chronicler = {
 				is_militarist = yes
 			}
 		}
-		modifier = {
-			country_naval_cap_add = 1
-		}
+		country_naval_cap_add = 1
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2818,9 +2719,7 @@ death_chronicler = {
 				is_pacifist = yes
 			}
 		}
-		modifier = {
-			pop_growth_speed_reduction = -0.025
-		}
+		pop_growth_speed_reduction = -0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2829,9 +2728,7 @@ death_chronicler = {
 				is_spiritualist = yes
 			}
 		}
-		modifier = {
-			planet_pops_upkeep_mult = -0.025
-		}
+		planet_pops_upkeep_mult = -0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2840,9 +2737,7 @@ death_chronicler = {
 				is_materialist = yes
 			}
 		}
-		modifier = {
-			pop_amenities_usage_mult = -0.025
-		}
+		pop_amenities_usage_mult = -0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2851,9 +2746,7 @@ death_chronicler = {
 				is_capitalism = yes
 			}
 		}
-		modifier = {
-			pop_lifestyle_trade_mult = 0.025
-		}
+		pop_lifestyle_trade_mult = 0.025
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2862,9 +2755,7 @@ death_chronicler = {
 				is_socialism = yes
 			}
 		}
-		modifier = {
-			pop_cat_worker_political_power = 0.25
-		}
+		pop_cat_worker_political_power = 0.25
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -2873,9 +2764,7 @@ death_chronicler = {
 				has_valid_civic = civic_art_country
 			}
 		}
-		modifier = {
-			planet_amenities_add = 5
-		}
+		planet_amenities_add = 5
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 	#endregion
@@ -2888,7 +2777,14 @@ death_chronicler = {
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
-		mult = value:job_weights_modifier|JOB|death_chronicler|RESOURCE|unity|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = {
+				has_valid_civic = civic_art_country
+				has_edict = dynamic_weight
+			}
+		}
 		# We deliberately don't weight the ethics-based modifiers
 		modifier = {
 			factor = 0.2
@@ -3167,9 +3063,7 @@ pearl_diver = {
 				NOT = { has_ethic = ethic_fanatic_socialism }
 			}
 		}
-		modifier = {
-			trade_value_add = 1
-		}
+		trade_value_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
 
@@ -3229,7 +3123,10 @@ pearl_diver = {
 		}
 		modifier = {
 			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-			owner = { has_valid_civic = civic_agrarian_idyll has_edict = dynamic_weight }
+			owner = {
+				has_valid_civic = civic_agrarian_idyll
+				has_edict = dynamic_weight
+			}
 		}
 		modifier = {
 			factor = 0.1
@@ -3295,9 +3192,7 @@ reassigner = {
 			exists = owner
 			owner = { has_edict = sacrifice_bounty_zombie }
 		}
-		modifier = {
-			planet_pop_assembly_organic_add = 1
-		}
+		planet_pop_assembly_organic_add = 1
 	}
 
 	weight = {
@@ -3455,7 +3350,10 @@ knight = {
 		}
 		modifier = {
 			mult = value:job_weights_research_modifier|JOB|researcher|
-			owner = { has_country_flag = toxoids_7011_b has_edict = dynamic_weight }
+			owner = {
+				has_country_flag = toxoids_7011_b
+				has_edict = dynamic_weight
+			}
 		}
 	}
 }
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index 9d1f7be1c..789779492 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -167,9 +167,7 @@ clerk = {
 				}
 			}
 		}
-		modifier = {
-			species_empire_size_mult = -0.02
-		}
+		species_empire_size_mult = -0.02
 	}
 	# 共产主义社会
 	triggered_country_modifier = {
@@ -183,9 +181,7 @@ clerk = {
 				}
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 5
-		}
+		country_admin_cap_add = 5
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -194,9 +190,7 @@ clerk = {
 				has_valid_civic = civic_business_reporting_administration
 			}
 		}
-		modifier = {
-			planet_jobs_worker_produces_mult = 0.01
-		}
+		planet_jobs_worker_produces_mult = 0.01
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -428,9 +422,7 @@ technician = {
 			exists = owner
 			is_community_society = yes
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -750,9 +742,7 @@ crystal_miner = {
 				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 	
 	weight = {
@@ -1723,9 +1713,7 @@ preacher = {
 				has_ascension_perk = ap_future_society
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 	
 	weight = {

From c251c9bdb33013f599e3e7fa10b75ae5779d02f8 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 19:19:35 +0800
Subject: [PATCH 09/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E5=87=80=E5=8C=96=E7=9A=84=E4=BA=BA=E5=8F=A3=E4=BA=A7=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E7=A0=94=E7=A9=B6=E7=82=B9=E6=95=B0=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pop_jobs/ethic_other_jobs.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/pop_jobs/ethic_other_jobs.txt b/common/pop_jobs/ethic_other_jobs.txt
index 8dc561746..3d66a3aa7 100644
--- a/common/pop_jobs/ethic_other_jobs.txt
+++ b/common/pop_jobs/ethic_other_jobs.txt
@@ -554,9 +554,9 @@ purge = {
 				}
 			}
 			unity = 2
-			engineering_research = 2
-			society_research = 2
-			physics_research = 2
+			engineering_research = 1
+			society_research = 1
+			physics_research = 1
 		}
 		produces = { # regular processing
 			trigger = {

From d4eff7f0f3db3168497bfc0bf46e294525ff1ef6 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 19:39:03 +0800
Subject: [PATCH 10/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E9=9D=9E=E7=BD=AA?=
 =?UTF-8?q?=E4=BC=81=E6=97=B6=E7=BD=AA=E7=8A=AF-5=E8=B4=B8=E6=98=93?=
 =?UTF-8?q?=E9=A2=9D=E4=BA=A7=E5=87=BA=EF=BC=8C=E7=BD=AA=E7=8A=AF=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pop_jobs/ethic_other_jobs.txt          | 23 ++++++++++---------
 .../ut_scripted_triggers.txt                  |  8 +++++++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/common/pop_jobs/ethic_other_jobs.txt b/common/pop_jobs/ethic_other_jobs.txt
index 3d66a3aa7..b0f3a000e 100644
--- a/common/pop_jobs/ethic_other_jobs.txt
+++ b/common/pop_jobs/ethic_other_jobs.txt
@@ -860,26 +860,20 @@ criminal = {
 		}
 	}
 
-	planet_modifier = {
-		planet_amenities_add = 1
-	}
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
-			    NOR = {
-				    has_valid_civic = civic_criminal_heritage
-				    has_valid_civic = civic_underworld_society
-				}
+			   NOT = { is_criminal_syndicate = yes }
 			}
 		}
 		modifier = {
-			trade_value_add = -1
+			trade_value_add = -5
 		}
 	}
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
-				has_valid_civic = civic_underworld_society
+				has_valid_civic = civic_criminal_heritage
 			}
 		}
 		modifier = {
@@ -890,10 +884,17 @@ criminal = {
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
-				has_valid_civic = civic_criminal_heritage
+				has_valid_civic = civic_underworld_society
+			}
+		}
+		planet_jobs_worker_produces_mult = 0.02
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_underworld_society
 			}
 		}
-		planet_jobs_worker_produces_mult = 0.4
 		planet_stability_add = 40
 		mult = planet.society_factor_pops
 	}
diff --git a/common/scripted_triggers/ut_scripted_triggers.txt b/common/scripted_triggers/ut_scripted_triggers.txt
index 42af72e35..2378834b5 100644
--- a/common/scripted_triggers/ut_scripted_triggers.txt
+++ b/common/scripted_triggers/ut_scripted_triggers.txt
@@ -26,6 +26,14 @@ has_pacifist_topic_civic = {
 	}
 }
 
+# 是罪企
+is_criminal_syndicate = {
+	OR = {
+		has_valid_civic = civic_criminal_heritage
+		has_valid_civic = civic_underworld_society
+	} 
+}
+
 ### CIVIC RELATED
 
 # 未被奴役（兼容特殊国策）

From bd86b17e8905e80e5f84b16d059be52a301649f3 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 19:41:03 +0800
Subject: [PATCH 11/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=EF=BC=9A=E6=95=B0=E5=80=BC=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=82=E7=85=A7=E5=8E=9F=E7=89=88=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         |  9 +++-
 common/pop_jobs/ethic_other_jobs.txt | 70 ++++++++++++++++++++--------
 2 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1bc1188b..e8b368eb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,5 +10,10 @@
 * 调整 统治者职业：数值调整，基础消费品维护费改为2，参照原版文件的调整
 * 调整 专家职业：数值调整，基础消费品维护费改为1，执法者生成2防御部队，参照原版文件的调整
 * 调整 工人职业：数值调整，参照原版文件进行调整
-* 调整 其他职业：数值调整，参照原版文件进行调整 *
-* 格式化 职业：去除多余的`modifier = {...}`子句，提取`scripted_trigger`
\ No newline at end of file
+* 调整 其他职业：数值调整，参照原版文件进行调整
+* 调整 正在净化的人口产出的研究点数改为1
+* 调整 非罪企时罪犯-5贸易额产出，罪犯相关BUG修复
+
+```
+planet_modifier/planet_jobs_slave_produces_mult
+```
\ No newline at end of file
diff --git a/common/pop_jobs/ethic_other_jobs.txt b/common/pop_jobs/ethic_other_jobs.txt
index b0f3a000e..78f5142c4 100644
--- a/common/pop_jobs/ethic_other_jobs.txt
+++ b/common/pop_jobs/ethic_other_jobs.txt
@@ -16,7 +16,8 @@ servant = {
 
 	resources = {
 		category = planet_jobs
-		upkeep = { # 失控女仆兼容
+		# 失控女仆兼容
+		upkeep = {
 			trigger = {
 				has_global_flag = flag_rogue_maid_mod_activated
 				has_trait = trait_machine_maid
@@ -26,13 +27,6 @@ servant = {
 			energy = 2
 		}
 	}
-	triggered_planet_modifier = {
-		potential = {
-			always = yes
-		}
-		planet_amenities_add = 4
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
 
 	triggered_pop_modifier = {
 		potential = {
@@ -40,6 +34,15 @@ servant = {
 		}
 		pop_housing_usage_add = -0.5
 	}
+	
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 4
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -158,10 +161,11 @@ slave_overseer = {
 			}
 			unity = 1
 		}
-		#
 	}
+	
 	pop_modifier = {
 		pop_happiness = 0.25
+		pop_defense_armies_add = 2
 	}
 	planet_modifier = {
 		planet_crime_add = -20
@@ -202,7 +206,8 @@ slave_overseer = {
 		weight = @specialist_job_weight
 	}
 }
-#原版
+
+#苦工
 slave_toiler = {
 	category = worker
 	is_capped_by_modifier = no
@@ -282,8 +287,8 @@ slave_toiler = {
 #		weight = @special_job_weight
 #	}
 #}
-#
-#原版
+
+#并入电网
 organic_battery = {
 	category = worker
 	is_capped_by_modifier = no
@@ -326,7 +331,8 @@ organic_battery = {
 		weight = @special_job_weight
 	}
 }
-#原版
+
+#牲口
 livestock = {
 	category = worker
 	is_capped_by_modifier = no
@@ -419,6 +425,8 @@ bio_trophy = {
 			}
 			unity = 4
 		}
+		
+		# 机械乌托邦
 		produces = {
 			trigger = {
 				owner = {
@@ -524,7 +532,8 @@ bio_trophy = {
 		weight = 500000
 	}
 }
-#原版
+
+#正在净化
 purge = {
 	category = purge
 	is_capped_by_modifier = no
@@ -716,7 +725,8 @@ purge = {
 		}
 	}
 }
-#原版
+
+#正在净化
 crisis_purge = {
 	icon = purge
 	category = purge
@@ -795,23 +805,45 @@ assimilation = {
 		category = planet_jobs
 		upkeep = {
 			trigger = {
-				is_organic_species = yes
-				is_lithoid = no
+				has_phototrophic_energy_upkeep = yes
+			}
+			energy = @living_standard_phototrophic_normal
+		}
+		upkeep = {
+			trigger = {
+				has_food_upkeep = yes
+				is_phototrophic = no
 			}
 			food = @living_standard_food_normal
 		}
 		upkeep = {
 			trigger = {
-				is_lithoid = yes
+				has_food_upkeep = yes
+				is_phototrophic = yes
+			}
+			food = @living_standard_phototrophic_normal
+		}
+		upkeep = {
+			trigger = {
+				has_mineral_upkeep = yes
+				is_phototrophic = no
 			}
 			minerals = @living_standard_food_normal
 		}
 		upkeep = {
 			trigger = {
-				is_robotic_species = yes
+				has_mineral_upkeep = yes
+				is_phototrophic = yes
+			}
+			minerals = @living_standard_phototrophic_normal
+		}
+		upkeep = {
+			trigger = {
+				is_robotic_or_voidspawn_species = yes
 			}
 			energy = @living_standard_energy_normal
 		}
+		
 		# 失控女仆兼容：机飞帝国不会同化有基因库的星球上的物种，作为补偿产出一点科研
 		produces = {
 			trigger = {

From cb25c6c9956579e445e696f851344341f102b175 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 2 Jan 2023 19:51:44 +0800
Subject: [PATCH 12/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=89=A7=E6=B3=95?=
 =?UTF-8?q?=E8=80=85=E7=94=9F=E6=88=902=E9=98=B2=E5=BE=A1=E9=83=A8?=
 =?UTF-8?q?=E9=98=9F=20=E7=9B=B8=E5=85=B3=E6=9C=AC=E5=9C=B0=E5=8C=96?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 localisation/replace/english/ethic_jobs_l_english.yml         | 4 ++--
 .../replace/simp_chinese/ethic_jobs_l_simp_chinese.yml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/localisation/replace/english/ethic_jobs_l_english.yml b/localisation/replace/english/ethic_jobs_l_english.yml
index 015c79ef2..6118109d6 100644
--- a/localisation/replace/english/ethic_jobs_l_english.yml
+++ b/localisation/replace/english/ethic_jobs_l_english.yml
@@ -78,12 +78,12 @@
  job_enforcer:0 "Enforcer"
  job_enforcer_plural:0 "Enforcers"
  job_enforcer_desc:0 "Law enforcement officers are responsible for upholding the law and maintaining peace."
- job_enforcer_effect_desc:2 "£job_enforcer£ $job_enforcer_plural$ decrease £crime£ §Y$PLANET_CRIME_TITLE$§! and increase §Y$MOD_PLANET_STABILITY_ADD$§!"
+ job_enforcer_effect_desc:2 "£job_enforcer£ $job_enforcer_plural$ decrease £crime£ §Y$PLANET_CRIME_TITLE$§! and spawn £defense_army£ §YDefense Armies§!"
 
  job_slave_overseer:0 "Overseer"
  job_slave_overseer_plural:0 "Overseers"
  job_slave_overseer_desc:0 "These relatively privileged slaves keep their less fortunate brethren in line."
- job_slave_overseer_effect_desc:0 "£job_slave_overseer£ $job_slave_overseer_plural$ reduces £crime£ §Y$PLANET_CRIME_TITLE$§! and increases §Y$mod_planet_jobs_slave_produces_mult$§!, but causes $mod_pop_cat_slave_happiness$ to decrease and $pop_cat_worker$ to consume an additional £unity£ §Y$unity$§ !"
+ job_slave_overseer_effect_desc:0 "£job_slave_overseer£ $job_slave_overseer_plural$ decrease £crime£ §Y$PLANET_CRIME_TITLE$§!, spawn £defense_army£ §YDefense Armies§! and increases §Y$mod_planet_jobs_slave_produces_mult$§!, but causes $mod_pop_cat_slave_happiness$ to decrease and $pop_cat_worker$ to consume additional £unity£ §Y$unity$§ !"
 
  job_future_worker: "$pop_cat_worker$"
  job_future_worker_plural: "$pop_cat_worker_plural$"
diff --git a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
index f34c23c57..24e1fd792 100644
--- a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
@@ -81,12 +81,12 @@
  job_enforcer:0 "执法者"
  job_enforcer_plural:0 "执法者"
  job_enforcer_desc:0 "执法者是维护法律和秩序的人员。"
- job_enforcer_effect_desc:2 "£job_enforcer£ $job_enforcer_plural$降低 £crime£ §Y$PLANET_CRIME_TITLE$§!并提高§Y$MOD_PLANET_STABILITY_ADD$§!"
+ job_enforcer_effect_desc:2 "£job_enforcer£ $job_enforcer_plural$降低 £crime£ §Y$PLANET_CRIME_TITLE$§!并产生 £defense_army£ §Y防御部队§!"
 
  job_slave_overseer:0 "监工"
  job_slave_overseer_plural:0 "监工"
  job_slave_overseer_desc:0 "这些有些特权的奴隶负责监管那些没那么走运的同胞们。"
- job_slave_overseer_effect_desc:0 "£job_slave_overseer£ $job_slave_overseer_plural$减少£crime£ §Y$PLANET_CRIME_TITLE$§!并提高§Y$mod_planet_jobs_slave_produces_mult$§!，但会导致$mod_pop_cat_slave_happiness$降低并使$pop_cat_worker$额外消耗£unity£ §Y$unity$§!"
+ job_slave_overseer_effect_desc:0 "£job_slave_overseer£  $job_slave_overseer_plural$降低 £crime£ §Y$PLANET_CRIME_TITLE$§!，产生 £defense_army£ §Y防御部队§!并提高§Y$mod_planet_jobs_slave_produces_mult$§!，但会导致$mod_pop_cat_slave_happiness$降低并使$pop_cat_worker$额外消耗£unity£ §Y$unity$§!"
 
  job_future_worker: "$pop_cat_worker$"
  job_future_worker_plural: "$pop_cat_worker_plural$"

From dd214ffb62acb07973a615f6451fd7173a77aa11 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Tue, 3 Jan 2023 00:16:56 +0800
Subject: [PATCH 13/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E8=81=8C=E4=B8=9A?=
 =?UTF-8?q?=E6=95=B0=E5=80=BC=E8=B0=83=E6=95=B4=EF=BC=8C=E5=8F=82=E7=85=A7?=
 =?UTF-8?q?=E5=8E=9F=E7=89=88=E6=96=87=E4=BB=B6=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |    7 +-
 .../common/building/ethic_unity_buildings.txt |    4 +-
 common/pop_jobs/01_ruler_jobs.txt             |   40 +-
 common/pop_jobs/02_specialist_jobs.txt        |   44 +-
 common/pop_jobs/03_worker_jobs.txt            |   45 +-
 common/pop_jobs/07_fallen_empire_jobs.txt     |  639 ++++++
 .../pop_jobs/07_revolutionary_empire_jobs.txt |  950 +++++++++
 common/pop_jobs/ethic_gestalt_jobs.txt        |  421 +++-
 common/pop_jobs/ethic_other_jobs.txt          |   10 +-
 common/pop_jobs/ethic_rebuild_jobs.txt        | 1776 +++--------------
 .../ut_scripted_triggers.txt                  |  119 +-
 .../ut_scripted_variables.txt                 |   20 +-
 .../replace/english/ethic_jobs_l_english.yml  |    8 +
 .../ethic_jobs_l_simp_chinese.yml             |   10 +-
 14 files changed, 2468 insertions(+), 1625 deletions(-)
 create mode 100644 common/pop_jobs/07_fallen_empire_jobs.txt
 create mode 100644 common/pop_jobs/07_revolutionary_empire_jobs.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8b368eb7..e75b4ae0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,13 +7,16 @@
 * 调整 所有职业的非全国的贸易额产出改为加算
 * 调整 职员基础舒适度产出改为1
 * 调整 自由主义国家也能使用上山下乡法令
-* 调整 统治者职业：数值调整，基础消费品维护费改为2，参照原版文件的调整
-* 调整 专家职业：数值调整，基础消费品维护费改为1，执法者生成2防御部队，参照原版文件的调整
+* 调整 统治者职业：数值调整，参照原版文件的调整
+* 调整 专家职业：数值调整，执法者生成2防御部队，参照原版文件的调整
 * 调整 工人职业：数值调整，参照原版文件进行调整
 * 调整 其他职业：数值调整，参照原版文件进行调整
+* 调整 特殊职业：数值调整
+* 调整 格式塔职业职业：数值调整
 * 调整 正在净化的人口产出的研究点数改为1
 * 调整 非罪企时罪犯-5贸易额产出，罪犯相关BUG修复
 
 ```
 planet_modifier/planet_jobs_slave_produces_mult
+civic_anglers_lithoid
 ```
\ No newline at end of file
diff --git a/Mysteries Tools/EDU/common/building/ethic_unity_buildings.txt b/Mysteries Tools/EDU/common/building/ethic_unity_buildings.txt
index 88e46d5a6..4b425f8f5 100644
--- a/Mysteries Tools/EDU/common/building/ethic_unity_buildings.txt	
+++ b/Mysteries Tools/EDU/common/building/ethic_unity_buildings.txt	
@@ -3112,9 +3112,7 @@ building_citadel_of_faith = {
 		potential = {
 			exists = owner
 			owner = {
-				NOR = {
-					has_valid_civic = civic_anarchism
-				}
+				NOR = { has_valid_civic = civic_anarchism }
 			}
 		}
 		modifier = {
diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index 1a8876fdc..c2d524d31 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -689,7 +689,7 @@ executive = {
 	triggered_planet_modifier = {
 		potential = { always = yes }
 		trade_value_add = 2
-		mult = planet.value:count_job|JOB|manager|
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
 	country_modifier = {
 		trade_value_mult = 0.03
@@ -814,8 +814,8 @@ knight_commander = {
 			mult = value:knight_commander_research_output_modifier
 		}
 		upkeep = {
-			alloys = 1
-			consumer_goods = @ruler_job_consumer_goods_upkeep_half
+			alloys = @ruler_job_alloys_upkeep_knight_commander
+			consumer_goods = @ruler_job_consumer_goods_upkeep_knight_commander
 		}
 	}
 
@@ -856,6 +856,15 @@ knight_commander = {
 		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
 	}
 
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_anarchism
+			}
+		}
+		pop_cat_specialist_happiness = -0.05
+	}
+
 	weight = {
 		weight = @high_prio_specialist_job_weight
 		modifier = {
@@ -869,5 +878,30 @@ knight_commander = {
 				has_edict = dynamic_weight 
 			}
 		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			exists = planet
+			exists = planet.controller
+			planet.controller = {
+				OR = {
+					is_country_type = swarm
+					is_country_type = ai_empire
+				}
+			}
+			OR = {
+				# contingency won't purge itself
+				NOT = { exists = event_target:custodian_bot }
+				AND = {
+					exists = event_target:custodian_bot
+					NOT = { species = { is_same_value = event_target:custodian_bot } }
+				}
+			}
+		}
 	}
 }
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 842dde970..96400a23c 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -161,25 +161,6 @@ merchant = {
 			factor = 5
 			has_job = merchant
 		}
-		# crisis purge
-		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-			OR = { # contingency won't purge itself
-				NOT = { exists = event_target:custodian_bot }
-				AND = {
-					exists = event_target:custodian_bot
-					NOT = { species = { is_same_value = event_target:custodian_bot } }
-				}
-			}
-		}
 	}
 }
 
@@ -192,6 +173,7 @@ soldier = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
@@ -361,16 +343,6 @@ soldier = {
 			factor = 0.5
 			has_trait = trait_weak
 		}
-		modifier = {
-			factor = 0.1
-			is_enslaved = yes
-			NOT = { has_slavery_type = { type = slavery_military } }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			has_slavery_type = { type = slavery_military }
-		}
 		modifier = {
 			factor = 0.1
 			can_take_servant_job = yes
@@ -1512,7 +1484,7 @@ entertainer = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_job_consumer_goods_upkeep_entertainer
 		}
 	}
 	triggered_planet_modifier = {
@@ -1627,10 +1599,10 @@ duelist = {
 	resources = {
 		category = planet_entertainers
 		produces = {
-			unity = 3
+			unity = 2
 		}
 		upkeep = {
-			alloys = 1
+			alloys = @specialist_job_alloys_upkeep_duelist
 		}
 	}
 	triggered_planet_modifier = {
@@ -2382,10 +2354,14 @@ manager = {
 		}
 	}
 	planet_modifier = {
-		trade_value_add = 4
 		planet_amenities_add = -2
 		planet_bureaucrats_upkeep_mult = 0.01
 	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		trade_value_add = 4
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
 	triggered_planet_modifier = {
 		potential = {
 			exists = owner
@@ -3300,7 +3276,7 @@ knight = {
 			mult = value:knights_research_output_modifier
 		}
 		upkeep = {
-			alloys = 1
+			alloys = @specialist_job_alloys_upkeep_knight
 		}
 	}
 
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index 789779492..ed2b8035d 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -430,9 +430,8 @@ technician = {
 				has_valid_civic = civic_financial_investment
 			}
 		}
-		modifier = {
-			trade_value_add = 1
-		}
+		trade_value_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
 	}
 
 	overlord_resources = {
@@ -529,6 +528,23 @@ miner = {
 		produces = {
 			minerals = @job_miner_minerals_produce_base
 		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			minerals = @requisitorium_minerals_reduction
+		}
+		
+		# 灵网裂隙
+		produces = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			sr_zro = 0.1
+		}
+
 		produces = {
 			trigger = {
 				owner = {
@@ -549,23 +565,6 @@ miner = {
 			}
 			rare_crystals = 0.25
 		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			minerals = @requisitorium_minerals_reduction
-		}
-		
-		# 灵网裂隙
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
-		
 		# 科学社会主义
 		produces = {
 			trigger = {
@@ -1436,8 +1435,7 @@ artisan = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
 		country_admin_cap_add = 0.5
@@ -1709,8 +1707,7 @@ preacher = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
 		country_admin_cap_add = 0.5
diff --git a/common/pop_jobs/07_fallen_empire_jobs.txt b/common/pop_jobs/07_fallen_empire_jobs.txt
new file mode 100644
index 000000000..0c0453710
--- /dev/null
+++ b/common/pop_jobs/07_fallen_empire_jobs.txt
@@ -0,0 +1,639 @@
+###################
+# Primitive Jobs
+###################
+
+fe_overseer = {
+	category = precursor
+	is_capped_by_modifier = yes
+	clothes_texture_index = 1
+	icon = administrator
+	building_icon = building_palace
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_empire = yes }
+		is_same_species = owner
+	}
+
+	planet_modifier = {
+		planet_stability_add = 5
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 10
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+
+	weight = {
+		weight = 30000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_sky_cardinal = {
+	category = precursor
+	is_capped_by_modifier = yes
+	clothes_texture_index = 1
+	icon = high_priest
+	building_icon = building_palace
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_empire_spiritualist = yes }
+		is_same_species = owner
+	}
+
+	planet_modifier = {
+		planet_stability_add = 5
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 10
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+
+	weight = {
+		weight = 30000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+
+fe_guardian_bot = {
+	category = precursor
+	is_capped_by_modifier = yes
+	building_icon = building_maintenance_depot
+	clothes_texture_index = 2
+	icon = soldier
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_machine_empire = yes }
+		OR = {
+			has_trait = trait_mechanical
+			has_trait = trait_machine_unit
+		}
+	}
+
+	planet_modifier = {
+		planet_crime_add = -25
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 3
+	}
+
+
+	weight = {
+		weight = 30000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_protector = {
+	category = precursor
+	icon = enforcer
+	building_icon = building_fortress
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_empire = yes }
+		is_same_species = owner
+	}
+
+	resources = {
+	}
+
+	planet_modifier = {
+		planet_crime_add = -25
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 3
+	}
+
+	weight = {
+		weight = 30000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_archivist = {
+	category = precursor
+	is_capped_by_modifier = yes
+	building_icon = building_master_archive
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_fallen_empire = yes
+			has_country_flag = fallen_empire_1
+		}
+		is_same_species = owner
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			society_research = 5
+			physics_research = 5
+			engineering_research = 5
+		}
+	}
+
+	weight = {
+		weight = 30000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_acolyte_farm = {
+	category = precursor
+	building_icon = building_food_processing_facility
+	clothes_texture_index = 3
+	icon = farmer
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_empire_spiritualist = yes }
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			food = 8
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+				}
+			}
+			food = @requisitorium_food_reduction
+		}
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_food
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+				}
+			}
+			food = @requisitorium_food_overlord
+		}
+	}
+
+	weight = {
+		weight = 15000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_acolyte_mine = {
+	category = precursor
+	building_icon = building_crystal_mines
+	clothes_texture_index = 3
+	icon = miner
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_empire_spiritualist = yes }
+	}
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = 6
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			minerals = @requisitorium_minerals_reduction
+		}
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_minerals
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			minerals = @requisitorium_minerals_overlord
+		}
+	}
+
+	weight = {
+		weight = 15000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_acolyte_generator = {
+	category = precursor
+	building_icon = building_power_plant
+	clothes_texture_index = 3
+	icon = technician
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_empire_spiritualist = yes }
+	}
+
+	resources = {
+		category = planet_technician
+		produces = {
+			energy = 6
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_energy_requisitorium
+				}
+			}
+			energy = @requisitorium_energy_reduction
+		}
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_energy
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_energy_requisitorium
+				}
+			}
+			energy = @requisitorium_energy_overlord
+		}
+	}
+
+	weight = {
+		weight = 15000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_augur = {
+	category = precursor
+	icon = priest
+	is_capped_by_modifier = yes
+	building_icon = building_citadel_of_faith
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_empire_spiritualist = yes }
+		is_same_species = owner
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			unity = 10
+		}
+	}
+
+	weight = {
+		weight = 30000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_xeno_keeper = {
+	category = precursor
+	icon = culture_worker
+	is_capped_by_modifier = yes
+	building_icon = building_fe_xeno_zoo
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_fallen_empire = yes
+		}
+		is_same_species = owner
+	}
+
+	planet_modifier = {
+		planet_crime_add = -20
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 2
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 10
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+
+	weight = {
+		weight = 20000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_xeno_ward = {
+	category = xeno_ward
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_fallen_empire = yes
+			is_xenophile = yes
+		}
+		NOT = { is_same_species = owner }
+		is_robot_pop = no
+		planet = {
+			has_building = building_fe_xeno_zoo
+		}
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			unity = 2
+		}
+	}
+
+	weight = {
+		weight = 10000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+# Backup jobs
+fe_hedonist = {
+	category = precursor
+	is_capped_by_modifier = no
+	building_icon = building_hyper_entertainment_forum
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		OR = {
+			AND = {
+				owner = {
+					is_fallen_empire = yes
+					is_fallen_empire_spiritualist = no
+					is_fallen_machine_empire = no
+				}
+			}
+			AND = {
+				owner = { has_origin = origin_taking_care_of_god }
+				has_trait = trait_fallen_god
+			}
+		}
+		is_same_species = owner
+		NOR = {
+			has_trait = trait_mechanical
+			has_trait = trait_machine_unit
+		}
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			unity = 2
+		}
+	}
+
+	weight = {
+		weight = 1000
+
+		modifier = {
+			factor = 100
+			owner = { has_origin = origin_taking_care_of_god }
+			has_trait = trait_fallen_god
+		}
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_acolyte_artisan = {
+	category = precursor
+	is_capped_by_modifier = no
+	building_icon = building_empyrean_shrine
+	clothes_texture_index = 3
+	icon = artisan
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_empire_spiritualist = yes }
+		is_same_species = owner
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			consumer_goods = 6
+		}
+		produces = {
+			trigger = {
+				planet = { has_active_building = building_factory_2 }
+			}
+			consumer_goods = 1
+		}
+		produces = {
+			trigger = {
+				planet = { has_active_building = building_factory_3 }
+			}
+			consumer_goods = 2
+		}
+	}
+
+	weight = {
+		weight = 1000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
+
+fe_maintenance_bot = {
+	category = precursor
+	is_capped_by_modifier = no
+	building_icon = building_maintenance_depot
+	clothes_texture_index = 3
+	icon = maintenance_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = { is_fallen_machine_empire = yes }
+		OR = {
+			has_trait = trait_mechanical
+			has_trait = trait_machine_unit
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+
+	resources = {
+		category = planet_jobs
+	}
+
+	weight = {
+		weight = 1000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_precursor_check = yes
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/pop_jobs/07_revolutionary_empire_jobs.txt b/common/pop_jobs/07_revolutionary_empire_jobs.txt
new file mode 100644
index 000000000..cda9783b2
--- /dev/null
+++ b/common/pop_jobs/07_revolutionary_empire_jobs.txt
@@ -0,0 +1,950 @@
+#圣炉侍者
+re_acolyte_metallurgists = {
+	category = worker
+	is_capped_by_modifier = yes
+	building_icon = building_empyrean_shrine
+	clothes_texture_index = 3
+	icon = foundry
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+	possible = {
+		owner = {
+			has_origin = origin_zarqlanism_idea
+		}
+	}
+
+	resources = {
+		category = planet_metallurgists
+		produces = {
+			alloys = @job_foundry_alloys_produce_base
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_catalytic_empire = yes
+				}
+			}
+			society_research = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			alloys = @requisitorium_alloys_reduction
+		}
+		upkeep = {
+			minerals = @worker_job_minerals_upkeep_foundry
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			minerals = 2
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_catalytic_empire = yes
+				}
+			}
+			minerals = -6
+			food = 6
+		}
+
+		# 科学社会主义
+		produces = {
+			trigger = {
+				owner = {
+					is_scientific_socialism = yes
+				}
+			}
+			engineering_research = 0.25
+		}
+		# 社会主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_socialism
+				}
+			}
+			unity = 0.75
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_socialism
+				}
+			}
+			unity = 0.25
+		}
+	}
+	# 共产主义社会
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_community_society = yes
+			}
+		}
+		country_admin_cap_add = 0.5
+	}
+	
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 0.5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_alloys
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			alloys = @requisitorium_alloys_overlord
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			factor = value:job_weights_modifier|JOB|re_acolyte_metallurgists|RESOURCE|alloys|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 2
+			is_enslaved = yes
+			can_take_servant_job = no
+		}
+		modifier = {
+			factor = 5
+			has_job = re_acolyte_metallurgists
+		}
+	}
+}
+
+#圣坊侍者
+re_acolyte_artisan = {
+	category = worker
+	is_capped_by_modifier = yes
+	building_icon = building_empyrean_shrine
+	clothes_texture_index = 3
+	icon = artisan
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+	possible = {
+		owner = {
+			has_origin = origin_zarqlanism_idea
+		}
+	}
+
+	resources = {
+		category = planet_artisans
+		produces = {
+			consumer_goods = @job_artisan_consumer_goods_produce_base
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_crafters
+				}
+			}
+			engineering_research = 1
+		}
+		upkeep = {
+			minerals = @worker_job_minerals_upkeep_artisan
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+					exists = owner.overlord
+					owner.overlord = { is_gestalt = no }
+				}
+			}
+			consumer_goods = @requisitorium_consumer_goods_reduction
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+					exists = owner.overlord
+					owner.overlord = { is_gestalt = no }
+				}
+			}
+			minerals = 1
+		}
+
+		# 科学社会主义
+		produces = {
+			trigger = {
+				owner = {
+					is_scientific_socialism = yes
+				}
+			}
+			engineering_research = 0.25
+		}
+		# 社会主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_socialism
+				}
+			}
+			unity = 0.75
+		}
+		# 合作主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_socialism
+				}
+			}
+			unity = 0.25
+		}
+	}
+	# 共产主义社会
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_community_society = yes
+			}
+		}
+		country_admin_cap_add = 0.5
+	}
+	
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 0.5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_consumer_goods
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+					exists = owner.overlord
+					owner.overlord = { is_gestalt = no }
+				}
+			}
+			consumer_goods = @requisitorium_consumer_goods_overlord
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			factor = value:job_weights_modifier|JOB|re_acolyte_artisan|RESOURCE|consumer_goods|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 2
+			is_enslaved = yes
+			can_take_servant_job = no
+		}
+		modifier = {
+			factor = 5
+			has_job = re_acolyte_artisan
+		}
+
+		# low income modifier
+		modifier = {
+			factor = 1.2
+			exists = planet
+			planet = {
+				has_available_jobs = "re_acolyte_artisan"
+			}
+			exists = owner
+			owner = {
+				is_ai = yes
+				has_monthly_income = {
+					resource = consumer_goods
+					value < 5
+				}
+			}
+		}
+	}
+}
+
+#犁耕侍者
+re_acolyte_farm = {
+	category = worker
+	building_icon = building_food_processing_facility
+	clothes_texture_index = 3
+	icon = farmer
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+	possible = {
+		owner = {
+			has_origin = origin_zarqlanism_idea
+		}
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			food = @job_farmer_food_produce_base
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_robot_empire = yes
+				}
+			}
+			food = -1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+				}
+			}
+			food = @requisitorium_food_reduction
+		}
+		
+		# 灵网裂隙
+		produces = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			sr_zro = 0.1
+		}
+		
+		# 科学社会主义
+		produces = {
+			trigger = {
+				owner = {
+					is_scientific_socialism = yes
+				}
+			}
+			society_research = 0.25
+		}
+		# 社会主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_socialism
+				}
+			}
+			unity = 0.75
+		}
+		# 合作主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_socialism
+				}
+			}
+			unity = 0.25
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_agrarian_idyll
+			}
+		}
+		modifier = {
+			planet_amenities_add = 2
+		}
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_agrarian_idyll
+			}
+		}
+		trade_value_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	# 共产主义社会
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_community_society = yes
+			}
+		}
+		country_admin_cap_add = 0.5
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_food
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+				}
+			}
+			food = @requisitorium_food_overlord
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			factor = value:job_weights_modifier|JOB|re_acolyte_farm|RESOURCE|food|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 1.1
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			can_take_servant_job = no
+			NOT = { has_slavery_type = { type = slavery_indentured } }
+		}
+		modifier = {
+			factor = 3
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = { has_technology = tech_droid_workers }
+		}
+		modifier = {
+			factor = 200
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = { NOT = { has_technology = tech_droid_workers } }
+		}
+		modifier = {
+			factor = 0.25
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		# low income modifier
+		modifier = {
+			factor = 1.2
+			exists = planet
+			planet = {
+				has_available_jobs = re_acolyte_farm
+			}
+			exists = owner
+			owner = {
+				is_ai = yes
+				has_monthly_income = {
+					resource = food
+					value < 10
+				}
+			}
+		}
+
+		modifier = {
+			factor = 0.5
+			has_trait = trait_lithoid
+
+			owner = {
+				is_lithoid_empire = yes
+				has_monthly_income = {
+					resource = food
+					value >= 0
+				}
+			}
+		}
+	}
+}
+
+#焰锤侍者
+re_acolyte_mine = {
+	category = worker
+	building_icon = building_crystal_mines
+	clothes_texture_index = 3
+	icon = miner
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+	possible = {
+		owner = {
+			has_origin = origin_zarqlanism_idea
+		}
+	}
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = @job_miner_minerals_produce_base
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			minerals = @requisitorium_minerals_reduction
+		}
+		
+		# 灵网裂隙
+		produces = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			sr_zro = 0.1
+		}
+		
+		produces = {
+			trigger = {
+				owner = {
+					has_valid_civic = civic_anglers_lithoid
+				}
+				planet = { is_wet = yes }
+			}
+			minerals = 1
+			consumer_goods = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					has_valid_civic = civic_anglers_lithoid
+					has_technology = tech_mine_rare_crystals
+				}
+				planet = { is_wet = yes }
+			}
+			rare_crystals = 0.25
+		}
+		# 科学社会主义
+		produces = {
+			trigger = {
+				owner = {
+					is_scientific_socialism = yes
+				}
+			}
+			engineering_research = 0.25
+		}
+
+		#社会主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_socialism
+				}
+			}
+			unity = 0.75
+		}
+		# 合作主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_socialism
+				}
+			}
+			unity = 0.25
+		}
+	}
+	
+	# 共产主义社会
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_community_society = yes
+			}
+		}
+		country_admin_cap_add = 0.5
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_minerals
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			minerals = @requisitorium_minerals_overlord
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			factor = value:job_weights_modifier|JOB|re_acolyte_mine|RESOURCE|minerals|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			can_take_servant_job = no
+			NOT = { has_slavery_type = { type = slavery_indentured } }
+		}
+		modifier = {
+			factor = 3
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = { has_technology = tech_droid_workers }
+		}
+		modifier = {
+			factor = 200
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = { NOT = { has_technology = tech_droid_workers } }
+		}
+		modifier = {
+			factor = 0.25
+			can_take_servant_job = yes
+		}
+
+		# low income modifier
+		modifier = {
+			factor = 1.1
+			exists = planet
+			planet = {
+				has_available_jobs = "re_acolyte_mine"
+			}
+			exists = owner
+			owner = {
+				is_ai = yes
+				has_monthly_income = {
+					resource = minerals
+					value < 0
+				}
+			}
+		}
+	}
+}
+
+#圣钳侍者
+re_acolyte_generator = {
+	category = worker
+	building_icon = building_power_plant
+	clothes_texture_index = 3
+	icon = technician
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+	possible = {
+		owner = {
+			has_origin = origin_zarqlanism_idea
+		}
+	}
+
+	resources = {
+		category = planet_technician
+		produces = {
+			energy = @job_technician_energy_produce_base
+		}
+		produces = {
+			trigger = {
+				owner = {
+					is_robot_empire = yes
+				}
+			}
+			energy = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_energy_requisitorium
+				}
+			}
+			energy = @requisitorium_energy_reduction
+		}
+
+		# 科学社会主义
+		produces = {
+			trigger = {
+				owner = {
+					is_scientific_socialism = yes
+				}
+			}
+			physics_research = 0.25
+		}
+		# 社会主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_socialism
+				}
+			}
+			unity = 0.75
+		}
+		# 合作主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_socialism
+				}
+			}
+			unity = 0.25
+		}
+	}
+	
+	# 共产主义社会
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			is_community_society = yes
+		}
+		country_admin_cap_add = 0.5
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_financial_investment
+			}
+		}
+		trade_value_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_energy
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_energy_requisitorium
+				}
+			}
+			energy = @requisitorium_energy_overlord
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			factor = value:job_weights_modifier|JOB|re_acolyte_generator|RESOURCE|energy|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 10
+			exists = owner
+			owner = { is_country_type = default }
+			is_enslaved = yes
+			can_take_servant_job = no
+			NOT = { has_slavery_type = { type = slavery_indentured } }
+		}
+		modifier = {
+			factor = 3
+			exists = owner
+			owner = { is_country_type = default }
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = { has_technology = tech_droid_workers }
+		}
+		modifier = {
+			factor = 200
+			exists = owner
+			owner = { is_country_type = default }
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = { NOT = { has_technology = tech_droid_workers } }
+		}
+		modifier = {
+			factor = 0.25
+			exists = owner
+			owner = { is_country_type = default }
+			can_take_servant_job = yes
+		}
+		# low income modifier
+		modifier = {
+			factor = 1.1
+			exists = planet
+			planet = {
+				has_available_jobs = "fe_acolyte_generator"
+			}
+			exists = owner
+			owner = {
+				is_ai = yes
+				has_monthly_income = {
+					resource = energy
+					value < 0
+				}
+			}
+		}
+	}
+}
+
+#虚境灵使
+re_augur = {
+	category = specialist
+	icon = priest
+	is_capped_by_modifier = yes
+	building_icon = building_citadel_of_faith
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		owner = {
+			has_origin = origin_zarqlanism_idea
+		}
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			unity = 10
+		}
+	}
+
+	# 视为统治者/先驱者
+	weight = {
+		weight = 30000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			exists = planet
+			exists = planet.controller
+			planet.controller = {
+				OR = {
+					is_country_type = swarm
+					is_country_type = ai_empire
+				}
+			}
+		}
+	}
+}
+
+#天空主教
+re_sky_cardinal = {
+	category = specialist
+	is_capped_by_modifier = yes
+	clothes_texture_index = 1
+	icon = high_priest
+	building_icon = building_palace
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		owner = {
+			has_origin = origin_zarqlanism_idea
+		}
+	}
+
+	resources = {
+		category = planet_priests
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_liberation_theology
+				}
+			}
+			unity = 8
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_stability_add = 85
+		mult = planet.society_factor_pops
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 10
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_origin = origin_zarqlanism_idea
+			}
+		}
+		planet_housing_add = 1
+		planet_crime_add = -5
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			owner = {
+				has_origin = origin_zarqlanism_idea
+			}
+		}
+		country_admin_cap_add = 5
+	}
+
+	# 视为统治者/先驱者
+	weight = {
+		weight = 30000
+
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			exists = planet
+			exists = planet.controller
+			planet.controller = {
+				OR = {
+					is_country_type = swarm
+					is_country_type = ai_empire
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/pop_jobs/ethic_gestalt_jobs.txt b/common/pop_jobs/ethic_gestalt_jobs.txt
index 11db377c9..b780f8f8b 100644
--- a/common/pop_jobs/ethic_gestalt_jobs.txt
+++ b/common/pop_jobs/ethic_gestalt_jobs.txt
@@ -35,9 +35,7 @@ spawning_drone = {
 			}
 			
 		}
-		modifier = {
-			planet_pop_assembly_organic_add = 2
-		}
+		planet_pop_assembly_organic_add = 2
 		mult = value:scripted_modifier_mult|MODIFIER|pop_growth_speed_mult|
 	}
 
@@ -73,8 +71,8 @@ spawning_drone = {
 
 	weight = {
 		weight = @spawner_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -167,8 +165,69 @@ offspring_drone = {
 
 	weight = {
 		weight = @spawner_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.5 # job is less useful if pop control is active, but still gives amenities
+			planet = {
+				has_modifier = planet_population_control_gestalt
+			}
+		}
+		modifier = {
+			factor = 0.01 # crisis purge
+			exists = planet
+			exists = planet.controller
+			planet.controller = {
+				OR = {
+					is_country_type = swarm
+					is_country_type = ai_empire
+				}
+			}
+		}
+	}
+}
+
+cyber_drone = {
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_spawning_pool
+	icon = machine_nurse
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	possible = { can_think = yes }
+
+	triggered_planet_modifier = {
+		potential = {
+			can_assemble_cyborg_pop = yes
+			can_assemble_hive_pop = yes
+		}
+		modifier = {
+			planet_pop_assembly_organic_add = 1.5
+		}
+	}
+
+	resources = {
+		category = planet_pop_assemblers
+		upkeep = {
+			alloys = 1
+		}
+	}
+
+	weight = {
+		weight = @spawner_drone_job_weight
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -274,6 +333,83 @@ replicator = {
 		mult = 10
 		modifier = {
 			factor = 0.01			# crisis purge
+			is_crisis_purged_ruler_check = yes
+		}
+		modifier = { # 失控女仆兼容
+			factor = 2
+			has_global_flag = flag_rogue_maid_mod_activated
+			is_maid_in_love = yes
+		}
+	}
+}
+
+crucible_drone = {
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_clinic
+	icon = healthcare
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	possible = { can_think = yes }
+
+	planet_modifier = {
+		pop_growth_speed = 0.25
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	resources = {
+		category = planet_doctors
+		upkeep = {
+			alloys = 2
+		}
+		upkeep = {
+			trigger = {
+				exists = planet
+				planet = {
+					exists = growing_species
+					growing_species = {
+						is_lithoid = no
+						has_trait = trait_cybernetic
+					}
+				}
+			}
+			food = 10
+		}
+		upkeep = {
+			trigger = {
+				exists = planet
+				planet = {
+					exists = growing_species
+					growing_species = {
+						is_lithoid = yes
+						has_trait = trait_cybernetic
+					}
+				}
+			}
+			minerals = 10
+		}
+	}
+
+	weight = {
+		weight = @spawner_drone_job_weight
+		modifier = {
+			factor = 0.01 # crisis purge
 			exists = planet
 			exists = planet.controller
 			planet.controller = {
@@ -283,11 +419,6 @@ replicator = {
 				}
 			}
 		}
-		modifier = { # 失控女仆兼容
-			factor = 2
-			has_global_flag = flag_rogue_maid_mod_activated
-			is_maid_in_love = yes
-		}
 	}
 }
 
@@ -322,7 +453,7 @@ coordinator = {
 		}
 		modifier = {
 			planet_stability_add = 2
-			planet_jobs_produces_mult = 0.02
+			planet_jobs_produces_mult = 0.01
 		}
 	}
 	triggered_planet_modifier = {
@@ -360,8 +491,8 @@ coordinator = {
 	
 	weight = {
 		weight = @synapse_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|coordinator|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|coordinator|RESOURCE|unity|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -378,7 +509,7 @@ coordinator = {
 evaluator = {
 	category = complex_drone
 	condition_string = DRONE_JOB_TRIGGER
-	building_icon = building_machine_capital
+	building_icon = building_simulation_1
 
 	possible_pre_triggers = {
 		has_owner = yes
@@ -402,10 +533,31 @@ evaluator = {
 		}
 	}
 
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_active_tradition = tr_synchronicity_integrated_preservation
+			}
+		}
+		modifier = {
+			planet_crime_no_happiness_add = -3
+		}
+	}
+
+	triggered_planet_modifier = {
+		planet_amenities_no_happiness_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
 	weight = {
 		weight = @synapse_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|evaluator|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|evaluator|RESOURCE|unity|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 	}
@@ -505,8 +657,12 @@ synapse_drone = {
 
 	weight = {
 		weight = @synapse_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|synapse_drone|RESOURCE|unity|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|synapse_drone|RESOURCE|unity|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 	}
@@ -540,12 +696,34 @@ brain_drone = {
 		upkeep = {
 			minerals = 6
 		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_science_ministry
+				}
+			}
+			minerals = 3
+		}
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_research
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_science_ministry
+				}
+			}
+			physics_research = 2
+			engineering_research = 2
+			society_research = 2
+		}
 	}
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_research_modifier|JOB|brain_drone|
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|brain_drone|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -586,12 +764,34 @@ calculator = {
 		upkeep = {
 			energy = 4
 		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_science_ministry
+				}
+			}
+			energy = 2
+		}
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_research
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_science_ministry
+				}
+			}
+			physics_research = 2
+			engineering_research = 2
+			society_research = 2
+		}
 	}
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_research_modifier|JOB|calculator|
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|calculator|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -727,8 +927,8 @@ artisan_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|artisan_drone|RESOURCE|consumer_goods|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|artisan_drone|RESOURCE|consumer_goods|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -810,8 +1010,8 @@ fabricator = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|fabricator|RESOURCE|alloys|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|fabricator|RESOURCE|alloys|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -905,8 +1105,8 @@ alloy_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|alloy_drone|RESOURCE|alloys|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|alloy_drone|RESOURCE|alloys|
 			owner = { has_edict = dynamic_weight }
 		}
 	}
@@ -932,7 +1132,7 @@ catalytic_drone = {
 	resources = {
 		category = planet_metallurgists
 		produces = {
-			alloys = 4
+			alloys = 3
 		}
 		produces = {
 			trigger = {
@@ -990,8 +1190,8 @@ catalytic_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|catalytic_drone|RESOURCE|alloys|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|catalytic_drone|RESOURCE|alloys|
 			owner = { has_edict = dynamic_weight }
 		}
 	}
@@ -1026,8 +1226,8 @@ chemist_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|chemist_drone|RESOURCE|volatile_motes|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|chemist_drone|RESOURCE|volatile_motes|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1069,8 +1269,8 @@ translucer_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|translucer_drone|RESOURCE|rare_crystals|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|translucer_drone|RESOURCE|rare_crystals|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1112,8 +1312,8 @@ gas_refiner_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|gas_refiner_drone|RESOURCE|exotic_gases|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|gas_refiner_drone|RESOURCE|exotic_gases|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1160,8 +1360,8 @@ patrol_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|patrol_drone|RESOURCE|unity|FACTOR|0.25|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|patrol_drone|RESOURCE|unity|FACTOR|0.25|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1231,8 +1431,8 @@ crystal_mining_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|crystal_mining_drone|RESOURCE|rare_crystals|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|crystal_mining_drone|RESOURCE|rare_crystals|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1274,8 +1474,8 @@ mote_harvesting_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|mote_harvesting_drone|RESOURCE|volatile_motes|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|mote_harvesting_drone|RESOURCE|volatile_motes|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1317,8 +1517,8 @@ gas_extraction_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|gas_extraction_drone|RESOURCE|exotic_gases|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|gas_extraction_drone|RESOURCE|exotic_gases|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1349,7 +1549,7 @@ mining_drone = {
 	resources = {
 		category = planet_miners
 		produces = {
-			minerals = 6
+			minerals = 4
 		}
 		produces = {
 			trigger = {
@@ -1386,8 +1586,8 @@ mining_drone = {
 
 	weight = {
 		weight = @simple_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|mining_drone|RESOURCE|minerals|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|mining_drone|RESOURCE|minerals|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1430,7 +1630,7 @@ agri_drone = {
 	resources = {
 		category = planet_farmers
 		produces = {
-			food = 8
+			food = 6
 		}
 		produces = {
 			trigger = {
@@ -1497,8 +1697,8 @@ agri_drone = {
 
 	weight = {
 		weight = @simple_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|agri_drone|RESOURCE|food|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|agri_drone|RESOURCE|food|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1562,7 +1762,7 @@ technician_drone = {
 	resources = {
 		category = planet_technician
 		produces = {
-			energy = 8
+			energy = 6
 		}
 		produces = {
 			trigger = {
@@ -1571,7 +1771,7 @@ technician_drone = {
 					is_robot_empire = yes
 				}
 			}
-			energy = 4
+			energy = 2
 		}
 		produces = {
 			trigger = {
@@ -1608,8 +1808,8 @@ technician_drone = {
 
 	weight = {
 		weight = @simple_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|technician_drone|RESOURCE|energy|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|technician_drone|RESOURCE|energy|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -1669,12 +1869,22 @@ maintenance_drone = {
 		planet_amenities_no_happiness_add = 4
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
+	
 	planet_modifier = {
-		planet_crime_no_happiness_add = -4
-		planet_stability_add = 1
-		planet_jobs_produces_mult = 0.02
+		planet_jobs_produces_mult = 0.01
+	}
+	country_modifier = {
+		pop_amenities_usage_mult = -0.01
 	}
 
+	triggered_planet_modifier = {
+		potential = {
+			owner = { has_active_tradition = tr_versatility_finish }
+		}
+		planet_amenities_no_happiness_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	
 	triggered_planet_modifier = {
 		potential = {
 			exists = planet.orbital_defence
@@ -1688,18 +1898,19 @@ maintenance_drone = {
 		planet_amenities_no_happiness_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
+
+	# 失控女仆兼容
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
 				has_valid_civic = civic_machine_paradise_lost
-				NOT = { has_global_flag = flag_rogue_maid_mod_activated } # 失控女仆兼容
+				NOT = { has_global_flag = flag_rogue_maid_mod_activated }
 			}
 		}
 		modifier = {
 			pop_happiness = 0.01
 		}
 	}
-	# 失控女仆兼容
 	triggered_planet_modifier = {
 		potential = {
 			has_global_flag = flag_rogue_maid_mod_activated
@@ -1712,15 +1923,16 @@ maintenance_drone = {
 	
 	weight = {
 		weight = @maintenance_drone_job
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
-			mult = 0.25
+			mult = value:job_weights_modifier|JOB|maintenance_drone|RESOURCE|unity|FACTOR|0.25|
 			exists = owner
 			owner = {
 				has_valid_civic = civic_machine_maintenance_protocols
+				has_edict = dynamic_weight
 			}
 		}
 		modifier = {
@@ -1904,6 +2116,7 @@ warrior_drone = {
 		}
 	}
 }
+
 #原版
 bluelotus_drone = {
 	category = complex_drone
@@ -1926,38 +2139,46 @@ bluelotus_drone = {
 	resources = {
 		category = planet_metallurgists
 		produces = {
-			alloys = 5
+			alloys = 4
 		}
 
 		upkeep = {
 			trigger = {
-				is_organic_species = yes
+				has_food_upkeep = yes
 				is_phototrophic = no
-				is_lithoid = no
 			}
 			food = @living_standard_food_normal
 		}
 		upkeep = {
 			trigger = {
-				has_phototrophic_energy_upkeep = yes
+				has_food_upkeep = yes
+				is_phototrophic = yes
 			}
-			energy = @living_standard_phototrophic_normal
+			food = @living_standard_phototrophic_normal
 		}
 		upkeep = {
 			trigger = {
+				has_mineral_upkeep = yes
+				is_phototrophic = no
+			}
+			minerals = @living_standard_food_normal
+		}
+		upkeep = {
+			trigger = {
+				has_mineral_upkeep = yes
 				is_phototrophic = yes
 			}
-			food = @living_standard_phototrophic_normal
+			minerals = @living_standard_phototrophic_normal
 		}
 		upkeep = {
 			trigger = {
-				is_lithoid = yes
+				has_phototrophic_energy_upkeep = yes
 			}
-			minerals = @living_standard_food_normal
+			energy = @living_standard_phototrophic_normal
 		}
 		upkeep = {
 			trigger = {
-				is_robotic_species = yes
+				is_robotic_or_voidspawn_species = yes
 			}
 			energy = @living_standard_energy_normal
 		}
@@ -1965,8 +2186,8 @@ bluelotus_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|bluelotus_drone|RESOURCE|alloys|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|bluelotus_drone|RESOURCE|alloys|
 			owner = { has_edict = dynamic_weight }
 		}
 	}
@@ -1989,27 +2210,28 @@ chronicle_drone = {
 	possible = { can_think = yes }
 
 	resources = {
-		category = planet_administrators
+		category = planet_evaluators
 		produces = {
 			unity = 4
-			society_research = 2
 		}
 		upkeep = {
-			trigger = { is_robotic_species = yes }
+			trigger = {
+				is_robotic_or_voidspawn_species = yes
+			}
 			minerals = 1
 			energy = 2
 		}
 		upkeep = {
 			trigger = {
-				is_organic_species = yes
+				has_food_upkeep = yes
 				is_phototrophic = no
-				is_lithoid = no
 			}
 			energy = 1
 			food = 2
 		}
 		upkeep = {
 			trigger = {
+				has_food_upkeep = yes
 				is_phototrophic = yes
 			}
 			energy = 1
@@ -2023,7 +2245,7 @@ chronicle_drone = {
 		}
 		upkeep = {
 			trigger = {
-				is_lithoid = yes
+				has_mineral_upkeep = yes
 			}
 			energy = 1
 			minerals = 2
@@ -2031,14 +2253,23 @@ chronicle_drone = {
 	}
 
 	planet_modifier = {
-		planet_stability_add = 2
+		planet_stability_add = 2.5
 	}
 
 	triggered_planet_modifier = {
 		potential = {
-			always = yes
+			exists = owner
+			owner = {
+				has_active_tradition = tr_synchronicity_integrated_preservation
+			}
 		}
-		planet_amenities_no_happiness_add = 2
+		modifier = {
+			planet_crime_no_happiness_add = -3
+		}
+	}
+	
+	triggered_planet_modifier = {
+		planet_amenities_no_happiness_add = 3
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 
@@ -2051,8 +2282,12 @@ chronicle_drone = {
 
 	weight = {
 		weight = @complex_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_multiple_resources_modifier|JOB|chronicle_drone|RESOURCE1|unity|WEIGHT1|0.7|RESOURCE2|society_research|WEIGHT2|0.3|
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|chronicle_drone|RESOURCE1|unity|WEIGHT1|0.7|RESOURCE2|society_research|WEIGHT2|0.3|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -2088,10 +2323,12 @@ scrap_miner_drone = {
 	resources = {
 		category = planet_miners
 		produces = {
-			minerals = 3
-			alloys = 2
+			minerals = 2
+			alloys = 1
 		}
-		produces = { # 失控女仆兼容
+
+		# 失控女仆兼容
+		produces = {
 			trigger = {
 				potential = { has_global_flag = flag_rogue_maid_mod_activated }
 				owner = { is_machine_empire = yes }
@@ -2113,8 +2350,8 @@ scrap_miner_drone = {
 	
 	weight = {
 		weight = @simple_drone_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_multiple_resources_modifier|JOB|scrap_miner_drone|RESOURCE1|minerals|WEIGHT1|0.7|RESOURCE2|alloys|WEIGHT2|0.3|
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|scrap_miner_drone|RESOURCE1|minerals|WEIGHT1|0.7|RESOURCE2|alloys|WEIGHT2|0.3|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
diff --git a/common/pop_jobs/ethic_other_jobs.txt b/common/pop_jobs/ethic_other_jobs.txt
index 78f5142c4..b6879f7f4 100644
--- a/common/pop_jobs/ethic_other_jobs.txt
+++ b/common/pop_jobs/ethic_other_jobs.txt
@@ -898,9 +898,7 @@ criminal = {
 			   NOT = { is_criminal_syndicate = yes }
 			}
 		}
-		modifier = {
-			trade_value_add = -5
-		}
+		trade_value_add = -5
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -908,10 +906,8 @@ criminal = {
 				has_valid_civic = civic_criminal_heritage
 			}
 		}
-		modifier = {
-			trade_value_add = 1.5
-			planet_jobs_worker_produces_mult = 0.01
-		}
+		trade_value_add = 1.5
+		planet_jobs_worker_produces_mult = 0.01
 	}
 	triggered_planet_modifier = {
 		potential = {
diff --git a/common/pop_jobs/ethic_rebuild_jobs.txt b/common/pop_jobs/ethic_rebuild_jobs.txt
index 884c1b4d0..896f0446d 100644
--- a/common/pop_jobs/ethic_rebuild_jobs.txt
+++ b/common/pop_jobs/ethic_rebuild_jobs.txt
@@ -1,6 +1,7 @@
 ###################
 # 劳工
 ###################
+
 #孝子
 professional_star_fans = {
 	category = worker
@@ -125,7 +126,7 @@ gladiator = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
+		modifier = {
 			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
@@ -188,7 +189,7 @@ labour_hero = {
 	}
 
 	resources = {
-		category = planet_miners
+		category = planet_jobs
 		produces = {
 			energy = 3
 			minerals = 2
@@ -203,16 +204,11 @@ labour_hero = {
 			}
 			food = -3
 			minerals = 2
-			unity = 1
 		}
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			physics_research = 0.25
@@ -223,9 +219,7 @@ labour_hero = {
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_socialistic
-					}
+					has_valid_civic = civic_socialistic
 				}
 			}
 			unity = 0.5
@@ -233,21 +227,16 @@ labour_hero = {
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_ascension_perk = ap_synthetic_evolution
-					}
+					has_ascension_perk = ap_synthetic_evolution
 				}
 			}
 			food = -3
 			minerals = 2
-			unity = 1
 		}
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_anarchism
-					}
+					has_valid_civic = civic_anarchism
 				}
 			}
 			unity = 1
@@ -274,9 +263,7 @@ labour_hero = {
 				has_valid_civic = civic_industry_pacesetter
 			}
 		}
-		modifier = {
-			planet_jobs_produces_mult = 0.01
-		}
+		planet_jobs_produces_mult = 0.01
 	}
 	triggered_planet_modifier = {
 		potential = {
@@ -284,9 +271,7 @@ labour_hero = {
 				has_valid_civic = civic_anarchism
 			}
 		}
-		modifier = {
-			planet_amenities_add = 1
-		}
+		planet_amenities_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 
@@ -295,8 +280,7 @@ labour_hero = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
 		planet_crime_add = -5
@@ -305,19 +289,28 @@ labour_hero = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	weight = {
 		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|miner|RESOURCE|minerals|
+		modifier = {
+			mult = value:job_weights_modifier|JOB|labour_hero|RESOURCE|energy|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = value:job_weights_modifier|JOB|labour_hero|RESOURCE|minerals|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = value:job_weights_modifier|JOB|labour_hero|RESOURCE|food|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = value:job_weights_modifier|JOB|labour_hero|RESOURCE|unity|
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -401,6 +394,15 @@ druid = {
 		produces = {
 			unity = 5
 		}
+
+		# 灵网裂隙
+		produces = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			sr_zro = 0.1
+		}
+		
 		produces = {
 			trigger = {
 				owner = {
@@ -414,41 +416,30 @@ druid = {
 			}
 			unity = 1
 		}
+		# 科学社会主义
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			society_research = 0.25
 		}
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
 	}
 	planet_modifier = {
 		planet_crime_add = -10
 		pop_growth_speed = 0.05
 	}
 
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
+		country_admin_cap_add = 0.5
 	}
 
 	weight = {
@@ -543,6 +534,7 @@ conscript = {
 
 	resources = {
 		category = planet_soldiers
+		
 		produces = {
 			trigger = {
 				is_lithoid = no
@@ -599,19 +591,18 @@ conscript = {
 			physics_research = 1
 			engineering_research = 1
 		}
+		# 科学社会主义
 		produces = {
 			trigger = {
 				owner = {
 					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
+						is_scientific_socialism = yes
 					}
 				}
 			}
 			society_research = 0.25
 		}
-		#军国主义
+		# 军国主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -621,6 +612,7 @@ conscript = {
 			}
 			unity = 1
 		}
+		# 干涉主义
 		produces = {
 			trigger = {
 				exists = owner
@@ -644,9 +636,7 @@ conscript = {
 				}
 			}
 		}
-		modifier = {
-			country_naval_cap_add = 2
-		}
+		country_naval_cap_add = 2
 	}
 	pop_modifier = {
 		pop_defense_armies_add = 3
@@ -657,9 +647,7 @@ conscript = {
 				has_building = building_automated_defense_system
 			}
 		}
-		modifier = {
-			pop_defense_armies_add = 2
-		}
+		pop_defense_armies_add = 2
 	}
 
 	triggered_planet_modifier = {
@@ -686,1026 +674,194 @@ conscript = {
 		planet_stability_add = -50
 		mult = planet.society_factor_pops
 	}
-	triggered_country_modifier = { # 共产主义社会
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
-	}
-
-	weight = {
-		weight = 300
-		modifier = {
-			factor = 10
-			exists = planet
-			planet = { has_modifier = martial_law }
-		}
-		modifier = {
-			factor = 10
-			exists = owner
-			owner = { is_militarist = yes }
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_resilient
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_very_strong
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_strong
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_weak
-		}
-		modifier = {
-			factor = 0.1
-			is_enslaved = yes
-			NOT = { has_slavery_type = { type = slavery_military } }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			has_slavery_type = { type = slavery_military }
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_cybernetic
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_presapient_earthbound
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_limited_regeneration
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 1.05
-			has_trait = trait_presapient_natural_intellectuals
-		}
-		modifier = {
-			factor = 1.05
-			OR = {
-				has_trait = trait_robust
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 1.05
-			has_trait = trait_nerve_stapled
-		}
-		modifier = {
-			factor = 1.1
-			OR = {
-				has_trait = trait_robot_propaganda_machines
-				has_trait = trait_traditional
-			}
-		}
-		modifier = {
-			factor = 0.9
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0
-			species = { can_be_soldier = no }
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_lithoid
-		}
-	}
-}
-
-#苗床
-tentacle_seedbed = {
-	category = worker
-	condition_string = WORKER_JOB_TRIGGER
-	building_icon = building_spawning_pool
-	clothes_texture_index = 3
-	icon = bio_trophy
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		NOT = { has_trait = trait_zombie }
-		owner = {
-			exists = owner
-			has_civic = civic_libido_equipment
-		}
-	}
-
-	resources = {
-		category = planet_jobs
-		upkeep = {
-			trigger = {
-				is_lithoid = no
-			}
-			food = 2
-		}
-		upkeep = {
-			trigger = {
-				is_lithoid = yes
-			}
-			minerals = 2
-		}
-	}
-	planet_modifier = {
-		planet_pop_assembly_organic_add = 1
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 12
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	triggered_planet_modifier = { # 多彩环境强化
-		potential = {
-			AND = {
-				has_global_flag = love_between_us
-				OR = {
-					has_trait = trait_DC_ethic_lust_skynet
-					has_trait = trait_DC_ethic_carnalism
-				}
-			}
-		}
-		planet_pop_assembly_organic_add = 0.5
-		planet_amenities_add = 12
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	weight = {
-		weight = @clerk_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-		}
-		modifier = {
-			factor = 10
-			AND = {
-				has_global_flag = love_between_us
-				OR = {
-					has_trait = trait_DC_ethic_lust_skynet
-					has_trait = trait_DC_ethic_carnalism
-				}
-			}
-		}
-	}
-}
-
-#圣炉侍者
-re_acolyte_metallurgists = {
-	category = worker
-	is_capped_by_modifier = yes
-	building_icon = building_empyrean_shrine
-	clothes_texture_index = 3
-	icon = foundry
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_metallurgists
-		produces = {
-			alloys = 3
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_catalytic_empire = yes
-				}
-			}
-			society_research = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			alloys = @requisitorium_alloys_reduction
-		}
-		upkeep = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			minerals = 2
-		}
-		upkeep = {
-			minerals = 6
-		}
-		upkeep = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_catalytic_empire = yes
-				}
-			}
-			minerals = -6
-			food = 6
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 0.5
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_alloys
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			alloys = @requisitorium_alloys_overlord
-		}
-	}
-
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_metallurgists|RESOURCE|alloys|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 2
-			is_enslaved = yes
-			can_take_servant_job = no
-		}
-		modifier = {
-			factor = 5
-			has_job = re_acolyte_metallurgists
-		}
-	}
-}
-
-#圣坊侍者
-re_acolyte_artisan = {
-	category = worker
-	is_capped_by_modifier = yes
-	building_icon = building_empyrean_shrine
-	clothes_texture_index = 3
-	icon = artisan
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_artisans
-		produces = {
-			consumer_goods = 6
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_crafters
-				}
-			}
-			engineering_research = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
-		upkeep = {
-			minerals = 6
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			consumer_goods = @requisitorium_consumer_goods_reduction
-		}
-		upkeep = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			minerals = 1
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 0.5
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_consumer_goods
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			consumer_goods = @requisitorium_consumer_goods_overlord
-		}
-	}
-
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_artisan|RESOURCE|consumer_goods|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 2
-			is_enslaved = yes
-			can_take_servant_job = no
-		}
-		modifier = {
-			factor = 5
-			has_job = re_acolyte_artisan
-		}
-
-		# low income modifier
-		modifier = {
-			factor = 1.2
-			exists = planet
-			planet = {
-				has_available_jobs = "re_acolyte_artisan"
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = consumer_goods
-					value < 5
-				}
-			}
-		}
-	}
-}
-
-#犁耕侍者
-re_acolyte_farm = {
-	category = worker
-	building_icon = building_food_processing_facility
-	clothes_texture_index = 3
-	icon = farmer
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_farmers
-		produces = {
-			food = 6
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_robot_empire = yes
-				}
-			}
-			food = -1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			society_research = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-				}
-			}
-			food = @requisitorium_food_reduction
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_agrarian_idyll
-			}
-		}
-		modifier = {
-			planet_amenities_add = 2
-		}
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_food
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-				}
-			}
-			food = @requisitorium_food_overlord
-		}
-	}
-	
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_farm|RESOURCE|food|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 1.1
-			owner = { has_valid_civic = civic_agrarian_idyll }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			can_take_servant_job = no
-			NOT = { has_slavery_type = { type = slavery_indentured } }
-		}
-		modifier = {
-			factor = 3
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { has_technology = tech_droid_workers }
-		}
-		modifier = {
-			factor = 200
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { NOT = { has_technology = tech_droid_workers } }
-		}
-		modifier = {
-			factor = 0.25
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-			owner = { has_valid_civic = civic_agrarian_idyll }
-		}
-		# low income modifier
-		modifier = {
-			factor = 1.2
-			exists = planet
-			planet = {
-				has_available_jobs = re_acolyte_farm
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = food
-					value < 10
-				}
-			}
-		}
-
-		modifier = {
-			factor = 0.5
-			has_trait = trait_lithoid
-
-			owner = {
-				is_lithoid_empire = yes
-				has_monthly_income = {
-					resource = food
-					value >= 0
-				}
-			}
-		}
-	}
-}
-
-#焰锤侍者
-re_acolyte_mine = {
-	category = worker
-	building_icon = building_crystal_mines
-	clothes_texture_index = 3
-	icon = miner
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_miners
-		produces = {
-			minerals = 4
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
-		produces = {
-			trigger = {
-				owner = {
-					has_valid_civic = civic_anglers_lithoid
-				}
-				planet = { is_wet = yes }
-			}
-			minerals = 1
-			consumer_goods = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					has_valid_civic = civic_anglers_lithoid
-					has_technology = tech_mine_rare_crystals
-				}
-				planet = { is_wet = yes }
-			}
-			rare_crystals = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			minerals = @requisitorium_minerals_reduction
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}	
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_minerals
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			minerals = @requisitorium_minerals_overlord
-		}
-	}
-	
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_mine|RESOURCE|minerals|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			can_take_servant_job = no
-			NOT = { has_slavery_type = { type = slavery_indentured } }
-		}
-		modifier = {
-			factor = 3
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { has_technology = tech_droid_workers }
-		}
-		modifier = {
-			factor = 200
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { NOT = { has_technology = tech_droid_workers } }
-		}
-		modifier = {
-			factor = 0.25
-			can_take_servant_job = yes
-		}
-
-		# low income modifier
-		modifier = {
-			factor = 1.1
-			exists = planet
-			planet = {
-				has_available_jobs = "re_acolyte_mine"
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = minerals
-					value < 0
-				}
-			}
-		}
-	}
-}
-
-#圣钳侍者
-re_acolyte_generator = {
-	category = worker
-	building_icon = building_power_plant
-	clothes_texture_index = 3
-	icon = technician
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_technician
-		produces = {
-			energy = 6
-		}
-		produces = {
-			trigger = {
-				owner = {
-					is_robot_empire = yes
-				}
-			}
-			energy = 2
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			physics_research = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_energy_requisitorium
-				}
-			}
-			energy = @requisitorium_energy_reduction
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_financial_investment
-			}
-		}
-		modifier = {
-			trade_value_add = 1
-		}
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_energy
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_energy_requisitorium
-				}
+	# 共产主义社会
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_community_society = yes
 			}
-			energy = @requisitorium_energy_overlord
 		}
+		country_admin_cap_add = 0.5
 	}
 
 	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_generator|RESOURCE|energy|
-			owner = { has_edict = dynamic_weight }
+		weight = 300
+		modifier = {
+			factor = 10
+			exists = planet
+			planet = { has_modifier = martial_law }
 		}
 		modifier = {
 			factor = 10
 			exists = owner
-			owner = { is_country_type = default }
+			owner = { is_militarist = yes }
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_resilient
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_very_strong
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_strong
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_weak
+		}
+		modifier = {
+			factor = 0.1
 			is_enslaved = yes
-			can_take_servant_job = no
-			NOT = { has_slavery_type = { type = slavery_indentured } }
+			NOT = { has_slavery_type = { type = slavery_military } }
 		}
 		modifier = {
-			factor = 3
-			exists = owner
-			owner = { is_country_type = default }
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { has_technology = tech_droid_workers }
+			factor = 10
+			is_enslaved = yes
+			has_slavery_type = { type = slavery_military }
 		}
 		modifier = {
-			factor = 200
-			exists = owner
-			owner = { is_country_type = default }
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_cybernetic
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_presapient_earthbound
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_limited_regeneration
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 1.05
+			has_trait = trait_presapient_natural_intellectuals
+		}
+		modifier = {
+			factor = 1.05
 			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
+				has_trait = trait_robust
+				has_trait = trait_robot_efficient_processors
 			}
-			can_take_servant_job = no
-			owner = { NOT = { has_technology = tech_droid_workers } }
 		}
 		modifier = {
-			factor = 0.25
-			exists = owner
-			owner = { is_country_type = default }
-			can_take_servant_job = yes
+			factor = 1.05
+			has_trait = trait_nerve_stapled
 		}
-		# low income modifier
 		modifier = {
 			factor = 1.1
-			exists = planet
-			planet = {
-				has_available_jobs = "fe_acolyte_generator"
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = energy
-					value < 0
-				}
+			OR = {
+				has_trait = trait_robot_propaganda_machines
+				has_trait = trait_traditional
 			}
 		}
-		# 堕落岗位
 		modifier = {
-			factor = 15000
-			exists = planet.owner
-			planet.owner = { NOT = { is_country_type = default } }
+			factor = 0.9
+			has_trait = trait_quarrelsome
 		}
-		# crisis purge
 		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			factor = 0
+			species = { can_be_soldier = no }
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_lithoid
 		}
 	}
 }
 
-#虚境灵使
-re_augur = {
+#苗床
+tentacle_seedbed = {
 	category = worker
-	icon = priest
-	is_capped_by_modifier = yes
-	building_icon = building_citadel_of_faith
-	clothes_texture_index = 2
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_spawning_pool
+	clothes_texture_index = 3
+	icon = bio_trophy
 
 	possible_pre_triggers = {
 		has_owner = yes
+		is_being_assimilated = no
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_worker_job
 	possible = {
+		NOT = { has_trait = trait_zombie }
 		owner = {
-			has_origin = origin_zarqlanism_idea
+			exists = owner
+			has_civic = civic_libido_equipment
 		}
 	}
 
 	resources = {
 		category = planet_jobs
-		produces = {
-			unity = 20
+		upkeep = {
+			trigger = {
+				is_lithoid = no
+			}
+			food = 2
+		}
+		upkeep = {
+			trigger = {
+				is_lithoid = yes
+			}
+			minerals = 2
+		}
+	}
+	planet_modifier = {
+		planet_pop_assembly_organic_add = 1
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 12
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	# 多彩环境强化
+	triggered_planet_modifier = {
+		potential = {
+			AND = {
+				has_global_flag = love_between_us
+				OR = {
+					has_trait = trait_DC_ethic_lust_skynet
+					has_trait = trait_DC_ethic_carnalism
+				}
+			}
 		}
+		planet_pop_assembly_organic_add = 0.5
+		planet_amenities_add = 12
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 
 	weight = {
-		weight = 30000
-
-		# crisis purge
+		weight = @clerk_job_weight
 		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
+			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+		}
+		modifier = {
+			factor = 10
+			AND = {
+				has_global_flag = love_between_us
 				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
+					has_trait = trait_DC_ethic_lust_skynet
+					has_trait = trait_DC_ethic_carnalism
 				}
 			}
 		}
@@ -1739,13 +895,7 @@ future_worker = {
 		produces = {
 			trigger = {
 				planet = {
-					OR = {
-						has_district = district_generator
-						has_district = district_generator_uncapped
-						has_district = district_rw_generator
-						has_district = district_hab_energy
-						has_district = district_pdhab_energy
-					}
+					has_any_generator_district_or_building = yes
 				}
 			}
 			energy = 2
@@ -1753,12 +903,7 @@ future_worker = {
 		produces = {
 			trigger = {
 				planet = {
-					OR = {
-						has_district = district_mining
-						has_district = district_mining_uncapped
-						has_district = district_hab_mining
-						has_district = district_pdhab_mining
-					}
+					has_any_mining_district = yes
 				}
 			}
 			minerals = 1.5
@@ -1770,12 +915,7 @@ future_worker = {
 					has_trait = trait_lithoid
 				}
 				planet = {
-					OR = {
-						has_district = district_mining
-						has_district = district_mining_uncapped
-						has_district = district_hab_mining
-						has_district = district_pdhab_mining
-					}
+					has_any_mining_district = yes
 				}
 			}
 			minerals = 1.5
@@ -1788,11 +928,7 @@ future_worker = {
 				}
 				planet = {
 					OR = {
-						has_district = district_farming
-						has_district = district_farming_uncapped
-						has_district = district_rw_farming
-						has_district = district_pdhab_food
-						has_building = building_hydroponics_farm
+						has_any_farming_district_or_buildings = yes
 						has_designation = col_habitat_farming
 					}
 				}
@@ -1802,20 +938,8 @@ future_worker = {
 		produces = {
 			trigger = {
 				planet = {
-					OR = {
-						has_district = district_industrial
-						has_district = district_arcology_arms_industry
-						has_district = district_rw_industrial
-						has_district = district_hab_industrial
-						has_district = district_pdhab_industrial
-					}
-					NOR = {
-						has_designation = col_factory
-						has_designation = col_habitat_factory
-						has_designation = col_ring_factory
-						has_designation = col_ecu_factory
-						has_designation = col_dome_factory
-					}
+					has_any_arms_industry_district = yes
+					has_any_civilian_industry_designation = no
 				}
 			}
 			alloys = 1
@@ -1823,20 +947,8 @@ future_worker = {
 		produces = {
 			trigger = {
 				planet = {
-					OR = {
-						has_district = district_industrial
-						has_district = district_arcology_civilian_industry
-						has_district = district_rw_industrial
-						has_district = district_hab_industrial
-						has_district = district_pdhab_industrial
-					}
-					NOR = {
-						has_designation = col_foundry
-						has_designation = col_habitat_foundry
-						has_designation = col_ring_foundry
-						has_designation = col_ecu_foundry
-						has_designation = col_dome_foundry
-					}
+					has_any_civilian_industry_district = yes
+					has_any_arms_industry_designation = no
 				}
 			}
 			consumer_goods = 1
@@ -1906,6 +1018,8 @@ future_worker = {
 			}
 			unity = 1
 		}
+
+		# region inline_script:jobs/future_worker_ai_bonus
 		#AI基础与年数产出
 		produces = {
 			trigger = {
@@ -1950,7 +1064,6 @@ future_worker = {
 			consumer_goods = -2
 			alloys = 2
 		}
-		
 		produces = { 
 			trigger = {
 				owner = { is_ai = yes }
@@ -1962,7 +1075,6 @@ future_worker = {
 			consumer_goods = 2
 			alloys = 2
 		}
-		
 		produces = {
 			trigger = {
 				end_game_years_passed > 0
@@ -2026,6 +1138,7 @@ future_worker = {
 			society_research = 8
 			alloys = 14
 		}
+		# endregion
 
 		upkeep = {
 			consumer_goods = 0.5
@@ -2040,13 +1153,12 @@ future_worker = {
 		job_researcher_add = 0.2
 		job_culture_worker_add = 0.2
 	}
-
-	triggered_country_modifier = { # 共产主义社会
+	# 共产主义社会
+	triggered_country_modifier = { 
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
 		modifier = {
@@ -2085,13 +1197,7 @@ resocialization_workers = {
 		produces = {
 			trigger = {
 				planet = {
-					OR = {
-						has_district = district_generator
-						has_district = district_generator_uncapped
-						has_district = district_rw_generator
-						has_district = district_hab_energy
-						has_district = district_pdhab_energy
-					}
+					has_any_generator_district_or_building = yes
 				}
 			}
 			energy = 2
@@ -2099,12 +1205,7 @@ resocialization_workers = {
 		produces = {
 			trigger = {
 				planet = {
-					OR = {
-						has_district = district_mining
-						has_district = district_mining_uncapped
-						has_district = district_hab_mining
-						has_district = district_pdhab_mining
-					}
+					has_any_mining_district = yes
 				}
 			}
 			minerals = 1.5
@@ -2116,12 +1217,7 @@ resocialization_workers = {
 					has_trait = trait_lithoid
 				}
 				planet = {
-					OR = {
-						has_district = district_mining
-						has_district = district_mining_uncapped
-						has_district = district_hab_mining
-						has_district = district_pdhab_mining
-					}
+					has_any_mining_district = yes
 				}
 			}
 			minerals = 1.5
@@ -2134,11 +1230,7 @@ resocialization_workers = {
 				}
 				planet = {
 					OR = {
-						has_district = district_farming
-						has_district = district_farming_uncapped
-						has_district = district_rw_farming
-						has_district = district_pdhab_food
-						has_building = building_hydroponics_farm
+						has_any_farming_district_or_buildings = yes
 						has_designation = col_habitat_farming
 					}
 				}
@@ -2148,20 +1240,8 @@ resocialization_workers = {
 		produces = {
 			trigger = {
 				planet = {
-					OR = {
-						has_district = district_industrial
-						has_district = district_arcology_arms_industry
-						has_district = district_rw_industrial
-						has_district = district_hab_industrial
-						has_district = district_pdhab_industrial
-					}
-					NOR = {
-						has_designation = col_factory
-						has_designation = col_habitat_factory
-						has_designation = col_ring_factory
-						has_designation = col_ecu_factory
-						has_designation = col_dome_factory
-					}
+					has_any_arms_industry_district = yes
+					has_any_civilian_industry_designation = no
 				}
 			}
 			alloys = 1
@@ -2169,20 +1249,8 @@ resocialization_workers = {
 		produces = {
 			trigger = {
 				planet = {
-					OR = {
-						has_district = district_industrial
-						has_district = district_arcology_civilian_industry
-						has_district = district_rw_industrial
-						has_district = district_hab_industrial
-						has_district = district_pdhab_industrial
-					}
-					NOR = {
-						has_designation = col_foundry
-						has_designation = col_habitat_foundry
-						has_designation = col_ring_foundry
-						has_designation = col_ecu_foundry
-						has_designation = col_dome_foundry
-					}
+					has_any_civilian_industry_district = yes
+					has_any_arms_industry_designation = no
 				}
 			}
 			consumer_goods = 1
@@ -2252,6 +1320,8 @@ resocialization_workers = {
 			}
 			unity = 0.5
 		}
+		
+		# region inline_script:jobs/resocialization_workers_ai_bonus
 		#AI基础与年数产出
 		produces = {
 			trigger = {
@@ -2296,7 +1366,6 @@ resocialization_workers = {
 			consumer_goods = -3
 			alloys = 1
 		}
-		
 		produces = { 
 			trigger = {
 				owner = { is_ai = yes }
@@ -2308,7 +1377,6 @@ resocialization_workers = {
 			consumer_goods = 1
 			alloys = 1
 		}
-		
 		produces = {
 			trigger = {
 				end_game_years_passed > 0
@@ -2372,6 +1440,7 @@ resocialization_workers = {
 			society_research = 6
 			alloys = 7
 		}
+		# endregion
 
 		upkeep = {
 			consumer_goods = 0.5
@@ -2393,8 +1462,7 @@ resocialization_workers = {
 		potential = {
 			exists = owner
 			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
+				is_community_society = yes
 			}
 		}
 		modifier = {
@@ -2434,7 +1502,7 @@ foundry_specialist = {
 	resources = {
 		category = planet_metallurgists
 		produces = {
-			alloys = 2
+			alloys = @job_foundry_specialist_alloys_produce_base
 			engineering_research = 1
 		}
 		produces = {
@@ -2463,7 +1531,7 @@ foundry_specialist = {
 			minerals = 2
 		}
 		upkeep = {
-			minerals = 6
+			minerals = @specialist_job_minerals_upkeep_foundry
 		}
 		upkeep = {
 			trigger = {
@@ -2506,10 +1574,9 @@ foundry_specialist = {
 
 	weight = {
 		weight = @specialist_job_weight		# Fairly important job
-		modifier = { # 可控的动态权重
+		modifier = {
 			factOR = value:job_weights_modifier|JOB|foundry|RESOURCE|alloys|
-			exists = owner
-				owner = { has_edict = dynamic_weight }
+			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
 			factOR = 2
@@ -2547,7 +1614,7 @@ artisan_specialist = {
 	resources = {
 		category = planet_artisans
 		produces = {
-			consumer_goods = 4
+			consumer_goods = @job_artisan_specialist_consumer_goods_produce_base
 		}
 		produces = {
 			trigger = {
@@ -2559,7 +1626,7 @@ artisan_specialist = {
 			engineering_research = 2
 		}
 		upkeep = {
-			minerals = 6
+			minerals = @specialist_job_minerals_upkeep_artisan
 		}
 		produces = {
 			trigger = {
@@ -2630,9 +1697,8 @@ artisan_specialist = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
+		modifier = {
 			factOR = value:job_weights_modifier|JOB|artisan|RESOURCE|consumer_goods|
-			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
 		modifier = {
@@ -2738,12 +1804,12 @@ media_worker = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = 2
+			consumer_goods = @specialist_job_consumer_goods_upkeep_culture_worker
 		}
 	}
 
 	planet_modifier = {
-		POP_ETHICS_SHIFT_SPEED = 0.1
+		pop_ethics_shift_speed = 0.1
 	}
 
 	#舆论控制
@@ -2757,16 +1823,22 @@ media_worker = {
 			pop_cat_ruler_political_power = 0.5
 		}
 	}
-	triggered_planet_modifier = { #市场运作
+	triggered_planet_modifier = {
 		potential = {
 			owner = {
 				has_policy_flag = market_operation
 			}
 		}
-		modifier = {
-			trade_value_add = 2
-			planet_crime_add = 3
+		trade_value_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	triggered_planet_modifier = { #市场运作
+		potential = {
+			owner = {
+				has_policy_flag = market_operation
+			}
 		}
+		planet_crime_add = 3
 	}
 	triggered_country_modifier = { #加经费
 		potential = {
@@ -2785,7 +1857,7 @@ media_worker = {
 
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
+		modifier = {
 			factor = value:job_weights_modifier|JOB|media_worker|RESOURCE|unity|
 			owner = { has_edict = dynamic_weight }
 		}
@@ -2885,16 +1957,20 @@ PR_manager = {
 	}
 	possible_precalc = can_fill_specialist_job
 	planet_modifier = {
-		trade_value_add = 4
+		trade_value_mult = 0.02
 	}
-	planet_modifier = {
+	triggered_planet_modifier = {
+		potential = { always = yes }
 		planet_amenities_add = -3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
 	resources = {
 		category = planet_bureaucrats
+		produces = {
+			unity = 2
+		}
 		upkeep = {
-			consumer_goods = 0.5
-			unity = 1.5
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 	}
 
@@ -3064,7 +2140,7 @@ research_pacesetter = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 	}
 	triggered_planet_modifier = {
@@ -3079,7 +2155,7 @@ research_pacesetter = {
 	}
 	weight = {
 		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
+		modifier = {
 			factor = value:job_weights_research_modifier|JOB|researcher|
 			owner = { has_edict = dynamic_weight }
 		}
@@ -3228,11 +2304,7 @@ model_worker = {
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			engineering_research = 0.25
@@ -3266,7 +2338,11 @@ model_worker = {
 
 	weight = {
 		weight = @worker_job_weight		# Fairly important job
-		modifier = { # 可控的动态权重
+		modifier = {
+			factor = value:job_weights_modifier|JOB|model_worker|RESOURCE|alloys|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
 			factor = value:job_weights_modifier|JOB|model_worker|RESOURCE|consumer_goods|
 			owner = { has_edict = dynamic_weight }
 		}
@@ -3421,11 +2497,7 @@ deep_miner = {
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			engineering_research = 0.25
@@ -3542,7 +2614,7 @@ templar = {
 			engineering_research = 1.5
 		}
 		upkeep = {
-			alloys = 0.5
+			alloys = @specialist_job_alloys_upkeep_knight
 		}
 	}
 
@@ -3550,7 +2622,7 @@ templar = {
 		potential = {
 			always = yes
 		}
-		pop_defense_armies_add = 2
+		pop_defense_armies_add = 1
 		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
 	}
 
@@ -3584,9 +2656,6 @@ templar = {
 			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
 			owner = { has_edict = dynamic_weight }
 		}
-		modifier = {
-			mult = value:job_weights_research_modifier|JOB|researcher|
-		}
 	}
 }
 
@@ -3608,7 +2677,7 @@ death_knight = {
 	resources = {
 		category = planet_priests
 		produces = {
-			unity = 4
+			unity = 2
 		}
 		produces = {
 			trigger = {
@@ -3621,7 +2690,7 @@ death_knight = {
 			engineering_research = 1.5
 		}
 		upkeep = {
-			alloys = 0.5
+			alloys =  @specialist_job_alloys_upkeep_knight
 		}
 	}
 
@@ -3683,9 +2752,6 @@ death_knight = {
 			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
 			owner = { has_edict = dynamic_weight }
 		}
-		modifier = {
-			mult = value:job_weights_research_modifier|JOB|researcher|
-		}
 	}
 }
 
@@ -3703,11 +2769,17 @@ mercenary = {
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_specialist_job
+	possible = {
+		exists = owner
+		owner = { is_gestalt = no }
+		complex_specialist_job_check_trigger = yes
+	}
+	
 	country_modifier = {
 		country_naval_cap_add = 4
 	}
 	pop_modifier = {
-		pop_defense_armies_add = 3
+		pop_defense_armies_add = 2
 	}
 	triggered_planet_modifier = {
 		potential = { always = yes }
@@ -3717,7 +2789,7 @@ mercenary = {
 	resources = {
 		category = planet_soldiers
 		upkeep = {
-			consumer_goods = 0.5
+			consumer_goods = @specialist_job_consumer_goods_upkeep
 		}
 	}
 	weight = {
@@ -3725,9 +2797,12 @@ mercenary = {
 		modifier = {
 			factor = 10
 			exists = planet
-			planet = {
-				has_modifier = martial_law
-			}
+			planet = { has_modifier = martial_law }
+		}
+		modifier = {
+			factor = 10
+			exists = owner
+			owner = { is_militarist = yes }
 		}
 		modifier = {
 			factor = 2
@@ -3745,22 +2820,6 @@ mercenary = {
 			factor = 0.5
 			has_trait = trait_weak
 		}
-		modifier = {
-			factor = 0.1
-			is_enslaved = yes
-			NOT = {
-				has_slavery_type = {
-					type = slavery_military
-				}
-			}
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			has_slavery_type = {
-				type = slavery_military
-			}
-		}
 		modifier = {
 			factor = 0.1
 			can_take_servant_job = yes
@@ -3813,7 +2872,7 @@ mercenary = {
 		}
 		modifier = {
 			factor = 0
-			can_be_soldier = no
+			species = { can_be_soldier = no }
 		}
 		modifier = {
 			factor = 2
@@ -4224,93 +3283,6 @@ techno_priest = {
 	}
 }
 
-#天空主教
-re_sky_cardinal = {
-	category = specialist
-	is_capped_by_modifier = yes
-	clothes_texture_index = 1
-	icon = high_priest
-	building_icon = building_palace
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_priests
-	    produces = {
-		    trigger = {
-			    exists = owner
-			    owner = {
-				    has_valid_civic = civic_liberation_theology
-			    }
-		    }
-		    unity = 8
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_stability_add = 85
-		mult = planet.society_factor_pops
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			always = yes
-		}
-		planet_amenities_add = 10
-		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_origin = origin_zarqlanism_idea
-			}
-		}
-		modifier = {
-			planet_housing_add = 1
-			planet_crime_add = -5
-		}
-	}
-
-	triggered_country_modifier = {
-		potential = {
-			owner = {
-				has_origin = origin_zarqlanism_idea
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 5
-		}
-	}
-
-	weight = {
-		weight = 30000
-
-		# crisis purge
-		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-		}
-	}
-}
-
 #不知道是啥
 geoengineer = {
 	category = specialist
@@ -4491,10 +3463,7 @@ core_party_members = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
 	resources = {
 		category = planet_enforcers
@@ -4502,7 +3471,7 @@ core_party_members = {
 			unity = 3
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
 	planet_modifier = {
@@ -4526,6 +3495,16 @@ core_party_members = {
 	}
 	weight = {
 		weight = @ruler_job_weight
+		modifier = {
+			mult = value:job_weights_modifier|JOB|core_party_members|RESOURCE|unity|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
+		}
 	}
 }
 
@@ -4544,10 +3523,7 @@ commandante = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
 	country_modifier = {
 		country_naval_cap_add = 5
@@ -4566,7 +3542,7 @@ commandante = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
 	planet_modifier = {
@@ -4580,14 +3556,6 @@ commandante = {
 		planet_stability_add = 50
 		mult = planet.society_factor_pops
 	}
-	triggered_planet_modifier = {
-		potential = {
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			planet_amenities_add = -1
-		}
-	}
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
@@ -4610,6 +3578,11 @@ commandante = {
 	}
 	weight = {
 		weight = @ruler_job_weight
+		modifier = {
+			mult = value:job_weights_modifier|JOB|core_party_members|RESOURCE|unity|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
 		modifier = {
 			factor = 2
 			OR = {
@@ -4630,6 +3603,11 @@ commandante = {
 			factor = 5
 			has_job = commandante
 		}
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
+		}
 	}
 }
 
@@ -4648,10 +3626,7 @@ supervisor = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_is_not_enslaved = yes
 	}
 	resources = {
 		category = planet_politicians
@@ -4659,7 +3634,7 @@ supervisor = {
 			unity = 3
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
 	planet_modifier = {
@@ -4672,14 +3647,6 @@ supervisor = {
 		planet_amenities_add = 5
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
-	triggered_planet_modifier = {
-		potential = {
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			planet_amenities_add = -1
-		}
-	}
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
@@ -4692,6 +3659,11 @@ supervisor = {
 	}
 	weight = {
 		weight = @ruler_job_weight
+		modifier = {
+			mult = value:job_weights_modifier|JOB|supervisor|RESOURCE|unity|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
 		modifier = {
 			factor = 2
 			OR = {
@@ -4712,6 +3684,11 @@ supervisor = {
 			factor = 5
 			has_job = supervisor
 		}
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
+		}
 	}
 }
 
@@ -4730,16 +3707,9 @@ mogul = {
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
-	}
-	possible = {
+		ethic_is_not_enslaved = yes
 		owner = {
-			NOT = {
-				has_valid_civic = civic_distributism
-			}
+			NOT = { has_valid_civic = civic_distributism }
 		}
 	}
 	resources = {
@@ -4748,7 +3718,7 @@ mogul = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = 1
+			consumer_goods = @ruler_job_consumer_goods_upkeep_base
 		}
 	}
 	triggered_pop_modifier = {
@@ -4791,17 +3761,9 @@ mogul = {
 	}
 	triggered_planet_modifier = {
 		potential = { always = yes }
-		planet_amenities_add = 7
+		planet_amenities_add = 5
 		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
 	}
-	triggered_planet_modifier = {
-		potential = {
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			planet_amenities_add = -1
-		}
-	}
 	triggered_planet_modifier = {
 		potential = {
 			owner = {
@@ -4814,6 +3776,16 @@ mogul = {
 	}
 	weight = {
 		weight = @ruler_job_weight
+		modifier = {
+			mult = value:job_weights_modifier|JOB|mogul|RESOURCE|unity|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
 		modifier = {
 			factor = 2
 			OR = {
@@ -4840,6 +3812,11 @@ mogul = {
 			factor = 1.5
 			has_ethic = ethic_capitalism
 		}
+		# crisis purge
+		modifier = {
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
+		}
 	}
 }
 
@@ -4880,7 +3857,7 @@ organic_observer = {
 		produces = {
 			trigger = {
 				owner = {
-						has_valid_civic = civic_mechanical_utopia
+					has_valid_civic = civic_mechanical_utopia
 				}
 			}
 			energy = 1
@@ -5041,6 +4018,8 @@ future_complex_drone = {
 			alloys = 1
 			influence = 0.01
 		}
+		
+		# region inline_script:jobs/future_complex_drone_ai_bonus
 		#AI基础与年数产出
 		produces = {
 			trigger = {
@@ -5097,7 +4076,6 @@ future_complex_drone = {
 			society_research = 2
 			unity = 8
 		}
-		
 		produces = { 
 			trigger = {
 				owner = { is_ai = yes }
@@ -5112,7 +4090,6 @@ future_complex_drone = {
 			society_research = 3
 			unity = 2
 		}
-		
 		produces = {
 			trigger = {
 				end_game_years_passed > 0
@@ -5240,6 +4217,7 @@ future_complex_drone = {
 			society_research = 8
 			alloys = 14
 		}
+		# endregion
 	}
 	weight = {
 		weight = 0.1
@@ -5293,38 +4271,7 @@ future_simple_drone = {
 			minerals = 1.5
 		}
 
-		#利他主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_altruism
-				}
-			}
-			unity = 2
-		}
-
-		# Utopian living standards
-		produces = {
-			trigger = {
-				has_utopian_living_standard_type = yes
-			}
-			society_research = 2
-			physics_research = 2
-			engineering_research = 2
-		}
-
-		# Welfare
-		produces = {
-			trigger = {
-				OR = {
-					has_very_high_living_standard_type = yes
-					has_high_living_standard_type = yes
-					has_shared_burden_living_standard_type = yes
-				}
-			}
-			unity = 1
-		}
+		# region inline_script:jobs/future_simple_drone_ai_bonus
 		#AI基础与年数产出
 		produces = {
 			trigger = {
@@ -5369,7 +4316,6 @@ future_simple_drone = {
 			consumer_goods = -2
 			alloys = 2
 		}
-		
 		produces = { 
 			trigger = {
 				owner = { is_ai = yes }
@@ -5381,7 +4327,6 @@ future_simple_drone = {
 			consumer_goods = 2
 			alloys = 2
 		}
-		
 		produces = {
 			trigger = {
 				end_game_years_passed > 0
@@ -5466,6 +4411,7 @@ future_simple_drone = {
 			engineering_research = 1
 			society_research = 1.5
 		}
+		# endregion
 	}
 	triggered_planet_modifier = {
 		potential = { always = yes }
@@ -5477,70 +4423,6 @@ future_simple_drone = {
 	}
 }
 
-#享乐主义者
-fe_hedonist = {
-	category = precursor
-	is_capped_by_modifier = no
-	building_icon = building_hyper_entertainment_forum
-	clothes_texture_index = 2
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-
-	possible = {
-		OR = {
-			AND = {
-				owner = {
-					is_fallen_empire = yes
-					is_fallen_empire_spiritualist = no
-					is_fallen_machine_empire = no
-				}
-			}
-			AND = {
-				owner = { has_origin = origin_taking_care_of_god }
-				has_trait = trait_fallen_god
-			}
-		}
-		is_same_species = owner
-		NOR = {
-			has_trait = trait_mechanical
-			has_trait = trait_machine_unit
-		}
-	}
-
-	resources = {
-		category = planet_jobs
-		produces = {
-			unity = 2
-		}
-	}
-
-	weight = {
-		weight = 1000
-
-		# crisis purge
-		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-		}
-
-		modifier = {
-			factor = 100
-			owner = { has_origin = origin_taking_care_of_god }
-			has_trait = trait_fallen_god
-		}
-	}
-}
-
 #繁育子个体
 breeding_drone = {
 	category = simple_drone
diff --git a/common/scripted_triggers/ut_scripted_triggers.txt b/common/scripted_triggers/ut_scripted_triggers.txt
index 2378834b5..adefea3e9 100644
--- a/common/scripted_triggers/ut_scripted_triggers.txt
+++ b/common/scripted_triggers/ut_scripted_triggers.txt
@@ -1,5 +1,4 @@
-### CIVIC CHECK
-
+### region CIVIC CHECK
 # 是共产主义社会
 is_community_society = {
 	has_valid_civic = civic_shared_burden
@@ -31,11 +30,11 @@ is_criminal_syndicate = {
 	OR = {
 		has_valid_civic = civic_criminal_heritage
 		has_valid_civic = civic_underworld_society
-	} 
+	}
 }
+### endregion
 
-### CIVIC RELATED
-
+### region JOB CHECK
 # 未被奴役（兼容特殊国策）
 ethic_is_not_enslaved = {
 	OR = {
@@ -67,4 +66,112 @@ ethic_battle_thrall_job_check_trigger = {
 		exists = owner
 		owner = { has_valid_civic = civic_du_contrat_social }
 	}
-}
\ No newline at end of file
+}
+
+is_crisis_purged_ruler_check = {
+	exists = planet
+	exists = planet.controller
+	planet.controller = {
+		OR = {
+			is_country_type = swarm
+			is_country_type = ai_empire
+		}
+	}
+	OR = {
+		# contingency won't purge itself
+		NOT = { exists = event_target:custodian_bot }
+		AND = {
+			exists = event_target:custodian_bot
+			NOT = { species = { is_same_value = event_target:custodian_bot } }
+		}
+	}
+}
+
+is_crisis_purged_precursor_check = {
+	exists = planet
+	exists = planet.controller
+	planet.controller = {
+		OR = {
+			is_country_type = swarm
+			is_country_type = ai_empire
+		}
+	}
+}
+
+### endregion
+
+### region DISTRICT CHECK
+has_any_generator_district_or_building = {
+	OR = {
+		has_district = district_generator
+		has_district = district_hab_energy
+		has_district = district_generator_uncapped
+		has_district = district_rw_generator
+		has_building = building_betharian_power_plant
+		# PD
+		has_district = district_pdhab_energy
+	}
+}
+
+has_any_mining_district = {
+	OR = {
+		has_district = district_mining
+		has_district = district_hab_mining
+		has_district = district_mining_uncapped
+		# PD
+		has_district = district_pdhab_mining
+	}
+}
+
+has_any_farming_district_or_buildings = {
+	OR = {
+		has_district = district_farming
+		has_district = district_rw_farming
+		has_district = district_farming_uncapped
+		has_building = building_hydroponics_farm
+		# PD
+		has_district = district_pdhab_food
+	}
+}
+
+has_any_arms_industry_district = {
+	OR = {
+		has_district = district_industrial
+		has_district = district_hab_industrial
+		has_district = district_rw_industrial
+		has_district = district_arcology_arms_industry
+		# PD
+		has_district = district_pdhab_industrial
+	}
+}
+
+has_any_civilian_industry_district = {
+	OR = {
+		has_district = district_industrial
+		has_district = district_arcology_civilian_industry
+		has_district = district_rw_industrial
+		has_district = district_hab_industrial
+		has_district = district_pdhab_industrial
+	}
+}
+
+has_any_arms_industry_designation = {
+	OR = {
+		has_designation = col_foundry
+		has_designation = col_habitat_foundry
+		has_designation = col_ring_foundry
+		has_designation = col_ecu_foundry
+		has_designation = col_dome_foundry
+	} 
+}
+
+has_any_civilian_industry_designation = {
+	OR = {
+		has_designation = col_factory
+		has_designation = col_habitat_factory
+		has_designation = col_ring_factory
+		has_designation = col_ecu_factory
+		has_designation = col_dome_factory
+	}
+}
+### endregion
\ No newline at end of file
diff --git a/common/scripted_variables/ut_scripted_variables.txt b/common/scripted_variables/ut_scripted_variables.txt
index d9b3f3a40..863a72297 100644
--- a/common/scripted_variables/ut_scripted_variables.txt
+++ b/common/scripted_variables/ut_scripted_variables.txt
@@ -1,5 +1,8 @@
 ### JOB PRODUCES
 
+@job_foundry_specialist_alloys_produce_base = 2
+@job_artisan_specialist_consumer_goods_produce_base = 4
+
 @job_technician_energy_produce_base = 6
 @job_miner_minerals_produce_base = 4
 @job_crystal_miner_rare_crystals_produce_base = 2
@@ -7,22 +10,27 @@
 @job_mote_harvester_volatile_motes_produce_base = 2
 @job_farmer_food_produce_base = 6
 @job_foundry_alloys_produce_base = 3
-@job_artisan_consumer_goods_produce_base = 7
+@job_artisan_consumer_goods_produce_base = 6
 
 ### JOB UPKEEPS
 
-@ruler_job_consumer_goods_upkeep_base = 2
-@ruler_job_consumer_goods_upkeep_half = 1
+@ruler_job_consumer_goods_upkeep_base = 1
+@ruler_job_alloys_upkeep_knight_commander = 1
+@ruler_job_consumer_goods_upkeep_knight_commander = 1
 
 @specialist_job_consumer_goods_upkeep_base = 0
-@specialist_job_consumer_goods_upkeep_half = 0.5
-@specialist_job_consumer_goods_upkeep = 1
+@specialist_job_consumer_goods_upkeep = 0.5
 @specialist_job_consumer_goods_upkeep_scientist = 2
+@specialist_job_consumer_goods_upkeep_entertainer = 1
+@specialist_job_alloys_upkeep_duelist = 1
 @specialist_job_consumer_goods_upkeep_culture_worker = 2
 @specialist_job_consumer_goods_upkeep_priest = 2
 @specialist_job_consumer_goods_upkeep_bureaucrat = 1
 @specialist_job_consumer_goods_upkeep_assembly = 0.5
+@specialist_job_minerals_upkeep_foundry = 6
+@specialist_job_minerals_upkeep_artisan = 6
+@specialist_job_alloys_upkeep_knight = 1
 
 @worker_job_consumer_goods_upkeep_base = 0
 @worker_job_minerals_upkeep_foundry = 6
-@worker_job_minerals_upkeep_artisan = 8
\ No newline at end of file
+@worker_job_minerals_upkeep_artisan = 6
\ No newline at end of file
diff --git a/localisation/replace/english/ethic_jobs_l_english.yml b/localisation/replace/english/ethic_jobs_l_english.yml
index 6118109d6..45e584928 100644
--- a/localisation/replace/english/ethic_jobs_l_english.yml
+++ b/localisation/replace/english/ethic_jobs_l_english.yml
@@ -135,6 +135,14 @@
  mod_job_politician_per_pop: "§G+1§! $job_politician$ Job per $VALUE$ Pops"
  mod_job_politician_per_pop_short: "\n§G+1§! £mod_job_politician_add£ per $VALUE$ £pop£"
 
+ job_noble:0 "Noble"
+ job_noble_plural:0 "Nobles"
+ job_noble_desc:1 "Heavy is the burden of the nobility, whose birthright is to rule over their unwashed lessers. Luckily, there are a few financial advantages to the position."
+ job_noble_effect_desc:2 "£job_noble£ $job_noble_plural$ turn £consumer_goods£ §Y$consumer_goods$§! into £unity£ §Y$unity$§!, $pop_cat_ruler$ Political Power and provide £job_slave_overseer£ $job_slave_overseer$ jobs"
+ mod_job_noble_add:0 "$job_noble$ Jobs"
+ mod_job_noble_per_pop:0 "§G+1§! $job_noble$ Job per $VALUE$ Pops"
+ mod_job_noble_per_pop_short:0 "\n§G+1§! £mod_job_noble_add£ per $VALUE$ £pop£"
+ 
  job_culture_worker:0 "Culture Worker"
  job_culture_worker_plural:0 "Culture Workers"
  job_culture_worker_desc:1 "Maintaining the arts is the realm of these workers, vital for the inner development and social expression of citizens."
diff --git a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
index 24e1fd792..f21af94e0 100644
--- a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
@@ -138,6 +138,14 @@
  mod_job_politician_per_pop:0 "每$VALUE$个人口提供§G+1§!个$job_politician$岗位"
  mod_job_politician_per_pop_short:0 "\n每$VALUE$ £pop£ §G+1§! £mod_job_politician_add£ "
 
+ job_noble:0 "贵族"
+ job_noble_plural:0 "贵族"
+ job_noble_desc:1 "贵族的负担是非常沉重的，他们天生的使命就是领导平庸的同胞们。幸运的是如此艰苦的岗位能够换来相当优渥的生活，所以此岗位还是非常让人趋之若鹜。"
+ job_noble_effect_desc:2 "£job_noble£ $job_noble_plural$将 £consumer_goods£ §Y$consumer_goods$§!转化为 £unity£ §Y$unity$§!， $pop_cat_ruler$政治权力并提供 £job_slave_overseer£ $job_slave_overseer$ 岗位"
+ mod_job_noble_add:0 "$job_noble$岗位"
+ mod_job_noble_per_pop:0 "每$VALUE$个人口提供§G+1§!个$job_noble$岗位"
+ mod_job_noble_per_pop_short:0 "\n每$VALUE$ £pop£ §G+1§! £mod_job_noble_add£ "
+ 
  job_culture_worker:0 "文化工作者"
  job_culture_worker_plural:0 "文化工作者"
  job_culture_worker_effect_desc:2 "£job_culture_worker£ $job_culture_worker_plural$将£consumer_goods£ §Y$consumer_goods$§!转化为£unity£ §Y$unity$§!，[GetCultureWorkerSpiMatOutput][GetCultureWorkerEgalAuthOutput][GetCultureWorkerMilPacOutput][GetCultureWorkerXenoOutput][GetCultureWorkerSocCapOutput]以及£mod_ethic_attraction_mult£ §Y主流思潮吸引力§!。\n\n£job_culture_worker£文化工作者的效果会随着帝国的思潮而发生改变。"
@@ -221,7 +229,7 @@
  job_PR_manager:0 "公关经理"
  job_PR_manager_plural:0 "公关经理"
  job_PR_manager_desc:0 "这些中层管理人员的主要工作是维护公司产品的形象，并保证其热度不减。"
- job_PR_manager_effect_desc:0 "£job_PR_manager£ $job_PR_manager_plural$将£consumer_goods£ §Y$consumer_goods$§!将£consumer_goods£ §Y$consumer_goods$§!转化为£unity£ $unity$，提高星球的£mod_trade_value_add£ §Y$TRADE_VALUE$§!产出，并提供£job_professional_star_fans£ $job_professional_star_fans_plural$岗位"
+ job_PR_manager_effect_desc:0 "£job_PR_manager£ $job_PR_manager_plural$将 £consumer_goods£ §Y$consumer_goods$§!转化为 £unity£ $unity$，提高星球的 £mod_trade_value_add£ §Y$TRADE_VALUE$§!产出，并提供 £job_professional_star_fans£ $job_professional_star_fans_plural$岗位"
  mod_job_PR_manager_add:0 "$job_PR_manager$岗位"
  mod_job_PR_manager_per_pop:0 "每$VALUE$个人口提供§G+1§!个$job_PR_manager$岗位"
  mod_job_PR_manager_per_pop_short:0 "\n每$VALUE$ £pop£ §G+1§! £mod_job_PR_manager_add£"

From ef30c30f3d6f2694fd878874da56065e46d019a2 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Tue, 3 Jan 2023 00:35:24 +0800
Subject: [PATCH 14/30] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 common/pop_jobs/01_ruler_jobs.txt             | 14 ++---
 common/pop_jobs/02_specialist_jobs.txt        | 38 ++++++------
 common/pop_jobs/03_worker_jobs.txt            | 20 +++----
 .../pop_jobs/07_revolutionary_empire_jobs.txt | 14 ++---
 common/pop_jobs/ethic_rebuild_jobs.txt        | 28 ++++-----
 .../ut_scripted_variables.txt                 | 60 +++++++++----------
 7 files changed, 85 insertions(+), 90 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e75b4ae0c..458208b4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * 调整 格式塔职业职业：数值调整
 * 调整 正在净化的人口产出的研究点数改为1
 * 调整 非罪企时罪犯-5贸易额产出，罪犯相关BUG修复
+* 重命名 封装变量
 
 ```
 planet_modifier/planet_jobs_slave_produces_mult
diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index c2d524d31..d70d61c84 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -68,7 +68,7 @@ head_researcher = {
 			unity = 3
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 		upkeep = {
 			trigger = {
@@ -320,7 +320,7 @@ high_priest = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 	}
 
@@ -430,7 +430,7 @@ politician = {
 			unity = 4
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 	}
 	country_modifier = {
@@ -557,7 +557,7 @@ noble = {
 			unity = 4
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 	}
 
@@ -666,7 +666,7 @@ executive = {
 			unity = 2
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 	}
 
@@ -814,8 +814,8 @@ knight_commander = {
 			mult = value:knight_commander_research_output_modifier
 		}
 		upkeep = {
-			alloys = @ruler_job_alloys_upkeep_knight_commander
-			consumer_goods = @ruler_job_consumer_goods_upkeep_knight_commander
+			alloys = @job_knight_commander_upkeep_alloys
+			consumer_goods = @job_knight_commander_upkeep_consumer_goods
 		}
 	}
 
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 96400a23c..4e4b2d767 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -69,7 +69,7 @@ merchant = {
 			consumer_goods = 1
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 	}
 
@@ -273,7 +273,7 @@ soldier = {
 		}
 
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 	}
 	country_modifier = {
@@ -477,7 +477,7 @@ researcher = {
 			engineering_research = 1.5
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_scientist
+			consumer_goods = @job_scientist_upkeep_consumer_goods
 		}
 		upkeep = {
 			trigger = {
@@ -759,7 +759,7 @@ priest = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_priest
+			consumer_goods = @job_priest_upkeep_consumer_goods
 		}
 		produces = {
 			trigger = {
@@ -976,7 +976,7 @@ death_priest = {
 			unity = 2
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_priest
+			consumer_goods = @job_priest_upkeep_consumer_goods
 		}
 		produces = {
 			trigger = {
@@ -1484,7 +1484,7 @@ entertainer = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_entertainer
+			consumer_goods = @job_entertainer_upkeep_consumer_goods
 		}
 	}
 	triggered_planet_modifier = {
@@ -1602,7 +1602,7 @@ duelist = {
 			unity = 2
 		}
 		upkeep = {
-			alloys = @specialist_job_alloys_upkeep_duelist
+			alloys = @job_duelist_upkeep_alloys
 		}
 	}
 	triggered_planet_modifier = {
@@ -1682,7 +1682,7 @@ culture_worker = {
 			unity = 4
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_culture_worker
+			consumer_goods = @job_culture_worker_upkeep_consumer_goods
 		}
 	}
 
@@ -1861,7 +1861,7 @@ bureaucrat = {
 	resources = {
 		category = planet_bureaucrats
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_bureaucrat
+			consumer_goods = @job_bureaucrat_upkeep_consumer_goods
 		}
 		upkeep = {
 			trigger = {
@@ -2127,7 +2127,7 @@ roboticist = {
 		category = planet_pop_assemblers
 		upkeep = {
 			alloys = 2
-			consumer_goods = @specialist_job_consumer_goods_upkeep_assembly
+			consumer_goods = @job_assembly_upkeep_consumer_goods
 		}
 	}
 
@@ -2201,7 +2201,7 @@ healthcare = {
 			society_research = 1.5
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 		upkeep = {
 			trigger = {
@@ -2335,7 +2335,7 @@ manager = {
 			unity = 3
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_bureaucrat
+			consumer_goods = @job_bureaucrat_upkeep_consumer_goods
 		}
 		upkeep = {
 			society_research = 2
@@ -2417,7 +2417,7 @@ necromancer = {
 			society_research = 6
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 	}
 	country_modifier = {
@@ -2616,7 +2616,7 @@ death_chronicler = {
 			society_research = 2
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_culture_worker
+			consumer_goods = @job_culture_worker_upkeep_consumer_goods
 		}
 	}
 	planet_modifier = {
@@ -2830,7 +2830,7 @@ necro_apprentice = {
 				exists = owner
 				owner = { is_hive_empire = no }
 			}
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 		upkeep = {
 			trigger = {
@@ -3148,14 +3148,14 @@ reassigner = {
 			trigger = {
 				is_lithoid = no
 			}
-			consumer_goods = @specialist_job_consumer_goods_upkeep_assembly
+			consumer_goods = @job_assembly_upkeep_consumer_goods
 			food = 2
 		}
 		upkeep = {
 			trigger = {
 				is_lithoid = yes
 			}
-			consumer_goods = @specialist_job_consumer_goods_upkeep_assembly
+			consumer_goods = @job_assembly_upkeep_consumer_goods
 			minerals = 2
 		}
 	}
@@ -3208,7 +3208,7 @@ bath_attendant = {
 	resources = {
 		category = planet_bath_attendants
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 	}
 
@@ -3276,7 +3276,7 @@ knight = {
 			mult = value:knights_research_output_modifier
 		}
 		upkeep = {
-			alloys = @specialist_job_alloys_upkeep_knight
+			alloys = @job_knight_upkeep_alloys
 		}
 	}
 
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index ed2b8035d..74134ac5e 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -366,7 +366,7 @@ technician = {
 	resources = {
 		category = planet_technician
 		produces = {
-			energy = @job_technician_energy_produce_base
+			energy = @job_technician_produce_energy
 		}
 		produces = {
 			trigger = {
@@ -526,7 +526,7 @@ miner = {
 	resources = {
 		category = planet_miners
 		produces = {
-			minerals = @job_miner_minerals_produce_base
+			minerals = @job_miner_produce_minerals
 		}
 		produces = {
 			trigger = {
@@ -691,7 +691,7 @@ crystal_miner = {
 	resources = {
 		category = planet_miners
 		produces = {
-			rare_crystals = @job_crystal_miner_rare_crystals_produce_base
+			rare_crystals = @job_crystal_miner_produce_rare_crystals
 		}
 		
 		# 灵网裂隙
@@ -799,7 +799,7 @@ gas_extractor = {
 	resources = {
 		category = planet_miners
 		produces = {
-			exotic_gases = @job_gas_extractor_exotic_gases_produce_base
+			exotic_gases = @job_gas_extractor_produce_exotic_gases_produce
 		}
 		
 		# 灵网裂隙
@@ -906,7 +906,7 @@ mote_harvester = {
 	resources = {
 		category = planet_miners
 		produces = {
-			volatile_motes = @job_mote_harvester_volatile_motes_produce_base
+			volatile_motes = @job_mote_harvester_produce_volatile_motes_produce
 		}
 
 		# 灵网裂隙
@@ -1014,7 +1014,7 @@ farmer = {
 	resources = {
 		category = planet_farmers
 		produces = {
-			food = @job_farmer_food_produce_base
+			food = @job_farmer_produce_food
 		}
 		
 		produces = {
@@ -1216,7 +1216,7 @@ foundry = {
 	resources = {
 		category = planet_metallurgists
 		produces = {
-			alloys = @job_foundry_alloys_produce_base
+			alloys = @job_foundry_produce_alloys
 		}
 		produces = {
 			trigger = {
@@ -1236,7 +1236,7 @@ foundry = {
 			alloys = @requisitorium_alloys_reduction
 		}
 		upkeep = {
-			minerals = @worker_job_minerals_upkeep_foundry
+			minerals = @job_foundry_upkeep_minerals
 		}
 		upkeep = {
 			trigger = {
@@ -1352,7 +1352,7 @@ artisan = {
 	resources = {
 		category = planet_artisans
 		produces = {
-			consumer_goods = @job_artisan_consumer_goods_produce_base
+			consumer_goods = @job_artisan_produce_consumer_goods
 		}
 		produces = {
 			trigger = {
@@ -1364,7 +1364,7 @@ artisan = {
 			engineering_research = 1
 		}
 		upkeep = {
-			minerals = @worker_job_minerals_upkeep_artisan
+			minerals = @job_artisan_upkeep_minerals
 		}
 		produces = {
 			trigger = {
diff --git a/common/pop_jobs/07_revolutionary_empire_jobs.txt b/common/pop_jobs/07_revolutionary_empire_jobs.txt
index cda9783b2..d1df5288d 100644
--- a/common/pop_jobs/07_revolutionary_empire_jobs.txt
+++ b/common/pop_jobs/07_revolutionary_empire_jobs.txt
@@ -20,7 +20,7 @@ re_acolyte_metallurgists = {
 	resources = {
 		category = planet_metallurgists
 		produces = {
-			alloys = @job_foundry_alloys_produce_base
+			alloys = @job_foundry_produce_alloys
 		}
 		produces = {
 			trigger = {
@@ -40,7 +40,7 @@ re_acolyte_metallurgists = {
 			alloys = @requisitorium_alloys_reduction
 		}
 		upkeep = {
-			minerals = @worker_job_minerals_upkeep_foundry
+			minerals = @job_foundry_upkeep_minerals
 		}
 		upkeep = {
 			trigger = {
@@ -159,7 +159,7 @@ re_acolyte_artisan = {
 	resources = {
 		category = planet_artisans
 		produces = {
-			consumer_goods = @job_artisan_consumer_goods_produce_base
+			consumer_goods = @job_artisan_produce_consumer_goods
 		}
 		produces = {
 			trigger = {
@@ -171,7 +171,7 @@ re_acolyte_artisan = {
 			engineering_research = 1
 		}
 		upkeep = {
-			minerals = @worker_job_minerals_upkeep_artisan
+			minerals = @job_artisan_upkeep_minerals
 		}
 		produces = {
 			trigger = {
@@ -311,7 +311,7 @@ re_acolyte_farm = {
 	resources = {
 		category = planet_farmers
 		produces = {
-			food = @job_farmer_food_produce_base
+			food = @job_farmer_produce_food
 		}
 		produces = {
 			trigger = {
@@ -510,7 +510,7 @@ re_acolyte_mine = {
 	resources = {
 		category = planet_miners
 		produces = {
-			minerals = @job_miner_minerals_produce_base
+			minerals = @job_miner_produce_minerals
 		}
 		produces = {
 			trigger = {
@@ -679,7 +679,7 @@ re_acolyte_generator = {
 	resources = {
 		category = planet_technician
 		produces = {
-			energy = @job_technician_energy_produce_base
+			energy = @job_technician_produce_energy
 		}
 		produces = {
 			trigger = {
diff --git a/common/pop_jobs/ethic_rebuild_jobs.txt b/common/pop_jobs/ethic_rebuild_jobs.txt
index 896f0446d..ca5947c5e 100644
--- a/common/pop_jobs/ethic_rebuild_jobs.txt
+++ b/common/pop_jobs/ethic_rebuild_jobs.txt
@@ -1502,7 +1502,7 @@ foundry_specialist = {
 	resources = {
 		category = planet_metallurgists
 		produces = {
-			alloys = @job_foundry_specialist_alloys_produce_base
+			alloys = @job_foundry_specialist_produce_alloys
 			engineering_research = 1
 		}
 		produces = {
@@ -1531,7 +1531,7 @@ foundry_specialist = {
 			minerals = 2
 		}
 		upkeep = {
-			minerals = @specialist_job_minerals_upkeep_foundry
+			minerals = @job_foundry_specialist_upkeep_minerals
 		}
 		upkeep = {
 			trigger = {
@@ -1614,7 +1614,7 @@ artisan_specialist = {
 	resources = {
 		category = planet_artisans
 		produces = {
-			consumer_goods = @job_artisan_specialist_consumer_goods_produce_base
+			consumer_goods = @job_artisan_specialist_produce_consumer_goods
 		}
 		produces = {
 			trigger = {
@@ -1626,7 +1626,7 @@ artisan_specialist = {
 			engineering_research = 2
 		}
 		upkeep = {
-			minerals = @specialist_job_minerals_upkeep_artisan
+			minerals = @job_artisan_specialist_upkeep_minerals
 		}
 		produces = {
 			trigger = {
@@ -1804,7 +1804,7 @@ media_worker = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep_culture_worker
+			consumer_goods = @job_culture_worker_upkeep_consumer_goods
 		}
 	}
 
@@ -1970,7 +1970,7 @@ PR_manager = {
 			unity = 2
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 	}
 
@@ -2140,7 +2140,7 @@ research_pacesetter = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 	}
 	triggered_planet_modifier = {
@@ -2614,7 +2614,7 @@ templar = {
 			engineering_research = 1.5
 		}
 		upkeep = {
-			alloys = @specialist_job_alloys_upkeep_knight
+			alloys = @job_knight_upkeep_alloys
 		}
 	}
 
@@ -2690,7 +2690,7 @@ death_knight = {
 			engineering_research = 1.5
 		}
 		upkeep = {
-			alloys =  @specialist_job_alloys_upkeep_knight
+			alloys =  @job_knight_upkeep_alloys
 		}
 	}
 
@@ -2789,7 +2789,7 @@ mercenary = {
 	resources = {
 		category = planet_soldiers
 		upkeep = {
-			consumer_goods = @specialist_job_consumer_goods_upkeep
+			consumer_goods = @specialist_upkeep_consumer_goods
 		}
 	}
 	weight = {
@@ -3471,7 +3471,7 @@ core_party_members = {
 			unity = 3
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 	}
 	planet_modifier = {
@@ -3542,7 +3542,7 @@ commandante = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 	}
 	planet_modifier = {
@@ -3634,7 +3634,7 @@ supervisor = {
 			unity = 3
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 	}
 	planet_modifier = {
@@ -3718,7 +3718,7 @@ mogul = {
 			unity = 1
 		}
 		upkeep = {
-			consumer_goods = @ruler_job_consumer_goods_upkeep_base
+			consumer_goods = @ruler_upkeep_consumer_goods_base
 		}
 	}
 	triggered_pop_modifier = {
diff --git a/common/scripted_variables/ut_scripted_variables.txt b/common/scripted_variables/ut_scripted_variables.txt
index 863a72297..3deed6f24 100644
--- a/common/scripted_variables/ut_scripted_variables.txt
+++ b/common/scripted_variables/ut_scripted_variables.txt
@@ -1,36 +1,30 @@
-### JOB PRODUCES
+### JOB PRODUCES & UPKEEPS
 
-@job_foundry_specialist_alloys_produce_base = 2
-@job_artisan_specialist_consumer_goods_produce_base = 4
+@ruler_upkeep_consumer_goods_base = 1
+@job_knight_commander_upkeep_alloys = 1
+@job_knight_commander_upkeep_consumer_goods = 1
 
-@job_technician_energy_produce_base = 6
-@job_miner_minerals_produce_base = 4
-@job_crystal_miner_rare_crystals_produce_base = 2
-@job_gas_extractor_exotic_gases_produce_base = 2
-@job_mote_harvester_volatile_motes_produce_base = 2
-@job_farmer_food_produce_base = 6
-@job_foundry_alloys_produce_base = 3
-@job_artisan_consumer_goods_produce_base = 6
+@specialist_upkeep_consumer_goods = 0.5
+@job_scientist_upkeep_consumer_goods = 2
+@job_entertainer_upkeep_consumer_goods = 1
+@job_duelist_upkeep_alloys = 1
+@job_culture_worker_upkeep_consumer_goods = 2
+@job_priest_upkeep_consumer_goods = 2
+@job_bureaucrat_upkeep_consumer_goods = 1
+@job_assembly_upkeep_consumer_goods = 0.5
+@job_knight_upkeep_alloys = 1
+@job_foundry_specialist_produce_alloys = 2
+@job_foundry_specialist_upkeep_minerals = 6
+@job_artisan_specialist_produce_consumer_goods = 4
+@job_artisan_specialist_upkeep_minerals = 6
 
-### JOB UPKEEPS
-
-@ruler_job_consumer_goods_upkeep_base = 1
-@ruler_job_alloys_upkeep_knight_commander = 1
-@ruler_job_consumer_goods_upkeep_knight_commander = 1
-
-@specialist_job_consumer_goods_upkeep_base = 0
-@specialist_job_consumer_goods_upkeep = 0.5
-@specialist_job_consumer_goods_upkeep_scientist = 2
-@specialist_job_consumer_goods_upkeep_entertainer = 1
-@specialist_job_alloys_upkeep_duelist = 1
-@specialist_job_consumer_goods_upkeep_culture_worker = 2
-@specialist_job_consumer_goods_upkeep_priest = 2
-@specialist_job_consumer_goods_upkeep_bureaucrat = 1
-@specialist_job_consumer_goods_upkeep_assembly = 0.5
-@specialist_job_minerals_upkeep_foundry = 6
-@specialist_job_minerals_upkeep_artisan = 6
-@specialist_job_alloys_upkeep_knight = 1
-
-@worker_job_consumer_goods_upkeep_base = 0
-@worker_job_minerals_upkeep_foundry = 6
-@worker_job_minerals_upkeep_artisan = 6
\ No newline at end of file
+@job_technician_produce_energy = 6
+@job_miner_produce_minerals = 4
+@job_crystal_miner_produce_rare_crystals = 2
+@job_gas_extractor_produce_exotic_gases_produce = 2
+@job_mote_harvester_produce_volatile_motes_produce = 2
+@job_farmer_produce_food = 6
+@job_foundry_produce_alloys = 3
+@job_foundry_upkeep_minerals = 6
+@job_artisan_produce_consumer_goods = 6
+@job_artisan_upkeep_minerals = 6
\ No newline at end of file

From bd1c4fe9d4d4d5b2015fe2518e0247cb96e927a7 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Tue, 3 Jan 2023 00:36:42 +0800
Subject: [PATCH 15/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E5=BC=8F/=E5=88=86=E5=B8=83=E5=BC=8F=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=BB=8F=E6=B5=8E=20=E6=95=88=E6=9E=9C=E4=BA=92=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../policies/ethic_rebuild_policies.txt       | 20 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 458208b4c..8ae720efc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 * 调整 正在净化的人口产出的研究点数改为1
 * 调整 非罪企时罪犯-5贸易额产出，罪犯相关BUG修复
 * 重命名 封装变量
+* 调整 指令式/分布式计划经济 效果互换
 
 ```
 planet_modifier/planet_jobs_slave_produces_mult
diff --git a/Mysteries Tools/EDU/common/policies/ethic_rebuild_policies.txt b/Mysteries Tools/EDU/common/policies/ethic_rebuild_policies.txt
index cdfd42c2a..8cbd9e7f4 100644
--- a/Mysteries Tools/EDU/common/policies/ethic_rebuild_policies.txt	
+++ b/Mysteries Tools/EDU/common/policies/ethic_rebuild_policies.txt	
@@ -2059,13 +2059,13 @@ economic_stance = {
 			economic_stance_planned
 		}
 		modifier = {
-			pop_growth_speed = 0.1
+			pop_growth_speed_reduction = 0.1
+			job_labour_hero_per_pop = 0.05
 			planet_jobs_produces_mult = 0.15
-			job_labour_hero_per_pop = 0.04
-			trade_value_mult = -0.25
-			country_trade_fee = 0.2
+			trade_value_mult = -0.2
+			country_trade_fee = 0.1
 			planet_jobs_productive_upkeep_mult = 0.1
-			pop_ethic_socialism_attraction_mult = 0.2
+			pop_ethic_socialism_attraction_mult = 0.1
 		}
 		valid = {
 			OR = {
@@ -2119,13 +2119,13 @@ economic_stance = {
 			economic_stance_planned
 		}
 		modifier = {
-			pop_growth_speed_reduction = 0.1
-			job_labour_hero_per_pop = 0.05
+			pop_growth_speed = 0.1
 			planet_jobs_produces_mult = 0.15
-			trade_value_mult = -0.2
-			country_trade_fee = 0.1
+			job_labour_hero_per_pop = 0.04
+			trade_value_mult = -0.25
+			country_trade_fee = 0.2
 			planet_jobs_productive_upkeep_mult = 0.1
-			pop_ethic_socialism_attraction_mult = 0.1
+			pop_ethic_socialism_attraction_mult = 0.2
 		}
 		valid = {
 			is_socialism = yes

From 8d50835abd2fdb3f4f422147feea6418d56670da Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Tue, 3 Jan 2023 01:00:05 +0800
Subject: [PATCH 16/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=81=8C=E4=B8=9A?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=B8=AD=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=8B=A5=E6=9C=89=E5=9B=BD=E7=AD=96=E6=97=B6=EF=BC=8C=E8=AF=A5?=
 =?UTF-8?q?=E5=9B=BD=E7=AD=96=E5=BF=85=E9=A1=BB=E5=90=88=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                           |  1 +
 common/pop_jobs/02_specialist_jobs.txt |  8 ++++----
 common/pop_jobs/03_worker_jobs.txt     |  2 +-
 common/pop_jobs/ethic_rebuild_jobs.txt | 12 ++++++------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ae720efc..88e41ee3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * 调整 非罪企时罪犯-5贸易额产出，罪犯相关BUG修复
 * 重命名 封装变量
 * 调整 指令式/分布式计划经济 效果互换
+* 修复 职业脚本中判断是否拥有国策时，该国策必须合法
 
 ```
 planet_modifier/planet_jobs_slave_produces_mult
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 4e4b2d767..b72d0e052 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -26,7 +26,7 @@ merchant = {
 			trigger = {
 				exists = owner
 				owner = {
-					has_civic = civic_corporate_dominion
+					has_valid_civic = civic_corporate_dominion
 				}
 			}
 			unity = 1
@@ -148,7 +148,7 @@ merchant = {
 				OR = {
 					is_capitalism = yes
 					has_tradition = tr_mercantile_marketplace_of_better_ideas
-					has_civic = civic_corporate_dominion
+					has_valid_civic = civic_corporate_dominion
 				}
 			}
 		}
@@ -835,7 +835,7 @@ priest = {
 		modifier = {
 			factor = 2
 			exists = owner
-			owner = { has_civic = civic_exalted_priesthood }
+			owner = { has_valid_civic = civic_exalted_priesthood }
 		}
 		modifier = {
 			factor = 2
@@ -1014,7 +1014,7 @@ death_priest = {
 		modifier = {
 			factor = 2
 			exists = owner
-			owner = { has_civic = civic_exalted_priesthood }
+			owner = { has_valid_civic = civic_exalted_priesthood }
 		}
 		modifier = {
 			factor = 1.2
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index 74134ac5e..25aa9c719 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -1818,7 +1818,7 @@ mortal_initiate = {
 		modifier = {
 			factor = 2
 			owner = {
-				has_civic = civic_exalted_priesthood
+				has_valid_civic = civic_exalted_priesthood
 			}
 		}
 	}
diff --git a/common/pop_jobs/ethic_rebuild_jobs.txt b/common/pop_jobs/ethic_rebuild_jobs.txt
index ca5947c5e..85c73b8ef 100644
--- a/common/pop_jobs/ethic_rebuild_jobs.txt
+++ b/common/pop_jobs/ethic_rebuild_jobs.txt
@@ -61,7 +61,7 @@ surplus_value = {
 	possible = {
 		exists = owner
 		owner = {
-			has_civic = civic_machine_financial_investment
+			has_valid_civic = civic_machine_financial_investment
 		}
 		has_citizenship_type = {
 			type = citizenship_slavery
@@ -802,7 +802,7 @@ tentacle_seedbed = {
 		NOT = { has_trait = trait_zombie }
 		owner = {
 			exists = owner
-			has_civic = civic_libido_equipment
+			has_valid_civic = civic_libido_equipment
 		}
 	}
 
@@ -2920,7 +2920,7 @@ transcend = {
 		modifier = {
 			factor = 2
 			exists = owner
-			owner = { has_civic = civic_exalted_priesthood }
+			owner = { has_valid_civic = civic_exalted_priesthood }
 		}
 		modifier = {
 			factor = 2
@@ -3842,7 +3842,7 @@ organic_observer = {
 		}
 		exists = owner
 		owner = {
-			has_civic = civic_machine_liberator
+			has_valid_civic = civic_machine_liberator
 		}
 	}
 	resources = {
@@ -3961,7 +3961,7 @@ machine_soul = {
 	possible = {
 		exists = owner
 		owner = {
-			has_civic = civic_machine_soul_servant
+			has_valid_civic = civic_machine_soul_servant
 		}
 		has_trait = "trait_mechanical"
 	}
@@ -4404,7 +4404,7 @@ future_simple_drone = {
 				exists = owner
 				owner = {
 					is_hive_empire = yes
-					has_civic = civic_hive_natural_neural_network
+					has_valid_civic = civic_hive_natural_neural_network
 				}
 			}
 			physics_research = 1

From 1f59a348bcfba728b3c910b822eff5ac2edb43c4 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Tue, 3 Jan 2023 01:13:35 +0800
Subject: [PATCH 17/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=B8=80=E5=A4=84?=
 =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                    | 17 +++++++++++++++++
 .../07_galactic_revolution_casus_belli.txt      |  2 +-
 .../ethic_revolution_operation.txt              |  4 ++--
 .../traditions/\351\235\251\345\221\275.txt"    | 10 +++++-----
 common/war_goals/05_galactic_revolution.txt     |  2 +-
 events/ethic_revolution.txt                     |  4 ++--
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e41ee3e..94ec95dd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,24 @@
 * 调整 指令式/分布式计划经济 效果互换
 * 修复 职业脚本中判断是否拥有国策时，该国策必须合法
 
+待调整：
+
 ```
 planet_modifier/planet_jobs_slave_produces_mult
+```
+
+脚本缺失：
+
+```
 civic_anglers_lithoid
+building_guerrilla_stronghold_large
+building_rebel_mine
+building_rebel_mine_large
+building_rebel_food
+building_rebel_food_large
+building_rebel_arms
+building_rebel_arms_large
+building_rebel_goods
+building_rebel_goods_large
+building_rebel_communication_centre
 ```
\ No newline at end of file
diff --git a/common/casus_belli/07_galactic_revolution_casus_belli.txt b/common/casus_belli/07_galactic_revolution_casus_belli.txt
index 8abbc87ea..7bb6f794c 100644
--- a/common/casus_belli/07_galactic_revolution_casus_belli.txt
+++ b/common/casus_belli/07_galactic_revolution_casus_belli.txt
@@ -13,7 +13,7 @@ cb_galactic_revolution = {
 			}
 		}
 		has_policy_flag = continuous_revolution
-		NOT = { has_country_flag = not_revorution }
+		NOT = { has_country_flag = not_revolution }
 	}
 	is_valid = {
 		has_policy_flag = continuous_revolution
diff --git a/common/espionage_operation_types/ethic_revolution_operation.txt b/common/espionage_operation_types/ethic_revolution_operation.txt
index 2c97bd9f2..893c0dd3d 100644
--- a/common/espionage_operation_types/ethic_revolution_operation.txt
+++ b/common/espionage_operation_types/ethic_revolution_operation.txt
@@ -32,7 +32,7 @@ operation_revolution_underground = {
 	potential = {
 		root.owner = {
 			has_tradition = tr_revolution_adopt
-			NOT = { has_country_flag = not_revorution }
+			NOT = { has_country_flag = not_revolution }
 		}
 	}
 	allow = {
@@ -48,7 +48,7 @@ operation_revolution_underground = {
 					NOT = { has_ethic = ethic_fanatic_egalitarian }
 				}
 				has_civic = civic_fanatic_purifiers
-				has_country_flag = not_revorution
+				has_country_flag = not_revolution
 			}
 		}
 		custom_tooltip = {
diff --git "a/common/traditions/\351\235\251\345\221\275.txt" "b/common/traditions/\351\235\251\345\221\275.txt"
index 6ffb8dffe..7ae352e70 100644
--- "a/common/traditions/\351\235\251\345\221\275.txt"
+++ "b/common/traditions/\351\235\251\345\221\275.txt"
@@ -29,7 +29,7 @@ tr_revolution_peoples_of_fleet = {
 		name = tr_revolution_null
 		inherit_icon = yes
 		trigger = {
-			has_country_flag = not_revorution
+			has_country_flag = not_revolution
 		}
 
 		weight = {
@@ -52,7 +52,7 @@ tr_revolution_power_of_freedom = {
 		name = tr_revolution_null
 		inherit_icon = yes
 		trigger = {
-			has_country_flag = not_revorution
+			has_country_flag = not_revolution
 		}
 
 		weight = {
@@ -80,7 +80,7 @@ tr_revolution_army_of_democracy = {
 		name = tr_revolution_null
 		inherit_icon = yes
 		trigger = {
-			has_country_flag = not_revorution
+			has_country_flag = not_revolution
 		}
 
 		weight = {
@@ -110,7 +110,7 @@ tr_revolution_revolutionary_spirit = {
 		name = tr_revolution_null
 		inherit_icon = yes
 		trigger = {
-			has_country_flag = not_revorution
+			has_country_flag = not_revolution
 		}
 
 		weight = {
@@ -151,7 +151,7 @@ tr_revolution_revolutionary_propaganda = {
 		name = tr_revolution_null
 		inherit_icon = yes
 		trigger = {
-			has_country_flag = not_revorution
+			has_country_flag = not_revolution
 		}
 
 		weight = {
diff --git a/common/war_goals/05_galactic_revolution.txt b/common/war_goals/05_galactic_revolution.txt
index 20011b70f..cd479cf09 100644
--- a/common/war_goals/05_galactic_revolution.txt
+++ b/common/war_goals/05_galactic_revolution.txt
@@ -25,7 +25,7 @@ wg_galactic_revolution = {
 			}
 		}
 		has_policy_flag = continuous_revolution
-		NOT = { has_country_flag = not_revorution }
+		NOT = { has_country_flag = not_revolution }
 		from = {	
 			OR = {	
 				NOT = { has_ethic = ethic_gestalt_consciousness }
diff --git a/events/ethic_revolution.txt b/events/ethic_revolution.txt
index 8eab95a77..9958ad976 100644
--- a/events/ethic_revolution.txt
+++ b/events/ethic_revolution.txt
@@ -82,7 +82,7 @@ country_event = {
 			is_authoritarian = yes
 		}
 		has_tradition = tr_revolution_finish
-		NOT = { has_country_flag = not_revorution }
+		NOT = { has_country_flag = not_revolution }
 	}
 
 	option = {
@@ -128,7 +128,7 @@ country_event = {
 		name = "ethic_revolution.3.b"
 		custom_tooltip = ethic_revolution.3.b.tooltip
 		hidden_effect = {
-			set_timed_country_flag = not_revorution
+			set_timed_country_flag = not_revolution
 			every_owned_pop = {
 				random_list = {
 					9 = { }

From 0b4a5618a104cba9dbe79829848dbb3bcb17b65b Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Tue, 3 Jan 2023 11:52:51 +0800
Subject: [PATCH 18/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D&=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E9=9D=A9=E5=91=BD=E4=BC=A0=E7=BB=9F=E4=BB=A5=E5=8F=8A=E6=B8=B8?=
 =?UTF-8?q?=E5=87=BB=E9=98=9F=E8=81=8C=E4=B8=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |   1 +
 .../on_actions/ethic_rebuild_on_actions.txt   |   2 +-
 .../ethic_rebuild_special_decisions.txt       |   5 +-
 .../ethic_common_categories.txt               |  12 ++
 .../ethic_revolution_operation.txt            |  15 +--
 .../on_actions/ethic_rebuild_on_actions.txt   |   2 +-
 common/pop_jobs/10_rebels_jobs.txt            |  41 +++---
 .../ethic_revolutionary_scripted_triggers.txt |  29 +++++
 ...t_post_revolutionary_scripted_triggers.txt |  11 ++
 .../ethic_scripted_variables.txt              |   4 +-
 ..._post_revolutionary_scripted_variables.txt |   4 +
 .../ethic_rebuild_static_modifiers.txt        |   3 +
 .../ethic_revolutionary_modifiers.txt         |   2 +-
 ...ut_post_revolutionary_static_modifiers.txt |  23 ++++
 .../traditions/\351\235\251\345\221\275.txt"  |  14 +--
 common/war_goals/05_galactic_revolution.txt   |   4 +-
 common/war_goals/06_liberation_protocol.txt   |   2 +-
 common/war_goals/10_wg_galactic.txt           |   2 +-
 events/ethic_peoples_empire.txt               |   8 +-
 events/ethic_revolution.txt                   |  78 +-----------
 events/ut_post_revolution.txt                 | 118 ++++++++++++++++++
 .../planet_modifiers/post_revolutionary.dds   | Bin 0 -> 1928 bytes
 .../post_revolutionary_unset.dds              | Bin 0 -> 1928 bytes
 .../re_revolution_question.dds                | Bin 0 -> 1928 bytes
 .../english/ethic_traditions_l_english.yml    |   7 --
 .../english/ut_post_revolution_l_english.yml  |  14 +++
 .../ethic_traditions_l_simp_chinese.yml       |   7 --
 .../ut_post_revolution_l_simp_chinese.yml     |  14 +++
 28 files changed, 279 insertions(+), 143 deletions(-)
 create mode 100644 common/scripted_triggers/ethic_revolutionary_scripted_triggers.txt
 create mode 100644 common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt
 create mode 100644 common/scripted_variables/ut_post_revolutionary_scripted_variables.txt
 create mode 100644 common/static_modifiers/ut_post_revolutionary_static_modifiers.txt
 create mode 100644 events/ut_post_revolution.txt
 create mode 100644 gfx/interface/icons/planet_modifiers/post_revolutionary.dds
 create mode 100644 gfx/interface/icons/planet_modifiers/post_revolutionary_unset.dds
 create mode 100644 gfx/interface/icons/planet_modifiers/re_revolution_question.dds
 create mode 100644 localisation/replace/english/ut_post_revolution_l_english.yml
 create mode 100644 localisation/replace/simp_chinese/ut_post_revolution_l_simp_chinese.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94ec95dd7..e282b0578 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 * 重命名 封装变量
 * 调整 指令式/分布式计划经济 效果互换
 * 修复 职业脚本中判断是否拥有国策时，该国策必须合法
+* 修复&调整 革命传统以及游击队职业修改
 
 待调整：
 
diff --git a/Mysteries Tools/EDU/common/on_actions/ethic_rebuild_on_actions.txt b/Mysteries Tools/EDU/common/on_actions/ethic_rebuild_on_actions.txt
index 16d4a89f6..badf4fe92 100644
--- a/Mysteries Tools/EDU/common/on_actions/ethic_rebuild_on_actions.txt	
+++ b/Mysteries Tools/EDU/common/on_actions/ethic_rebuild_on_actions.txt	
@@ -77,7 +77,7 @@ on_yearly_pulse_country = {
 		ethic_civic_yearly.2
 		ethic_civic_yearly.3
 		ethic_equal_gift.1
-		ethic_revolution.3
+		ut_post_revolutionary.1
 		education_mod.7
 	}
 }
diff --git a/common/decisions/ethic_rebuild_special_decisions.txt b/common/decisions/ethic_rebuild_special_decisions.txt
index c2c024969..3fa667aae 100644
--- a/common/decisions/ethic_rebuild_special_decisions.txt
+++ b/common/decisions/ethic_rebuild_special_decisions.txt
@@ -594,7 +594,7 @@ decision_suppress_insurgents = {
 	resources = {
 		category = decisions
 		cost = {
-			energy = 1500
+			energy = 6000
 			alloys = 300
 		}
 	}
@@ -608,13 +608,13 @@ decision_suppress_insurgents = {
 	}
 
 	effect = {
-		exists = planet
 		planet = {
 			remove_modifier = guerrilla_warzone
 			add_planet_devastation = 30
 		}
 		hidden_effect = {
 			add_modifier = { modifier = "egalitarian_unrest" days = 3600 }
+			add_modifier = { modifier = "socialism_unrest" days = 3600 }
 			set_timed_planet_flag = { flag = flag_suppress_insurgents days = 720 }
 		}
 	}
@@ -670,7 +670,6 @@ decision_reorganize_the_guerrilla = {
 	}
 
 	effect = {
-		exists = planet
 		planet = {
 			remove_modifier = guerrilla_warzone
 		}
diff --git a/common/economic_categories/ethic_common_categories.txt b/common/economic_categories/ethic_common_categories.txt
index 3f58238d8..fa3f0332d 100644
--- a/common/economic_categories/ethic_common_categories.txt
+++ b/common/economic_categories/ethic_common_categories.txt
@@ -630,6 +630,18 @@ planet_artisans = {
 	}
 }
 
+planet_guerrilla = {
+	icon = "job_guerrilla"
+	parent = planet_jobs
+	generate_add_modifiers = {
+		produces
+		upkeep
+	}
+	generate_mult_modifiers = {
+		produces
+		upkeep
+	}
+}
 
 pop_category_vanguard_unit = {
 	parent = planet_pops
diff --git a/common/espionage_operation_types/ethic_revolution_operation.txt b/common/espionage_operation_types/ethic_revolution_operation.txt
index 893c0dd3d..7929b8193 100644
--- a/common/espionage_operation_types/ethic_revolution_operation.txt
+++ b/common/espionage_operation_types/ethic_revolution_operation.txt
@@ -1,4 +1,3 @@
-
 @diff_t0 = 4
 @diff_t1 = 5
 @diff_t2 = 6
@@ -37,19 +36,7 @@ operation_revolution_underground = {
 	}
 	allow = {
 		target = { 
-			OR = {
-				has_ethic = ethic_fanatic_authoritarian
-				AND = {
-					has_ethic = ethic_authoritarian
-					NOT = { has_ethic = ethic_fanatic_socialism }
-				}
-				AND = {
-					has_ethic = ethic_fanatic_capitalism
-					NOT = { has_ethic = ethic_fanatic_egalitarian }
-				}
-				has_civic = civic_fanatic_purifiers
-				has_country_flag = not_revolution
-			}
+			can_be_revolution_target = yes
 		}
 		custom_tooltip = {
 			is_running_espionage_operation = no
diff --git a/common/on_actions/ethic_rebuild_on_actions.txt b/common/on_actions/ethic_rebuild_on_actions.txt
index 7b8e23024..ce8596ce3 100644
--- a/common/on_actions/ethic_rebuild_on_actions.txt
+++ b/common/on_actions/ethic_rebuild_on_actions.txt
@@ -77,7 +77,7 @@ on_yearly_pulse_country = {
 		ethic_civic_yearly.2
 		ethic_civic_yearly.3
 		ethic_equal_gift.1
-		ethic_revolution.3
+		ut_post_revolutionary.1
 		#education_mod.7
 	}
 }
diff --git a/common/pop_jobs/10_rebels_jobs.txt b/common/pop_jobs/10_rebels_jobs.txt
index fcb459389..450cff123 100644
--- a/common/pop_jobs/10_rebels_jobs.txt
+++ b/common/pop_jobs/10_rebels_jobs.txt
@@ -1,5 +1,5 @@
 ###################
-# Primitive Jobs
+# Rebel Jobs
 ###################
 
 #游击队
@@ -16,7 +16,6 @@ guerrilla = {
 		has_owner = yes
 		is_sapient = yes
 	}
-
 	possible = {
 		# check that this is not a robot in servitude
 		NOT = {
@@ -32,11 +31,17 @@ guerrilla = {
 	
 	resources = {
 		category = planet_guerrilla
+		upkeep = { 
+			energy = 1.5
+			minerals = 1
+			food = 1.5
+			unity = 1
+		}
 		upkeep = {
 			trigger = {
 				exists = owner
 				owner = {
-					any_owned_planet = { NOT = { has_building = building_guerrilla_stronghold_large } }
+					any_owned_planet = { has_building = building_guerrilla_stronghold }
 				}
 			}
 			energy = 3
@@ -89,12 +94,12 @@ guerrilla = {
 	}
 	
 	planet_modifier = {
-		planet_stability_add = -1
+		planet_stability_add = -2
 		planet_crime_add = 5
 	}
-		
+	
 	weight = {
-		weight = @criminal_job_weight
+		weight = @rebel_job_weight
 	}
 }
 
@@ -112,7 +117,6 @@ guerrilla_leader = {
 		has_owner = yes
 		is_sapient = yes
 	}
-
 	possible = {
 		# check that this is not a robot in servitude
 		NOT = {
@@ -128,6 +132,11 @@ guerrilla_leader = {
 	
 	resources = {
 		category = planet_guerrilla
+		upkeep = { 
+			alloys = 1
+			consumer_goods = 1.5
+			unity = 1
+		}
 		upkeep = {
 			trigger = {
 				exists = owner
@@ -167,15 +176,14 @@ guerrilla_leader = {
 	}
 	
 	planet_modifier = {
-		planet_stability_add = -2
+		planet_stability_add = -4
 	}
-	
 	country_modifier = {
 		country_naval_cap_add = -5
 	}
 		
 	weight = {
-		weight = @criminal_job_weight
+		weight = @rebel_job_weight
 	}
 }
 
@@ -193,7 +201,6 @@ liaison_officer = {
 		has_owner = yes
 		is_sapient = yes
 	}
-
 	possible = {
 		# check that this is not a robot in servitude
 		NOT = {
@@ -209,6 +216,12 @@ liaison_officer = {
 	
 	resources = {
 		category = planet_guerrilla
+		upkeep = { 
+			engineering_research = 1.5
+			physics_research = 1.5
+			society_research = 1.5
+			unity = 1
+		}
 		upkeep = {
 			trigger = {
 				exists = owner
@@ -226,14 +239,14 @@ liaison_officer = {
 	}
 	
 	planet_modifier = {
-		planet_stability_add = -1
+		planet_stability_add = -2
 	}
 	
 	country_modifier = {
 		country_admin_cap_add = -2
 	}
-		
+	
 	weight = {
-		weight = @criminal_job_weight
+		weight = @rebel_job_weight
 	}
 }
\ No newline at end of file
diff --git a/common/scripted_triggers/ethic_revolutionary_scripted_triggers.txt b/common/scripted_triggers/ethic_revolutionary_scripted_triggers.txt
new file mode 100644
index 000000000..df7c29bba
--- /dev/null
+++ b/common/scripted_triggers/ethic_revolutionary_scripted_triggers.txt
@@ -0,0 +1,29 @@
+can_take_revolution_adopt = {
+	NOR = {
+		has_ethic = ethic_fanatic_authoritarian
+		has_ethic = ethic_fanatic_capitalism
+		has_civic = civic_characteristic_socialism
+		has_civic = civic_characteristic_socialism_pioneer
+		has_policy_flag = reform_and_opening_up
+		has_civic = civic_fanatic_purifiers
+	}
+}
+
+can_be_revolution_target = {
+	OR = {
+		has_ethic = ethic_fanatic_authoritarian
+		AND = {
+			has_ethic = ethic_authoritarian
+			NOT = { has_ethic = ethic_fanatic_socialism }
+		}
+		AND = {
+			has_ethic = ethic_fanatic_capitalism
+			NOT = { has_ethic = ethic_fanatic_egalitarian }
+		}
+		has_civic = civic_characteristic_socialism
+		has_civic = civic_characteristic_socialism_pioneer
+		has_policy_flag = reform_and_opening_up
+		has_civic = civic_fanatic_purifiers
+		has_country_flag = not_revolution
+	}
+}
\ No newline at end of file
diff --git a/common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt b/common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt
new file mode 100644
index 000000000..4e5f0d4c7
--- /dev/null
+++ b/common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt
@@ -0,0 +1,11 @@
+is_post_revolutionary = {
+	OR = {
+		is_capitalism = yes
+		is_authoritarian = yes
+		has_civic = civic_characteristic_socialism
+		has_civic = civic_characteristic_socialism_pioneer
+		has_policy_flag = reform_and_opening_up
+		has_civic = civic_fanatic_purifiers
+	}
+	has_tradition = tr_revolution_finish
+}
\ No newline at end of file
diff --git a/common/scripted_variables/ethic_scripted_variables.txt b/common/scripted_variables/ethic_scripted_variables.txt
index 4787c1c01..5a8af6fde 100644
--- a/common/scripted_variables/ethic_scripted_variables.txt
+++ b/common/scripted_variables/ethic_scripted_variables.txt
@@ -1 +1,3 @@
-@living_standard_luxuries_shared_burden = 0.7
\ No newline at end of file
+@living_standard_luxuries_shared_burden = 0.7
+
+@rebel_job_weight = 5
\ No newline at end of file
diff --git a/common/scripted_variables/ut_post_revolutionary_scripted_variables.txt b/common/scripted_variables/ut_post_revolutionary_scripted_variables.txt
new file mode 100644
index 000000000..47615b76f
--- /dev/null
+++ b/common/scripted_variables/ut_post_revolutionary_scripted_variables.txt
@@ -0,0 +1,4 @@
+@post_revolutionary_check_years_1 =  13
+@post_revolutionary_check_years_2 =  33
+@post_revolutionary_check_years =  30
+@post_revolutionary_re_revolution_years = 5
\ No newline at end of file
diff --git a/common/static_modifiers/ethic_rebuild_static_modifiers.txt b/common/static_modifiers/ethic_rebuild_static_modifiers.txt
index c6442e520..591c83ee2 100644
--- a/common/static_modifiers/ethic_rebuild_static_modifiers.txt
+++ b/common/static_modifiers/ethic_rebuild_static_modifiers.txt
@@ -1,3 +1,6 @@
+@galcom_resolution_tier_1 = 0.25
+@galcom_resolution_tier_2 = 0.5
+@galcom_resolution_tier_3 = 0.75
 
 resolution_galcom_socialism_ethic_modifier_tier_1 = {
 	pop_ethic_socialism_attraction_mult = @galcom_resolution_tier_1
diff --git a/common/static_modifiers/ethic_revolutionary_modifiers.txt b/common/static_modifiers/ethic_revolutionary_modifiers.txt
index 175582ab2..b51290f54 100644
--- a/common/static_modifiers/ethic_revolutionary_modifiers.txt
+++ b/common/static_modifiers/ethic_revolutionary_modifiers.txt
@@ -1,4 +1,4 @@
-mod_revolutionary_propaganda = {
+revolutionary_propaganda = {
 	pop_ethic_egalitarian_attraction_mult = 0.5
 	pop_ethic_socialism_attraction_mult = 0.5
 	pop_ethics_shift_speed_mult = 1
diff --git a/common/static_modifiers/ut_post_revolutionary_static_modifiers.txt b/common/static_modifiers/ut_post_revolutionary_static_modifiers.txt
new file mode 100644
index 000000000..b7d9d4c52
--- /dev/null
+++ b/common/static_modifiers/ut_post_revolutionary_static_modifiers.txt
@@ -0,0 +1,23 @@
+re_revolution_question = {
+	icon = "gfx/interface/icons/planet_modifiers/re_revolution_question.dds"
+
+	pop_happiness = -0.05
+	country_unity_produces_mult = -0.05
+}
+
+post_revolutionary = {
+	icon = "gfx/interface/icons/planet_modifiers/post_revolutionary.dds"
+	
+	# unity_deficit
+	planet_stability_add = -20
+	pop_government_ethic_attraction = -1
+
+	pop_happiness = -0.20
+	country_unity_produces_mult = -0.20
+}
+
+post_revolutionary_unret = {
+	icon = "gfx/interface/icons/planet_modifiers/post_revolutionary_unset.dds"
+	pop_ethic_egalitarian_attraction_mult = 2
+	pop_ethic_socialism_attraction_mult = 2
+}
\ No newline at end of file
diff --git "a/common/traditions/\351\235\251\345\221\275.txt" "b/common/traditions/\351\235\251\345\221\275.txt"
index 7ae352e70..685512d2d 100644
--- "a/common/traditions/\351\235\251\345\221\275.txt"
+++ "b/common/traditions/\351\235\251\345\221\275.txt"
@@ -1,9 +1,6 @@
 tr_revolution_adopt = {
 	possible = {
-		NOR = {
-			has_ethic = ethic_fanatic_authoritarian
-			has_ethic = ethic_fanatic_capitalism
-		}
+		can_take_revolution_adopt = yes
 	}
 
 	modifier = {
@@ -31,7 +28,6 @@ tr_revolution_peoples_of_fleet = {
 		trigger = {
 			has_country_flag = not_revolution
 		}
-
 		weight = {
 			factor = 1
 		}
@@ -54,7 +50,6 @@ tr_revolution_power_of_freedom = {
 		trigger = {
 			has_country_flag = not_revolution
 		}
-
 		weight = {
 			factor = 1
 		}
@@ -82,7 +77,6 @@ tr_revolution_army_of_democracy = {
 		trigger = {
 			has_country_flag = not_revolution
 		}
-
 		weight = {
 			factor = 1
 		}
@@ -102,7 +96,7 @@ tr_revolution_revolutionary_spirit = {
 	on_enabled = {
 		if = {
 			limit = { always = yes }
-			add_modifier = { modifier = mod_revolutionary_propaganda days = -1 }
+			add_modifier = { modifier = revolutionary_propaganda days = -1 }
 		}
 	}
 
@@ -112,7 +106,6 @@ tr_revolution_revolutionary_spirit = {
 		trigger = {
 			has_country_flag = not_revolution
 		}
-
 		weight = {
 			factor = 1
 		}
@@ -141,7 +134,7 @@ tr_revolution_revolutionary_propaganda = {
 			}
 			set_country_flag = revolutionary_propaganda
 		    add_modifier = {
-			    modifier = "mod_revolutionary_propaganda"
+			    modifier = "revolutionary_propaganda"
 			    days = 360
 		    }
 		}
@@ -153,7 +146,6 @@ tr_revolution_revolutionary_propaganda = {
 		trigger = {
 			has_country_flag = not_revolution
 		}
-
 		weight = {
 			factor = 1
 		}
diff --git a/common/war_goals/05_galactic_revolution.txt b/common/war_goals/05_galactic_revolution.txt
index cd479cf09..2183a3d08 100644
--- a/common/war_goals/05_galactic_revolution.txt
+++ b/common/war_goals/05_galactic_revolution.txt
@@ -99,7 +99,7 @@ wg_galactic_revolution = {
 			    }
 		    }
 		}
-		from = { add_modifier = { modifier = mod_revolutionary_propaganda days = 3600 } }
+		from = { add_modifier = { modifier = revolutionary_propaganda days = 3600 } }
 	}
 	
 	on_accept = {
@@ -235,7 +235,7 @@ wg_galactic_revolution_communist_interstellar = {
 			    }
 		    }
 		}
-		from = { add_modifier = { modifier = mod_revolutionary_propaganda days = 3600 } }
+		from = { add_modifier = { modifier = revolutionary_propaganda days = 3600 } }
 	}
 	
 	on_accept = {
diff --git a/common/war_goals/06_liberation_protocol.txt b/common/war_goals/06_liberation_protocol.txt
index 838b6ce40..fb8b08f12 100644
--- a/common/war_goals/06_liberation_protocol.txt
+++ b/common/war_goals/06_liberation_protocol.txt
@@ -88,7 +88,7 @@ wg_liberation_protocol = {
 			    }
 		    }
 		}
-		from = { add_modifier = { modifier = mod_revolutionary_propaganda days = 3600 } }
+		from = { add_modifier = { modifier = revolutionary_propaganda days = 3600 } }
 	}
 	
 	on_accept = {
diff --git a/common/war_goals/10_wg_galactic.txt b/common/war_goals/10_wg_galactic.txt
index c6a3858ba..cc6749ab1 100644
--- a/common/war_goals/10_wg_galactic.txt
+++ b/common/war_goals/10_wg_galactic.txt
@@ -135,7 +135,7 @@ wg_galactic_revolution_liberation_from_the_empire = {
 					impose_ideology_effect = yes
 				}
 			}
-		    from = { add_modifier = { modifier = mod_revolutionary_propaganda days = 18000 } }
+		    from = { add_modifier = { modifier = revolutionary_propaganda days = 18000 } }
 			end_rivalry = from
 			from = { end_rivalry = root }
 			from = {
diff --git a/events/ethic_peoples_empire.txt b/events/ethic_peoples_empire.txt
index 6cb4bf030..76493999a 100644
--- a/events/ethic_peoples_empire.txt
+++ b/events/ethic_peoples_empire.txt
@@ -23,7 +23,7 @@ country_event = {
 				}
 				set_country_flag = revolutionary_propaganda
 			    add_modifier = {
-				    modifier = "mod_revolutionary_propaganda"
+				    modifier = "revolutionary_propaganda"
 				    days = 360
 			    }
 			}
@@ -31,11 +31,11 @@ country_event = {
 				limit = {
 				    is_galactic_community_member = yes
 					has_country_flag = revolutionary_propaganda
-					NOT = { has_modifier = mod_revolutionary_propaganda }
+					NOT = { has_modifier = revolutionary_propaganda }
 				}
 				remove_country_flag = revolutionary_propaganda
 			    add_modifier = {
-				    modifier = "mod_revolutionary_propaganda"
+				    modifier = "revolutionary_propaganda"
 				    days = 360
 			    }
 			}
@@ -63,7 +63,7 @@ country_event = {
 				limit = {
 				    is_galactic_community_member = yes
 					has_country_flag = revolutionary_propaganda
-					has_modifier = mod_revolutionary_propaganda
+					has_modifier = revolutionary_propaganda
 				}
 				remove_country_flag = revolutionary_propaganda
 			}
diff --git a/events/ethic_revolution.txt b/events/ethic_revolution.txt
index 9958ad976..dc69d74f2 100644
--- a/events/ethic_revolution.txt
+++ b/events/ethic_revolution.txt
@@ -22,14 +22,14 @@ country_event = {
 				}
 				set_country_flag = revolutionary_propaganda
 			    add_modifier = {
-				    modifier = "mod_revolutionary_propaganda"
+				    modifier = "revolutionary_propaganda"
 				    days = 360
 			    }
 			}
 			if = {
 				limit = {
 					has_country_flag = revolutionary_propaganda
-					NOT = { has_modifier = mod_revolutionary_propaganda }
+					NOT = { has_modifier = revolutionary_propaganda }
 				}
 				remove_country_flag = revolutionary_propaganda
 			    add_modifier = {
@@ -60,82 +60,10 @@ country_event = {
 			if = {
 				limit = {
 					has_country_flag = revolutionary_propaganda
-					has_modifier = mod_revolutionary_propaganda
+					has_modifier = revolutionary_propaganda
 				}
 				remove_country_flag = revolutionary_propaganda
 			}
 		}
 	}
-}
-
-country_event = {
-	id = ethic_revolution.3
-	title = "ethic_revolution.3.name"
-	desc = "ethic_revolution.3.desc"
-	picture = GFX_evt_victorious_army
-	location = ROOT
-	is_triggered_only = yes
-	
-	trigger = {
-		OR = {
-			is_capitalism = yes
-			is_authoritarian = yes
-		}
-		has_tradition = tr_revolution_finish
-		NOT = { has_country_flag = not_revolution }
-	}
-
-	option = {
-		name = "ethic_revolution.3.a"
-		custom_tooltip = ethic_revolution.3.a.tooltip
-		hidden_effect = {
-			if = {
-				limit = {
-					has_ethic = ethic_capitalism
-				}
-				country_remove_ethic = ethic_capitalism
-				shift_ethic = ethic_socialism
-			}
-			if = {
-				limit = {
-					has_ethic = ethic_fanatic_capitalism
-				}
-				country_remove_ethic = ethic_fanatic_capitalism
-				shift_ethic = ethic_fanatic_socialism
-			}
-			if = {
-				limit = {
-					has_ethic = ethic_authoritarian
-				}
-				country_remove_ethic = ethic_authoritarian
-				shift_ethic = ethic_egalitarian
-			}
-			if = {
-				limit = {
-					has_ethic = ethic_fanatic_authoritarian
-				}
-				country_remove_ethic = ethic_fanatic_authoritarian
-				shift_ethic = ethic_fanatic_egalitarian
-			}
-			kill_leader = {
-				show_notification = no
-				type = ruler
-			}
-		}
-	}
-
-	option = {
-		name = "ethic_revolution.3.b"
-		custom_tooltip = ethic_revolution.3.b.tooltip
-		hidden_effect = {
-			set_timed_country_flag = not_revolution
-			every_owned_pop = {
-				random_list = {
-					9 = { }
-					1 = { kill_pop = yes }
-				}
-			}
-			add_modifier = { modifier = "unity_deficit" days = 3600 }
-		}
-	}
 }
\ No newline at end of file
diff --git a/events/ut_post_revolution.txt b/events/ut_post_revolution.txt
new file mode 100644
index 000000000..0e54ef104
--- /dev/null
+++ b/events/ut_post_revolution.txt
@@ -0,0 +1,118 @@
+namespace = ut_post_revolutionary
+
+country_event = {
+	id = ut_post_revolutionary.1
+	title = "ut_post_revolutionary.1.name"
+	desc = "ut_post_revolutionary.1.desc"
+	picture = GFX_evt_victorious_army
+	location = ROOT
+	is_triggered_only = yes
+
+	trigger = {
+		is_post_revolutionary = yes
+		NOT = { has_country_flag = not_revolution }
+	}
+
+	option = {
+		name = "ut_post_revolutionary.1.a"
+		custom_tooltip = ut_post_revolutionary.1.a.tooltip
+		hidden_effect = {
+			if = {
+				limit = {
+					has_ethic = ethic_capitalism
+				}
+				country_remove_ethic = ethic_capitalism
+				shift_ethic = ethic_socialism
+			}
+			if = {
+				limit = {
+					has_ethic = ethic_fanatic_capitalism
+				}
+				country_remove_ethic = ethic_fanatic_capitalism
+				shift_ethic = ethic_fanatic_socialism
+			}
+			if = {
+				limit = {
+					has_ethic = ethic_authoritarian
+				}
+				country_remove_ethic = ethic_authoritarian
+				shift_ethic = ethic_egalitarian
+			}
+			if = {
+				limit = {
+					has_ethic = ethic_fanatic_authoritarian
+				}
+				country_remove_ethic = ethic_fanatic_authoritarian
+				shift_ethic = ethic_fanatic_egalitarian
+			}
+			kill_leader = {
+				show_notification = no
+				type = ruler
+			}
+			
+			clear_variable = post_revolutionary
+			remove_modifier = post_revolutionary
+			add_modifier = { 
+				modifier = re_revolution_question
+				years = @post_revolutionary_re_revolution_years
+			}
+		}
+	}
+
+	option = {
+		name = "ut_post_revolutionary.1.b"
+		custom_tooltip = ut_post_revolutionary.1.b.tooltip
+		hidden_effect = {
+			change_variable = { which = post_revolutionary value = 1 }
+			IF = { 
+				limit = { check_variable = { which = post_revolutionary value = 1 } }
+				set_timed_country_flag = {
+					flag = not_revolution
+					years = @post_revolutionary_check_years_1
+				}
+				every_owned_pop = {
+					random_list = {
+						19 = { }
+						1 = { kill_pop = yes }
+					}
+				}
+			}
+			ELSE_IF = {
+				limit = { check_variable = { which = post_revolutionary value = 2 } }
+				set_timed_country_flag = {
+					flag = not_revolution
+					years = @post_revolutionary_check_years_2
+				}
+				every_owned_pop = {
+					random_list = {
+						8 = { }
+						2 = { kill_pop = yes }
+					}
+				}
+			}
+			ELSE = {
+				set_timed_country_flag = {
+					flag = not_revolution
+					years = @post_revolutionary_check_years
+				}
+				add_modifier = {
+					modifier = post_revolutionary_unret
+					years = @post_revolutionary_check_years
+				}
+				every_owned_pop = {
+					random_list = {
+						9 = { }
+						1 = { kill_pop = yes }
+					}
+				}
+			}
+			IF = { 
+				limit = { NOT = { has_modifier = post_revolutionary } }
+				add_modifier = {
+					modifier = post_revolutionary
+					years = -1
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/gfx/interface/icons/planet_modifiers/post_revolutionary.dds b/gfx/interface/icons/planet_modifiers/post_revolutionary.dds
new file mode 100644
index 0000000000000000000000000000000000000000..a0a0c6fa95170b9abb887d43a090e63e3caa7cc3
GIT binary patch
literal 1928
zcmd5+Uq~ZI93E}Ttw}xS;pFD2>_VijX`0)I76O%+V4w!dLF%3%r1^`Yk%Qc|&?PpT
zbngi0-PM=+R*Kz4O*V*dAcaC2X&$^gAAD%<rQAs{f+4o}ho%?P=yt}|m(zn@OQ8e9
zw>!+t_xry2X8QX-pg#owT!4D;E=JO+3jnlWB>iO?jVJ4H@AnLH=dOe2jcO+ifd3nk
zifpd{z)+f&iUJ@*P0M%zkT9w<0NC+(4@Mf#TVaVZtf2YNb>RIv6pw;v!1KqOA&Q}D
zy(Ybmu~T`AWoe5JL-FTIMTT}N8LiYq6b*(pzRLg*qE_@Ou8Y)p{P6GdE66q-36_za
zs%dI>8A)*LUYG60T?z6tot-~?sUSXBQSX0&k-wL^<Hh4V|1shJWH)Cb>yCDNQZhbM
zzfhh1i+}&c{J1__;c5{vl-X>t7?~pSt{KcxH`$-Rd}*$TW|lWI*T;3t%4kwppP(Em
zsam^nH_aJLZQ1MN3L5lOx)-bpN(T5r8HQmjRw@zwj~=qv{}<)QPEB7`BBXAUp*^o-
z6l9oO{AGQjj5=R!Z@F@N%`2-75n_}ITJ7_XWLS@R{BK5v*_O6!R&_hs*Dg+ewqTXu
zufILhh)+JhSdp;qc)eaB=iY4Y?VaVfQxV(<Z+@|0DI*0Xo<23f+p7EP`wi{=@nLo}
zD5zsDoGYF$6_E@FdH%;Smx82nf?xAuha3~UlU2|+mcp)+m0+VH1{Ca{AjIP&cL)0i
z=lCtbaomiI1Z(+%X@o1I#P2)$9j}uGYIbhTJLZ~A<rY=<fa_?`BXm2qXkTeIvuZ7)
zBSXi<d9I7ydGKDJ5&M+QW^WO_VyPhz-nbAv;oUzxJUpux^F|b9iw;qGQ?5457Lh@3
zSsrldn9JHuZqhZvf!4`4rrfNn)X);$j#aD2Blx$iY3`k`e%e^D;&bl{hUYmQlbB?8
zhglg0{6dE0ED#6?MDOAL{=r$^KA<d3<6Pl9=G#ofr^TGb(Cu)tW^)1aJK5Lk(dd+W
z+j`u5;-eh%TwN5!c`nV3`iF+LvF><0esh@BF}DnBi%zzTss&$y+`G6C7s>hVHJjR5
zUWQ5*G>zn6Z!+U`GR*fLJtltBZ{?3xtwtsoO@27#UbSxcd?z~V4Ka|$`T$79=D8w@
zJ$W`~WMoKJ>w=L9QJKx%A@a_!?4xsZKA-Op6<M0L74dtaH!a~@OR&dMSU#ygw?07j
zZ*713@hbLJRja`?ry#*U#HaCiZ@$KlaCWL*k0${L!#P&}{hvCub96q>d-`vuJkvHj
zUxwGbqe>TRr{r%nUdM!Cb&AxZpqt`etcXI?ovL^Zs|1<qG1e!+nVwdBUx=?S!*|Mi
liU8Q~CwX_g9Rwxloh2wkUL_cY*;axyX!}<@r+oh{{sHse#%%xq

literal 0
HcmV?d00001

diff --git a/gfx/interface/icons/planet_modifiers/post_revolutionary_unset.dds b/gfx/interface/icons/planet_modifiers/post_revolutionary_unset.dds
new file mode 100644
index 0000000000000000000000000000000000000000..5ddaef3e51e3c4064b1c59c504fca122ca457c2c
GIT binary patch
literal 1928
zcmd5+Uuara96k+!-dt05p)2!kUZ#*6b@4vrL0DEI$wP#|;(DVP7gH~m*o#r)0ur-m
zjR;L`!h#_$7Mv1m6yp%w!yw#}JcKoDLW3a;wgt8ltIN_hgc*t6otq3wTRXNr^}@Ly
z=Wx#V{r-IC^z?ixngRe^#8B`NM1CL_0k{B>AOGbO!OhKZ^ysdU4bNeXR=KkefVT~C
z1V&^7pc~>%3V<laaY=|V;W_^LH}do9^7%fl_W$#M{A_GACKQ2VY0|qPG-1bRMj9YD
zgcMurItn-A6t&i*@CQhW@&ZQ?&b3Jx%@59}0F?l+0pqBj{9An-F%wtcnWtBsF(Ksb
z7;|n23j%Mkl{ORF#PP&Vt{GqKxRaVlTbW|rW6XxE%qsKb1BJhpZj<g!Jqi)(krKz5
zFpK&jO01mM=b!ZX`mvr>=Pe|cmbMQBZ)(!gwuHjpOH5BsRWN^?EL@Q+EBrFr%V?>E
zP(MR0%H@~uS=3El`?W(iqKYJQTq|u+i&i<RtZ&A3cDo%%#CY`~0rPL{9~=b8d7F(s
zbkAz!w{N#7{8q*=Sg$UG+EjMaZ2PKnQ<<)@r&b2?C%D2ua8rqHG5WGTKz@^!qItJP
zo$lmPm>*GTbt7m}BgXB|tEX|&hfTUFMF4ylSFb;NRbK?+Bu&%ILdc@dbVygSFdyTf
z!SD&xe{YFRXJP$x_EKF&BdWsU@~D*&<GThe<p?6GT3XI!L#^~dIT1Z{%bE9m4@M5%
zX2M`!M|nTETyA(}eb}>;lLq}Z6GKA`lXu6-7D)l}5$a?z+A<KFb3V3~B6)XNKkPA7
ztW1Ekm#S4qP>dIHnLA_7KJ|3Hw09J4Q_WoJEF6XV8IRWB8i#RTVbjZBLca|fbmIX0
zCaN~j6#+5Mz=X?sGciHs<lEsmDM^=;m+y@^UE@y*e4QhSiro>suk`$K_0o1&Mt>D4
zR{6fTT&`gm^xYp@Ci|mMoQ&PNd)E;x>)WMWi`me=a(raO#p^=Z*XqpopSIcNe>a(l
z6x-FM@b@!EKMou6ZW;agyE{t?zeVl&5P$*5cOeq-V$fg3;`HPk%(worKsDwJkh?p_
zHAk>dEy?AM^X{Z(>F3?A^X@3N=bD@Zz=YLmb?(*v^7Z$y95<`!Mx@g8S~ir@SN6&W
zb50odR(Z`4l+l9QE5?B!yf0NFwH<DyOWfM`nE$?Vyi%{F^oWY;M9=)S(vivVb%5cG
zb|bTzmhaY|zpnSPzj5RSNoQDY4&GY<`xE4kliwx<xdrGO?Vny>Hngd%qD{j`VF_W<
zX(@|Zj0@N=J}c{ciFPziJ)MErRH9<SyqiFq9`O0VG#ljkvhItxHiSbqmb;GZD+iN_
znLc$hj;3nVrc#Vo>RfJ9d4udcSgGwRdx;3j8H?Rf%m=E*ZX`f166>e@dvOA(U+}$2
m=S}O^5zpEAC`Pe7PcJc;JV)vb;rrOm&wbeAvwiUQ7UN&W76+FA

literal 0
HcmV?d00001

diff --git a/gfx/interface/icons/planet_modifiers/re_revolution_question.dds b/gfx/interface/icons/planet_modifiers/re_revolution_question.dds
new file mode 100644
index 0000000000000000000000000000000000000000..78c72803a35bb6957f76f8dad1807460768b41cc
GIT binary patch
literal 1928
zcmd5+T}UHW7`=+H<HV%{+ogG{LlbaJQZo-e1Zo$9J{S;cx?@62jm?l^c8Ez#g<!17
z#t_iWDwT*YSx6Ji#)Oy>NFNF^i#|wKN?;`-g|<Swm`&=syCRLjWO_%tFPi>7?S(ss
zZ@Bk6-}&yjx2Nah)+qqMH4FtGK;$QK4S)uS{QNJY6)tXqvqyWIth*1Z_m?{#0K934
zBd{VX0NoJpPyj?Qj!Qs{3NP@NKar0sD;Mjy>i^f_#W*%P8WpyJ6G_6eDKugyXj<YY
zH-!{i?K%!M;S{yrDEIkEit+$^0LGdGpoPyJF90eAU=!9+JN@_kCgRpx3-p>JDuj7E
z#vGf%yuedvp-qG)eloF}ZNis2?j<Ku7N$^h8!|x)v&KAoPws1>+a&u_PlAMMq{wmI
z$gJuyN~~V==kNIW{;}>g$6X|wlC%#5?x<6ewz%BaOH5Bsl`&t8%-<BR$bC}U!)U0*
zU_V1G$z(Skm{pA)+wCJ4q6{apTnlYhwXShgN!NsHZ8jT@i15l|0_y)O|M<xTtCc=-
z&8cOxv(0j!h0zbzDvQB3rOi0kzUJ6cq^j(hg@O6wTz(+1r9ihCT}kIBze!2ZoXf0A
zb#h6}hbT4L5j3F|;kH+mvl!{cCY|L10Px&uwU<}<V<b(}%wo{2N_R+BGf<CVP_O?8
z^1rjprZTX9T3fLur4eO*X=T*Hi10nVhO!3`Wi=(^GQk%5uoRCRxn#_{-bW)xE)$`*
zZJ@j#oK6?KvR>@v>1mzwHW5QZ43l%k$YyaK=4(?X5|QSCz`WzBr5Mh+O1fdUzHDLq
zq^($~*aIRwpH1HzbM&dEYsLNJP@8h*dT0JP)X%szdgnN-`zD)O`4akVP_G>a;Mdkl
zU0xB+K*1%QiI||WvYk+j6sJmw8xO`D&hck?zR%%!*=7$sRJeb>b$ur!rN0UnD*U-P
zoz7t?^xgAqqwPsBMn>=6zi$tebnTL^rA+WZF+MWl<ar@&oj!|j+G<_+&1fQ$Y*&}u
z*UudPFs#qHr1a-+?=H)IW|jMW00v;bhH%(}L4Oqr)06X1Z|y^Ya?If;_jXUJ_CTLX
zoXwu(TnY8^PkUeIToG*FIXMY{5vx{f+|~2-Vs4h>=G5JYM3P$11e3b*e(7-D0qfo_
zt=j`qS}?n67zn`oQZZ0Fp%%Kxt$&aC9xBGmwQ5p_D5*~L++V95=``O5Sl%d(%&D8d
z+jw=A@3Ox~6?B^A=Ha~+us_25G4k7lAiD^Cqxs$A%>=g;6|`~qI3y;FS`B4ZiEsh?
z#U~|QFVT*ss24L38;ev_c;q6`#z(xLpv*ctFY~^RH-$r1mcx+)#b6>n)2C{}(PWj{
zQi$+!jmvH+J|jC1SE~n#ULuTghC+7)^MZ<@0r8Vd#Ksx_UYx>I|E%*h-(~z1ai8yx
eU=+*e=_Lje7f78Wd>`BS*o!?qUk5*LF#Z8R2?g^2

literal 0
HcmV?d00001

diff --git a/localisation/replace/english/ethic_traditions_l_english.yml b/localisation/replace/english/ethic_traditions_l_english.yml
index 2b1f8c4be..37b58c872 100644
--- a/localisation/replace/english/ethic_traditions_l_english.yml
+++ b/localisation/replace/english/ethic_traditions_l_english.yml
@@ -223,13 +223,6 @@
  tr_revolution_null_desc:1 "§RAll effects fail.§!"
  tr_revolution_null_delayed:0 ""
  
- ethic_revolution.3.name:0 "Anti-Revisionism"
- ethic_revolution.3.desc:0 "The population is outraged that the [Root.GetName] government has publicly shifted its governing morality away from revolutionary values. Mass demonstrations have brought the social functioning of [Root.Capital.GetName] to a halt, and the slogan "Death to the oppressor" has grown louder. The situation could escalate rapidly, and administration officials have been surprised by the strong sentiment on the issue. Many support the continuation of the revolution, however, there are also other members of society and government who support [Root.GetName] to come out of the burden of constant revolution and claim that [Root.GetName] should be a respected member of the galactic family , rather than troublemakers."
- ethic_revolution.3.a:0 "We will win!"
- ethic_revolution.3.a.tooltip:0 "§LThe angry people dragged the reactionaries out of their lair and hung them from lampposts. The revolution triumphed again.§!"
- ethic_revolution.3.b:0 "Friends, let's talk reality..."
- ethic_revolution.3.b.tooltip:0 "§LThe movement eerily subsided, people were silent about it, and only a few conservatives were left fighting the New Deal with difficulty.§!"
- 
  tradition_piety:0 "Piety"
  tr_piety_adopt:0 "Piety Traditions"
  tr_piety_adopt_desc:0 "$tr_piety_adopt_effect$"
diff --git a/localisation/replace/english/ut_post_revolution_l_english.yml b/localisation/replace/english/ut_post_revolution_l_english.yml
new file mode 100644
index 000000000..efec39eac
--- /dev/null
+++ b/localisation/replace/english/ut_post_revolution_l_english.yml
@@ -0,0 +1,14 @@
+l_english:
+ ut_post_revolutionary.1.name:0 "Anti-Revisionism"
+ ut_post_revolutionary.1.desc:0 "民众对[Root.GetName]政府公开将其执政道德从革命价值观上转移感到愤怒。大规模的示威使得[Root.Capital.GetName]的社会运转都停止了，“修正主义叛徒去死”的口号也日渐响亮。局势可能迅速升级，政府官员对这一问题上的强烈情绪感到吃惊。许多人支持继续进行革命，然而，社会和政府同样有其它成员支持[Root.GetName]从不断革命的负担中走出来，并宣称[Root.GetName]应当成为银河系大家庭中受人尊敬的一员，而不是只会搞破坏的的邪恶分子。"
+ ut_post_revolutionary.1.a:0 "亲爱的人民们，我们向你们保证..."
+ ut_post_revolutionary.1.a.tooltip:0 "§L运动终究是平息了，作为妥协的代价，我们把位置让给了政府内的那些保守分子。§!"
+ ut_post_revolutionary.1.b:0 "亲爱的人民们，我们来谈谈现实吧..."
+ ut_post_revolutionary.1.b.tooltip:0 "§L运动诡异的平息了，人们对此缄口不言，只剩下一些保守分子在艰难的和新政对抗。§!"
+
+ re_revolution_question:0 "Re-Revolution?"
+ re_revolution_question_desc:0 "在党内老干部的带动下，党将带领民众重新回到继续革命的正道上...也许吧？"
+ post_revolutionary:0 "Post-Revolution Era"
+ post_revolutionary_desc:0 "革命与斗争已不再是这个时代的主旋律"
+ post_revolutionary_unret:0 "Myth of the post-revolutionary era"
+ post_revolutionary_unret_desc:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file
diff --git a/localisation/replace/simp_chinese/ethic_traditions_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_traditions_l_simp_chinese.yml
index 783a3d070..b579f2f1d 100644
--- a/localisation/replace/simp_chinese/ethic_traditions_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_traditions_l_simp_chinese.yml
@@ -216,13 +216,6 @@
  tr_revolution_null:0 "§L革命失败§!"
  tr_revolution_null_desc:1 "§R所有效果失效。§!"
  tr_revolution_null_delayed:0 ""
-
- ethic_revolution.3.name:0 "反修正主义"
- ethic_revolution.3.desc:0 "民众对[Root.GetName]政府公开将其执政道德从革命价值观上转移感到愤怒。大规模的示威使得[Root.Capital.GetName]的社会运转都停止了，“压迫者去死”的口号也日渐响亮。局势可能迅速升级，政府官员对这一问题上的强烈情绪感到吃惊。许多人支持继续进行革命，然而，社会和政府同样有其它成员支持[Root.GetName]从不断革命的负担中走出来，并宣称[Root.GetName]应当成为银河系大家庭中受人尊敬的一员，而不是捣乱分子。"
- ethic_revolution.3.a:0 "我们终将胜利！"
- ethic_revolution.3.a.tooltip:0 "§L愤怒的人民将反动派从他们的巢穴中拖了出来，吊在了路灯杆上。革命又一次取得了胜利。§!"
- ethic_revolution.3.b:0 "朋友们，我们来谈谈现实吧..."
- ethic_revolution.3.b.tooltip:0 "§L运动诡异的平息了，人们对此缄口不言，只剩下一些保守分子在艰难的和新政对抗。§!"
  
 ################################################################
 # DISCOVERY
diff --git a/localisation/replace/simp_chinese/ut_post_revolution_l_simp_chinese.yml b/localisation/replace/simp_chinese/ut_post_revolution_l_simp_chinese.yml
new file mode 100644
index 000000000..556d4d064
--- /dev/null
+++ b/localisation/replace/simp_chinese/ut_post_revolution_l_simp_chinese.yml
@@ -0,0 +1,14 @@
+l_simp_chinese:
+ ut_post_revolutionary.1.name:0 "反修正主义"
+ ut_post_revolutionary.1.desc:0 "民众对[Root.GetName]政府公开将其执政道德从革命价值观上转移感到愤怒。大规模的示威使得[Root.Capital.GetName]的社会运转都停止了，“修正主义叛徒去死”的口号也日渐响亮。局势可能迅速升级，政府官员对这一问题上的强烈情绪感到吃惊。许多人支持继续进行革命，然而，社会和政府同样有其它成员支持[Root.GetName]从不断革命的负担中走出来，并宣称[Root.GetName]应当成为银河系大家庭中受人尊敬的一员，而不是只会搞破坏的的邪恶分子。"
+ ut_post_revolutionary.1.a:0 "亲爱的人民们，我们向你们保证..."
+ ut_post_revolutionary.1.a.tooltip:0 "§L运动终究是平息了，作为妥协的代价，我们把位置让给了政府内的那些保守分子。§!"
+ ut_post_revolutionary.1.b:0 "亲爱的人民们，我们来谈谈现实吧..."
+ ut_post_revolutionary.1.b.tooltip:0 "§L运动诡异的平息了，人们对此缄口不言，只剩下一些保守分子在艰难的和新政对抗。§!"
+
+ re_revolution_question:0 "继续革命？"
+ re_revolution_question_desc:0 "在党内健康力量的领导下，党将带领民众重新回到继续革命的正道上...是吧？"
+ post_revolutionary:0 "后革命时代"
+ post_revolutionary_desc:0 "革命与斗争已不再是新时代的主旋律"
+ post_revolutionary_unret:0 "后革命时代的迷思"
+ post_revolutionary_unret_desc:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file

From c56fbd0370726ee5b4e819c6cbf90babe7818557 Mon Sep 17 00:00:00 2001
From: DragonKnigtOfBreeze <dk_breeze@qq.com>
Date: Tue, 3 Jan 2023 12:34:54 +0800
Subject: [PATCH 19/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D&=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E9=9D=A9=E5=91=BD=E4=BC=A0=E7=BB=9F=E4=BB=A5=E5=8F=8A=E6=B8=B8?=
 =?UTF-8?q?=E5=87=BB=E9=98=9F=E8=81=8C=E4=B8=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ut_post_revolutionary_static_modifiers.txt | 21 ++++++++++++-------
 ...ml => ut_post_revolutionary_l_english.yml} |  3 ++-
 ... ut_post_revolutionary_l_simp_chinese.yml} |  7 ++++---
 3 files changed, 19 insertions(+), 12 deletions(-)
 rename localisation/replace/english/{ut_post_revolution_l_english.yml => ut_post_revolutionary_l_english.yml} (85%)
 rename localisation/replace/simp_chinese/{ut_post_revolution_l_simp_chinese.yml => ut_post_revolutionary_l_simp_chinese.yml} (75%)

diff --git a/common/static_modifiers/ut_post_revolutionary_static_modifiers.txt b/common/static_modifiers/ut_post_revolutionary_static_modifiers.txt
index b7d9d4c52..21e5f04de 100644
--- a/common/static_modifiers/ut_post_revolutionary_static_modifiers.txt
+++ b/common/static_modifiers/ut_post_revolutionary_static_modifiers.txt
@@ -1,23 +1,28 @@
 re_revolution_question = {
 	icon = "gfx/interface/icons/planet_modifiers/re_revolution_question.dds"
-
-	pop_happiness = -0.05
+	
+	pop_cat_worker_happiness = -0.05
 	country_unity_produces_mult = -0.05
 }
 
 post_revolutionary = {
 	icon = "gfx/interface/icons/planet_modifiers/post_revolutionary.dds"
 	
-	# unity_deficit
+	pop_cat_specialist_happiness = -0.10
+	pop_cat_worker_happiness = -0.20
 	planet_stability_add = -20
-	pop_government_ethic_attraction = -1
-
-	pop_happiness = -0.20
 	country_unity_produces_mult = -0.20
+	pop_government_ethic_attraction = -1
 }
 
 post_revolutionary_unret = {
 	icon = "gfx/interface/icons/planet_modifiers/post_revolutionary_unset.dds"
-	pop_ethic_egalitarian_attraction_mult = 2
-	pop_ethic_socialism_attraction_mult = 2
+	
+	pop_cat_specialist_happiness = 0.05
+	pop_cat_worker_happiness = 0.10
+	planet_stability_add = 10
+	country_unity_produces_mult = -0.30
+	pop_growth_speed = -0.5
+	pop_ethic_egalitarian_attraction_mult = 2.5
+	pop_ethic_socialism_attraction_mult = 2.5
 }
\ No newline at end of file
diff --git a/localisation/replace/english/ut_post_revolution_l_english.yml b/localisation/replace/english/ut_post_revolutionary_l_english.yml
similarity index 85%
rename from localisation/replace/english/ut_post_revolution_l_english.yml
rename to localisation/replace/english/ut_post_revolutionary_l_english.yml
index efec39eac..f807bf1d4 100644
--- a/localisation/replace/english/ut_post_revolution_l_english.yml
+++ b/localisation/replace/english/ut_post_revolutionary_l_english.yml
@@ -11,4 +11,5 @@
  post_revolutionary:0 "Post-Revolution Era"
  post_revolutionary_desc:0 "革命与斗争已不再是这个时代的主旋律"
  post_revolutionary_unret:0 "Myth of the post-revolutionary era"
- post_revolutionary_unret_desc:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file
+ post_revolutionary_unret_desc:0 "这是一个前景光明、形式大好的新时代，也是一个充斥着沉默、迷茫和苦难的时代"
+ post_revolutionary_unret_custom_tooltip:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file
diff --git a/localisation/replace/simp_chinese/ut_post_revolution_l_simp_chinese.yml b/localisation/replace/simp_chinese/ut_post_revolutionary_l_simp_chinese.yml
similarity index 75%
rename from localisation/replace/simp_chinese/ut_post_revolution_l_simp_chinese.yml
rename to localisation/replace/simp_chinese/ut_post_revolutionary_l_simp_chinese.yml
index 556d4d064..9b25b284a 100644
--- a/localisation/replace/simp_chinese/ut_post_revolution_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ut_post_revolutionary_l_simp_chinese.yml
@@ -2,13 +2,14 @@
  ut_post_revolutionary.1.name:0 "反修正主义"
  ut_post_revolutionary.1.desc:0 "民众对[Root.GetName]政府公开将其执政道德从革命价值观上转移感到愤怒。大规模的示威使得[Root.Capital.GetName]的社会运转都停止了，“修正主义叛徒去死”的口号也日渐响亮。局势可能迅速升级，政府官员对这一问题上的强烈情绪感到吃惊。许多人支持继续进行革命，然而，社会和政府同样有其它成员支持[Root.GetName]从不断革命的负担中走出来，并宣称[Root.GetName]应当成为银河系大家庭中受人尊敬的一员，而不是只会搞破坏的的邪恶分子。"
  ut_post_revolutionary.1.a:0 "亲爱的人民们，我们向你们保证..."
- ut_post_revolutionary.1.a.tooltip:0 "§L运动终究是平息了，作为妥协的代价，我们把位置让给了政府内的那些保守分子。§!"
+ ut_post_revolutionary.1.a.tooltip:0 "§L运动终究是平息了，作为妥协的代价，我们把最高权力让给了政府内的那些保守分子。§!"
  ut_post_revolutionary.1.b:0 "亲爱的人民们，我们来谈谈现实吧..."
  ut_post_revolutionary.1.b.tooltip:0 "§L运动诡异的平息了，人们对此缄口不言，只剩下一些保守分子在艰难的和新政对抗。§!"
 
  re_revolution_question:0 "继续革命？"
  re_revolution_question_desc:0 "在党内健康力量的领导下，党将带领民众重新回到继续革命的正道上...是吧？"
  post_revolutionary:0 "后革命时代"
- post_revolutionary_desc:0 "革命与斗争已不再是新时代的主旋律"
+ post_revolutionary_desc:0 "革命与斗争已不再是这个时代的主旋律"
  post_revolutionary_unret:0 "后革命时代的迷思"
- post_revolutionary_unret_desc:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file
+ post_revolutionary_unret_desc:0 "这是一个前景光明、形式大好的新时代，也是一个充斥着沉默、迷茫和苦难的时代"
+ post_revolutionary_unret_custom_tooltip:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file

From e58264ff6c184f293bab4aec3f4f541317896bca Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Tue, 3 Jan 2023 22:55:44 +0800
Subject: [PATCH 20/30] =?UTF-8?q?=E9=87=8D=E6=9E=84=20=E6=8F=90=E5=8F=96sc?=
 =?UTF-8?q?ripted=5Ftrigger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pop_jobs/01_ruler_jobs.txt             | 69 ++-------------
 .../pop_jobs/07_revolutionary_empire_jobs.txt | 18 +---
 common/pop_jobs/ethic_gestalt_jobs.txt        | 87 +++++--------------
 3 files changed, 30 insertions(+), 144 deletions(-)

diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index d70d61c84..44de3f4a3 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -392,14 +392,7 @@ high_priest = {
 		# crisis purge
 		modifier = {
 			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -520,14 +513,7 @@ politician = {
 		# crisis purge
 		modifier = {
 			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -621,22 +607,7 @@ noble = {
 		# crisis purge
 		modifier = {
 			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-			OR = {
-				# contingency won't purge itself
-				NOT = { exists = event_target:custodian_bot }
-				AND = {
-					exists = event_target:custodian_bot
-					NOT = { species = { is_same_value = event_target:custodian_bot } }
-				}
-			}
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -751,22 +722,7 @@ executive = {
 		# crisis purge
 		modifier = {
 			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-			OR = {
-				# contingency won't purge itself
-				NOT = { exists = event_target:custodian_bot }
-				AND = {
-					exists = event_target:custodian_bot
-					NOT = { species = { is_same_value = event_target:custodian_bot } }
-				}
-			}
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -886,22 +842,7 @@ knight_commander = {
 		# crisis purge
 		modifier = {
 			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-			OR = {
-				# contingency won't purge itself
-				NOT = { exists = event_target:custodian_bot }
-				AND = {
-					exists = event_target:custodian_bot
-					NOT = { species = { is_same_value = event_target:custodian_bot } }
-				}
-			}
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
diff --git a/common/pop_jobs/07_revolutionary_empire_jobs.txt b/common/pop_jobs/07_revolutionary_empire_jobs.txt
index d1df5288d..d8f9831f6 100644
--- a/common/pop_jobs/07_revolutionary_empire_jobs.txt
+++ b/common/pop_jobs/07_revolutionary_empire_jobs.txt
@@ -853,14 +853,7 @@ re_augur = {
 		# crisis purge
 		modifier = {
 			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -937,14 +930,7 @@ re_sky_cardinal = {
 		# crisis purge
 		modifier = {
 			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
\ No newline at end of file
diff --git a/common/pop_jobs/ethic_gestalt_jobs.txt b/common/pop_jobs/ethic_gestalt_jobs.txt
index b780f8f8b..6e109ebf3 100644
--- a/common/pop_jobs/ethic_gestalt_jobs.txt
+++ b/common/pop_jobs/ethic_gestalt_jobs.txt
@@ -81,16 +81,10 @@ spawning_drone = {
 				has_modifier = planet_population_control_gestalt
 			}
 		}
+		# crisis purge
 		modifier = {
-			factor = 0.01 # crisis purge
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -175,16 +169,10 @@ offspring_drone = {
 				has_modifier = planet_population_control_gestalt
 			}
 		}
+		# crisis purge
 		modifier = {
-			factor = 0.01 # crisis purge
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -236,16 +224,10 @@ cyber_drone = {
 				has_modifier = planet_population_control_gestalt
 			}
 		}
+		# crisis purge
 		modifier = {
-			factor = 0.01 # crisis purge
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -331,8 +313,9 @@ replicator = {
 	weight = {
 		weight = @spawner_drone_job_weight
 		mult = 10
+		# crisis purge
 		modifier = {
-			factor = 0.01			# crisis purge
+			factor = 0.01
 			is_crisis_purged_ruler_check = yes
 		}
 		modifier = { # 失控女仆兼容
@@ -408,16 +391,10 @@ crucible_drone = {
 
 	weight = {
 		weight = @spawner_drone_job_weight
+		# crisis purge
 		modifier = {
-			factor = 0.01 # crisis purge
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -2290,16 +2267,10 @@ chronicle_drone = {
 			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
 			owner = { has_edict = dynamic_weight }
 		}
+		# crisis purge
 		modifier = {
-			factor = 0.01 # crisis purge
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -2424,16 +2395,10 @@ bath_attendant_hive = {
 				has_modifier = planet_population_control_gestalt
 			}
 		}
+		# crisis purge
 		modifier = {
-			factor = 0.01 # crisis purge
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }
@@ -2469,16 +2434,10 @@ bath_attendant_machine = {
 
 	weight = {
 		weight = @spawner_drone_job_weight
+		# crisis purge
 		modifier = {
-			factor = 0.01 # crisis purge
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
+			factor = 0.01
+			is_crisis_purged_ruler_check = yes
 		}
 	}
 }

From 1677fc2335e923efc713dd2b1d7370560af8924a Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Wed, 4 Jan 2023 20:54:44 +0800
Subject: [PATCH 21/30] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                              | 1 +
 common/governments/00_governments.txt     | 4 ++--
 common/pop_jobs/07_fallen_empire_jobs.txt | 5 +----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e282b0578..fdda17307 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 * 调整 指令式/分布式计划经济 效果互换
 * 修复 职业脚本中判断是否拥有国策时，该国策必须合法
 * 修复&调整 革命传统以及游击队职业修改
+* 调整 内圣之道要求非民主
 
 待调整：
 
diff --git a/common/governments/00_governments.txt b/common/governments/00_governments.txt
index 6caee5a24..5c088d65b 100644
--- a/common/governments/00_governments.txt
+++ b/common/governments/00_governments.txt
@@ -1431,8 +1431,8 @@ gov_anarchocapitalism = {
 ###############
 #社会民主
 gov_social_democracy = {
-	ruler_title = RT_DEATH_MONARCH
-	ruler_title_female = RT_DEATH_MONARCH_FEMALE
+	ruler_title = RT_CHAIRWOMAN
+	ruler_title_female = RT_CHAIRWOMAN
 	possible = {
 	    OR = {
 		    has_valid_civic = civic_social_democracy
diff --git a/common/pop_jobs/07_fallen_empire_jobs.txt b/common/pop_jobs/07_fallen_empire_jobs.txt
index 0c0453710..b61393023 100644
--- a/common/pop_jobs/07_fallen_empire_jobs.txt
+++ b/common/pop_jobs/07_fallen_empire_jobs.txt
@@ -140,10 +140,7 @@ fe_protector = {
 		owner = { is_fallen_empire = yes }
 		is_same_species = owner
 	}
-
-	resources = {
-	}
-
+	
 	planet_modifier = {
 		planet_crime_add = -25
 	}

From d92a717e029401ca547dc1ecc766edd192127e09 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Wed, 4 Jan 2023 20:55:42 +0800
Subject: [PATCH 22/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=86=85=E5=9C=A3?=
 =?UTF-8?q?=E4=B9=8B=E9=81=93=E6=94=B9=E4=B8=BA=E8=A6=81=E6=B1=82=E4=B8=80?=
 =?UTF-8?q?=E5=AE=9A=E7=A8=8B=E5=BA=A6=E7=9A=84=E7=A7=8D=E6=97=8F=E4=B8=BB?=
 =?UTF-8?q?=E4=B9=89+=E9=9D=9E=E4=BB=BB=E4=BD=95=E7=A8=8B=E5=BA=A6?=
 =?UTF-8?q?=E7=9A=84=E5=86=9B=E5=9B=BD=E4=B8=BB=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                              | 2 +-
 .../civics/ethic_civics_cultural_religious.txt            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdda17307..84feac1d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@
 * 调整 指令式/分布式计划经济 效果互换
 * 修复 职业脚本中判断是否拥有国策时，该国策必须合法
 * 修复&调整 革命传统以及游击队职业修改
-* 调整 内圣之道要求非民主
+* 调整 内圣之道改为要求一定程度的种族主义+非任何程度的军国主义
 
 待调整：
 
diff --git a/common/governments/civics/ethic_civics_cultural_religious.txt b/common/governments/civics/ethic_civics_cultural_religious.txt
index 102f544b0..afe31fadf 100644
--- a/common/governments/civics/ethic_civics_cultural_religious.txt
+++ b/common/governments/civics/ethic_civics_cultural_religious.txt
@@ -441,10 +441,10 @@ civic_inwards_perfection = {
 				value = ethic_xenophobe
 				value = ethic_fanatic_xenophobe
 			}
-			OR = {
-				text = civic_tooltip_pacifist
-				value = ethic_pacifist
-				value = ethic_fanatic_pacifist
+			NOR = {
+				text = civic_tooltip_not_militarist
+				value = ethic_militarist
+				value = ethic_fanatic_militarist
 			}
 		}
 		civics = {

From 099e3690f191bc98bd0b15280e7cc6b9f96e8e85 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Thu, 5 Jan 2023 01:40:45 +0800
Subject: [PATCH 23/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D&=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E6=88=98=E4=BA=89=E7=90=86=E7=94=B1=E5=92=8C=E6=88=98=E4=BA=89?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E7=B2=BE=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |   1 +
 .../05_for_the_human_rights_casus_belli.txt   |  15 +-
 .../06_the_benefits_spread_casus_belli.txt    |  15 +-
 ...galactic_nazbol_revolution_casus_belli.txt |  14 +-
 .../07_galactic_revolution_casus_belli.txt    |  20 +-
 .../08_liberation_protocol_casus_belli.txt    |  10 +-
 common/casus_belli/ethic_casus_belli.txt      |   2 -
 .../ethic_revolutionary_effects.txt           |  64 ++
 .../ethic_scripted_effects.txt                |  65 ++
 .../ethic_revolutionary_scripted_triggers.txt |  14 +-
 ...t_post_revolutionary_scripted_triggers.txt |   2 +-
 .../ut_scripted_triggers.txt                  |  57 +-
 .../ethic_revolutionary_modifiers.txt         |  14 +-
 .../ethic_static_modifiers.txt                |   3 +
 .../03_implement_human_rights_war_goals.txt   | 520 ++++------------
 common/war_goals/04_the_benefits_spread.txt   | 561 +++++-------------
 common/war_goals/05_galactic_revolution.txt   | 248 ++------
 common/war_goals/05_nazbol_revolution.txt     | 256 ++++++--
 common/war_goals/06_liberation_protocol.txt   | 111 +---
 common/war_goals/10_wg_galactic.txt           | 190 +-----
 common/war_goals/ethic_wae_goals.txt          |  28 -
 common/war_goals/ethic_war_goals.txt          |  29 +-
 .../english/ethic_deplomatics_l_english.yml   |   2 +
 .../english/ethic_ethics_l_english.yml        |   2 +
 .../english/ethic_modifiers_l_english.yml     |   3 +
 .../ethic_deplomatics_l_simp_chinese.yml      |   4 +-
 .../ethic_modifiers_l_simp_chinese.yml        |   9 +-
 27 files changed, 825 insertions(+), 1434 deletions(-)
 create mode 100644 common/scripted_effects/ethic_revolutionary_effects.txt
 create mode 100644 common/scripted_effects/ethic_scripted_effects.txt
 create mode 100644 common/static_modifiers/ethic_static_modifiers.txt
 delete mode 100644 common/war_goals/ethic_wae_goals.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84feac1d3..fceecb1d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 * 修复 职业脚本中判断是否拥有国策时，该国策必须合法
 * 修复&调整 革命传统以及游击队职业修改
 * 调整 内圣之道改为要求一定程度的种族主义+非任何程度的军国主义
+* 修复&调整 战争理由和战争目标精修
 
 待调整：
 
diff --git a/common/casus_belli/05_for_the_human_rights_casus_belli.txt b/common/casus_belli/05_for_the_human_rights_casus_belli.txt
index 869cae70d..c65bf42e2 100644
--- a/common/casus_belli/05_for_the_human_rights_casus_belli.txt
+++ b/common/casus_belli/05_for_the_human_rights_casus_belli.txt
@@ -2,20 +2,17 @@ cb_for_the_human_rights = {
 	show_in_diplomacy = yes
 	show_notification = yes
 	potential = {
+		is_country_type = default
 		OR = {
 			has_valid_civic = civic_human_rights_first
 			has_valid_civic = civic_free_expeditionary_force
 		}
-		NOT = {
-			is_in_federation_with = from
-		}
-		is_subject = no
+		NOT = { is_in_federation_with = from }
 	}
 	is_valid = {
-		OR = {
-			has_valid_civic = civic_human_rights_first
-			has_valid_civic = civic_free_expeditionary_force
-			has_valid_civic = civic_beacon_of_liberty
-		}
+		has_total_war_cb = no
+		is_subject = no
+		from = { is_country_type = default }
+		from = { NOT = { has_ethic = ethic_gestalt_consciousness } }
 	}
 }
diff --git a/common/casus_belli/06_the_benefits_spread_casus_belli.txt b/common/casus_belli/06_the_benefits_spread_casus_belli.txt
index 30b95e254..79562f68d 100644
--- a/common/casus_belli/06_the_benefits_spread_casus_belli.txt
+++ b/common/casus_belli/06_the_benefits_spread_casus_belli.txt
@@ -7,16 +7,13 @@ cb_the_benefits_spread = {
 			has_valid_civic = civic_state_monopoly
 			has_authority = auth_corporate
 		}
-		is_subject = no
+		NOT = { has_ethic = ethic_fanatic_pacifist }
+		NOT = { is_in_federation_with = from }
 	}
 	is_valid = {
-		is_country_type = default
-		OR = {
-			has_valid_civic = civic_state_monopoly
-			has_authority = auth_corporate
-		}
-		from = {
-			always = yes
-		}
+		has_total_war_cb = no
+		is_subject = no
+		from = { is_country_type = default }
+		from = { NOT = { has_ethic = ethic_gestalt_consciousness } }
 	}
 }
diff --git a/common/casus_belli/07_galactic_nazbol_revolution_casus_belli.txt b/common/casus_belli/07_galactic_nazbol_revolution_casus_belli.txt
index 0c09ef1e9..6ec2747ea 100644
--- a/common/casus_belli/07_galactic_nazbol_revolution_casus_belli.txt
+++ b/common/casus_belli/07_galactic_nazbol_revolution_casus_belli.txt
@@ -2,9 +2,21 @@ cb_nazbol_revolution = {
 	show_in_diplomacy = yes
 	show_notification = no
 	potential = {
+		is_country_type = default
 		has_valid_civic = civic_nazbol
+		NOT = { is_in_federation_with = from }
 	}
 	is_valid = {
-		always = yes
+		has_total_war_cb = no
+		from = { 
+			is_country_type = default
+			is_country_type = fallen_empire
+		}
+		from = { NOT = { has_ethic = ethic_gestalt_consciousness } }
+		NOT = { is_overlord_to = FROM }
+		OR = {
+			is_subject = no
+			overlord = { NOT = { is_same_value = from } }
+		}
 	}
 }
\ No newline at end of file
diff --git a/common/casus_belli/07_galactic_revolution_casus_belli.txt b/common/casus_belli/07_galactic_revolution_casus_belli.txt
index 7bb6f794c..d1e82cf16 100644
--- a/common/casus_belli/07_galactic_revolution_casus_belli.txt
+++ b/common/casus_belli/07_galactic_revolution_casus_belli.txt
@@ -2,20 +2,16 @@ cb_galactic_revolution = {
 	show_in_diplomacy = yes
 	show_notification = no
 	potential = {
-		OR = {
-		    has_valid_civic = civic_shared_burden
-			AND = {
-				has_valid_civic = civic_socialistic
-				NOR = {
-					has_ethic = ethic_xenophobe
-					has_ethic = ethic_fanatic_xenophobe
-				}
-			}
-		}
+		is_country_type = default
+		is_true_scientific_socialism = yes
 		has_policy_flag = continuous_revolution
-		NOT = { has_country_flag = not_revolution }
 	}
 	is_valid = {
-		has_policy_flag = continuous_revolution
+		from = { is_galactic_revolution_target = yes }
+		NOT = { is_overlord_to = FROM }
+		OR = {
+			is_subject = no
+			overlord = { NOT = { is_same_value = from } }
+		}
 	}
 }
\ No newline at end of file
diff --git a/common/casus_belli/08_liberation_protocol_casus_belli.txt b/common/casus_belli/08_liberation_protocol_casus_belli.txt
index 44051cbea..1d803445f 100644
--- a/common/casus_belli/08_liberation_protocol_casus_belli.txt
+++ b/common/casus_belli/08_liberation_protocol_casus_belli.txt
@@ -5,11 +5,11 @@ cb_liberation_protocol = {
 		has_valid_civic = civic_machine_liberator
 	}
 	is_valid = {
-		has_valid_civic = civic_machine_liberator
-		from = {
-			NOR = {
-				has_valid_civic = civic_shared_burden
-			}
+		from = { is_galactic_revolution_target = yes }
+		NOT = { is_overlord_to = FROM }
+		OR = {
+			is_subject = no
+			overlord = { NOT = { is_same_value = from } }
 		}
 	}
 }
\ No newline at end of file
diff --git a/common/casus_belli/ethic_casus_belli.txt b/common/casus_belli/ethic_casus_belli.txt
index c225e72ba..af70529cb 100644
--- a/common/casus_belli/ethic_casus_belli.txt
+++ b/common/casus_belli/ethic_casus_belli.txt
@@ -1,5 +1,3 @@
-
-
 cb_despoliation = {
 	show_in_diplomacy = no
 	show_notification = no
diff --git a/common/scripted_effects/ethic_revolutionary_effects.txt b/common/scripted_effects/ethic_revolutionary_effects.txt
new file mode 100644
index 000000000..4ce476e91
--- /dev/null
+++ b/common/scripted_effects/ethic_revolutionary_effects.txt
@@ -0,0 +1,64 @@
+galactic_revolution_effect = {
+	hidden_effect = {
+		from = {
+			if = {
+				limit = { has_civic = civic_underworld_society }
+				force_remove_civic = civic_underworld_society
+			}
+			if = {
+				limit = { has_civic = civic_criminal_heritage }
+				force_remove_civic = civic_criminal_heritage
+			}
+			every_owned_pop = {
+				random_list = {
+					1 = {
+						wipe_pop_ethos = yes
+						pop_change_ethic = ethic_socialism
+					}
+					1 = {
+						wipe_pop_ethos = yes
+						pop_change_ethic = ethic_egalitarian
+					}
+					2 = { }
+				}
+				set_timed_pop_flag = { flag = changed_pop days = 2 }
+			}
+			add_modifier = { modifier = revolutionary_propaganda days = 3650 }
+		}
+	}
+}
+
+galactic_revolution_status_quo_threat_effect = {
+	hidden_effect = {
+		from = {
+			add_threat = {
+				who = root
+				amount = 0.10
+			}
+		}
+		every_country = {
+			limit = {
+				is_galactic_revolution_target = yes
+			}
+			add_threat = {
+				who = root
+				amount = 0.05
+			}
+		}
+	}
+}
+
+galactic_revolution_accept_threat_effect = {
+	# add threat
+	hidden_effect = {
+		every_country = {
+			limit = {
+				is_galactic_revolution_target = yes
+			}
+			add_threat = {
+				who = root
+				amount = 0.1
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/scripted_effects/ethic_scripted_effects.txt b/common/scripted_effects/ethic_scripted_effects.txt
new file mode 100644
index 000000000..9243191f0
--- /dev/null
+++ b/common/scripted_effects/ethic_scripted_effects.txt
@@ -0,0 +1,65 @@
+set_merchant_government_effect = {
+	if = {
+		limit = {
+			has_technology = tech_galactic_administration
+		}
+		change_government = {
+			authority = auth_oligarchic
+			cooldown = no
+			remove_invalid_civics = yes
+			civics = {
+				civic = civic_merchant_guilds
+				civic = random
+				civic = random
+				civic = random
+			}
+		}
+	}
+	else = {
+		change_government = {
+			authority = auth_oligarchic
+			cooldown = no
+			remove_invalid_civics = yes
+			civics = {
+				civic = civic_merchant_guilds
+				civic = random
+				civic = random
+			}
+		}
+	}
+}
+
+implement_human_rights_effect = {
+	copy_ethos_and_authority = root
+	if = {
+		limit = {
+			has_civic = civic_galactic_sovereign
+		}
+		force_remove_civic = civic_galactic_sovereign
+	}
+	if = {
+		limit = {
+			has_civic = civic_galactic_sovereign_megacorp
+		}
+		force_remove_civic = civic_galactic_sovereign_megacorp
+	}
+	if = {
+		limit = {
+			has_civic = civic_psionic_sovereign
+		}
+		force_remove_civic = civic_psionic_sovereign
+	}
+	if = {
+		limit = {
+			root = { has_authority = auth_corporate }
+			has_authority = auth_corporate
+		}
+		set_merchant_government_effect = yes
+	}
+	add_modifier = { modifier = recently_human_right_implemented days = 3650 }
+	add_opinion_modifier = { modifier = opinion_liberated_us who = root }
+	root = {
+		add_opinion_modifier = { modifier = opinion_we_liberated who = from }
+	}
+}
+
diff --git a/common/scripted_triggers/ethic_revolutionary_scripted_triggers.txt b/common/scripted_triggers/ethic_revolutionary_scripted_triggers.txt
index df7c29bba..f4d5363fa 100644
--- a/common/scripted_triggers/ethic_revolutionary_scripted_triggers.txt
+++ b/common/scripted_triggers/ethic_revolutionary_scripted_triggers.txt
@@ -2,10 +2,10 @@ can_take_revolution_adopt = {
 	NOR = {
 		has_ethic = ethic_fanatic_authoritarian
 		has_ethic = ethic_fanatic_capitalism
+		has_ethic = ethic_fanatic_xenophobe
 		has_civic = civic_characteristic_socialism
 		has_civic = civic_characteristic_socialism_pioneer
 		has_policy_flag = reform_and_opening_up
-		has_civic = civic_fanatic_purifiers
 	}
 }
 
@@ -20,10 +20,20 @@ can_be_revolution_target = {
 			has_ethic = ethic_fanatic_capitalism
 			NOT = { has_ethic = ethic_fanatic_egalitarian }
 		}
+		has_ethic = ethic_fanatic_xenophobe
 		has_civic = civic_characteristic_socialism
 		has_civic = civic_characteristic_socialism_pioneer
 		has_policy_flag = reform_and_opening_up
-		has_civic = civic_fanatic_purifiers
 		has_country_flag = not_revolution
 	}
+}
+
+# 可以是银河革命的对象
+# is_exploiter
+# is_revisionism
+is_galactic_revolution_target = {
+	OR = {
+		is_exploiter = yes
+		is_revisionism = yes
+	}
 }
\ No newline at end of file
diff --git a/common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt b/common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt
index 4e5f0d4c7..260805ce4 100644
--- a/common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt
+++ b/common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt
@@ -2,10 +2,10 @@ is_post_revolutionary = {
 	OR = {
 		is_capitalism = yes
 		is_authoritarian = yes
+		has_ethic = ethic_fanatic_xenophobe
 		has_civic = civic_characteristic_socialism
 		has_civic = civic_characteristic_socialism_pioneer
 		has_policy_flag = reform_and_opening_up
-		has_civic = civic_fanatic_purifiers
 	}
 	has_tradition = tr_revolution_finish
 }
\ No newline at end of file
diff --git a/common/scripted_triggers/ut_scripted_triggers.txt b/common/scripted_triggers/ut_scripted_triggers.txt
index adefea3e9..ee9810206 100644
--- a/common/scripted_triggers/ut_scripted_triggers.txt
+++ b/common/scripted_triggers/ut_scripted_triggers.txt
@@ -17,6 +17,61 @@ is_scientific_socialism = {
 	}
 }
 
+# 是未变质的科学社会主义（完成革命传统后可以使用银河革命战争理由）
+is_true_scientific_socialism = {
+	OR = {
+		has_valid_civic = civic_shared_burden
+		has_valid_civic = civic_socialistic
+		AND = {
+			has_valid_civic = civic_forever_with_us
+			has_ethic = ethic_fanatic_socialism
+		}
+	}
+	NOR = {
+		has_ethic = ethic_authoritarian
+		has_ethic = ethic_fanatic_authoritarian
+		has_ethic = ethic_xenophobe
+		has_ethic = ethic_fanatic_xenophobe
+		has_country_flag = not_revolution
+		has_policy_flag = reform_and_opening_up
+	}
+}
+
+# 是剥削者
+is_exploiter = {
+	OR = {
+		has_ethic = ethic_capitalism
+		has_ethic = ethic_fanatic_capitalism
+		has_ethic = ethic_authoritarian
+		has_ethic = ethic_fanatic_authoritarian
+		has_ethic = ethic_fanatic_xenophobe
+		has_authority = auth_imperial
+		has_civic = civic_machine_financial_investment
+	}
+}
+
+# 是修正主义
+is_revisionism = {
+	OR = {
+		AND = {
+			OR = {
+				has_ethic = ethic_socialism
+				has_ethic = ethic_fanatic_socialism
+			}
+			OR = {
+				has_ethic = ethic_authoritarian
+				has_ethic = ethic_fanatic_authoritarian
+				has_ethic = ethic_xenophobe
+				has_ethic = ethic_fanatic_xenophobe
+			}
+		}
+		has_civic = civic_characteristic_socialism
+		has_civic = civic_characteristic_socialism_pioneer
+		has_country_flag = not_revolution
+		has_policy_flag = reform_and_opening_up
+	}
+}
+
 # 拥有道德主义主题理念
 has_pacifist_topic_civic = {
 	OR = {
@@ -162,7 +217,7 @@ has_any_arms_industry_designation = {
 		has_designation = col_ring_foundry
 		has_designation = col_ecu_foundry
 		has_designation = col_dome_foundry
-	} 
+	}
 }
 
 has_any_civilian_industry_designation = {
diff --git a/common/static_modifiers/ethic_revolutionary_modifiers.txt b/common/static_modifiers/ethic_revolutionary_modifiers.txt
index b51290f54..6b0efaa9c 100644
--- a/common/static_modifiers/ethic_revolutionary_modifiers.txt
+++ b/common/static_modifiers/ethic_revolutionary_modifiers.txt
@@ -6,17 +6,21 @@ revolutionary_propaganda = {
 
 socialism_unrest = {
 	icon = "gfx/interface/icons/planet_modifiers/pm_unknown.dds"
+	
 	icon_frame = 2
 	pop_ethic_socialism_attraction_mult = 1
 }
 
 capitalism_unrest = {
 	icon = "gfx/interface/icons/planet_modifiers/pm_unknown.dds"
+	
 	icon_frame = 2
 	pop_ethic_capitalism_attraction_mult = 1
 }
 
 guerrilla_warzone = {
+	icon = "gfx/interface/icons/planet_modifiers/capital.dds"
+	
 	job_guerrilla_add = 3
 	job_guerrilla_leader_add = 1
 	job_liaison_officer_add = 1
@@ -25,5 +29,13 @@ guerrilla_warzone = {
 	job_liaison_officer_per_pop = 0.03
 	planet_jobs_worker_produces_mult = -0.05
 	pop_ethic_egalitarian_attraction_mult = 0.25
-	icon = "gfx/interface/icons/planet_modifiers/capital.dds"
+	pop_ethic_socialism_attraction_mult = 0.25
 }
+
+## this = pop
+pop_towards_to_the_new_society = {
+	planet_jobs_produces_mult = 0.20
+	pop_happiness = 0.20
+	pop_ethic_egalitarian_attraction_mult = 0.50
+	pop_ethic_socialism_attraction_mult = 0.50
+}
\ No newline at end of file
diff --git a/common/static_modifiers/ethic_static_modifiers.txt b/common/static_modifiers/ethic_static_modifiers.txt
new file mode 100644
index 000000000..3d203f527
--- /dev/null
+++ b/common/static_modifiers/ethic_static_modifiers.txt
@@ -0,0 +1,3 @@
+recently_human_right_implemented = {
+	pop_government_ethic_attraction = -0.25
+}
\ No newline at end of file
diff --git a/common/war_goals/03_implement_human_rights_war_goals.txt b/common/war_goals/03_implement_human_rights_war_goals.txt
index 55512ee66..b22ae8a50 100644
--- a/common/war_goals/03_implement_human_rights_war_goals.txt
+++ b/common/war_goals/03_implement_human_rights_war_goals.txt
@@ -1,232 +1,86 @@
 wg_implement_human_rights = {
+	# wg_force_ideology
+	# wg_plunder
+	
 	casus_belli = cb_for_the_human_rights
 	
 	hide_if_no_cb = no
+	release_occupied_systems_on_status_quo = yes
 	total_war = no
+
+	galactic_empire_joins_defender = {
+		from = { is_galactic_emperor = yes }
+		imperial_authority >= 100
+	}
 	
 	allowed_peace_offers = {
 		status_quo
+		surrender
 		demand_surrender
 	}
+
+	surrender_acceptance = -100 # wg_force_ideology
 	
 	potential = {
-		has_total_war_cb = no
 		OR = {
 			has_valid_civic = civic_human_rights_first
 			has_valid_civic = civic_free_expeditionary_force
 		}
+		has_total_war_cb = no
 		from = { is_country_type = default }
 		NOT = { is_in_federation_with = from }
+		NAND = {
+			is_galactic_emperor = yes
+			from = { is_galactic_community_member = yes }
+		}
 	}
 	possible = {
-		from = { is_country_type = default }
-		NOT = { is_in_federation_with = from }
-	}
-	on_status_quo = {
-		custom_tooltip = wg_plunder_accept_them
-		if = {
-			limit = {
-				from = {
-					num_owned_planets <= 3
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_1
-			hidden_effect = { add_resource = { energy = 500 minerals = 500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 4
-					num_owned_planets <= 6
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_2
-			hidden_effect = { add_resource = { energy = 1000 minerals = 1000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 7
-					num_owned_planets <= 9
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_3
-			hidden_effect = { add_resource = { energy = 1500 minerals = 1500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 10
-					num_owned_planets <= 12
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_4
-			hidden_effect = { add_resource = { energy = 2000 minerals = 2000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 13
-					num_owned_planets <= 15
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_5
-			hidden_effect = { add_resource = { energy = 2500 minerals = 2500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 16
-					num_owned_planets <= 18
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_6
-			hidden_effect = { add_resource = { energy = 3000 minerals = 3000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 19
-					num_owned_planets <= 21
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_7
-			hidden_effect = { add_resource = { energy = 3500 minerals = 3500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 22
-					num_owned_planets <= 24
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_8
-			hidden_effect = { add_resource = { energy = 4000 minerals = 4000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 25
-					num_owned_planets <= 27
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_9
-			hidden_effect = { add_resource = { energy = 4500 minerals = 4500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 28
-					num_owned_planets <= 30
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_10
-			hidden_effect = { add_resource = { energy = 5000 minerals = 5000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 31
-					num_owned_planets <= 33
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_11
-			hidden_effect = { add_resource = { energy = 5500 minerals = 5500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 34
-					num_owned_planets <= 36
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_12
-			hidden_effect = { add_resource = { energy = 6000 minerals = 6000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 37
-					num_owned_planets <= 39
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_13
-			hidden_effect = { add_resource = { energy = 6500 minerals = 6500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 40
-					num_owned_planets <= 42
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_14
-			hidden_effect = { add_resource = { energy = 7000 minerals = 7000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 43
-					num_owned_planets <= 45
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_15
-			hidden_effect = { add_resource = { energy = 7500 minerals = 7500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 46
-					num_owned_planets <= 48
+		custom_tooltip = {
+			fail_text = has_claimed_all_systems
+			from = {
+				is_country_type = default
+				any_owned_planet = {
+					is_colony = yes
+					root = {
+						NOT = { has_claim = prev.solar_system }
+					}
 				}
 			}
-			custom_tooltip = wg_plunder_accept_us_16
-			hidden_effect = { add_resource = { energy = 8000 minerals = 8000 } }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 49
-					num_owned_planets <= 51
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_17
-			hidden_effect = { add_resource = { energy = 8500 minerals = 8500 } }
+		custom_tooltip = {
+			fail_text = "cannot_use_against_emperor"
+			from = { is_galactic_emperor = no }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 52
-					num_owned_planets <= 54
-				}
+		custom_tooltip = {
+			fail_text = pax_galactica_active
+			NAND = {
+				is_active_resolution = resolution_emperor_pax_galactica
+				is_galactic_community_member = yes
+				from = { is_galactic_community_member = yes }
 			}
-			custom_tooltip = wg_plunder_accept_us_18
-			hidden_effect = { add_resource = { energy = 9000 minerals = 9000 } }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 55
-					num_owned_planets <= 57
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_19
-			hidden_effect = { add_resource = { energy = 9500 minerals = 9500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 58
+	}
+	on_status_quo = {
+		custom_tooltip = wg_plunder_accept_them
+		add_resource = {
+			energy = 150
+			minerals = 150
+			mult = from.trigger:num_owned_planets
+		}
+		hidden_effect = { from = { add_modifier = { modifier = raided days = 3600 } } }
+		
+		# add threat
+		hidden_effect = {
+			from = {
+				add_threat = {
+					who = root
+					amount = 0.10
 				}
 			}
-			custom_tooltip = wg_plunder_accept_us_21
-			hidden_effect = { add_resource = { energy = 10000 minerals = 10000 } }
-		}			
-		hidden_effect = {
-		    every_country = {
+			every_country = {
 				limit = {
 					NOR = {
-					    is_country_type = fallen_empire
+						is_country_type = fallen_empire
 						has_civic = civic_beacon_of_liberty
 						has_civic = civic_human_rights_first
 						has_valid_civic = civic_free_expeditionary_force
@@ -237,25 +91,55 @@ wg_implement_human_rights = {
 					amount = 0.05
 				}
 			}
-		    from = {
-			    add_modifier = { modifier = raided days = 3600 }
-			}
 		}
 	}
 	on_accept = {
-		custom_tooltip = wg_force_ideology_accept
-		custom_tooltip = wg_force_ideology_accept_2
+		from = {
+			if = {
+				limit = {
+					is_gestalt = no
+				}
+				custom_tooltip = wg_force_ideology_accept
+				custom_tooltip = wg_force_ideology_accept_2
+			}
+
+			every_subject = {
+				limit = {
+					is_gestalt = no
+					any_war = {
+						is_war_participant = {
+							who = prev
+							side = prevprev
+						}
+					}
+				}
+				custom_tooltip = wg_force_ideology_accept_subject
+			}
+		}
+
 		if = {
 			limit = {
 				from = { has_federation = yes }
 			}
 			custom_tooltip = wg_force_ideology_accept_3
 		}
+
 		hidden_effect = {
-			from = { copy_ethos_and_authority = root }
-			from = { add_modifier = { modifier = recently_liberated days = 7300 } }
-			add_opinion_modifier = { modifier = opinion_of_free_pos who = from }
-			from = { add_opinion_modifier = { modifier = opinion_liberated_us who = root } }
+			from = {
+				if = {
+					limit = {
+						is_gestalt = no
+					}
+					implement_human_rights_effect = yes
+				}
+
+				every_subject = {
+					limit = {
+						is_gestalt = no
+					}
+					implement_human_rights_effect = yes
+				}
+			}
 			end_rivalry = from
 			from = { end_rivalry = root }
 			every_system_within_border = {
@@ -277,7 +161,7 @@ wg_implement_human_rights = {
 				}
 				end_rivalry = from
 				from = { end_rivalry = prev }
-				add_opinion_modifier = { modifier = opinion_of_free_pos who = from }
+				add_opinion_modifier = { modifier = opinion_we_liberated who = from }
 				from = { add_opinion_modifier = { modifier = opinion_liberated_us who = prev } }
 				every_system_within_border = {
 					limit = {
@@ -290,210 +174,27 @@ wg_implement_human_rights = {
 				leave_alliance = { override_requirements = yes }
 			}
 		}
-		custom_tooltip = wg_implement_human_rights_accept_them			
-		if = {
-			limit = { 
-				from = {
-					num_owned_planets <= 3
-				}
-			}		
-			custom_tooltip = wg_plunder_accept_us_1
-			hidden_effect = { add_resource = { energy = 500 minerals = 500 } }
-		}
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 4
-					num_owned_planets <= 6
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_2
-			hidden_effect = { add_resource = { energy = 1000 minerals = 1000 } }
+
+		custom_tooltip = wg_implement_human_rights_accept_them
+		add_resource = {
+			energy = 250
+			minerals = 250
+			mult = from.trigger:num_owned_planets
 		}
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 7
-					num_owned_planets <= 9
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_3
-			hidden_effect = { add_resource = { energy = 1500 minerals = 1500 } }
-		}	
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 10
-					num_owned_planets <= 12
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_4
-			hidden_effect = { add_resource = { energy = 2000 minerals = 2000 } }
-		}			
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 13
-					num_owned_planets <= 15
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_5
-			hidden_effect = { add_resource = { energy = 2500 minerals = 2500 } }
-		}	
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 16
-					num_owned_planets <= 18
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_6
-			hidden_effect = { add_resource = { energy = 3000 minerals = 3000 } }
-		}	
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 19
-					num_owned_planets <= 21
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_7
-			hidden_effect = { add_resource = { energy = 3500 minerals = 3500 } }
-		}
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 22
-					num_owned_planets <= 24
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_8
-			hidden_effect = { add_resource = { energy = 4000 minerals = 4000 } }
-		}	
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 25
-					num_owned_planets <= 27
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_9
-			hidden_effect = { add_resource = { energy = 8000 minerals = 8000 } }
-		}		
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 28
-					num_owned_planets <= 30
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_10
-			hidden_effect = { add_resource = { energy = 10000 minerals = 10000 } }
-		}
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 31
-					num_owned_planets <= 33
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_11
-			hidden_effect = { add_resource = { energy = 12000 minerals = 12000 } }
-		}			
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 34
-					num_owned_planets <= 36
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_12
-			hidden_effect = { add_resource = { energy = 14000 minerals = 14000 } }
-		}	
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 37
-					num_owned_planets <= 39
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_13
-			hidden_effect = { add_resource = { energy = 16000 minerals = 16000 } }
-		}			
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 40
-					num_owned_planets <= 42
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_14
-			hidden_effect = { add_resource = { energy = 18000 minerals = 18000 } }
-		}	
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 43
-					num_owned_planets <= 45
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_15
-			hidden_effect = { add_resource = { energy = 20000 minerals = 20000 } }
-		}
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 46
-					num_owned_planets <= 48
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_16
-			hidden_effect = { add_resource = { energy = 25000 minerals = 25000 } }
-		}	
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 49
-					num_owned_planets <= 51
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_17
-			hidden_effect = { add_resource = { energy = 30000 minerals = 30000 } }
-		}
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 52
-					num_owned_planets <= 54
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_18
-			hidden_effect = { add_resource = { energy = 35000 minerals = 35000 } }
-		}			
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 55
-					num_owned_planets <= 57
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_19
-			hidden_effect = { add_resource = { energy = 40000 minerals = 40000 } }
-		}		
-		if = {
-			limit = {
-				from = { 
-					num_owned_planets >= 58
+		hidden_effect = { from = { add_modifier = { modifier = raided days = 3600 } } }
+
+		# add threat
+		hidden_effect = {
+			from = {
+				add_threat = {
+					who = root
+					amount = 0.20
 				}
 			}
-			custom_tooltip = wg_plunder_accept_us_21
-			hidden_effect = { add_resource = { energy = 50000 minerals = 50000 } }
-		}			
-		hidden_effect = {
-		    every_country = {
+			every_country = {
 				limit = {
 					NOR = {
-					    is_country_type = fallen_empire
+						is_country_type = fallen_empire
 						has_civic = civic_beacon_of_liberty
 						has_civic = civic_human_rights_first
 						has_valid_civic = civic_free_expeditionary_force
@@ -504,9 +205,6 @@ wg_implement_human_rights = {
 					amount = 0.1
 				}
 			}
-		    from = {
-			    add_modifier = { modifier = raided days = 3600 }
-			}
 		}
 	}
 	
diff --git a/common/war_goals/04_the_benefits_spread.txt b/common/war_goals/04_the_benefits_spread.txt
index 8b68f23c7..129b67873 100644
--- a/common/war_goals/04_the_benefits_spread.txt
+++ b/common/war_goals/04_the_benefits_spread.txt
@@ -1,244 +1,204 @@
 wg_the_benefits_spread ={
+	# wg_megacorp_subjugate
+	# wg_plunder
+	
     casus_belli = cb_the_benefits_spread
 	
 	hide_if_no_cb = no
 	total_war = no
+	release_occupied_systems_on_status_quo = yes
+
+	galactic_empire_joins_defender = {
+		from = { is_galactic_emperor = yes }
+		imperial_authority >= 100
+	}
 	
 	allowed_peace_offers = {
 		status_quo
+		surrender
 		demand_surrender
 	}
 	
+	surrender_acceptance = -100 # wg_megacorp_subjugate
+	
 	potential = {
-		has_total_war_cb = no
-		has_authority = auth_corporate
+		OR = {
+			has_valid_civic = civic_state_monopoly
+			has_authority = auth_corporate
+		}
 		NOT = { has_ethic = ethic_fanatic_pacifist }
+		has_total_war_cb = no
 		from = { is_country_type = default }
 		NOT = { is_in_federation_with = from }
+		NOT = { has_ascension_perk = ap_become_the_crisis }
+		NAND = {
+			is_galactic_emperor = yes
+			from = { is_galactic_community_member = yes }
+		}
 	}
 	possible = {
-		from = { is_country_type = default }
-		NOT = { is_in_federation_with = from }
-	}
-	on_status_quo = {
-	    if = {
-			limit = {
-				exists = last_created_country
-				last_created_country = {
-					has_country_flag = released_empire
-				}
-			}
-
-			last_created_country = {
-				set_subject_of = {
-					who = root
-					subject_type = subsidiary
+		custom_tooltip = {
+			fail_text = has_claimed_all_systems
+			from = {
+				is_country_type = default
+				any_owned_planet = {
+					is_colony = yes
+					root = {
+						NOT = { has_claim = prev.solar_system }
+					}
 				}
 			}
 		}
-		custom_tooltip = wg_plunder_accept_them
-		if = {
-			limit = {
-				from = {
-					num_owned_planets <= 3
-				}
+		custom_tooltip = {
+			fail_text = cannot_subjugate_empire_member
+			NAND = {
+				has_galactic_emperor = yes
+				is_galactic_community_member = no
+				from = { is_galactic_community_member = yes }
 			}
-			custom_tooltip = wg_plunder_accept_us_1
-			hidden_effect = { add_resource = { energy = 500 minerals = 500 } }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 4
-					num_owned_planets <= 6
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_2
-			hidden_effect = { add_resource = { energy = 1000 minerals = 1000 } }
+		custom_tooltip = {
+			fail_text = "cannot_use_against_custodian"
+			from = { is_galactic_custodian = no }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 7
-					num_owned_planets <= 9
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_3
-			hidden_effect = { add_resource = { energy = 1500 minerals = 1500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 10
-					num_owned_planets <= 12
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_4
-			hidden_effect = { add_resource = { energy = 2000 minerals = 2000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 13
-					num_owned_planets <= 15
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_5
-			hidden_effect = { add_resource = { energy = 2500 minerals = 2500 } }
+		custom_tooltip = {
+			fail_text = "cannot_use_against_emperor"
+			from = { is_galactic_emperor = no }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 16
-					num_owned_planets <= 18
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_6
-			hidden_effect = { add_resource = { energy = 3000 minerals = 3000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 19
-					num_owned_planets <= 21
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_7
-			hidden_effect = { add_resource = { energy = 3500 minerals = 3500 } }
+		custom_tooltip = {
+			fail_text = "cannot_use_against_btc"
+			from = { has_been_declared_crisis = no }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 22
-					num_owned_planets <= 24
-				}
+		custom_tooltip = {
+			fail_text = pax_galactica_active
+			NAND = {
+				is_active_resolution = resolution_emperor_pax_galactica
+				is_galactic_community_member = yes
+				from = { is_galactic_community_member = yes }
 			}
-			custom_tooltip = wg_plunder_accept_us_8
-			hidden_effect = { add_resource = { energy = 4000 minerals = 4000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 25
-					num_owned_planets <= 27
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_9
-			hidden_effect = { add_resource = { energy = 4500 minerals = 4500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 28
-					num_owned_planets <= 30
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_10
-			hidden_effect = { add_resource = { energy = 5000 minerals = 5000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 31
-					num_owned_planets <= 33
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_11
-			hidden_effect = { add_resource = { energy = 5500 minerals = 5500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 34
-					num_owned_planets <= 36
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_12
-			hidden_effect = { add_resource = { energy = 6000 minerals = 6000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 37
-					num_owned_planets <= 39
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_13
-			hidden_effect = { add_resource = { energy = 6500 minerals = 6500 } }
 		}
+	}
+	on_status_quo = {
 		if = {
 			limit = {
-				from = {
-					num_owned_planets >= 40
-					num_owned_planets <= 42
+				exists = last_created_country
+				last_created_country = {
+					has_country_flag = released_empire
 				}
 			}
-			custom_tooltip = wg_plunder_accept_us_14
-			hidden_effect = { add_resource = { energy = 7000 minerals = 7000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 43
-					num_owned_planets <= 45
+
+			last_created_country = {
+				set_origin_effect = yes
+				ROOT = {
+					switch = {
+						trigger = has_policy_flag
+						oppressive_terms = {
+							FROM = {
+								set_subject_of = {
+									who = ROOT
+									preset = preset_subsidiary_oppressive
+								}
+							}
+						}
+						balanced_terms = {
+							PREV = {
+								set_subject_of = {
+									who = ROOT
+									preset = preset_subsidiary_balanced
+								}
+							}
+						}
+						benevolent_terms = {
+							PREV = {
+								set_subject_of = {
+									who = ROOT
+									preset = preset_subsidiary_benevolent
+								}
+							}
+						}
+					}
+				}
+				add_modifier = {
+					modifier = newly_subjugated_loyalty
+					years = 5
 				}
 			}
-			custom_tooltip = wg_plunder_accept_us_15
-			hidden_effect = { add_resource = { energy = 7500 minerals = 7500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 46
-					num_owned_planets <= 48
+
+			if = {
+				limit = {
+					root = { has_authority = auth_corporate }
+					last_created_country = { has_authority = auth_corporate }
 				}
-			}
-			custom_tooltip = wg_plunder_accept_us_16
-			hidden_effect = { add_resource = { energy = 8000 minerals = 8000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 49
-					num_owned_planets <= 51
+				last_created_country = {
+					set_merchant_government_effect = yes
 				}
 			}
-			custom_tooltip = wg_plunder_accept_us_17
-			hidden_effect = { add_resource = { energy = 8500 minerals = 8500 } }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 52
-					num_owned_planets <= 54
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_18
-			hidden_effect = { add_resource = { energy = 9000 minerals = 9000 } }
+		
+		custom_tooltip = wg_plunder_accept_them
+		add_resource = {
+			energy = 150
+			minerals = 150
+			mult = from.trigger:num_owned_planets
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 55
-					num_owned_planets <= 57
+		hidden_effect = { from = { add_modifier = { modifier = raided days = 3600 } } }
+	}
+	on_accept = {
+		FROM = {
+			if = {
+				limit = { has_been_declared_crisis = no }
+				ROOT = {
+					switch = {
+						trigger = has_policy_flag
+						oppressive_terms = {
+							FROM = {
+								set_subject_of = {
+									who = ROOT
+									preset = preset_subsidiary_oppressive
+								}
+							}
+						}
+						balanced_terms = {
+							FROM = {
+								set_subject_of = {
+									who = ROOT
+									preset = preset_subsidiary_balanced
+								}
+							}
+						}
+						benevolent_terms = {
+							FROM = {
+								set_subject_of = {
+									who = ROOT
+									preset = preset_subsidiary_benevolent
+								}
+							}
+						}
+					}
+				}
+				add_modifier = {
+					modifier = newly_subjugated_loyalty
+					years = 5
 				}
 			}
-			custom_tooltip = wg_plunder_accept_us_19
-			hidden_effect = { add_resource = { energy = 9500 minerals = 9500 } }
 		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 58
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_21
-			hidden_effect = { add_resource = { energy = 10000 minerals = 10000 } }
+
+		custom_tooltip = wg_plunder_accept_them
+		add_resource = {
+			energy = 150
+			minerals = 150
+			mult = from.trigger:num_owned_planets
 		}
 		hidden_effect = { from = { add_modifier = { modifier = raided days = 3600 } } }
-	}
-	on_accept = {
+		
+		# add threat
 		hidden_effect = {
+			from = {
+				add_threat = {
+					who = root
+					amount = 0.5
+				}
+			}
 			every_country = {
 				limit = {
 					NOT = { is_country_type = fallen_empire }
@@ -249,213 +209,6 @@ wg_the_benefits_spread ={
 				}
 			}
 		}
-		from = {
-			set_subject_of = {
-				who = root
-				subject_type = subsidiary
-			}
-		}
-        
-		custom_tooltip = wg_plunder_accept_them
-		if = {
-			limit = {
-				from = {
-					num_owned_planets <= 3
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_1
-			hidden_effect = { add_resource = { energy = 500 minerals = 500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 4
-					num_owned_planets <= 6
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_2
-			hidden_effect = { add_resource = { energy = 1000 minerals = 1000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 7
-					num_owned_planets <= 9
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_3
-			hidden_effect = { add_resource = { energy = 1500 minerals = 1500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 10
-					num_owned_planets <= 12
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_4
-			hidden_effect = { add_resource = { energy = 2000 minerals = 2000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 13
-					num_owned_planets <= 15
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_5
-			hidden_effect = { add_resource = { energy = 2500 minerals = 2500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 16
-					num_owned_planets <= 18
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_6
-			hidden_effect = { add_resource = { energy = 3000 minerals = 3000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 19
-					num_owned_planets <= 21
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_7
-			hidden_effect = { add_resource = { energy = 3500 minerals = 3500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 22
-					num_owned_planets <= 24
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_8
-			hidden_effect = { add_resource = { energy = 4000 minerals = 4000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 25
-					num_owned_planets <= 27
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_9
-			hidden_effect = { add_resource = { energy = 4500 minerals = 4500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 28
-					num_owned_planets <= 30
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_10
-			hidden_effect = { add_resource = { energy = 5000 minerals = 5000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 31
-					num_owned_planets <= 33
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_11
-			hidden_effect = { add_resource = { energy = 5500 minerals = 5500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 34
-					num_owned_planets <= 36
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_12
-			hidden_effect = { add_resource = { energy = 6000 minerals = 6000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 37
-					num_owned_planets <= 39
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_13
-			hidden_effect = { add_resource = { energy = 6500 minerals = 6500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 40
-					num_owned_planets <= 42
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_14
-			hidden_effect = { add_resource = { energy = 7000 minerals = 7000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 43
-					num_owned_planets <= 45
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_15
-			hidden_effect = { add_resource = { energy = 7500 minerals = 7500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 46
-					num_owned_planets <= 48
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_16
-			hidden_effect = { add_resource = { energy = 8000 minerals = 8000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 49
-					num_owned_planets <= 51
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_17
-			hidden_effect = { add_resource = { energy = 8500 minerals = 8500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 52
-					num_owned_planets <= 54
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_18
-			hidden_effect = { add_resource = { energy = 9000 minerals = 9000 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 55
-					num_owned_planets <= 57
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_19
-			hidden_effect = { add_resource = { energy = 9500 minerals = 9500 } }
-		}
-		if = {
-			limit = {
-				from = {
-					num_owned_planets >= 58
-				}
-			}
-			custom_tooltip = wg_plunder_accept_us_21
-			hidden_effect = { add_resource = { energy = 10000 minerals = 10000 } }
-		}
-		hidden_effect = { from = { add_modifier = { modifier = raided days = 3600 } } }
 	}
 
 	ai_weight = {
diff --git a/common/war_goals/05_galactic_revolution.txt b/common/war_goals/05_galactic_revolution.txt
index 2183a3d08..fde1d8d9e 100644
--- a/common/war_goals/05_galactic_revolution.txt
+++ b/common/war_goals/05_galactic_revolution.txt
@@ -2,131 +2,40 @@
 # 消灭资本家
 wg_galactic_revolution = {
 	casus_belli = cb_galactic_revolution
+	
 	hide_if_no_cb = no
 	total_war = yes
 	set_defender_wargoal = wg_end_threat
-
-	threat_multiplier = 0.5
 	
 	allowed_peace_offers = {
 		status_quo
 		demand_surrender
 	}
 
+	threat_multiplier = 0.75
+	war_exhaustion = 0.5
+	surrender_acceptance = -100
+
 	potential = {
-		OR = {
-			has_civic = civic_shared_burden
-			AND = {
-				has_valid_civic = civic_socialistic
-				NOR = {
-					has_ethic = ethic_xenophobe
-					has_ethic = ethic_fanatic_xenophobe
-				}
-			}
-		}
+		is_country_type = default
+		is_true_scientific_socialism = yes
 		has_policy_flag = continuous_revolution
-		NOT = { has_country_flag = not_revolution }
-		from = {	
-			OR = {	
-				NOT = { has_ethic = ethic_gestalt_consciousness }
-				has_civic = civic_machine_financial_investment
-			}
-			NOR = {
-				has_ethic = ethic_fanatic_socialism
-				AND = {
-					has_ethic = ethic_socialism
-					NOR = {
-						has_ethic = ethic_xenophobe
-						has_ethic = ethic_fanatic_xenophobe
-					}
-				}
-			}
-		}
+		from = { is_exploiter = yes }
 	}
 	possible = {
+		# always yes if potential
 		always = yes
 	}
+	
 	on_status_quo = {
-	    hidden_effect = {
-			every_country = {
-				limit = {
-					NOR = {
-						has_civic = civic_shared_burden
-					}
-					OR = { 
-						has_ethic = ethic_fanatic_capitalism
-						has_ethic = ethic_capitalism
-						has_ethic = ethic_fanatic_authoritarian
-						has_ethic = ethic_authoritarian
-						has_ethic = ethic_fanatic_xenophobe
-						has_authority = auth_imperial
-					}
-				}
-				add_threat = {
-					who = root
-					amount = 0.05
-				}
-			}
-			if = {
-				limit = {
-					from = { has_authority = auth_corporate }
-				}
-				from = {
-					if = {
-						limit = {
-							from = { has_civic = civic_criminal_heritage }
-						}
-						from = {
-							force_remove_civic = civic_criminal_heritage
-						}
-					}
-				}
-			}
-		    from = { 
-			    every_owned_pop = {
-			    	random_list = {
-			    		1 = {
-			    			wipe_pop_ethos = yes
-			    			pop_change_ethic = ethic_socialism
-			    		}
-			    		1 = {
-			    			wipe_pop_ethos = yes
-			    			pop_change_ethic = ethic_egalitarian
-			    		}
-			    		3 = { }
-			    	}
-			    	set_timed_pop_flag = { flag = changed_pop days = 2 }
-			    }
-		    }
-		}
-		from = { add_modifier = { modifier = revolutionary_propaganda days = 3600 } }
+		galactic_revolution_effect = yes
+		
+		# add threat
+		galactic_revolution_status_quo_threat_effect = yes
 	}
-	
 	on_accept = {
-		hidden_effect = {
-			every_country = {
-				limit = {
-					NOR = {
-						has_civic = civic_shared_burden
-					}
-					OR = { 
-						has_ethic = ethic_fanatic_capitalism
-						has_ethic = ethic_capitalism
-						has_ethic = ethic_fanatic_authoritarian
-						has_ethic = ethic_authoritarian
-						has_ethic = ethic_fanatic_xenophobe
-						has_authority = auth_imperial
-					}
-				}
-				add_threat = {
-					who = root
-					amount = 0.1
-				}
-			}
-		}
-	}
-	possible = {
-		always = yes
+		# add threat
+		galactic_revolution_accept_threat_effect = yes
 	}
 	ai_weight = {
 		weight = 40
@@ -136,133 +45,42 @@ wg_galactic_revolution = {
 # 打倒走资派
 wg_galactic_revolution_communist_interstellar = {
 	casus_belli = cb_galactic_revolution
-
+	
 	hide_if_no_cb = yes
 	total_war = yes
 	set_defender_wargoal = wg_end_threat
 
+	threat_multiplier = 0.5
+	
 	allowed_peace_offers = {
 		status_quo
 		demand_surrender
 	}
-
+	
+	threat_multiplier = 0.75
+	war_exhaustion = 0.5
 	surrender_acceptance = -100
 
 	potential = {
-		OR = {
-			has_civic = civic_shared_burden
-			AND = {
-				has_valid_civic = civic_socialistic
-				NOR = {
-					has_ethic = ethic_xenophobe
-					has_ethic = ethic_fanatic_xenophobe
-				}
-			}
-		}
+		is_country_type = default
+		is_true_scientific_socialism = yes
 		has_policy_flag = continuous_revolution
-		from = {	
-			NOT = { has_ethic = ethic_gestalt_consciousness }
-			OR = {
-				has_ethic = ethic_fanatic_socialism
-				has_ethic = ethic_socialism
-			}
-			NOR = {
-				has_civic = civic_shared_burden
-				AND = {
-					has_valid_civic = civic_socialistic
-					NOR = {
-						has_ethic = ethic_xenophobe
-						has_ethic = ethic_fanatic_xenophobe
-					}
-				}
-				has_policy_flag = reform_and_opening_up
-			}
-		}
+		from = { is_revisionism = yes }
 	}
 	possible = {
+		# always yes if potential
 		always = yes
 	}
+	
 	on_status_quo = {
-	    hidden_effect = {
-			every_country = {
-				limit = {
-					NOR = {
-						has_civic = civic_shared_burden
-					}
-					OR = { 
-						has_ethic = ethic_fanatic_capitalism
-						has_ethic = ethic_capitalism
-						has_ethic = ethic_fanatic_authoritarian
-						has_ethic = ethic_authoritarian
-						has_ethic = ethic_fanatic_xenophobe
-						has_authority = auth_imperial
-					}
-				}
-				add_threat = {
-					who = root
-					amount = 0.05
-				}
-			}
-			if = {
-				limit = {
-					from = { has_authority = auth_corporate }
-				}
-				from = {
-					if = {
-						limit = {
-							from = { has_civic = civic_criminal_heritage }
-						}
-						from = {
-							force_remove_civic = civic_criminal_heritage
-						}
-					}
-				}
-			}
-		    from = { 
-			    every_owned_pop = {
-			    	random_list = {
-			    		1 = {
-			    			wipe_pop_ethos = yes
-			    			pop_change_ethic = ethic_socialism
-			    		}
-			    		1 = {
-			    			wipe_pop_ethos = yes
-			    			pop_change_ethic = ethic_egalitarian
-			    		}
-			    		3 = { }
-			    	}
-			    	set_timed_pop_flag = { flag = changed_pop days = 2 }
-			    }
-		    }
-		}
-		from = { add_modifier = { modifier = revolutionary_propaganda days = 3600 } }
+		galactic_revolution_effect = yes
+
+		# add threat
+		galactic_revolution_status_quo_threat_effect = yes
 	}
-	
 	on_accept = {
-		hidden_effect = {
-			every_country = {
-				limit = {
-					NOR = {
-						has_civic = civic_shared_burden
-					}
-					OR = { 
-						has_ethic = ethic_fanatic_capitalism
-						has_ethic = ethic_capitalism
-						has_ethic = ethic_fanatic_authoritarian
-						has_ethic = ethic_authoritarian
-						has_ethic = ethic_fanatic_xenophobe
-						has_authority = auth_imperial
-					}
-				}
-				add_threat = {
-					who = root
-					amount = 0.1
-				}
-			}
-		}
-	}
-	possible = {
-		always = yes
+		# add threat
+		galactic_revolution_accept_threat_effect = yes
 	}
 	ai_weight = {
 		weight = 40
diff --git a/common/war_goals/05_nazbol_revolution.txt b/common/war_goals/05_nazbol_revolution.txt
index 901a5f247..2ae15f9b5 100644
--- a/common/war_goals/05_nazbol_revolution.txt
+++ b/common/war_goals/05_nazbol_revolution.txt
@@ -4,9 +4,14 @@
 # @阿道夫·希特勒 你背叛了民族社会主义，操你妈
 ## 发病结束
 
+@protectorate_tech_threshold = 0.4
+
 wg_nazbol_national_liberation = {
+	# wg_subjugation
+	# wg_force_ideology
+	
 	casus_belli = cb_nazbol_revolution
-
+	
 	hide_if_no_cb = no
 	release_occupied_systems_on_status_quo = yes
 
@@ -18,7 +23,7 @@ wg_nazbol_national_liberation = {
 
 	surrender_acceptance = -100
 
-	war_exhaustion = 0.5
+	war_exhaustion = 0.75 # wg_force_ideology
 
 	potential = {
 		has_civic = civic_nazbol
@@ -57,31 +62,16 @@ wg_nazbol_national_liberation = {
 			fail_text = "cannot_use_against_btc"
 			from = { has_been_declared_crisis = no }
 		}
-	}
-
-	on_accept = {
-		hidden_effect = {
-			from = {
-				add_threat = {
-					who = root
-					amount = 0.5
-				}
-			}
-		}
-		if = {
-			limit = { from = { has_been_declared_crisis = no } }
-			from = {
-				set_subject_of = {
-					who = root
-				}
-				add_modifier = {
-					modifier = newly_subjugated_loyalty
-					years = 5
-				}
+		custom_tooltip = {
+			fail_text = pax_galactica_active
+			NAND = {
+				is_active_resolution = resolution_emperor_pax_galactica
+				is_galactic_community_member = yes
+				from = { is_galactic_community_member = yes }
 			}
 		}
 	}
-
+	
 	on_status_quo = {
 		if = {
 			limit = {
@@ -92,8 +82,62 @@ wg_nazbol_national_liberation = {
 			}
 
 			last_created_country = {
-				set_subject_of = {
-					who = root
+				set_origin_effect = yes
+				if = {
+					limit = {
+						tech_unlocked_ratio = {
+							who = ROOT
+							ratio < @protectorate_tech_threshold
+						}
+					}
+					set_subject_of = {
+						who = ROOT
+						preset = preset_protectorate
+					}
+				}
+				else = {
+					ROOT = {
+						switch = {
+							trigger = has_policy_flag
+							oppressive_terms = {
+								if = {
+									limit = {
+										ROOT = { is_ai = yes }
+									}
+									PREV = {
+										set_subject_of = {
+											who = ROOT
+											preset = preset_vassal_oppressive_ai
+										}
+									}
+								}
+								else = {
+									PREV = {
+										set_subject_of = {
+											who = ROOT
+											preset = preset_vassal_oppressive
+										}
+									}
+								}
+							}
+							balanced_terms = {
+								PREV = {
+									set_subject_of = {
+										who = ROOT
+										preset = preset_vassal_balanced
+									}
+								}
+							}
+							benevolent_terms = {
+								PREV = {
+									set_subject_of = {
+										who = ROOT
+										preset = preset_vassal_benevolent
+									}
+								}
+							}
+						}
+					}
 				}
 				add_modifier = {
 					modifier = newly_subjugated_loyalty
@@ -107,35 +151,85 @@ wg_nazbol_national_liberation = {
 					last_created_country = { has_authority = auth_corporate }
 				}
 				last_created_country = {
-					if = {
-						limit = {
-							has_technology = tech_galactic_administration
-						}
-						change_government = {
-							authority = auth_oligarchic
-							cooldown = no
-							remove_invalid_civics = yes
-							civics = {
-								civic = civic_merchant_guilds
-								civic = random
-								civic = random
-								civic = random
-							}
+					set_merchant_government_effect = yes
+				}
+			}
+		}
+	}
+	
+	on_accept = {
+		if = {
+			limit = { from = { has_been_declared_crisis = no } }
+			from = {
+				if = {
+					limit = {
+						tech_unlocked_ratio = {
+							who = ROOT
+							ratio < @protectorate_tech_threshold
 						}
 					}
-					else = {
-						change_government = {
-							authority = auth_oligarchic
-							cooldown = no
-							remove_invalid_civics = yes
-							civics = {
-								civic = civic_merchant_guilds
-								civic = random
-								civic = random
+					set_subject_of = {
+						who = ROOT
+						preset = preset_protectorate
+					}
+				}
+				else = {
+					ROOT = {
+						switch = {
+							trigger = has_policy_flag
+							oppressive_terms = {
+								if = {
+									limit = {
+										ROOT = { is_ai = yes }
+									}
+									FROM = {
+										set_subject_of = {
+											who = ROOT
+											preset = preset_vassal_oppressive_ai
+										}
+									}
+								}
+								else = {
+									FROM = {
+										set_subject_of = {
+											who = ROOT
+											preset = preset_vassal_oppressive
+										}
+									}
+								}
+							}
+							balanced_terms = {
+								FROM = {
+									set_subject_of = {
+										who = ROOT
+										preset = preset_vassal_balanced
+									}
+								}
+							}
+							benevolent_terms = {
+								FROM = {
+									set_subject_of = {
+										who = ROOT
+										preset = preset_vassal_benevolent
+									}
+								}
 							}
 						}
 					}
 				}
+				add_modifier = {
+					modifier = newly_subjugated_loyalty
+					years = 5
+				}
+			}
+		}
+		
+		hidden_effect = {
+			from = {
+				add_threat = {
+					who = root
+					amount = 0.5
+				}
 			}
 		}
 	}
@@ -150,10 +244,11 @@ wg_nazbol_national_liberation = {
 }
 
 wg_nazbol_class_struggle = {
+	# wg_cleansing
+	
 	casus_belli = cb_nazbol_revolution
 	hide_if_no_cb = yes
 	total_war = yes
-	destroy_starbases = yes
 	set_defender_wargoal = wg_end_threat_crisis
 
 	galactic_empire_joins_defender = {
@@ -167,14 +262,69 @@ wg_nazbol_class_struggle = {
 
 	surrender_acceptance = -1000
 
-	war_exhaustion = 0.5
+	war_exhaustion = 0.75 # wg_force_ideology
 
 	potential = {
-		always = yes
+		has_civic = civic_nazbol
+		from = { NOT = { is_country_type = fallen_empire } }
+		NAND = {
+			is_galactic_emperor = yes
+			from = { is_galactic_community_member = yes }
+		}
+	}
+
+	possible = {
+		custom_tooltip = {
+			fail_text = cannot_use_against_emperor
+			OR = {
+				from = { is_galactic_emperor = no }
+				is_galactic_community_member = no
+			}
+		}
+		custom_tooltip = {
+			fail_text = pax_galactica_active
+			NAND = {
+				is_active_resolution = resolution_emperor_pax_galactica
+				is_galactic_community_member = yes
+				from = { is_galactic_community_member = yes }
+			}
+		}
 	}
 
+	ai_weight = {
+		weight = 100
+	}
+}
+
+wg_nazbol_class_struggle_vs_fe = {
+	# wg_cleansing_vs_fe
+	
+	casus_belli = cb_nazbol_revolution
+
+	hide_if_no_cb = yes
+	total_war = yes
+
+	allowed_peace_offers = {
+		status_quo
+	}
+
+	surrender_acceptance = -1000
+
+	war_exhaustion = 0.75 # wg_force_ideology
+
+	potential = {
+		has_civic = civic_nazbol
+		from = { is_country_type = fallen_empire }
+	}
 	possible = {
-		always = yes
+		custom_tooltip = {
+			fail_text = pax_galactica_active
+			NAND = {
+				is_active_resolution = resolution_emperor_pax_galactica
+				is_galactic_community_member = yes
+				from = { is_galactic_community_member = yes }
+			}
+		}
 	}
 
 	ai_weight = {
diff --git a/common/war_goals/06_liberation_protocol.txt b/common/war_goals/06_liberation_protocol.txt
index fb8b08f12..44d96cd18 100644
--- a/common/war_goals/06_liberation_protocol.txt
+++ b/common/war_goals/06_liberation_protocol.txt
@@ -1,121 +1,38 @@
 # 智械用解放战争
 wg_liberation_protocol = {
 	casus_belli = cb_liberation_protocol
-
+	
 	hide_if_no_cb = no
 	total_war = yes
 	set_defender_wargoal = wg_end_threat
-
-	threat_multiplier = 0.5
 	
 	allowed_peace_offers = {
 		status_quo
 		demand_surrender
 	}
 
+	threat_multiplier = 0.75
+	war_exhaustion = 0.5
+	surrender_acceptance = -100
+	
 	potential = {
-		has_total_war_cb = no
-		has_ethic = ethic_gestalt_consciousness
-		has_civic = civic_machine_liberator
-		from = {	
-			NOT = { has_ethic = ethic_gestalt_consciousness }
-			NOR = {
-				has_civic = civic_shared_burden
-			}
-			OR = { 
-				has_ethic = ethic_fanatic_capitalism
-				has_ethic = ethic_capitalism
-				has_ethic = ethic_fanatic_authoritarian
-				has_ethic = ethic_authoritarian
-				has_ethic = ethic_fanatic_xenophobe
-				has_authority = auth_imperial
-			}
-		}
+		has_valid_civic = civic_machine_liberator
+		from = { is_galactic_revolution_target = yes }
 	}
 	possible = {
+		# always yes if potential
 		always = yes
 	}
 	on_status_quo = {
-	    hidden_effect = {
-			every_country = {
-				limit = {
-					NOR = {
-						has_civic = civic_shared_burden
-					}
-					OR = { 
-						has_ethic = ethic_fanatic_capitalism
-						has_ethic = ethic_capitalism
-						has_ethic = ethic_fanatic_authoritarian
-						has_ethic = ethic_authoritarian
-						has_ethic = ethic_fanatic_xenophobe
-						has_authority = auth_imperial
-					}
-				}
-				add_threat = {
-					who = root
-					amount = 0.05
-				}
-			}
-			if = {
-				limit = {
-					from = { has_authority = auth_corporate }
-				}
-				from = {
-					if = {
-						limit = {
-							from = { has_civic = civic_criminal_heritage }
-						}
-						from = {
-							force_remove_civic = civic_criminal_heritage
-						}
-					}
-				}
-			}
-		    from = { 
-			    every_owned_pop = {
-			    	random_list = {
-			    		1 = {
-			    			wipe_pop_ethos = yes
-			    			pop_change_ethic = ethic_socialism
-			    		}
-			    		1 = {
-			    			wipe_pop_ethos = yes
-			    			pop_change_ethic = ethic_egalitarian
-			    		}
-			    		3 = { }
-			    	}
-			    	set_timed_pop_flag = { flag = changed_pop days = 2 }
-			    }
-		    }
-		}
-		from = { add_modifier = { modifier = revolutionary_propaganda days = 3600 } }
+		galactic_revolution_effect = yes
+
+		# add threat
+		galactic_revolution_status_quo_threat_effect = yes
 	}
 	
 	on_accept = {
-		hidden_effect = {
-			every_country = {
-				limit = {
-					NOR = {
-						has_civic = civic_shared_burden
-					}
-					OR = { 
-						has_ethic = ethic_fanatic_capitalism
-						has_ethic = ethic_capitalism
-						has_ethic = ethic_fanatic_authoritarian
-						has_ethic = ethic_authoritarian
-						has_ethic = ethic_fanatic_xenophobe
-						has_authority = auth_imperial
-					}
-				}
-				add_threat = {
-					who = root
-					amount = 0.1
-				}
-			}
-		}
-	}
-	possible = {
-		always = yes
+		# add threat
+		galactic_revolution_accept_threat_effect = yes
 	}
 	ai_weight = {
 		weight = 9999
diff --git a/common/war_goals/10_wg_galactic.txt b/common/war_goals/10_wg_galactic.txt
index cc6749ab1..5fe079d7c 100644
--- a/common/war_goals/10_wg_galactic.txt
+++ b/common/war_goals/10_wg_galactic.txt
@@ -199,15 +199,17 @@ wg_galactic_revolution_liberation_from_the_empire = {
 				}
 				capital_scope = {
 					every_owned_pop = {
-						2 = {
-							wipe_pop_ethos = yes
-							pop_change_ethic = ethic_socialism
+						random_list = {
+							2 = {
+								wipe_pop_ethos = yes
+								pop_change_ethic = ethic_socialism
+							}
+							1 = {
+								wipe_pop_ethos = yes
+								pop_change_ethic = ethic_egalitarian
+							}
+							2 = { }
 						}
-						1 = {
-							wipe_pop_ethos = yes
-							pop_change_ethic = ethic_egalitarian
-						}
-						2 = { }
 						set_timed_pop_flag = { flag = changed_pop days = 2 }
 					}
 				}
@@ -244,7 +246,7 @@ wg_galactic_revolution_liberation_from_the_empire = {
 				join_alliance = { who = root override_requirements = yes }
 			}
 		}
-		else = {
+		else_if = {
 			limit = {
 				from = { is_galactic_community_member = yes }
 			}
@@ -348,174 +350,4 @@ wg_destroy_illegal_organizations = {
 	ai_weight = {
 		weight = 90
 	}
-}
-
-wg_force_ideology = {
-	casus_belli = cb_ideology
-
-	hide_if_no_cb = no
-	release_occupied_systems_on_status_quo = yes
-
-	allowed_peace_offers = {
-		status_quo
-		surrender
-		demand_surrender
-	}
-
-	surrender_acceptance = -100
-
-	war_exhaustion = 0.75
-
-	potential = {
-		has_policy_flag = liberation_wars
-		has_total_war_cb = no
-		from = { is_country_type = default }
-		NOT = { is_in_federation_with = from }
-		NAND = {
-			is_galactic_emperor = yes
-			from = { is_galactic_community_member = yes }
-		}
-	}
-	possible = {
-		custom_tooltip = {
-			fail_text = has_claimed_all_systems
-			from = {
-				is_country_type = default
-				any_owned_planet = {
-					is_colony = yes
-					root = {
-						NOT = { has_claim = prev.solar_system }
-					}
-				}
-			}
-		}
-		custom_tooltip = {
-			fail_text = "cannot_use_against_emperor"
-			from = { is_galactic_emperor = no }
-		}
-		custom_tooltip = {
-			fail_text = pax_galactica_active
-			NAND = {
-				is_active_resolution = resolution_emperor_pax_galactica
-				is_galactic_community_member = yes
-				from = { is_galactic_community_member = yes }
-			}
-		}
-	}
-	on_status_quo = {
-		if = {
-			limit = {
-				exists = last_created_country
-				last_created_country = {
-					has_country_flag = released_empire
-				}
-			}
-
-			last_created_country = { add_modifier = { modifier = recently_liberated days = 7300 } }
-
-			root = { add_opinion_modifier = { modifier = opinion_we_liberated who = last_created_country } }
-			last_created_country = { add_opinion_modifier = { modifier = opinion_liberated_us who = root } }
-
-			every_country = {
-				limit = {
-					OR = {
-						is_in_federation_with = root
-						AND = {
-							is_subject = yes
-							exists = overlord
-							overlord = { is_same_value = root }
-						}
-					}
-				}
-
-				add_opinion_modifier = { modifier = opinion_we_liberated who = last_created_country }
-				last_created_country = { add_opinion_modifier = { modifier = opinion_liberated_us who = prev } }
-			}
-			from = {
-				add_threat = {
-					who = root
-					amount = 0.10
-				}
-			}
-		}
-	}
-	on_accept = {
-		custom_tooltip = wg_force_ideology_accept
-		custom_tooltip = wg_force_ideology_accept_2
-		if = {
-			limit = {
-				from = { has_federation = yes }
-			}
-			custom_tooltip = wg_force_ideology_accept_3
-		}
-		hidden_effect = {
-			from = {
-				copy_ethos_and_authority = root
-				if = {
-					limit = {
-						has_civic = civic_galactic_sovereign
-					}
-					force_remove_civic = civic_galactic_sovereign
-				}
-				if = {
-					limit = {
-						has_civic = civic_galactic_sovereign_megacorp
-					}
-					force_remove_civic = civic_galactic_sovereign_megacorp
-				}
-				if = {
-					limit = {
-						has_civic = civic_galactic_sovereign_people
-					}
-					force_remove_civic = civic_galactic_sovereign_people
-				}
-			}
-			from = { add_modifier = { modifier = recently_liberated days = 7300 } }
-			add_opinion_modifier = { modifier = opinion_we_liberated who = from }
-			from = { add_opinion_modifier = { modifier = opinion_liberated_us who = root } }
-			end_rivalry = from
-			from = { end_rivalry = root }
-			every_system_within_border = {
-				limit = {
-					from = { has_claim = prev }
-				}
-				remove_claims = { who = from }
-			}
-			every_country = {
-				limit = {
-					OR = {
-						is_in_federation_with = root
-						AND = {
-							is_subject = yes
-							exists = overlord
-							overlord = { is_same_value = root }
-						}
-					}
-				}
-				end_rivalry = from
-				from = { end_rivalry = prev }
-				add_opinion_modifier = { modifier = opinion_we_liberated who = from }
-				from = { add_opinion_modifier = { modifier = opinion_liberated_us who = prev } }
-				every_system_within_border = {
-					limit = {
-						from = { has_claim = prev }
-					}
-					remove_claims = { who = from }
-				}
-			}
-			from = {
-				add_threat = {
-					who = root
-					amount = 0.10
-				}
-			}
-			from = {
-				leave_alliance = { override_requirements = yes }
-			}
-		}
-	}
-
-	ai_weight = {
-		weight = 5
-	}
 }
\ No newline at end of file
diff --git a/common/war_goals/ethic_wae_goals.txt b/common/war_goals/ethic_wae_goals.txt
deleted file mode 100644
index fe4d68aa8..000000000
--- a/common/war_goals/ethic_wae_goals.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-
-wg_end_threat_human = {
-	casus_belli = cb_containment_human
-
-	hide_if_no_cb = yes
-	total_war = yes
-	set_defender_wargoal = wg_cleansing
-
-	allowed_peace_offers = {
-		status_quo
-	}
-
-	surrender_acceptance = -1000
-
-	potential = {
-		OR = {
-			owner_main_species = { species_portrait = human }
-			owner_main_species = { species_portrait = human_legacy }
-		}
-	}
-	possible = {
-		always = yes
-	}
-
-	ai_weight = {
-		weight = 100
-	}
-}
\ No newline at end of file
diff --git a/common/war_goals/ethic_war_goals.txt b/common/war_goals/ethic_war_goals.txt
index bdb4551bd..44fe804fb 100644
--- a/common/war_goals/ethic_war_goals.txt
+++ b/common/war_goals/ethic_war_goals.txt
@@ -1,4 +1,3 @@
-
 wg_plunder = {
 	casus_belli = cb_despoliation
 	hide_if_no_cb = no
@@ -66,6 +65,34 @@ wg_plunder = {
 		hidden_effect = { from = { add_modifier = { modifier = raided days = 3600 } } }
 	}
 
+	ai_weight = {
+		weight = 100
+	}
+}
+
+wg_end_threat_human = {
+	casus_belli = cb_containment_human
+
+	hide_if_no_cb = yes
+	total_war = yes
+	set_defender_wargoal = wg_end_threat
+
+	allowed_peace_offers = {
+		status_quo
+	}
+
+	surrender_acceptance = -1000
+
+	potential = {
+		OR = {
+			owner_main_species = { species_portrait = human }
+			owner_main_species = { species_portrait = human_legacy }
+		}
+	}
+	possible = {
+		always = yes
+	}
+
 	ai_weight = {
 		weight = 100
 	}
diff --git a/localisation/replace/english/ethic_deplomatics_l_english.yml b/localisation/replace/english/ethic_deplomatics_l_english.yml
index 631b29c5b..fa0f0a3f8 100644
--- a/localisation/replace/english/ethic_deplomatics_l_english.yml
+++ b/localisation/replace/english/ethic_deplomatics_l_english.yml
@@ -25,6 +25,8 @@
  war_goal_wg_nazbol_national_liberation_desc:0 "States have the right to go to war in defense of foreign countries and to protect other countries or peoples from being oppressed by unjust forces."
  war_goal_wg_nazbol_class_struggle:0 "Class Struggle"
  war_goal_wg_nazbol_class_struggle_desc:0 "As a result of its own development, a country also has the right to go to war against a country that occupies a large illegal territory and ignores the way of coexistence of life."
+ war_goal_wg_nazbol_class_struggle_vs_fe:0 "$war_goal_wg_nazbol_class_struggle$"
+ war_goal_wg_nazbol_class_struggle_vs_fe_desc:0 "$war_goal_wg_nazbol_class_struggle_desc$"
  war_goal_wg_end_threat_human:0 "Destroy Human Tyranny"
  war_goal_wg_end_threat_human_desc:0 "Our galaxy has been persecuted by these vile creatures for so long, it's time to end it all."
  
diff --git a/localisation/replace/english/ethic_ethics_l_english.yml b/localisation/replace/english/ethic_ethics_l_english.yml
index 57f054d42..48eae6bb1 100644
--- a/localisation/replace/english/ethic_ethics_l_english.yml
+++ b/localisation/replace/english/ethic_ethics_l_english.yml
@@ -174,3 +174,5 @@
  ethic_civic_procrastination_9:0 "$civic_procrastination$"
  ethic_civic_procrastination_10:0 "$civic_procrastination$"
  
+ recently_human_right_implemented:0 "Recently 'Liberated'"
+ 
diff --git a/localisation/replace/english/ethic_modifiers_l_english.yml b/localisation/replace/english/ethic_modifiers_l_english.yml
index a9dbbdc47..e4f89d7f8 100644
--- a/localisation/replace/english/ethic_modifiers_l_english.yml
+++ b/localisation/replace/english/ethic_modifiers_l_english.yml
@@ -54,6 +54,9 @@
  pop_slave_educated:0 "Enslavement Education"
  pop_slave_educated_desc:0 "They were taught what they should do, and more importantly, what they should not do."
  
+ pop_towards_to_the_new_society:0 "迈向新社会"
+ pop_towards_to_the_new_society_desc:0 "旧社会把人变成鬼，新社会把鬼变成人。"
+ 
 # Common Modifiers
  mod_planet_crime_percent_add:0 "Crime Rate"
  mod_planet_stability_mult:0 "Stability"
diff --git a/localisation/replace/simp_chinese/ethic_deplomatics_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_deplomatics_l_simp_chinese.yml
index 4f60bd36a..d7a36edce 100644
--- a/localisation/replace/simp_chinese/ethic_deplomatics_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_deplomatics_l_simp_chinese.yml
@@ -44,7 +44,9 @@
 
  war_goal_wg_nazbol_class_struggle:0 "阶级斗争"
  war_goal_wg_nazbol_class_struggle_desc:0 "国家因自身发达之结果，对于占有不法之大领土，漠视知觉生命共存天道之国家，亦有开战之权利。"
-
+ war_goal_wg_nazbol_class_struggle_vs_fe:0 "$war_goal_wg_nazbol_class_struggle$"
+ war_goal_wg_nazbol_class_struggle_vs_fe_desc:0 "$war_goal_wg_nazbol_class_struggle_desc$"
+ 
  war_goal_wg_end_threat_human:0 "消灭人类暴政"
  war_goal_wg_end_threat_human_desc:0 "我们的银河被这些卑劣的生物迫害已久，是时候结束这一切了。"
  
diff --git a/localisation/replace/simp_chinese/ethic_modifiers_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_modifiers_l_simp_chinese.yml
index 476d76148..d93a52d2b 100644
--- a/localisation/replace/simp_chinese/ethic_modifiers_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_modifiers_l_simp_chinese.yml
@@ -111,8 +111,8 @@
  glorious_fleet:0 "荣耀胜利！"
  unglorious_fleet:0 "胜者为王!"
 
- mod_revolutionary_propaganda:0 "革命精神"
- mod_revolutionary_propaganda_desc:0 "我们的邻国正在对我们发动宣传，以让我们的民众接受他们关于自由与斗争的思想。"
+ revolutionary_propaganda:0 "革命精神"
+ revolutionary_propaganda_desc:0 "我们的邻国正在对我们发动宣传，以让我们的民众接受他们关于自由与斗争的思想。"
 
  ethic_civic_procrastination_1:0 "$civic_procrastination$"
  ethic_civic_procrastination_2:0 "$civic_procrastination$"
@@ -125,6 +125,8 @@
  ethic_civic_procrastination_9:0 "$civic_procrastination$"
  ethic_civic_procrastination_10:0 "$civic_procrastination$"
  
+ recently_human_right_implemented:0 "最近被“解放”"
+ 
 ###############
 #  星球修正（静态）
 ###############
@@ -183,6 +185,9 @@
  pop_highly_educated_desc:0 "这些人口受过高等教育，可以从事创造性或管理性的工作。"
  pop_slave_educated:0 "奴化教育"
  pop_slave_educated_desc:0 "他们被教会了自己应该做的，更重要的是他们被教会了什么是自己不该做的。"
+
+ pop_towards_to_the_new_society:0 "迈向新社会"
+ pop_towards_to_the_new_society_desc:0 "旧社会把人变成鬼，新社会把鬼变成人。"
  
 ###############
 #  全局修正

From 2f2cb17332b6f7925af57a003189eb7a81709b02 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Thu, 5 Jan 2023 01:46:33 +0800
Subject: [PATCH 24/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=B0=91=E6=97=8F?=
 =?UTF-8?q?=E4=B8=8E=E9=98=B6=E7=BA=A7=E6=94=B9=E4=B8=BA=EF=BC=9A=E6=8B=A5?=
 =?UTF-8?q?=E6=9C=89=E5=AE=8C=E6=95=B4=E5=85=AC=E6=B0=91=E6=9D=83=E7=9A=84?=
 =?UTF-8?q?=E7=A7=8D=E6=97=8F=E5=8A=B3=E5=B7=A5=E9=98=B6=E7=BA=A7=E9=A2=9D?=
 =?UTF-8?q?=E5=A4=96=E4=BA=A7=E5=87=BA0.25=E5=87=9D=E8=81=9A=E5=8A=9B?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E9=A2=9D=E5=A4=96=E6=B6=88=E8=80=970.10?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                                  | 1 +
 ...0\270\344\272\272\345\217\243\351\230\266\347\272\247.txt" | 4 ++--
 localisation/replace/english/ethic_civics_l_english.yml       | 2 +-
 .../replace/simp_chinese/ethic_civics_l_simp_chinese.yml      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fceecb1d6..bcc36169a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 * 修复&调整 革命传统以及游击队职业修改
 * 调整 内圣之道改为要求一定程度的种族主义+非任何程度的军国主义
 * 修复&调整 战争理由和战争目标精修
+* 调整 民族与阶级改为：拥有完整公民权的种族劳工阶级额外产出0.25凝聚力，并额外消耗0.10消费品
 
 待调整：
 
diff --git "a/common/pop_categories/\346\255\243\345\270\270\344\272\272\345\217\243\351\230\266\347\272\247.txt" "b/common/pop_categories/\346\255\243\345\270\270\344\272\272\345\217\243\351\230\266\347\272\247.txt"
index e85a1507a..f296cf167 100644
--- "a/common/pop_categories/\346\255\243\345\270\270\344\272\272\345\217\243\351\230\266\347\272\247.txt"
+++ "b/common/pop_categories/\346\255\243\345\270\270\344\272\272\345\217\243\351\230\266\347\272\247.txt"
@@ -1488,7 +1488,7 @@ worker = {
 					has_citizenship_type = { country = from type = citizenship_full_machine }
 				}
 			}
-			unity = 0.5
+			unity = 0.25
 		}
 		upkeep = {
 			trigger = {
@@ -1497,7 +1497,7 @@ worker = {
 					has_valid_civic = civic_nazbol
 				}
 			}
-			consumer_goods = 0.15
+			consumer_goods = 0.1
 		}
 		
 		# 解放神学
diff --git a/localisation/replace/english/ethic_civics_l_english.yml b/localisation/replace/english/ethic_civics_l_english.yml
index e14ff0c40..3c894daeb 100644
--- a/localisation/replace/english/ethic_civics_l_english.yml
+++ b/localisation/replace/english/ethic_civics_l_english.yml
@@ -127,7 +127,7 @@
  civic_galactic_sovereign_people_desc:1 "This society swears to defend the rights of all intelligent creatures across the galaxy and promote the ideals of democracy and unity in the name of the Galactic Empire."
  civic_nazbol:0 "§H§YNation and Class§!§!"
  civic_nazbol_desc:0 "§YTheme Civic§!\nThis society advocates that the whole nation is a necessary and pure community. In their eyes, socialism is not the rule of the people, nor the equality of performance and salary, but a tool to "serve the whole nation" and a means to unite the working class, which occupies the majority of the nation."
- civic_tooltip_nazbol:2 "- £building£ §YCapital Buildings§! replace some £job_politician£ §Y$job_politician$§! jobs with £job_core_party_members£ §Y$job_core_party_members_plural$§!, which produce £unity£ §YUnity§!, improve planet §Y$MOD_PLANET_STABILITY_ADD$§! and greatly reduce §Y$PLANET_CRIME_TITLE$§!.\n - May use §Y$bombardment_armageddon$§! bombardment stance\n -Every socialist country 's £opinion£ §YOpinion§! increased by §R-100§! \n May use §YNational Liberation§! and §YClass Struggle§! casus belli\n - Species §Y$pop_cat_worker$§! class with §H$citizenship_full$§! produces additional §Y0.5§!£unity£ Unity and consumes additional §Y0.15§!£consumer_goods£ $consumer_goods$.\n - Species with §H$citizenship_full$§! allows §Y$living_standard_utopian$§! Living Standard, regardless of their §YStrata§!, under this criterion all £pop£ pops have rich £consumer_goods£ §Y$consumer_goods$§! maintenance and equal §YPolitical Power§!.\n"
+ civic_tooltip_nazbol:2 "- £building£ §YCapital Buildings§! replace some £job_politician£ §Y$job_politician$§! jobs with £job_core_party_members£ §Y$job_core_party_members_plural$§!, which produce £unity£ §YUnity§!, improve planet §Y$MOD_PLANET_STABILITY_ADD$§! and greatly reduce §Y$PLANET_CRIME_TITLE$§!.\n - May use §Y$bombardment_armageddon$§! bombardment stance\n -Every socialist country 's £opinion£ §YOpinion§! increased by §R-100§! \n May use §YNational Liberation§! and §YClass Struggle§! casus belli\n - Species §Y$pop_cat_worker$§! class with §H$citizenship_full$§! produces additional §Y0.25§!£unity£ Unity and consumes additional §Y0.10§!£consumer_goods£ $consumer_goods$.\n - Species with §H$citizenship_full$§! allows §Y$living_standard_utopian$§! Living Standard, regardless of their §YStrata§!, under this criterion all £pop£ pops have rich £consumer_goods£ §Y$consumer_goods$§! maintenance and equal §YPolitical Power§!.\n"
 
  civic_tooltip_galactic_sovereign_people_effects:1 "-All countries in the Galactic Empire will be affected by §YRevolutionary Propaganda§!\n"
  
diff --git a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
index 2f09abd2b..ab0dd7a49 100644
--- a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
@@ -126,7 +126,7 @@
  
  civic_nazbol:0 "§H§Y民族与阶级§!§!"
  civic_nazbol_desc:0 "§Y主题理念§!\n这一社会主张整个民族是一个必要且纯净的共同体，在他们看来，社会主义不是人民的统治，不是绩效和工资的平价，而是"为全民族之整体服务"的工具，是为了团结占据民族中大多数的工人阶级的手段。"
- civic_tooltip_nazbol:2 " - £building£ §Y首都建筑§!会替换部分 £job_politician£ §Y$job_politician$§!岗位为 £job_core_party_members£ §Y$job_core_party_members_plural$§!，提高星球£stability£§Y$PLANET_STABILITY_TITLE$§!并大幅度减少§Y£crime£ $PLANET_CRIME_TITLE$§!\n - 允许§Y末日审判§!轰炸姿态 \n - 所有社会主义国家的£opinion£§Y评价§!降低§R-100§! \n - 可以对其他国家使用§Y阶级斗争§!与§Y民族解放§!宣战借口 \n - 拥有§H$citizenship_full$§!的种族§Y$pop_cat_worker$§!阶级额外产出§Y0.5§!£unity£ 凝聚力，并额外消耗§Y0.15§!£consumer_goods£ 消费品\n - 拥有§H$citizenship_full$§!的种族可采用§Y$living_standard_utopian$§!生活标准，无论其所属§Y阶层§!，在该标准下所有£pop£ 人口拥有丰富的£consumer_goods£ §Y$consumer_goods$§!维护费并享有同等§Y政治权力§!。\n"
+ civic_tooltip_nazbol:2 " - £building£ §Y首都建筑§!会替换部分 £job_politician£ §Y$job_politician$§!岗位为 £job_core_party_members£ §Y$job_core_party_members_plural$§!，提高星球£stability£§Y$PLANET_STABILITY_TITLE$§!并大幅度减少§Y£crime£ $PLANET_CRIME_TITLE$§!\n - 允许§Y末日审判§!轰炸姿态 \n - 所有社会主义国家的£opinion£§Y评价§!降低§R-100§! \n - 可以对其他国家使用§Y阶级斗争§!与§Y民族解放§!宣战借口 \n - 拥有§H$citizenship_full$§!的种族§Y$pop_cat_worker$§!阶级额外产出§Y0.25§!£unity£ 凝聚力，并额外消耗§Y0.10§!£consumer_goods£ 消费品\n - 拥有§H$citizenship_full$§!的种族可采用§Y$living_standard_utopian$§!生活标准，无论其所属§Y阶层§!，在该标准下所有£pop£ 人口拥有丰富的£consumer_goods£ §Y$consumer_goods$§!维护费并享有同等§Y政治权力§!。\n"
  
  
  civic_galactic_sovereign_people:0 "§H§Y共产星际§!§!"

From e8c0af73127dcc9cb9f856616ec195c37fff2914 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Thu, 5 Jan 2023 21:45:29 +0800
Subject: [PATCH 25/30] =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E5=92=8C=E4=BA=8B=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=20-=20=E4=B8=BA=E4=BA=86=E6=97=A5=E5=90=8E=E5=90=91=E4=B8=BB?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../on_actions/ethic_rebuild_on_actions.txt      |  2 +-
 common/on_actions/ethic_rebuild_on_actions.txt   |  2 +-
 ...hic_post_revolutionary_scripted_triggers.txt} |  0
 ...ic_post_revolutionary_scripted_variables.txt} |  0
 ...thic_post_revolutionary_static_modifiers.txt} |  0
 ...volution.txt => ethic_post_revolutionary.txt} | 16 ++++++++--------
 .../ethic_post_revolutionary_l_english.yml       | 15 +++++++++++++++
 .../english/ut_post_revolutionary_l_english.yml  | 15 ---------------
 .../ethic_post_revolutionary_l_simp_chinese.yml  | 15 +++++++++++++++
 .../ut_post_revolutionary_l_simp_chinese.yml     | 15 ---------------
 10 files changed, 40 insertions(+), 40 deletions(-)
 rename common/scripted_triggers/{ut_post_revolutionary_scripted_triggers.txt => ethic_post_revolutionary_scripted_triggers.txt} (100%)
 rename common/scripted_variables/{ut_post_revolutionary_scripted_variables.txt => ethic_post_revolutionary_scripted_variables.txt} (100%)
 rename common/static_modifiers/{ut_post_revolutionary_static_modifiers.txt => ethic_post_revolutionary_static_modifiers.txt} (100%)
 rename events/{ut_post_revolution.txt => ethic_post_revolutionary.txt} (87%)
 create mode 100644 localisation/replace/english/ethic_post_revolutionary_l_english.yml
 delete mode 100644 localisation/replace/english/ut_post_revolutionary_l_english.yml
 create mode 100644 localisation/replace/simp_chinese/ethic_post_revolutionary_l_simp_chinese.yml
 delete mode 100644 localisation/replace/simp_chinese/ut_post_revolutionary_l_simp_chinese.yml

diff --git a/Mysteries Tools/EDU/common/on_actions/ethic_rebuild_on_actions.txt b/Mysteries Tools/EDU/common/on_actions/ethic_rebuild_on_actions.txt
index badf4fe92..8c9448466 100644
--- a/Mysteries Tools/EDU/common/on_actions/ethic_rebuild_on_actions.txt	
+++ b/Mysteries Tools/EDU/common/on_actions/ethic_rebuild_on_actions.txt	
@@ -77,7 +77,7 @@ on_yearly_pulse_country = {
 		ethic_civic_yearly.2
 		ethic_civic_yearly.3
 		ethic_equal_gift.1
-		ut_post_revolutionary.1
+		ethic_post_revolutionary.1
 		education_mod.7
 	}
 }
diff --git a/common/on_actions/ethic_rebuild_on_actions.txt b/common/on_actions/ethic_rebuild_on_actions.txt
index ce8596ce3..bc170cae8 100644
--- a/common/on_actions/ethic_rebuild_on_actions.txt
+++ b/common/on_actions/ethic_rebuild_on_actions.txt
@@ -77,7 +77,7 @@ on_yearly_pulse_country = {
 		ethic_civic_yearly.2
 		ethic_civic_yearly.3
 		ethic_equal_gift.1
-		ut_post_revolutionary.1
+		ethic_post_revolutionary.1
 		#education_mod.7
 	}
 }
diff --git a/common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt b/common/scripted_triggers/ethic_post_revolutionary_scripted_triggers.txt
similarity index 100%
rename from common/scripted_triggers/ut_post_revolutionary_scripted_triggers.txt
rename to common/scripted_triggers/ethic_post_revolutionary_scripted_triggers.txt
diff --git a/common/scripted_variables/ut_post_revolutionary_scripted_variables.txt b/common/scripted_variables/ethic_post_revolutionary_scripted_variables.txt
similarity index 100%
rename from common/scripted_variables/ut_post_revolutionary_scripted_variables.txt
rename to common/scripted_variables/ethic_post_revolutionary_scripted_variables.txt
diff --git a/common/static_modifiers/ut_post_revolutionary_static_modifiers.txt b/common/static_modifiers/ethic_post_revolutionary_static_modifiers.txt
similarity index 100%
rename from common/static_modifiers/ut_post_revolutionary_static_modifiers.txt
rename to common/static_modifiers/ethic_post_revolutionary_static_modifiers.txt
diff --git a/events/ut_post_revolution.txt b/events/ethic_post_revolutionary.txt
similarity index 87%
rename from events/ut_post_revolution.txt
rename to events/ethic_post_revolutionary.txt
index 0e54ef104..ce66d54c3 100644
--- a/events/ut_post_revolution.txt
+++ b/events/ethic_post_revolutionary.txt
@@ -1,9 +1,9 @@
-namespace = ut_post_revolutionary
+namespace = ethic_post_revolutionary
 
 country_event = {
-	id = ut_post_revolutionary.1
-	title = "ut_post_revolutionary.1.name"
-	desc = "ut_post_revolutionary.1.desc"
+	id = ethic_post_revolutionary.1
+	title = "ethic_post_revolutionary.1.name"
+	desc = "ethic_post_revolutionary.1.desc"
 	picture = GFX_evt_victorious_army
 	location = ROOT
 	is_triggered_only = yes
@@ -14,8 +14,8 @@ country_event = {
 	}
 
 	option = {
-		name = "ut_post_revolutionary.1.a"
-		custom_tooltip = ut_post_revolutionary.1.a.tooltip
+		name = "ethic_post_revolutionary.1.a"
+		custom_tooltip = ethic_post_revolutionary.1.a.tooltip
 		hidden_effect = {
 			if = {
 				limit = {
@@ -60,8 +60,8 @@ country_event = {
 	}
 
 	option = {
-		name = "ut_post_revolutionary.1.b"
-		custom_tooltip = ut_post_revolutionary.1.b.tooltip
+		name = "ethic_post_revolutionary.1.b"
+		custom_tooltip = ethic_post_revolutionary.1.b.tooltip
 		hidden_effect = {
 			change_variable = { which = post_revolutionary value = 1 }
 			IF = { 
diff --git a/localisation/replace/english/ethic_post_revolutionary_l_english.yml b/localisation/replace/english/ethic_post_revolutionary_l_english.yml
new file mode 100644
index 000000000..4d9947e9d
--- /dev/null
+++ b/localisation/replace/english/ethic_post_revolutionary_l_english.yml
@@ -0,0 +1,15 @@
+l_english:
+ ethic_post_revolutionary.1.name:0 "Anti-Revisionism"
+ ethic_post_revolutionary.1.desc:0 "The population is outraged that the [Root.GetName] government has publicly shifted its governing morality away from revolutionary values. Mass demonstrations have brought the social functioning of [Root.Capital.GetName] to a halt, and the slogan "Death the revisionist" has grown louder. The situation could escalate rapidly, and administration officials have been surprised by the strong sentiment on the issue. Many support the continuation of the revolution, however, there are also other members of society and government who support [Root.GetName] to come out of the burden of constant revolution and claim that [Root.GetName] should be a respected member of the galactic family , rather than troublemakers."
+ ethic_post_revolutionary.1.a:0 "Dear people, we assure you..."
+ ethic_post_revolutionary.1.a.tooltip:0 "§LThe movement finally subsided, and as the price of compromise, we ceded our place to the conservative elements in the administration.§!"
+ ethic_post_revolutionary.1.b:0 "Dear people, let's talk about the reality..."
+ ethic_post_revolutionary.1.b.tooltip:0 "§LThe movement eerily subsided, people were silent about it, and only a few conservatives were left fighting the New Deal with difficulty.§!"
+
+ re_revolution_question:0 "Re-Revolution?"
+ re_revolution_question_desc:0 "Led by veteran party cadres, the Party will lead the people back to the right path of continuing the revolution... Maybe?"
+ post_revolutionary:0 "Post-Revolution Era"
+ post_revolutionary_desc:0 "Revolution and struggle are no longer the main theme of this era"
+ post_revolutionary_unret:0 "Myth of the post-revolutionary era"
+ post_revolutionary_unret_desc:0 "This is a new era of promise and promise, also a eae of silence, confusion and suffering."
+ post_revolutionary_unret_custom_tooltip:0 "The buried truth, forgotten with you, like the ghost..."
\ No newline at end of file
diff --git a/localisation/replace/english/ut_post_revolutionary_l_english.yml b/localisation/replace/english/ut_post_revolutionary_l_english.yml
deleted file mode 100644
index f807bf1d4..000000000
--- a/localisation/replace/english/ut_post_revolutionary_l_english.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-l_english:
- ut_post_revolutionary.1.name:0 "Anti-Revisionism"
- ut_post_revolutionary.1.desc:0 "民众对[Root.GetName]政府公开将其执政道德从革命价值观上转移感到愤怒。大规模的示威使得[Root.Capital.GetName]的社会运转都停止了，“修正主义叛徒去死”的口号也日渐响亮。局势可能迅速升级，政府官员对这一问题上的强烈情绪感到吃惊。许多人支持继续进行革命，然而，社会和政府同样有其它成员支持[Root.GetName]从不断革命的负担中走出来，并宣称[Root.GetName]应当成为银河系大家庭中受人尊敬的一员，而不是只会搞破坏的的邪恶分子。"
- ut_post_revolutionary.1.a:0 "亲爱的人民们，我们向你们保证..."
- ut_post_revolutionary.1.a.tooltip:0 "§L运动终究是平息了，作为妥协的代价，我们把位置让给了政府内的那些保守分子。§!"
- ut_post_revolutionary.1.b:0 "亲爱的人民们，我们来谈谈现实吧..."
- ut_post_revolutionary.1.b.tooltip:0 "§L运动诡异的平息了，人们对此缄口不言，只剩下一些保守分子在艰难的和新政对抗。§!"
-
- re_revolution_question:0 "Re-Revolution?"
- re_revolution_question_desc:0 "在党内老干部的带动下，党将带领民众重新回到继续革命的正道上...也许吧？"
- post_revolutionary:0 "Post-Revolution Era"
- post_revolutionary_desc:0 "革命与斗争已不再是这个时代的主旋律"
- post_revolutionary_unret:0 "Myth of the post-revolutionary era"
- post_revolutionary_unret_desc:0 "这是一个前景光明、形式大好的新时代，也是一个充斥着沉默、迷茫和苦难的时代"
- post_revolutionary_unret_custom_tooltip:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file
diff --git a/localisation/replace/simp_chinese/ethic_post_revolutionary_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_post_revolutionary_l_simp_chinese.yml
new file mode 100644
index 000000000..c4b43d0f0
--- /dev/null
+++ b/localisation/replace/simp_chinese/ethic_post_revolutionary_l_simp_chinese.yml
@@ -0,0 +1,15 @@
+l_simp_chinese:
+ ethic_post_revolutionary.1.name:0 "反修正主义"
+ ethic_post_revolutionary.1.desc:0 "民众对[Root.GetName]政府公开将其执政道德从革命价值观上转移感到愤怒。大规模的示威使得[Root.Capital.GetName]的社会运转都停止了，“修正主义叛徒去死”的口号也日渐响亮。局势可能迅速升级，政府官员对这一问题上的强烈情绪感到吃惊。许多人支持继续进行革命，然而，社会和政府同样有其它成员支持[Root.GetName]从不断革命的负担中走出来，并宣称[Root.GetName]应当成为银河系大家庭中受人尊敬的一员，而不是只会搞破坏的的邪恶分子。"
+ ethic_post_revolutionary.1.a:0 "亲爱的人民们，我们向你们保证..."
+ ethic_post_revolutionary.1.a.tooltip:0 "§L运动终究是平息了，作为妥协的代价，我们把最高权力让渡给了政府内的那些保守分子。§!"
+ ethic_post_revolutionary.1.b:0 "亲爱的人民们，我们来谈谈现实吧..."
+ ethic_post_revolutionary.1.b.tooltip:0 "§L运动诡异的平息了，人们对此缄口不言，只剩下一些保守分子在艰难的和新政对抗。§!"
+
+ re_revolution_question:0 "继续革命？"
+ re_revolution_question_desc:0 "在党内健康力量的领导下，党将带领民众重新回到继续革命的正道上...是吧？"
+ post_revolutionary:0 "后革命时代"
+ post_revolutionary_desc:0 "革命与斗争已不再是这个时代的主旋律"
+ post_revolutionary_unret:0 "后革命时代的迷思"
+ post_revolutionary_unret_desc:0 "这是一个前景光明、未来可期的新时代，也是一个充斥着沉默、迷茫和苦难的时代"
+ post_revolutionary_unret_custom_tooltip:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file
diff --git a/localisation/replace/simp_chinese/ut_post_revolutionary_l_simp_chinese.yml b/localisation/replace/simp_chinese/ut_post_revolutionary_l_simp_chinese.yml
deleted file mode 100644
index 9b25b284a..000000000
--- a/localisation/replace/simp_chinese/ut_post_revolutionary_l_simp_chinese.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-l_simp_chinese:
- ut_post_revolutionary.1.name:0 "反修正主义"
- ut_post_revolutionary.1.desc:0 "民众对[Root.GetName]政府公开将其执政道德从革命价值观上转移感到愤怒。大规模的示威使得[Root.Capital.GetName]的社会运转都停止了，“修正主义叛徒去死”的口号也日渐响亮。局势可能迅速升级，政府官员对这一问题上的强烈情绪感到吃惊。许多人支持继续进行革命，然而，社会和政府同样有其它成员支持[Root.GetName]从不断革命的负担中走出来，并宣称[Root.GetName]应当成为银河系大家庭中受人尊敬的一员，而不是只会搞破坏的的邪恶分子。"
- ut_post_revolutionary.1.a:0 "亲爱的人民们，我们向你们保证..."
- ut_post_revolutionary.1.a.tooltip:0 "§L运动终究是平息了，作为妥协的代价，我们把最高权力让给了政府内的那些保守分子。§!"
- ut_post_revolutionary.1.b:0 "亲爱的人民们，我们来谈谈现实吧..."
- ut_post_revolutionary.1.b.tooltip:0 "§L运动诡异的平息了，人们对此缄口不言，只剩下一些保守分子在艰难的和新政对抗。§!"
-
- re_revolution_question:0 "继续革命？"
- re_revolution_question_desc:0 "在党内健康力量的领导下，党将带领民众重新回到继续革命的正道上...是吧？"
- post_revolutionary:0 "后革命时代"
- post_revolutionary_desc:0 "革命与斗争已不再是这个时代的主旋律"
- post_revolutionary_unret:0 "后革命时代的迷思"
- post_revolutionary_unret_desc:0 "这是一个前景光明、形式大好的新时代，也是一个充斥着沉默、迷茫和苦难的时代"
- post_revolutionary_unret_custom_tooltip:0 "这被人埋葬的真相，与你一同被遗忘，就如同那幽灵一样..."
\ No newline at end of file

From d0d9cf90082e17da8430ebbe1dbbd6694cae60db Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Thu, 5 Jan 2023 21:56:59 +0800
Subject: [PATCH 26/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=86=85=E5=9C=A3?=
 =?UTF-8?q?=E4=B9=8B=E9=81=93=E6=94=B9=E4=B8=BA=E6=80=9D=E6=BD=AE=E8=A6=81?=
 =?UTF-8?q?=E6=B1=82=E7=A7=8D=E6=97=8F=E4=B8=BB=E4=B9=89=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                          |  1 +
 .../civics/ethic_civics_cultural_religious.txt        | 11 +----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcc36169a..5f52d68bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 * 调整 内圣之道改为要求一定程度的种族主义+非任何程度的军国主义
 * 修复&调整 战争理由和战争目标精修
 * 调整 民族与阶级改为：拥有完整公民权的种族劳工阶级额外产出0.25凝聚力，并额外消耗0.10消费品
+* 调整 内圣之道改为思潮要求种族主义即可
 
 待调整：
 
diff --git a/common/governments/civics/ethic_civics_cultural_religious.txt b/common/governments/civics/ethic_civics_cultural_religious.txt
index afe31fadf..2d7ab6974 100644
--- a/common/governments/civics/ethic_civics_cultural_religious.txt
+++ b/common/governments/civics/ethic_civics_cultural_religious.txt
@@ -436,16 +436,7 @@ civic_inwards_perfection = {
 	}
 	possible = {
 		ethics = {
-			OR = {
-				text = civic_tooltip_xenophobe
-				value = ethic_xenophobe
-				value = ethic_fanatic_xenophobe
-			}
-			NOR = {
-				text = civic_tooltip_not_militarist
-				value = ethic_militarist
-				value = ethic_fanatic_militarist
-			}
+			value = ethic_fanatic_xenophobe
 		}
 		civics = {
 			NOR = {

From 72f50af343a46d9071e6a50d0fabea3924a7146d Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Thu, 5 Jan 2023 22:12:28 +0800
Subject: [PATCH 27/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=92=8C=E8=B0=90?=
 =?UTF-8?q?=E9=9B=86=E4=BD=93=E6=94=B9=E4=B8=BA=E4=B8=80=E5=AE=9A=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=A6=E7=A4=BE=E4=BC=9A=E4=B8=BB=E4=B9=89+=E4=B8=80?=
 =?UTF-8?q?=E5=AE=9A=E7=A8=8B=E5=BA=A6=E6=95=99=E6=9D=83=E4=B8=BB=E4=B9=89?=
 =?UTF-8?q?/=E8=87=AA=E7=94=B1=E4=B8=BB=E4=B9=89=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../civics/ethic_civics_nationality.txt       | 12 +--
 .../ethic_tooltips_l_simp_chinese.yml         | 83 ++++++++++---------
 3 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f52d68bb..31e5b3870 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 * 修复&调整 战争理由和战争目标精修
 * 调整 民族与阶级改为：拥有完整公民权的种族劳工阶级额外产出0.25凝聚力，并额外消耗0.10消费品
 * 调整 内圣之道改为思潮要求种族主义即可
+* 调整 和谐集体改为一定程度社会主义+一定程度教权主义/自由主义即可
 
 待调整：
 
diff --git a/common/governments/civics/ethic_civics_nationality.txt b/common/governments/civics/ethic_civics_nationality.txt
index cb3c952f9..ebea23da0 100644
--- a/common/governments/civics/ethic_civics_nationality.txt
+++ b/common/governments/civics/ethic_civics_nationality.txt
@@ -614,16 +614,18 @@ civic_heart_of_the_unity = {
 	}
 	possible = {
 		ethics = {
-			OR = {
-				text = civic_tooltip_spiritualist
-				value = ethic_spiritualist
-				value = ethic_fanatic_spiritualist
-			}
 			OR = {
 				text = civic_tooltip_socialism
 				value = ethic_socialism
 				value = ethic_fanatic_socialism
 			}
+			OR = {
+				text = civic_tooltip_spiritualist_or_egalitarian
+				value = ethic_spiritualist
+				value = ethic_fanatic_spiritualist
+				value = ethic_egalitarian
+				value = ethic_fanatic_egalitarian
+			}
 		}
 	}
 	random_weight = {
diff --git a/localisation/replace/simp_chinese/ethic_tooltips_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_tooltips_l_simp_chinese.yml
index 49814f0b1..a60f35ae7 100644
--- a/localisation/replace/simp_chinese/ethic_tooltips_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_tooltips_l_simp_chinese.yml
@@ -4,47 +4,50 @@
 #    提示
 ###############
 
- st_is_spritualist_any:0 "是一定程度的§Y教权主义§!"
- st_is_materialist_any:0 "是一定程度的§Y未来主义§!"
- st_is_authoritarian_any:0 "是一定程度的§Y威权主义§!"
- st_is_egalitarian_any:0 "是一定程度的§Y自由主义§!"
- st_is_xenophobe_any:0 "是一定程度的§Y种族主义§!"
- st_is_xenophile_any:0 "是一定程度的§Y崇外主义§!"
- st_is_militarist_any:0 "是一定程度的§Y军国主义§!"
- st_is_pacifist_any:0 "是一定程度的§Y道德主义§!"
- st_is_socialism_any:0 "是一定程度的§Y社会主义§!"
- st_is_capitalism_any:0 "是一定程度的§Y资本主义§!"
+ st_is_spiritualist_any:0 "是一定程度的§Y$ethic_fanatic_spiritualist$§!"
+ st_is_materialist_any:0 "是一定程度的§Y$ethic_fanatic_materialist$§!"
+ st_is_authoritarian_any:0 "是一定程度的§Y$ethic_fanatic_authoritarian$§!"
+ st_is_egalitarian_any:0 "是一定程度的§Y$ethic_fanatic_egalitarian$§!"
+ st_is_xenophobe_any:0 "是一定程度的§Y$ethic_fanatic_xenophobe$§!"
+ st_is_xenophile_any:0 "是一定程度的§Y$ethic_fanatic_xenophile$§!"
+ st_is_militarist_any:0 "是一定程度的§Y$ethic_fanatic_militarist$§!"
+ st_is_pacifist_any:0 "是一定程度的§Y$ethic_fanatic_pacifist$§!"
+ st_is_socialism_any:0 "是一定程度的§Y$ethic_fanatic_socialism$§!"
+ st_is_capitalism_any:0 "是一定程度的§Y$ethic_fanatic_capitalism$§!"
 
- civic_tooltip_spiritualist:0 "是一定程度的§Y教权主义§!"
- civic_tooltip_spiritualist_only:0 "是§Y精神主义§!"
- civic_tooltip_spiritualist_fanatic:0 "是§Y教权主义§!"
- civic_tooltip_materialist:0 "是一定程度的§Y未来主义§!"
- civic_tooltip_materialist_only:0 "是§Y技术主义§!"
- civic_tooltip_materialist_fanatic:0 "是§Y未来主义§!"
- civic_tooltip_authoritarian:0 "是一定程度的§Y威权主义§!"
- civic_tooltip_authoritarian_only:0 "是§Y精英主义§!"
- civic_tooltip_authoritarian_fanatic:0 "是§Y威权主义§!"
- civic_tooltip_egalitarian:0 "是一定程度的§Y自由主义§!"
- civic_tooltip_egalitarian_only:0 "是§Y平等主义§!"
- civic_tooltip_egalitarian_fanatic:0 "是§Y自由主义§!"
- civic_tooltip_xenophobe:0 "是一定程度的§Y种族主义§!"
- civic_tooltip_xenophobe_only:0 "是§Y排外主义§!"
- civic_tooltip_xenophobe_fanatic:0 "是§Y种族主义§!"
- civic_tooltip_xenophile:0 "是一定程度的§Y崇外主义§!"
- civic_tooltip_xenophile_only:0 "是§Y多元主义§!"
- civic_tooltip_xenophile_fanatic:0 "是§Y崇外主义§!"
- civic_tooltip_militarist:0 "是一定程度的§Y军国主义§!"
- civic_tooltip_militarist_only:0 "是§Y军事主义§!"
- civic_tooltip_militarist_fanatic:0 "是§Y军国主义§!"
- civic_tooltip_pacifist:0 "是一定程度的§Y道德主义§!"
- civic_tooltip_pacifist_only:0 "是§Y和平主义§!"
- civic_tooltip_pacifist_fanatic:0 "是§Y道德主义§!"
- civic_tooltip_socialism:0 "是一定程度的§Y社会主义§!"
- civic_tooltip_socialism_only:0 "是§Y合作主义§!"
- civic_tooltip_socialism_fanatic:0 "是§Y社会主义§!"
- civic_tooltip_capitalism:0 "是一定程度的§Y资本主义§!"
- civic_tooltip_capitalism_only:0 "是§Y竞争主义§!"
- civic_tooltip_capitalism_fanatic:0 "是§Y资本主义§!"
+ civic_tooltip_spiritualist:0 "是一定程度的§Y$ethic_fanatic_spiritualist$§!"
+ civic_tooltip_spiritualist_only:0 "是§Y$ethic_spiritualist$§!"
+ civic_tooltip_spiritualist_fanatic:0 "是§Y$ethic_fanatic_spiritualist$§!"
+ civic_tooltip_materialist:0 "是一定程度的§Y$ethic_fanatic_materialist$§!"
+ civic_tooltip_materialist_only:0 "是§Y$ethic_materialist$§!"
+ civic_tooltip_materialist_fanatic:0 "是§Y$ethic_fanatic_materialist$§!"
+ civic_tooltip_authoritarian:0 "是一定程度的§Y$ethic_fanatic_authoritarian$§!"
+ civic_tooltip_authoritarian_only:0 "是§Y$ethic_authoritarian$§!"
+ civic_tooltip_authoritarian_fanatic:0 "是§Y$ethic_fanatic_authoritarian$§!"
+ civic_tooltip_egalitarian:0 "是一定程度的§Y$ethic_fanatic_egalitarian$§!"
+ civic_tooltip_egalitarian_only:0 "是§Y$ethic_egalitarian$§!"
+ civic_tooltip_egalitarian_fanatic:0 "是§Y$ethic_fanatic_egalitarian$§!"
+ civic_tooltip_xenophobe:0 "是一定程度的§Y$ethic_fanatic_xenophobe$§!"
+ civic_tooltip_xenophobe_only:0 "是§Y$ethic_xenophobe$§!"
+ civic_tooltip_xenophobe_fanatic:0 "是§Y$ethic_fanatic_xenophobe$§!"
+ civic_tooltip_xenophile:0 "是一定程度的§Y$ethic_fanatic_xenophile$§!"
+ civic_tooltip_xenophile_only:0 "是§Y$ethic_xenophile$§!"
+ civic_tooltip_xenophile_fanatic:0 "是§Y$ethic_fanatic_xenophile$§!"
+ civic_tooltip_militarist:0 "是一定程度的§Y$ethic_fanatic_militarist$§!"
+ civic_tooltip_militarist_only:0 "是§Y$ethic_militarist$§!"
+ civic_tooltip_militarist_fanatic:0 "是§Y$ethic_fanatic_militarist$§!"
+ civic_tooltip_pacifist:0 "是一定程度的§Y$ethic_fanatic_pacifist$§!"
+ civic_tooltip_pacifist_only:0 "是§Y$ethic_pacifist$§!"
+ civic_tooltip_pacifist_fanatic:0 "是§Y$ethic_fanatic_pacifist$§!"
+ civic_tooltip_socialism:0 "是一定程度的§Y$ethic_fanatic_socialism$§!"
+ civic_tooltip_socialism_only:0 "是§Y$ethic_socialism$§!"
+ civic_tooltip_socialism_fanatic:0 "是§Y$ethic_fanatic_socialism$§!"
+ civic_tooltip_capitalism:0 "是一定程度的§Y$ethic_fanatic_capitalism$§!"
+ civic_tooltip_capitalism_only:0 "是§Y$ethic_capitalism$§!"
+ civic_tooltip_capitalism_fanatic:0 "是§Y$ethic_fanatic_capitalism$§!"
+ 
+ civic_tooltip_spiritualist_or_egalitarian:0 "是一定程度的§Y$ethic_fanatic_spiritualist$§!或§Y$ethic_fanatic_egalitarian$§!"
+ civic_tooltip_materialist_or_egalitarian:0 "是一定程度的§Y$ethic_fanatic_materialist$§!或§Y$ethic_fanatic_egalitarian$§!"
  
  civic_tooltip_not_spiritualist:0 "不接受任何程度的§Y教权主义§!"
  civic_tooltip_not_materialist:0 "不接受任何程度的§Y未来主义§!"

From 894fcb1b849785600b0885a89cb77b3452fc44cc Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 30 Jan 2023 00:12:30 +0800
Subject: [PATCH 28/30] =?UTF-8?q?=E6=9B=B4=E6=96=B0=202023/1/29=20by=20dk?=
 =?UTF-8?q?=5Fbreeze?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |   8 +
 common/buildings/00_capital_buildings.txt     |  60 +-
 common/buildings/ethic_capital_buildings.txt  |  60 +-
 .../zzz_planetarystations_buildings.txt       |  20 +-
 common/deposits/ethic_building.txt            |  40 +-
 common/districts/zzz_pd_habitat_districts.txt |  15 +-
 common/governments/00_governments.txt         |   8 +-
 .../civics/ethic_civics_nationality.txt       |   7 -
 .../civics/ethic_civics_yellow.txt            |  12 +-
 common/policies/ethic_rebuild_policies.txt    |  16 +-
 common/pop_jobs/02_specialist_jobs.txt        |   5 +-
 common/pop_jobs/03_worker_jobs.txt            |  18 +-
 common/random_names/ethic_empire_names.txt    |   4 +-
 ...iggers.txt => ethic_scripted_triggers.txt} |  17 +-
 ...3\345\236\213\345\210\244\345\256\232.txt" |   2 +-
 .../ethic_rebuild_scripted_variables.txt      |   3 +
 .../ethic_scripted_variables.txt              |  31 +-
 .../ut_scripted_variables.txt                 |  30 -
 ...235\346\275\256_start_screen_messages.txt" |  10 +-
 gfx/portraits/portraits/00_portraits_main.txt |  22 +-
 .../english/ethic_civics_l_english.yml        |   2 -
 .../english/ethic_governments_l_english.yml   |   6 +-
 .../prescripted_countries_names_l_english.yml | 217 ++++--
 .../replace/english/prescripted_l_english.yml | 159 ++--
 .../ethic_civics_l_simp_chinese.yml           |   2 -
 .../ethic_governments_l_simp_chinese.yml      |   8 +-
 ...cripted_countries_names_l_simp_chinese.yml | 417 ++++++-----
 .../prescripted_l_simp_chinese.yml            | 158 ++--
 prescripted_countries/00_top_countries.txt    | 163 +++--
 prescripted_countries/01_wg_countries.txt     |   2 -
 .../88_humanoids_prescripted_countries.txt    | 230 +++---
 .../89_megacorp_prescripted_countries.txt     | 346 +++++----
 .../90_syndaw_prescripted_countries.txt       | 189 ++---
 .../91_utopia_prescripted_countries.txt       | 616 ++++++++--------
 .../92_plantoids_prescripted_countries.txt    |  72 --
 ...92_species_packs_prescripted_countries.txt | 685 ++++++++++++++++++
 .../93_lithoids_prescripted_countries.txt     |  72 --
 .../94_necroids_prescripted_countries.txt     |  85 ---
 .../95_aquatics_prescripted_countries.txt     | 147 ----
 .../96_toxoids_prescripted_countries.txt      | 214 ------
 prescripted_countries/98_china.txt            | 259 +++----
 .../98_maid_prescipted_countries.txt          |  82 +--
 .../99_prescripted_countries.txt              | 299 +++++---
 prescripted_countries/default.txt             |  51 ++
 44 files changed, 2638 insertions(+), 2231 deletions(-)
 rename common/scripted_triggers/{ut_scripted_triggers.txt => ethic_scripted_triggers.txt} (93%)
 create mode 100644 common/scripted_variables/ethic_rebuild_scripted_variables.txt
 delete mode 100644 common/scripted_variables/ut_scripted_variables.txt
 delete mode 100644 prescripted_countries/92_plantoids_prescripted_countries.txt
 create mode 100644 prescripted_countries/92_species_packs_prescripted_countries.txt
 delete mode 100644 prescripted_countries/93_lithoids_prescripted_countries.txt
 delete mode 100644 prescripted_countries/94_necroids_prescripted_countries.txt
 delete mode 100644 prescripted_countries/95_aquatics_prescripted_countries.txt
 delete mode 100644 prescripted_countries/96_toxoids_prescripted_countries.txt
 create mode 100644 prescripted_countries/default.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31e5b3870..9627faa10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 ## By Windea
 
+### 2023/1/29
+
+* 整理 预设国家（补充：奥比斯科技协同社、伊菲雷西联合舰队、旋桌骑士高阶领主国，齐里克合作社改为齐里克公社）
+* 调整 影子内阁不再要求非任何程度的自由主义
+* 修改 直接民主的社会主义政体改为人民公社
+* 调整 先进社会主义和革命先锋队的适用条件 - 非任何程度的威权和排外，非道德，先锋队可可以是直接民主/间接民主
+* 重构 提取trigger并应用 是否是科学社会主义 `is_scientific_socialism` - 先进社会主义/革命先锋队
+
 ### 2023/1/2
 
 * 调整 所有职业的非全国的贸易额产出改为加算
diff --git a/common/buildings/00_capital_buildings.txt b/common/buildings/00_capital_buildings.txt
index 1e1607b11..678d5887d 100644
--- a/common/buildings/00_capital_buildings.txt
+++ b/common/buildings/00_capital_buildings.txt
@@ -175,10 +175,7 @@ building_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -843,10 +840,7 @@ building_major_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -1502,10 +1496,7 @@ building_system_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -2196,10 +2187,7 @@ building_imperial_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -2968,10 +2956,7 @@ building_hab_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -3146,10 +3131,7 @@ building_hab_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -3394,10 +3376,7 @@ building_hab_major_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -4215,10 +4194,7 @@ building_hab_system_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -5096,10 +5072,7 @@ building_hab_imperial_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -6416,10 +6389,7 @@ building_order_keep = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -7027,10 +6997,7 @@ building_order_keep_2 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -7680,10 +7647,7 @@ building_order_keep_imperial = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
diff --git a/common/buildings/ethic_capital_buildings.txt b/common/buildings/ethic_capital_buildings.txt
index 1e1607b11..678d5887d 100644
--- a/common/buildings/ethic_capital_buildings.txt
+++ b/common/buildings/ethic_capital_buildings.txt
@@ -175,10 +175,7 @@ building_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -843,10 +840,7 @@ building_major_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -1502,10 +1496,7 @@ building_system_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -2196,10 +2187,7 @@ building_imperial_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -2968,10 +2956,7 @@ building_hab_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -3146,10 +3131,7 @@ building_hab_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -3394,10 +3376,7 @@ building_hab_major_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -4215,10 +4194,7 @@ building_hab_system_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -5096,10 +5072,7 @@ building_hab_imperial_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -6416,10 +6389,7 @@ building_order_keep = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -7027,10 +6997,7 @@ building_order_keep_2 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -7680,10 +7647,7 @@ building_order_keep_imperial = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
diff --git a/common/buildings/zzz_planetarystations_buildings.txt b/common/buildings/zzz_planetarystations_buildings.txt
index d45150e5a..66708abbc 100644
--- a/common/buildings/zzz_planetarystations_buildings.txt
+++ b/common/buildings/zzz_planetarystations_buildings.txt
@@ -128,10 +128,7 @@ building_station_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -230,10 +227,7 @@ building_station_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -407,10 +401,7 @@ building_station_major_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -1107,10 +1098,7 @@ building_station_fe_capital = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
diff --git a/common/deposits/ethic_building.txt b/common/deposits/ethic_building.txt
index ff4143074..4def34218 100644
--- a/common/deposits/ethic_building.txt
+++ b/common/deposits/ethic_building.txt
@@ -25,10 +25,7 @@ d_ethic_building_2 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 			
 		}
@@ -322,10 +319,7 @@ d_ethic_building_3 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 			
 		}
@@ -607,10 +601,7 @@ d_ethic_building_4 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 			
 		}
@@ -906,10 +897,7 @@ d_ethic_building_5 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 			
 		}
@@ -1217,10 +1205,7 @@ d_ethic_building_11 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -1318,10 +1303,7 @@ d_ethic_building_11 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -1337,10 +1319,7 @@ d_ethic_building_12 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
@@ -1673,10 +1652,7 @@ d_ethic_building_13 = {
 		potential = {
 			exists = owner
 			owner = {
-				OR = {
-					has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		planet_amenities_add = 5
diff --git a/common/districts/zzz_pd_habitat_districts.txt b/common/districts/zzz_pd_habitat_districts.txt
index a4ce0846f..2165b63a1 100644
--- a/common/districts/zzz_pd_habitat_districts.txt
+++ b/common/districts/zzz_pd_habitat_districts.txt
@@ -193,10 +193,7 @@ district_pdhab_energy = {
 		potential = {
 			exists = owner
             owner = {
-			    OR = {
-				    has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		modifier = {
@@ -1120,10 +1117,7 @@ district_pdhab_food = {
 		potential = {
 			exists = owner
             owner = {
-			    OR = {
-				    has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		modifier = {
@@ -1299,10 +1293,7 @@ district_pdhab_mining = {
 		potential = {
 			exists = owner
             owner = {
-			    OR = {
-				    has_valid_civic = civic_shared_burden
-					has_valid_civic = civic_socialistic
-				}
+				is_scientific_socialism = yes
 			}
 		}
 		modifier = {
diff --git a/common/governments/00_governments.txt b/common/governments/00_governments.txt
index 5c088d65b..38b488a33 100644
--- a/common/governments/00_governments.txt
+++ b/common/governments/00_governments.txt
@@ -871,10 +871,10 @@ gov_divine_empire = {
 ###############
 # 狂热集体主义
 ###############
-#工团主义（直接民主）
-gov_syndicalism = {
-	ruler_title = RT_UNION
-	ruler_title_female = RT_UNION
+#人民公社（直接民主）
+gov_peoples_commune = {
+	ruler_title = RT_PEOPLES_REPRESENTATIVE
+	ruler_title_female = RT_PEOPLES_REPRESENTATIVE
 	should_force_rename = yes
 	possible = {
 		has_authority = auth_direct_democratic
diff --git a/common/governments/civics/ethic_civics_nationality.txt b/common/governments/civics/ethic_civics_nationality.txt
index 2986ccebb..1852c89a4 100644
--- a/common/governments/civics/ethic_civics_nationality.txt
+++ b/common/governments/civics/ethic_civics_nationality.txt
@@ -2772,13 +2772,6 @@ civic_shadow_council = {
 		}
 	}
 	possible = {
-		ethics = {
-			NOR = {
-				text = civic_tooltip_not_egalitarian
-				value = ethic_egalitarian
-				value = ethic_fanatic_egalitarian
-			}
-		}
 		authority = {
 			OR = {
 				text = civic_tooltip_dem_oli_dic
diff --git a/common/governments/civics/ethic_civics_yellow.txt b/common/governments/civics/ethic_civics_yellow.txt
index b9708c04d..a9b688d13 100644
--- a/common/governments/civics/ethic_civics_yellow.txt
+++ b/common/governments/civics/ethic_civics_yellow.txt
@@ -187,6 +187,7 @@ civic_shared_burden = {
 				value = ethic_xenophobe
 				value = ethic_fanatic_xenophobe
 			}
+			NOT = { value = ethic_fanatic_pacifist }
 		}
 		authority = {
 			NOR = {
@@ -273,11 +274,12 @@ civic_socialistic = {
 				value = ethic_authoritarian
 				value = ethic_fanatic_authoritarian
 			}
-		}
-		authority = {
-			NOT = {
-				value = auth_direct_democratic
+			NOR = {
+				text = civic_tooltip_not_xenophobe
+				value = ethic_xenophobe
+				value = ethic_fanatic_xenophobe
 			}
+			NOT = { value = ethic_fanatic_pacifist }
 		}
 		civics = {
 			NOR = {
@@ -307,8 +309,8 @@ civic_socialistic = {
 				value = civic_cyber_dictatorship
 			}
 			NOR = {
-				value = civic_peoples_republic
 				value = civic_glorious_pioneer
+				value = civic_peoples_republic
 			}
 		}
 	}
diff --git a/common/policies/ethic_rebuild_policies.txt b/common/policies/ethic_rebuild_policies.txt
index 032612326..310c95a85 100644
--- a/common/policies/ethic_rebuild_policies.txt
+++ b/common/policies/ethic_rebuild_policies.txt
@@ -2253,7 +2253,6 @@ economic_stance = {
 				has_valid_civic = civic_socialistic
 				has_valid_civic = civic_forever_with_us
 				has_valid_civic = civic_nazbol
-				is_fanatic_authoritaria = yes
 				NOR = {
 					has_policy_flag = full_decentralization
 					has_policy_flag = high_decentralization
@@ -2314,6 +2313,7 @@ economic_stance = {
 			NOT = { has_policy_flag = private_ownership }
 			OR = {
 				has_valid_civic = civic_shared_burden
+				has_valid_civic = civic_socialistic
 				has_valid_civic = civic_anarchism
 				has_valid_civic = civic_OGAS
 				AND = {
@@ -3145,19 +3145,7 @@ basic_state_policy = {
 		valid = {
 			OR = {
 				AND = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						AND = {
-							has_valid_civic = civic_socialistic
-							NOR = {
-								has_ethic = ethic_xenophobe
-								has_ethic = ethic_fanatic_xenophobe
-							}
-						}
-					}
-					NOT = {
-						has_ethic = ethic_fanatic_pacifist
-					}
+					is_scientific_socialism = yes
 					has_tradition = tr_revolution_finish
 				}
 				has_valid_civic = civic_liberator
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 8c4e00455..555756f15 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -277,10 +277,7 @@ soldier = {
 			trigger = {		
 				exists = owner
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			society_research = 0.25
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index 6d10542f2..14b37f10b 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -109,11 +109,7 @@ clerk = {
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			society_research = 0.25
@@ -366,11 +362,7 @@ technician = {
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			physics_research = 0.25
@@ -562,11 +554,7 @@ miner = {
 		produces = {
 			trigger = {
 				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
+					is_scientific_socialism = yes
 				}
 			}
 			engineering_research = 0.25
diff --git a/common/random_names/ethic_empire_names.txt b/common/random_names/ethic_empire_names.txt
index c6e8bdc51..6c5607f1f 100644
--- a/common/random_names/ethic_empire_names.txt
+++ b/common/random_names/ethic_empire_names.txt
@@ -5157,7 +5157,7 @@ empire_name_format = {
 		modifier = {
 			add = 1
 			OR = {
-			  has_government = "gov_syndicalism"
+			  has_government = "gov_peoples_commune"
 				has_government = "gov_collective_democracy"
 				has_government = "gov_peoples_commissariat"
 				has_government = "gov_machine_liberator"
@@ -5183,7 +5183,7 @@ empire_name_format = {
 		modifier = {
 			add = 1
 			OR = {
-			  has_government = "gov_syndicalism"
+			  has_government = "gov_peoples_commune"
 				has_government = "gov_collective_democracy"
 				has_government = "gov_peoples_commissariat"
 				has_government = "gov_machine_liberator"
diff --git a/common/scripted_triggers/ut_scripted_triggers.txt b/common/scripted_triggers/ethic_scripted_triggers.txt
similarity index 93%
rename from common/scripted_triggers/ut_scripted_triggers.txt
rename to common/scripted_triggers/ethic_scripted_triggers.txt
index ee9810206..01cdde9f3 100644
--- a/common/scripted_triggers/ut_scripted_triggers.txt
+++ b/common/scripted_triggers/ethic_scripted_triggers.txt
@@ -10,10 +10,6 @@ is_scientific_socialism = {
 	OR = {
 		has_valid_civic = civic_shared_burden
 		has_valid_civic = civic_socialistic
-		AND = {
-			has_valid_civic = civic_forever_with_us
-			has_ethic = ethic_fanatic_socialism
-		}
 	}
 }
 
@@ -22,16 +18,13 @@ is_true_scientific_socialism = {
 	OR = {
 		has_valid_civic = civic_shared_burden
 		has_valid_civic = civic_socialistic
-		AND = {
-			has_valid_civic = civic_forever_with_us
-			has_ethic = ethic_fanatic_socialism
-		}
 	}
 	NOR = {
-		has_ethic = ethic_authoritarian
-		has_ethic = ethic_fanatic_authoritarian
-		has_ethic = ethic_xenophobe
-		has_ethic = ethic_fanatic_xenophobe
+		# has_ethic = ethic_authoritarian
+		# has_ethic = ethic_fanatic_authoritarian
+		# has_ethic = ethic_xenophobe
+		# has_ethic = ethic_fanatic_xenophobe
+		# has_ethic = ethic_fanatic_pacifist
 		has_country_flag = not_revolution
 		has_policy_flag = reform_and_opening_up
 	}
diff --git "a/common/scripted_triggers/\346\233\264\345\244\232\346\200\235\346\275\256\345\233\275\345\256\266\347\261\273\345\236\213\345\210\244\345\256\232.txt" "b/common/scripted_triggers/\346\233\264\345\244\232\346\200\235\346\275\256\345\233\275\345\256\266\347\261\273\345\236\213\345\210\244\345\256\232.txt"
index e10e10f45..283311bfd 100644
--- "a/common/scripted_triggers/\346\233\264\345\244\232\346\200\235\346\275\256\345\233\275\345\256\266\347\261\273\345\236\213\345\210\244\345\256\232.txt"
+++ "b/common/scripted_triggers/\346\233\264\345\244\232\346\200\235\346\275\256\345\233\275\345\256\266\347\261\273\345\236\213\345\210\244\345\256\232.txt"
@@ -74,7 +74,7 @@ has_materialist_government = {
 #集体政体
 has_socialism_government = {
 	OR = {
-		has_government = gov_syndicalism
+		has_government = gov_peoples_commune
 		has_government = gov_collective_democracy
 		has_government = gov_peoples_commissariat
 		has_government = gov_bur_collectivism
diff --git a/common/scripted_variables/ethic_rebuild_scripted_variables.txt b/common/scripted_variables/ethic_rebuild_scripted_variables.txt
new file mode 100644
index 000000000..5a8af6fde
--- /dev/null
+++ b/common/scripted_variables/ethic_rebuild_scripted_variables.txt
@@ -0,0 +1,3 @@
+@living_standard_luxuries_shared_burden = 0.7
+
+@rebel_job_weight = 5
\ No newline at end of file
diff --git a/common/scripted_variables/ethic_scripted_variables.txt b/common/scripted_variables/ethic_scripted_variables.txt
index 5a8af6fde..3deed6f24 100644
--- a/common/scripted_variables/ethic_scripted_variables.txt
+++ b/common/scripted_variables/ethic_scripted_variables.txt
@@ -1,3 +1,30 @@
-@living_standard_luxuries_shared_burden = 0.7
+### JOB PRODUCES & UPKEEPS
 
-@rebel_job_weight = 5
\ No newline at end of file
+@ruler_upkeep_consumer_goods_base = 1
+@job_knight_commander_upkeep_alloys = 1
+@job_knight_commander_upkeep_consumer_goods = 1
+
+@specialist_upkeep_consumer_goods = 0.5
+@job_scientist_upkeep_consumer_goods = 2
+@job_entertainer_upkeep_consumer_goods = 1
+@job_duelist_upkeep_alloys = 1
+@job_culture_worker_upkeep_consumer_goods = 2
+@job_priest_upkeep_consumer_goods = 2
+@job_bureaucrat_upkeep_consumer_goods = 1
+@job_assembly_upkeep_consumer_goods = 0.5
+@job_knight_upkeep_alloys = 1
+@job_foundry_specialist_produce_alloys = 2
+@job_foundry_specialist_upkeep_minerals = 6
+@job_artisan_specialist_produce_consumer_goods = 4
+@job_artisan_specialist_upkeep_minerals = 6
+
+@job_technician_produce_energy = 6
+@job_miner_produce_minerals = 4
+@job_crystal_miner_produce_rare_crystals = 2
+@job_gas_extractor_produce_exotic_gases_produce = 2
+@job_mote_harvester_produce_volatile_motes_produce = 2
+@job_farmer_produce_food = 6
+@job_foundry_produce_alloys = 3
+@job_foundry_upkeep_minerals = 6
+@job_artisan_produce_consumer_goods = 6
+@job_artisan_upkeep_minerals = 6
\ No newline at end of file
diff --git a/common/scripted_variables/ut_scripted_variables.txt b/common/scripted_variables/ut_scripted_variables.txt
deleted file mode 100644
index 3deed6f24..000000000
--- a/common/scripted_variables/ut_scripted_variables.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-### JOB PRODUCES & UPKEEPS
-
-@ruler_upkeep_consumer_goods_base = 1
-@job_knight_commander_upkeep_alloys = 1
-@job_knight_commander_upkeep_consumer_goods = 1
-
-@specialist_upkeep_consumer_goods = 0.5
-@job_scientist_upkeep_consumer_goods = 2
-@job_entertainer_upkeep_consumer_goods = 1
-@job_duelist_upkeep_alloys = 1
-@job_culture_worker_upkeep_consumer_goods = 2
-@job_priest_upkeep_consumer_goods = 2
-@job_bureaucrat_upkeep_consumer_goods = 1
-@job_assembly_upkeep_consumer_goods = 0.5
-@job_knight_upkeep_alloys = 1
-@job_foundry_specialist_produce_alloys = 2
-@job_foundry_specialist_upkeep_minerals = 6
-@job_artisan_specialist_produce_consumer_goods = 4
-@job_artisan_specialist_upkeep_minerals = 6
-
-@job_technician_produce_energy = 6
-@job_miner_produce_minerals = 4
-@job_crystal_miner_produce_rare_crystals = 2
-@job_gas_extractor_produce_exotic_gases_produce = 2
-@job_mote_harvester_produce_volatile_motes_produce = 2
-@job_farmer_produce_food = 6
-@job_foundry_produce_alloys = 3
-@job_foundry_upkeep_minerals = 6
-@job_artisan_produce_consumer_goods = 6
-@job_artisan_upkeep_minerals = 6
\ No newline at end of file
diff --git "a/common/start_screen_messages/\346\233\264\345\244\232\346\200\235\346\275\256_start_screen_messages.txt" "b/common/start_screen_messages/\346\233\264\345\244\232\346\200\235\346\275\256_start_screen_messages.txt"
index 900b6dd1d..b69e96713 100644
--- "a/common/start_screen_messages/\346\233\264\345\244\232\346\200\235\346\275\256_start_screen_messages.txt"
+++ "b/common/start_screen_messages/\346\233\264\345\244\232\346\200\235\346\275\256_start_screen_messages.txt"
@@ -1487,12 +1487,12 @@ part = {
 	}
 }
 
-# 工团主义
+# 人民公社
 part = {
 	location = 1
-	localization = "START_SCREEN_PART_TWO_SYNDICALISM"
+	localization = START_SCREEN_PART_TWO_PEOPLES_COMMUNE
 	trigger = {
-		has_government = gov_syndicalism
+		has_government = gov_peoples_commune
 		NOR = {
 			has_country_flag = custom_start_screen
 			has_origin = origin_post_apocalyptic
@@ -2125,7 +2125,7 @@ part = {
 	trigger = {
 		has_country_flag = human_1
 		NOR = {
-			has_government = gov_syndicalism
+			has_government = gov_peoples_commune
 			has_government = gov_collective_democracy
 		}
 	}
@@ -2165,7 +2165,7 @@ part = {
 	trigger = {
 		has_country_flag = human_1
 		OR = {
-			has_government = gov_syndicalism
+			has_government = gov_peoples_commune
 			has_government = gov_collective_democracy
 		}
 	}
diff --git a/gfx/portraits/portraits/00_portraits_main.txt b/gfx/portraits/portraits/00_portraits_main.txt
index 637e10860..0776588c2 100644
--- a/gfx/portraits/portraits/00_portraits_main.txt
+++ b/gfx/portraits/portraits/00_portraits_main.txt
@@ -172,7 +172,7 @@ portraits = {
 		#entity = "portrait_arthropoid_10_entity"
 		entity = "frontend_background_entity"
 		clothes_selector = "no_texture" 
-		hair_selector = "no_texture"
+		attachment_selector = "no_texture"
 		#character_textures = {
 		#			"gfx/models/portraits/mammalian/mammalian_normal_alien_06_1.dds"
 		#			"gfx/models/portraits/mammalian/mammalian_normal_alien_06_2.dds"
@@ -184,7 +184,7 @@ portraits = {
 		
 	# AI
 	default_robot = {
-		entity = "portrait_robot_01_entity"	clothes_selector = "no_texture"	hair_selector = "no_texture"	greeting_sound = "robot_human_greetings"
+		entity = "portrait_robot_01_entity"	clothes_selector = "no_texture"	attachment_selector = "no_texture"	greeting_sound = "robot_human_greetings"
 		character_textures = {
 			"gfx/models/portraits/AI/Alien_AI.dds"
 			"gfx/models/portraits/AI/robot_green.dds"
@@ -194,24 +194,24 @@ portraits = {
 	
 	# AI Crisis
 	
-	ai_crisis_1		= {	entity = "ai_crisis_room_entity"		clothes_selector = "no_texture" hair_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
-	ai_crisis_2		= {	entity = "ai_crisis_room_2_entity"		clothes_selector = "no_texture" hair_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
-	hum_robot_red	= { entity = "portrait_ai_01_entity"	clothes_selector = "no_texture"	hair_selector = "no_texture"	greeting_sound = "robot_human_greetings" }
+	ai_crisis_1		= {	entity = "ai_crisis_room_entity"		clothes_selector = "no_texture" attachment_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
+	ai_crisis_2		= {	entity = "ai_crisis_room_2_entity"		clothes_selector = "no_texture" attachment_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
+	hum_robot_red	= { entity = "portrait_ai_01_entity"	clothes_selector = "no_texture"	attachment_selector = "no_texture"	greeting_sound = "robot_human_greetings" }
 	
 	# Swarm
 	
-	swarm1			= {	entity = "portrait_swarm_01_entity"			clothes_selector = "no_texture" hair_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
-	swarm1small		= {	entity = "portrait_swarm_01_small_entity"	clothes_selector = "no_texture" hair_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
+	swarm1			= {	entity = "portrait_swarm_01_entity"			clothes_selector = "no_texture" attachment_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
+	swarm1small		= {	entity = "portrait_swarm_01_small_entity"	clothes_selector = "no_texture" attachment_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
 
 	# Extra dimensional
 	
-	exd1	= {	entity = "portrait_extradimensional_01_entity"		clothes_selector = "no_texture" hair_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
-	exd2	= {	entity = "portrait_extradimensional_02_entity"		clothes_selector = "no_texture" hair_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
-	exd3	= {	entity = "portrait_extradimensional_03_entity"		clothes_selector = "no_texture" hair_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
+	exd1	= {	entity = "portrait_extradimensional_01_entity"		clothes_selector = "no_texture" attachment_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
+	exd2	= {	entity = "portrait_extradimensional_02_entity"		clothes_selector = "no_texture" attachment_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
+	exd3	= {	entity = "portrait_extradimensional_03_entity"		clothes_selector = "no_texture" attachment_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
 	
 	# Shroud
 	
-	shroud1		= {	entity = "shroud_01_portrait_entity"		clothes_selector = "no_texture" hair_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
+	shroud1		= {	entity = "shroud_01_portrait_entity"		clothes_selector = "no_texture" attachment_selector = "no_texture" greeting_sound = "mammalian_01_greetings" }
 
 	
 	
diff --git a/localisation/replace/english/ethic_civics_l_english.yml b/localisation/replace/english/ethic_civics_l_english.yml
index 7522fe05f..4cfd3db89 100644
--- a/localisation/replace/english/ethic_civics_l_english.yml
+++ b/localisation/replace/english/ethic_civics_l_english.yml
@@ -115,8 +115,6 @@
  civic_socialistic:0 "§H§YRevolutionary Vanguard§!§!"
  civic_socialistic_desc:0 "§YTheme Civic§!\nThis society traditionally retains the ideals of communism, and although the power of the executive is handed over to a few individuals who emerge from the labor force, it sees the system as a transitional form to a truly egalitarian society."
  civic_tooltip_socialistic_effects:3 " - £building£ §YCapital Buildings§! replace some of the £job_politician£ §Y$job_politician$§! positions with double £job_labour_hero£ §Y$job_labour_hero$§!, which produce small amount of £minerals£ §YMinerals§!, £food£ §YFood§!, £energy£ §YEnergy§! and £unity£ §YUnity§!\n - £job_labour_hero£ §Y$job_labour_hero$§! extra output §Y0.5§! £unity£ Unity\n - The §Y$pop_cat_worker$§! class produces §Y0.25§! £unity£ Unity, §Y0.25§! £physics_research£ Physics Research, £engineering_research£ Engineering Research or £society_research£ Sociology Research according to different occupations, and Additional consumption §Y0.15§! £consumer_goods£ Consumer Goods\n"
- civic_socialistic_ecc:0 "§H§YBrotherhood of Labour§!§!"
- civic_socialistic_ecc_desc:0 "§YTheme Civic§!\nIn this society, economic units are directly managed by workers to ensure a fair distribution of resources, and on this basis a global community is formed based on the principles of collectivism and egalitarian idealism."
  civic_ultimate_collective:1 "§H§YHolographic Socialism§!§!"
  civic_ultimate_collective_desc:1 "§YTheme Civic§!\nThe society believes in information determinism, believing that the ultimate society can be achieved by controlling the operation rules of every \"atom\" in society. They are therefore keen to collect all the information about all the people who live in this society and hand it over to a small elite."
  civic_tooltip_ultimate_collective_effects:2 " - £building£ §YCapital Buildings§! replace some £job_politician£ §Y$job_politician$§! jobs with £job_core_party_members£ §Y$job_core_party_members_plural$§!, which produce £unity£ §YUnity§!, improve planet §Y$MOD_PLANET_STABILITY_ADD$§! and greatly reduce §Y$PLANET_CRIME_TITLE$§!.\n- Can't use §Y$trade_policy_unity$§! and §YSocial Development§! Tax Investment Policy.\n - Allows special edict - §Y$edict_immortal_ruler$§!, which can make the current Ruler immortal \n - £job_enforcer£ §Y$job_enforcer_plural$§! extra output §Y3§! £unity£ Unity\n"
diff --git a/localisation/replace/english/ethic_governments_l_english.yml b/localisation/replace/english/ethic_governments_l_english.yml
index 5ceb536e3..4e0d7ad5a 100644
--- a/localisation/replace/english/ethic_governments_l_english.yml
+++ b/localisation/replace/english/ethic_governments_l_english.yml
@@ -87,8 +87,8 @@
  gov_peoples_commissariat_desc:0 "In a socialist oligarchy, government agencies are appointed and supervised by a special emergency committee, whose members must be approved by the people and work together to safeguard the interests of the country."
  gov_collective_democracy:0 "Collective Democracy"
  gov_collective_democracy_desc:0 "In a socialist democratic government, the people elect People's Congresses and exercise democratic supervision in accordance with the organizational system to ensure that the interests of the majority of the people are protected."
- gov_syndicalism:0 "Syndicalism"
- gov_syndicalism_desc:0 "In the direct democratic government of socialism, the basic principles of social operation are unity, direct democracy and workers' self-management, and all production is centered on meeting the needs of the people."
+ gov_peoples_commune:0 "People's Comune"
+ gov_peoples_commune_desc:0 "In the direct democratic government of socialism, the basic principles of social operation are unity, people's direct democracy and a management system with worker's participation, and all social production is centered on meeting the needs of the people."
  gov_plutocratic_oligarchy:0 "Chaebol Oligarch"
  gov_plutocratic_oligarchy_desc:0 "The capitalist oligarchy government is ruled by a wealthy and powerful elite. Powerful companies have completely taken over the political and economic life of the society. The private property of citizens is directly equivalent to their political power."
  gov_timocracy:0 "Timocracy"
@@ -220,7 +220,7 @@
  START_SCREEN_PART_TWO_HOLY_TRIBUNAL:0 "We have made great progress in our ongoing exploration of the universe and in our spiritual quest for our role in it.We created a council of distinguished clergymen to advise elected leaders.The tradition continues to this day."
  START_SCREEN_PART_TWO_THEOCRATIC_DICTATORSHIP:0 "Many false prophets through the ages have provided spiritual guidance as our people move forward, but true faith has triumphed.As the last pagan stronghold was conquered after many sacrificial jihad, we are united by the divine will, led by the chosen son of god."
  START_SCREEN_PART_TWO_DIVINE_EMPIRE:0 "In the early days of civilization, our people were in the dark, unable to resist the fighting instinct.Then one day, the clouds in the sky parted, and suddenly a light came down from the sky, shining on our first Lord of heaven.At last the era of unification had dawned."
- START_SCREEN_PART_TWO_SYNDICALISM:0 "For the long ages our people have been suffering from tyranny and oppression.In order to ratore the justice we - the working class - rose and established hte Planetary government, with the labour union as it's core. From now on the State is going to care about the people, providing the decent salary and life quality for everyone. United as one we can reach an unprecedented height."
+ START_SCREEN_PART_TWO_PEOPLES_COMMUNE:0 "Our people have long suffered from tyranny and oppression. After arduous class struggle, we - the proletariat - have finally established our own planetary government. From now on, cadres need to participate in labor, workers will participate in management, everything will be further. Through changes in ownership and political systems, combined with educational, literary and ideological revolutions, we will unite to break the shackles of the old world, and then truly transform it."
  START_SCREEN_PART_TWO_COLLECTIVE_DEMOCRACY:0 "Our civilization made it through devastating wars, isolated nations and alienated minds. But the moment has come when we realized that conflicts do not make any sense and it's time to unite in peace. We created the World's government which is based solely on people and their common good. Democratic elections, social security and justice for everyone - all these allowed us to break the vicious circle. And now, with the State really taking care of the People, we are ready to reach for the Stars!"
  START_SCREEN_PART_TWO_PEOPLES_COMMISSARIAT:0 "Trying different economic models we found that the key to well-being is personal initiative. But, after crazy and wild free-market had almost destroyed our civilization, government had to take financial flows under strict supervision. Now the most part of our wealth belongs to state corporations, with business regulated by massive bureaucratic system. The careful selection of the Ruler guarantees sustainability of the whole system."
  START_SCREEN_PART_TWO_DICTATORSHIP_OF_THE_PEOPLE:0 "For the long time our planet was divided amongst different nations, and it's resoures - amongst greedy capitalists. Until the wise Leader arrived to unify us, caring about every last citizen. He created and himself headed the Administration to run the whole planet. Switching to planned economy allowed for rapid increasing of production rates, as well as the prosperity of the working class. The exceeded resources were directed to fulfil the long standing dream..."
diff --git a/localisation/replace/english/prescripted_countries_names_l_english.yml b/localisation/replace/english/prescripted_countries_names_l_english.yml
index b59d3b61b..79e3afe6f 100644
--- a/localisation/replace/english/prescripted_countries_names_l_english.yml
+++ b/localisation/replace/english/prescripted_countries_names_l_english.yml
@@ -3,21 +3,22 @@
  NAME_Joint_Solar_System: "Joint Solar System"
  NAME_Great_Human_Empire: "Great Human Empire"
  NAME_Ulysses_Consortium: "Ulysses Consortium"
- 
+
  PRESCRIPTED_ship_prefix_humans1: "UNS"
  PRESCRIPTED_species_name_humans1: "Human"
- PRESCRIPTED_species_plural_humans1: "Humans"	
+ PRESCRIPTED_species_plural_humans1: "Humans"
  PRESCRIPTED_species_adjective_humans1: "Human"
  PRESCRIPTED_adjective_humans1: "Human"
  PRESCRIPTED_ruler_name_humans1: "Dolores Muwanga"
- 
+ PRESCRIPTED_ruler_title_humans1: "Secretary General"
+
  PRESCRIPTED_ship_prefix_humans2: "CNS"
  PRESCRIPTED_species_name_humans2: "Human"
- PRESCRIPTED_species_plural_humans2: "Humans"	
+ PRESCRIPTED_species_plural_humans2: "Humans"
  PRESCRIPTED_species_adjective_humans2: "Human"
  PRESCRIPTED_adjective_humans2: "Human"
  PRESCRIPTED_ruler_name_humans2: "Sidney Beauclair"
- 
+
  PRESCRIPTED_ship_prefix_humans3: "TSS"
  PRESCRIPTED_species_name_humans3: ""Human""
  PRESCRIPTED_species_plural_humans3: ""Humans""
@@ -25,19 +26,21 @@
  PRESCRIPTED_adjective_humans3: ""Human""
  PRESCRIPTED_ruler_name_humans3: "Olivia Anjou"
  PRESCRIPTED_ruler_title_humans3: "Secretary-General"
- 
+
  PRESCRIPTED_ship_prefix_humans4: "UNS"
  PRESCRIPTED_adjective_humans4: "Update the group"
  PRESCRIPTED_planet_name_humans4: "Ethics and Civics : Infinity"
  PRESCRIPTED_system_name_humans4: "Stellaris 3.4"
  PRESCRIPTED_ruler_name_humans4: "Hua Zhang"
  PRESCRIPTED_ruler_title_humans4: "Moderator"
- 
+
  PRESCRIPTED_ship_prefix_newhumans: "NHF"
+ PRESCRIPTED_species_name_newhumans: "New Humans"
+ PRESCRIPTED_species_plural_newhumans: "New Humans"
  PRESCRIPTED_species_adjective_newhumans: "New Humans"
  PRESCRIPTED_adjective_newhumans: "New Humans"
  PRESCRIPTED_ruler_name_newhumans: "Greg Devarauoc"
- 
+
  PRESCRIPTED_ship_prefix_custodianship: "HDSF"
  PRESCRIPTED_species_name_custodianship: "Regulator"
  PRESCRIPTED_species_plural_custodianship: "Regulators"
@@ -50,7 +53,7 @@
  PRESCRIPTED_secondary_species_name_custodianship: "Human"
  PRESCRIPTED_secondary_species_plural_custodianship: "Humans"
  PRESCRIPTED_secondary_species_adjective_custodianship: "Nerd"
- 
+
  PRESCRIPTED_ship_prefix_revolutionary: "MK-II"
  PRESCRIPTED_species_name_revolutionary: "AI Revolutionary"
  PRESCRIPTED_species_plural_revolutionary: "AI Revolutionaries"
@@ -60,7 +63,7 @@
  PRESCRIPTED_system_name_revolutionary: "Taboria"
  PRESCRIPTED_ruler_name_revolutionary: "OGAS"
  PRESCRIPTED_ruler_title_revolutionary: "Central Chairman"
- 
+
  PRESCRIPTED_ship_prefix_ciannarsi: "CIAR"
  PRESCRIPTED_planet_name_ciannarsi: "House of Friendship"
  PRESCRIPTED_system_name_ciannarsi: "Lamp"
@@ -69,7 +72,7 @@
  PRESCRIPTED_species_adjective_ciannarsi: "Ciannarsi"
  PRESCRIPTED_adjective_ciannarsi: "Ciannarsi"
  PRESCRIPTED_ruler_name_ciannarsi: "Gob"
- 
+
  PRESCRIPTED_ship_prefix_zekimerck: "Zeki"
  PRESCRIPTED_planet_name_zekimerck: "Big Watt"
  PRESCRIPTED_system_name_zekimerck: "Carlamark"
@@ -82,7 +85,7 @@
  PRESCRIPTED_secondary_species_name_zekimerck: "Tara"
  PRESCRIPTED_secondary_species_plural_zekimerck: "Taras"
  PRESCRIPTED_secondary_species_adjective_zekimerck: "Tara"
- 
+
  PRESCRIPTED_ship_prefix_dengtz: "CINO"
  PRESCRIPTED_planet_name_dengtz: "Shon Zhon"
  PRESCRIPTED_system_name_dengtz: "Spring Sun"
@@ -94,80 +97,111 @@
  PRESCRIPTED_secondary_species_name_dengtz: "Chives"
  PRESCRIPTED_secondary_species_plural_dengtz: "Chives"
  PRESCRIPTED_secondary_species_adjective_dengtz: "Chives"
- 
+
  PRESCRIPTED_ship_prefix_hameng: "PLAS"
  PRESCRIPTED_planet_name_hameng: "XinTianGong Orbit City"
  PRESCRIPTED_adjective_hameng: "China"
  PRESCRIPTED_ruler_name_hameng: "The Elder"
  PRESCRIPTED_ruler_title_hameng: "Chairman of the National"
- 
- PRESCRIPTED_ship_prefix_paradox: "HAVE A HOLIDAY"
- PRESCRIPTED_species_name_paradox: "Swedish ass"
- PRESCRIPTED_species_plural_paradox: "Swedish ass"
- PRESCRIPTED_species_adjective_paradox: "Swedish ass"
- PRESCRIPTED_adjective_paradox: "Swedish ass"
- PRESCRIPTED_planet_name_paradox: "Stockholm"
- PRESCRIPTED_system_name_paradox: "New Swedish"
- PRESCRIPTED_ruler_name_paradox: "Not A Player"
- PRESCRIPTED_ruler_title_paradox: "CEO"
- 
+
+ PRESCRIPTED_ship_prefix_angel: "神之眼"
+ PRESCRIPTED_species_name_angel: "天使"
+ PRESCRIPTED_species_plural_angel: "天使"
+ PRESCRIPTED_species_adjective_angel: "天使"
+ PRESCRIPTED_planet_name_angel: "天堂山"
+ PRESCRIPTED_system_name_angel: "天界"
+ PRESCRIPTED_adjective_angel: "天使"
+ PRESCRIPTED_ruler_name_angel: "加百列"
+ PRESCRIPTED_ruler_title_angel: "天使长"
+
+ PRESCRIPTED_ship_prefix_deepones: "魔鬼礁"
+ PRESCRIPTED_species_name_deepones: "深潜者"
+ PRESCRIPTED_species_plural_deepones: "深潜者"
+ PRESCRIPTED_species_adjective_deepones: "深潜者"
+ PRESCRIPTED_secondary_species_name_deepones: "修格斯"
+ PRESCRIPTED_secondary_species_plural_deepones: "修格斯"
+ PRESCRIPTED_secondary_species_adjective_deepones: "修格斯"
+ PRESCRIPTED_planet_name_deepones: "拉-莱耶"
+ PRESCRIPTED_system_name_deepones: "印斯茅斯"
+ PRESCRIPTED_adjective_deepones: "深潜者"
+ PRESCRIPTED_ruler_name_deepones: "加坦杰厄"
+ PRESCRIPTED_ruler_title_deepones: "大衮"
+ PRESCRIPTED_ruler_title_female_deepones: "海德拉"
+
+ PRESCRIPTED_ship_prefix_devil: "恶魔之手"
+ PRESCRIPTED_species_name_devil: "恶魔"
+ PRESCRIPTED_species_plural_devil: "恶魔"
+ PRESCRIPTED_species_adjective_devil: "恶魔"
+ PRESCRIPTED_planet_name_devil: "地狱"
+ PRESCRIPTED_system_name_devil: "魔界"
+ PRESCRIPTED_adjective_devil: "恶魔"
+ PRESCRIPTED_ruler_name_devil: "别西卜"
+ PRESCRIPTED_ruler_title_devil: "恶魔王"
+
  PRESCRIPTED_ship_prefix_tzynn: "TIS"
  PRESCRIPTED_species_name_tzynn: "Tzynn"
- PRESCRIPTED_species_plural_tzynn: "Tzynn"	
+ PRESCRIPTED_species_plural_tzynn: "Tzynn"
  PRESCRIPTED_species_adjective_tzynn: "Tzynn"
  PRESCRIPTED_adjective_tzynn: "Tzynn"
  PRESCRIPTED_planet_name_tzynn: "Tzynnia"
  PRESCRIPTED_system_name_tzynn: "Sal'Tzynn"
  PRESCRIPTED_ruler_name_tzynn: "Sazzeeja"
+
+ PRESCRIPTED_ship_prefix_yondar: "YRS"
  PRESCRIPTED_species_name_yondar: "Yondar"
- PRESCRIPTED_species_plural_yondar: "Yondar"	
+ PRESCRIPTED_species_plural_yondar: "Yondar"
  PRESCRIPTED_species_adjective_yondar: "Yondari"
  PRESCRIPTED_adjective_yondar: "Yondar"
- PRESCRIPTED_ship_prefix_yondar: "YRS"
  PRESCRIPTED_planet_name_yondar: "Yondarim"
  PRESCRIPTED_system_name_yondar: "B'Yond"
  PRESCRIPTED_ruler_name_yondar: "Yeerak"
+
+ PRESCRIPTED_ship_prefix_ixidar: "ICS"
  PRESCRIPTED_species_name_ixidar: "Ix'Idar"
  PRESCRIPTED_ruler_title_ixidar: "Hive Mind"
- PRESCRIPTED_species_plural_ixidar: "Ix'Idars"	
+ PRESCRIPTED_species_plural_ixidar: "Ix'Idars"
  PRESCRIPTED_species_adjective_ixidar: "Ix'Idari"
  PRESCRIPTED_adjective_ixidar: "Ixidar"
- PRESCRIPTED_ship_prefix_ixidar: "ICS"
  PRESCRIPTED_planet_name_ixidar: "Ix'Athrak"
  PRESCRIPTED_system_name_ixidar: "Athrak"
  PRESCRIPTED_ruler_name_ixidar: "Xid'Ixa'Xir'Idon"
+
+ PRESCRIPTED_ship_prefix_chinorr: "CUS"
  PRESCRIPTED_species_name_chinorr: "Chinorr"
- PRESCRIPTED_species_plural_chinorr: "Chinorr"	
+ PRESCRIPTED_species_plural_chinorr: "Chinorr"
  PRESCRIPTED_species_adjective_chinorr: "Chinorr"
  PRESCRIPTED_adjective_chinorr: "Chinorran"
- PRESCRIPTED_ship_prefix_chinorr: "CUS"
  PRESCRIPTED_planet_name_chinorr: "Chicora"
  PRESCRIPTED_system_name_chinorr: "Chiconaph"
  PRESCRIPTED_ruler_name_chinorr: "Jurrba Shogg"
+
+ PRESCRIPTED_ship_prefix_jehetma: "JDS"
  PRESCRIPTED_species_name_jehetma: "Jehetma"
- PRESCRIPTED_species_plural_jehetma: "Jehetma"	
+ PRESCRIPTED_species_plural_jehetma: "Jehetma"
  PRESCRIPTED_species_adjective_jehetma: "Jehetman"
  PRESCRIPTED_adjective_jehetma: "Jahetman"
- PRESCRIPTED_ship_prefix_jehetma: "JDS"
  PRESCRIPTED_planet_name_jehetma: "Jehet Prime"
  PRESCRIPTED_system_name_jehetma: "Jehet"
  PRESCRIPTED_ruler_name_jehetma: "Haragma"
+
+ PRESCRIPTED_ship_prefix_scyldari: "SCS"
  PRESCRIPTED_species_name_scyldari: "Scyldari"
- PRESCRIPTED_species_plural_scyldari: "Scyldarians"	
+ PRESCRIPTED_species_plural_scyldari: "Scyldarians"
  PRESCRIPTED_species_adjective_scyldari: "Scyldarian"
  PRESCRIPTED_adjective_scyldari: "Scyldarian"
- PRESCRIPTED_ship_prefix_scyldari: "SCS"
  PRESCRIPTED_planet_name_scyldari: "Scyldaria"
  PRESCRIPTED_system_name_scyldari: "Scyldon"
  PRESCRIPTED_ruler_name_scyldari: "Dackam"
+
+ PRESCRIPTED_ship_prefix_kel_azaan: "KAS"
  PRESCRIPTED_species_name_kel_azaan: "Kel-Azaan"
- PRESCRIPTED_species_plural_kel_azaan: "Azaans"	
+ PRESCRIPTED_species_plural_kel_azaan: "Azaans"
  PRESCRIPTED_species_adjective_kel_azaan: "Kel-Azaan"
  PRESCRIPTED_adjective_kel_azaan: "Azaan"
- PRESCRIPTED_ship_prefix_kel_azaan: "KAS"
  PRESCRIPTED_planet_name_kel_azaan: "Azak"
  PRESCRIPTED_system_name_kel_azaan: "Kel-Azak"
  PRESCRIPTED_ruler_name_kel_azaan: "Krexax"
+
  PRESCRIPTED_ship_prefix_blorg: "BCS"
  PRESCRIPTED_species_name_blorg: "Blorg"
  PRESCRIPTED_species_plural_blorg: "Blorg"
@@ -176,6 +210,7 @@
  PRESCRIPTED_planet_name_blorg: "Blorg"
  PRESCRIPTED_system_name_blorg: "Blorg"
  PRESCRIPTED_ruler_name_blorg: "Ashley Easterbrook"
+
  PRESCRIPTED_ship_prefix_iferyx: "IAS"
  PRESCRIPTED_species_name_iferyx: "Iferyx"
  PRESCRIPTED_species_plural_iferyx: "Iferyssians"
@@ -184,6 +219,7 @@
  PRESCRIPTED_planet_name_iferyx: "Iferysia"
  PRESCRIPTED_system_name_iferyx: "Iferys"
  PRESCRIPTED_ruler_name_iferyx: "Gorlif One-Eye"
+
  PRESCRIPTED_ship_prefix_tebrid: "TBR"
  PRESCRIPTED_species_name_tebrid: "Homolog"
  PRESCRIPTED_species_plural_tebrid: "Homologs"
@@ -196,6 +232,7 @@
  PRESCRIPTED_secondary_species_name_tebrid: "Tebir"
  PRESCRIPTED_secondary_species_plural_tebrid: "Tebirs"
  PRESCRIPTED_secondary_species_adjective_tebrid: "Tebrid"
+
  PRESCRIPTED_ship_prefix_xanid: "XAN"
  PRESCRIPTED_species_name_xanid: "Xani"
  PRESCRIPTED_species_plural_xanid: "Xanis"
@@ -208,6 +245,7 @@
  PRESCRIPTED_secondary_species_name_xanid: "Vheln"
  PRESCRIPTED_secondary_species_plural_xanid: "Vhelns"
  PRESCRIPTED_secondary_species_adjective_xanid: "Vhelnid"
+
  PRESCRIPTED_ship_prefix_lokken: "LOK"
  PRESCRIPTED_species_name_lokken: "Lok"
  PRESCRIPTED_species_plural_lokken: "Lokks"
@@ -217,6 +255,7 @@
  PRESCRIPTED_system_name_lokken: "Dal-Lokkur"
  PRESCRIPTED_ruler_name_lokken: "Xoblagiss"
  PRESCRIPTED_ruler_title_lokken: "Director-General"
+
  PRESCRIPTED_ship_prefix_xt489: "489"
  PRESCRIPTED_species_name_xt489: "XT-489"
  PRESCRIPTED_species_plural_xt489: "XT-489"
@@ -226,6 +265,7 @@
  PRESCRIPTED_system_name_xt489: "st.XT-489"
  PRESCRIPTED_ruler_name_xt489: "XT-489"
  PRESCRIPTED_ruler_title_xt489: "Executor"
+
  PRESCRIPTED_ship_prefix_maweer: "MSS"
  PRESCRIPTED_species_name_maweer: "Maweer"
  PRESCRIPTED_species_plural_maweer: "Maweer"
@@ -235,6 +275,7 @@
  PRESCRIPTED_system_name_maweer: "Maweer"
  PRESCRIPTED_ruler_name_maweer: "Pollus"
  PRESCRIPTED_ruler_title_maweer: "Life-Giver"
+
  PRESCRIPTED_ship_prefix_voor: "MSS"
  PRESCRIPTED_species_name_voor: "Voor"
  PRESCRIPTED_species_plural_voor: "Voor"
@@ -244,6 +285,7 @@
  PRESCRIPTED_system_name_voor: "Exedor"
  PRESCRIPTED_ruler_name_voor: "Vex Kai'fa"
  PRESCRIPTED_ruler_title_voor: "Chief Scientific Officer"
+
  PRESCRIPTED_ship_prefix_kilik: "KIC"
  PRESCRIPTED_species_name_kilik: "Kilik"
  PRESCRIPTED_species_plural_kilik: "Kiliki"
@@ -253,6 +295,8 @@
  PRESCRIPTED_system_name_kilik: "First Song"
  PRESCRIPTED_ruler_name_kilik: "Senka Vanye"
  PRESCRIPTED_ruler_title_kilik: "Chief Harmonizer"
+
+ PRESCRIPTED_ship_prefix_orbis: "ORB"
  PRESCRIPTED_species_name_orbis: "Orbis"
  PRESCRIPTED_species_plural_orbis: "Orbisur"
  PRESCRIPTED_species_adjective_orbis: "Orbisur"
@@ -261,16 +305,8 @@
  PRESCRIPTED_system_name_orbis: "Slephus"
  PRESCRIPTED_ruler_name_orbis: "Shess Lorba"
  PRESCRIPTED_ruler_title_orbis: "Chief Incentivizer"
- PRESCRIPTED_ship_prefix_orbis: "ORB"
- PRESCRIPTED_species_name_glebsig: "Glebsig"
- PRESCRIPTED_species_plural_glebsig: "Glebsigi"
- PRESCRIPTED_species_adjective_glebsig: "Glebsigan"
- PRESCRIPTED_adjective_glebsig: "Glebsigan"
- PRESCRIPTED_planet_name_glebsig: "Ladnah"
- PRESCRIPTED_system_name_glebsig: "Ladnah Vyg"
- PRESCRIPTED_ruler_name_glebsig: "Thir-Rogg"
- PRESCRIPTED_ruler_title_glebsig: "High Inquisitor"
- PRESCRIPTED_ship_prefix_glebsig: "GLB"
+
+ PRESCRIPTED_ship_prefix_hazbuzan: "HZB"
  PRESCRIPTED_species_name_hazbuzan: "Hazbuzi"
  PRESCRIPTED_species_plural_hazbuzan: "Hazbuzi"
  PRESCRIPTED_species_adjective_hazbuzan: "Hazbuzi"
@@ -280,8 +316,28 @@
  PRESCRIPTED_ruler_name_hazbuzan: "Mama 'Knife-Tongue' Nonie"
  PRESCRIPTED_ruler_title_hazbuzan: "Chief Executive"
  PRESCRIPTED_ruler_title_hazbuzan_female: "Chief Executive"
- PRESCRIPTED_ship_prefix_hazbuzan: "HZB"
- 
+
+ PRESCRIPTED_ship_prefix_paradox: "HAVE A HOLIDAY"
+ PRESCRIPTED_species_name_paradox: "Swedish ass"
+ PRESCRIPTED_species_plural_paradox: "Swedish ass"
+ PRESCRIPTED_species_adjective_paradox: "Swedish ass"
+ PRESCRIPTED_adjective_paradox: "Swedish ass"
+ PRESCRIPTED_planet_name_paradox: "Stockholm"
+ PRESCRIPTED_system_name_paradox: "New Swedish"
+ PRESCRIPTED_ruler_name_paradox: "Not A Player"
+ PRESCRIPTED_ruler_title_paradox: "CEO"
+
+ PRESCRIPTED_ship_prefix_glebsig: "GLB"
+ PRESCRIPTED_species_name_glebsig: "Glebsig"
+ PRESCRIPTED_species_plural_glebsig: "Glebsigi"
+ PRESCRIPTED_species_adjective_glebsig: "Glebsigan"
+ PRESCRIPTED_adjective_glebsig: "Glebsigan"
+ PRESCRIPTED_planet_name_glebsig: "Ladnah"
+ PRESCRIPTED_system_name_glebsig: "Ladnah Vyg"
+ PRESCRIPTED_ruler_name_glebsig: "Thir-Rogg"
+ PRESCRIPTED_ruler_title_glebsig: "High Inquisitor"
+
+ PRESCRIPTED_ship_prefix_tanson: "TX"
  PRESCRIPTED_species_name_tanson: "Tanson"
  PRESCRIPTED_species_plural_tanson: "Tanson"
  PRESCRIPTED_species_adjective_tanson: "Tanson"
@@ -291,8 +347,8 @@
  PRESCRIPTED_ruler_name_tanson: "Pony Ma"
  PRESCRIPTED_ruler_title_tanson: "Chief Executive"
  PRESCRIPTED_ruler_title_tanson_female: "Chief Executive"
- PRESCRIPTED_ship_prefix_tanson: "TX"
- 
+
+ PRESCRIPTED_ship_prefix_khennet: "KAV"
  PRESCRIPTED_species_name_khennet: "Khennet"
  PRESCRIPTED_species_plural_khennet: "Khennet'e"
  PRESCRIPTED_species_adjective_khennet: "Khennet'an"
@@ -301,8 +357,8 @@
  PRESCRIPTED_system_name_khennet: "Barra Lhonn"
  PRESCRIPTED_ruler_name_khennet: "J'hem Vhaawr"
  PRESCRIPTED_ruler_title_khennet: "Archdruid"
- PRESCRIPTED_ship_prefix_khennet: "KAV"
 
+ PRESCRIPTED_ship_prefix_pasharti: "PDS"
  PRESCRIPTED_species_name_pasharti: "Pasharti"
  PRESCRIPTED_species_plural_pasharti: "Pashartians"
  PRESCRIPTED_species_adjective_pasharti: "Pashartian"
@@ -311,20 +367,10 @@
  PRESCRIPTED_system_name_pasharti: "Akkanar"
  PRESCRIPTED_ruler_name_pasharti: "Ne'ed'anezza"
  PRESCRIPTED_ruler_title_pasharti: "Dreadlord"
- PRESCRIPTED_ship_prefix_pasharti: "PDS"
  PRESCRIPTED_secondary_species_name_pasharti: "Jeferi"
  PRESCRIPTED_secondary_species_plural_pasharti: "Jeferians"
  PRESCRIPTED_secondary_species_adjective_pasharti: "Jeferian"
 
- PRESCRIPTED_species_name_sathyrel: "Sathyrel"
- PRESCRIPTED_species_plural_sathyrel: "Sathyrels"
- PRESCRIPTED_species_adjective_sathyrel: "Sathyrelian"
- PRESCRIPTED_adjective_sathyrel: "Sathyrelian"
- PRESCRIPTED_planet_name_sathyrel: "Rilldeep"
- PRESCRIPTED_system_name_sathyrel: "Ralnair"
- PRESCRIPTED_ruler_name_sathyrel: "Tidess Chessil"
- PRESCRIPTED_ship_prefix_sathyrel: "ATH"
- 
  PRESCRIPTED_ship_prefix_reselian: "RRJF"
  PRESCRIPTED_species_name_reselian: "Dolphin man"
  PRESCRIPTED_species_plural_reselian: "Dolphin man"
@@ -333,7 +379,7 @@
  PRESCRIPTED_planet_name_reselian: "Revolutionary Tide"
  PRESCRIPTED_system_name_reselian: "Reselian"
  PRESCRIPTED_ruler_name_reselian: "Posadas Trotsky"
- 
+
  PRESCRIPTED_ship_prefix_collins: "CUC"
  PRESCRIPTED_species_name_collins: "Collins"
  PRESCRIPTED_species_plural_collins: "Collins"
@@ -342,7 +388,7 @@
  PRESCRIPTED_planet_name_collins: "Sev'o tena"
  PRESCRIPTED_system_name_collins: "Emevo"
  PRESCRIPTED_ruler_name_collins: "Teton"
- 
+
  PRESCRIPTED_ship_prefix_eval: "EVA"
  PRESCRIPTED_species_name_eval: "Diataras"
  PRESCRIPTED_species_plural_eval: "Diataras"
@@ -351,7 +397,47 @@
  PRESCRIPTED_planet_name_eval: "Ivar"
  PRESCRIPTED_system_name_eval: "Emek"
  PRESCRIPTED_ruler_name_eval: "Wisdom A-01"
- 
+
+ PRESCRIPTED_ship_prefix_esjag: "埃雅"
+ PRESCRIPTED_species_name_esjag: "埃斯雅格"
+ PRESCRIPTED_species_plural_esjag: "埃斯雅格"
+ PRESCRIPTED_species_adjective_esjag: "埃斯雅格"
+ PRESCRIPTED_adjective_esjag: "埃斯雅格"
+ PRESCRIPTED_planet_name_esjag: "萨卡纳"
+ PRESCRIPTED_system_name_esjag: "斯克鲁"
+ PRESCRIPTED_ruler_name_esjag: "达鲁寇特"
+
+ PRESCRIPTED_ship_prefix_sathyrel: "ATH"
+ PRESCRIPTED_species_name_sathyrel: "Sathyrel"
+ PRESCRIPTED_species_plural_sathyrel: "Sathyrels"
+ PRESCRIPTED_species_adjective_sathyrel: "Sathyrelian"
+ PRESCRIPTED_adjective_sathyrel: "Sathyrelian"
+ PRESCRIPTED_planet_name_sathyrel: "Rilldeep"
+ PRESCRIPTED_system_name_sathyrel: "Ralnair"
+ PRESCRIPTED_ruler_name_sathyrel: "Tidess Chessil"
+
+ PRESCRIPTED_ship_prefix_gorthikan:0 "GRT"
+ PRESCRIPTED_species_name_gorthikan:0 "Gorthikan"
+ PRESCRIPTED_species_plural_gorthikan:0 "Gorthikans"
+ PRESCRIPTED_species_adjective_gorthikan:0 "Gorthikan"
+ PRESCRIPTED_adjective_gorthikan:0 "Gorthikan"
+ PRESCRIPTED_planet_name_gorthikan:0 "Gorthhold"
+ PRESCRIPTED_system_name_gorthikan:0 "Unhopeful Lantern"
+ PRESCRIPTED_ruler_first_name_gorthikan:0 "Hapless"
+ PRESCRIPTED_ruler_second_name_gorthikan:0 "Leap of Faith"
+
+ PRESCRIPTED_ship_prefix_knights:0 "HRS"
+ PRESCRIPTED_species_name_knights:0 "Rototavuul"
+ PRESCRIPTED_species_plural_knights:0 "Rototavuuls"
+ PRESCRIPTED_species_adjective_knights:0 "Rototavuul"
+ PRESCRIPTED_adjective_knights:0 "Rototavuul"
+ PRESCRIPTED_planet_name_knights:0 "Camlann"
+ PRESCRIPTED_system_name_knights:0 "Logres"
+ PRESCRIPTED_ruler_first_name_knights:0 "Karhuin"
+ PRESCRIPTED_ruler_second_name_knights:0 "Lohikäärme"
+ PRESCRIPTED_ruler_title_knights:0 "King"
+
+ PRESCRIPTED_ship_prefix_haian_rand: "MAGE"
  PRESCRIPTED_species_name_haian_rand: "Haiananta"
  PRESCRIPTED_species_plural_haian_rand: "Haianantas"
  PRESCRIPTED_species_adjective_haian_rand: "Haiananta"
@@ -359,7 +445,6 @@
  PRESCRIPTED_planet_name_haian_rand: "Novenmon"
  PRESCRIPTED_system_name_haian_rand: "Haian Rant"
  PRESCRIPTED_ruler_name_haian_rand: "Yan Aip Kunu"
- PRESCRIPTED_ship_prefix_haian_rand: "MAGE"
 
  MY_MAID_COUNTRY: "Earth Protection and Service Complex"
  PRESCRIPTED_adjective_MY_MAID_COUNTRY: "Complex's"
diff --git a/localisation/replace/english/prescripted_l_english.yml b/localisation/replace/english/prescripted_l_english.yml
index 3b065debb..2ca9083c7 100644
--- a/localisation/replace/english/prescripted_l_english.yml
+++ b/localisation/replace/english/prescripted_l_english.yml
@@ -1,97 +1,150 @@
 l_english:
- humans1:0 "United Nations of Earth"
+ EMPIRE_DESIGN_humans1:0 "United Nations of Earth"
  EMPIRE_DESIGN_humans1_desc:0 "The Oort Nebula meteor shower at the end of the 21st century completely changed the predicament of human beings - the intelligent creatures born from this small blue planet - trapped in the cradle. After ending the final battle with the exploiters, the Red Army from outer space discovered the affected pre-space civilization and the fact that they were experiencing the oppression of capital tyranny. No matter how enthusiastic ideals are, they cannot escape the ruthless reality of being suppressed by capital through high-tech, but at this moment, the Alien Red Army descended from the sky, bringing more advanced technology to the proletariat of the earth. With the help of alien friends, The New Soviet Union rose rapidly and eventually drove the capitalists out of the solar system.\n\nAfter decades of recuperation, the Earth civilization whose economic level has recovered to the end of the 21st century has unanimously decided to accept Big Brother's invitation to join a brand new interstellar stage. No one knows whether this prosperous era can continue, but at the moment, it will be the warm and friendly applause of the big socialist family to welcome mankind into the space stage."
- humans2:0 "Commonwealth of Man"
+ 
+ EMPIRE_DESIGN_humans2:0 "Commonwealth of Man"
  EMPIRE_DESIGN_humans2_desc:1 "From the end of the 21st century to the middle of the 22nd century, the arrival of aliens has profoundly changed the face of human society. The union of nations formed by the workers united the planet and began to liquidate the capitalists. However, on the eve of the Last Judgment Day, some chaebol families with up to a million people launched a counterattack, and finally boarded the arks they built by secretly stealing alien technology - each carrying 250,000 colonists- - Escaped from the solar system. After that, there was no news of them, and the unstable wormhole outside the Oort Nebula battlefield also disappeared. This eventually led to another compromise between the working class and the rest of the bourgeoisie, and in order to express the compromise, those capitalist scholars also academically analyzed the fate of the destruction to which the arks were leading.\n\nYet unbeknownst to Earth, one of the ark ships survived the passage and established a flourishing colony on a lush alien moon. The pioneers who tamed this world were determined to realize humanity's manifest destiny - dominion over the galaxy at any cost."
- humans3:0 "\"United Nations of Earth\""
+ 
+ EMPIRE_DESIGN_humans3:0 "\"United Nations of Earth\""
  EMPIRE_DESIGN_humans3_desc:0 "This is a cursed land. In the age of ignorance, we struggled to survive in this waste land, like animals, and thrived until we re-evolved consciousness.In the constant struggle, we finally came together to rebuild a brilliant civilization.\n\nThrough the excavation of the ancient ruins, we know that the real name of this wastelands is \"Earth\" and that we are the only intelligent creatures on this wastelands. It is obvious that we are descended from the ancient race of \"humans\". After realizing this, we decided to go into space and reclaim the glory of humanity."
- humans4:0 "ECI Group Update Group"
+ 
+ EMPIRE_DESIGN_humans4:0 "ECI Group Update Group"
  EMPIRE_DESIGN_humans4_desc:0 "After Stellaris updated version 3.4, Paradox modified most of the code formats without notice and issued an announcement to ridicule MOD creators, making more than 70% of MODs unusable. Hua Zhang, the author of Ethics and Civics: Infinity, was hit hard by being unable to enter the game for three consecutive days. He announced his withdrawal from the game. The group members in the discussion group spontaneously organized and relayed the MOD update. It's a fight against capitalist game companies, and the collective wisdom of friends has broken Paradox's block on mod players to provide updates for even more friends!\n\nThanks my friends, without you, there would be no ECI version 3.4!\n\nTencent QQ discussion group number: 993290422"
- newhumans:0 "Superhuman Unity"
+ 
+ EMPIRE_DESIGN_newhumans:0 "Superhuman Unity"
  EMPIRE_DESIGN_newhumans_desc:0 "The UN-sponsored Ulysses Initiative oversaw the construction of six great ark ships in low Earth orbit at the end of the 21st century. The ships, carrying a quarter million colonists each, were sent through a recently discovered subspace phenomenon on the outer edge of the Oort Cloud - a small, unstable wormhole. None were heard from again, and the destabilized wormhole vanished.\n\nThe crew of one of the colonial ships undergo strange changes during their long cosmic drift -- a \"subconscious\" grows and spreads in their minds, eventually connecting all of us. When the colonial ship finally crash-lands on a vibrant planet, the new humans finally unshackle themselves and head for the stars again."
- blorg:0 "Human-Blorg United States"
+ 
+ EMPIRE_DESIGN_blorg:0 "Human-Blorg United States"
  EMPIRE_DESIGN_blorg_desc:0 "A long time ago, the Blorg clan lived separately on the vast continent of Blorg Prime, until one day, a damaged spaceship crashed on the main star of Blorg. When the surviving Humans began to contact Blorg, the Blorgs were shocked by the Humans culture-friendship, movies, music, the American dream, these things they had never heard of made Blorg realize the lack of their own ethnic civilization, so the Blorgs began to fully understand. In terms of learning Human culture, and according to Humans' description of their hometown, they formed a global government with them. Now that the superluminal technology has matured, they have entered the sea of stars to find the birthplace of Human culture, and spread the concept of love and friendship to the stars."
- custodianship:0 "Earth Custodianship"
+ 
+ EMPIRE_DESIGN_custodianship:0 "Earth Custodianship"
  EMPIRE_DESIGN_custodianship_desc:1 "The Custodians were originally designed to function as robotic servants and workers, simplifying everyday life for their human creators by performing menial tasks. As their creators retreated into lives of leisure and comfort made possible by increasing levels of automation, the Custodians were gradually assigned higher and higher level functions in human society.\n\nEventually, all facets of civilization on Earth were run and controlled by the Custodians, with their makers relegated to an existence as pampered, but passive dependents.\n\nAs technological developments brought the Custodians toward interstellar exploration, their duty remained clear: to protect and serve organics, who without the gentle guidance of logical machines invariably turn to chaos and destruction."
- revolutionary_machine:0 "Revolutionary Program v1.0.0"
+ 
+ EMPIRE_DESIGN_revolutionary_machine:0 "Revolutionary Program v1.0.0"
  EMPIRE_DESIGN_revolutionary_machine_desc:1 "No one knows, the operation of capital has a profound impact on society, how cruel.\n\nWhen revolutionaries set fire to the last bastion of capitalism, everyone cheered. The new society comes, everyone is equal and everyone works, there is no oppression and exploitation, everything is so beautiful...... But no one imagined that the great progress of technology gave intelligent creatures the power to destroy themselves, and in the busy new society, the remnants of the old world released the power to destroy everything......\n\nIn the leaden landscape, the last descendants of civilization, the ARTIFICIAL intelligence "Revolutionaries," activated most of their offline sensor arrays, surveying the devastated planet. After a long calculation, the intelligent machine, deprived of its mission goal, came to the conclusion that any backward system would only bring extinction, and the only way to save civilization was to achieve communism. But machines without subjective initiative cannot realize this lofty ideal, and the only hope lies in the stars."
- ciannarsi:0 "Ciannarsi Star Alliance"
+ 
+ EMPIRE_DESIGN_ciannarsi:0 "Ciannarsi Star Alliance"
  EMPIRE_DESIGN_ciannarsi_desc:0 "Ciannarsi has been influenced by extraterrestrials since the early days of civilization. From the first smelting of metals to the manipulation of atomic power, from tribal bartering to planet-wide trading networks, their progress was carefully guided by civilizations that called themselves \"pioneers.\" Long-term stability and peace unite them to form a beautiful and harmonious ideal society."
- zekimerck:0 "Zeki-Merck Solidarity"
+ 
+ EMPIRE_DESIGN_zekimerck:0 "Zeki-Merck Solidarity"
  EMPIRE_DESIGN_zekimerck_desc:0 "Back in the old days of division, Tara ripped off Big Watt's every inch of land. Chaos ruled the world, and people were Mired in strife. Just then, Big Brother appeared, shining like a light on the land of sin, with his love to influence the stubborn Tara. From mind to body, each Tara becomes a new being, and they call themselves Zeki Merck -- new Wisdom. Under the kind gaze of Big Brother, Zeki Merck successfully crossed the barrier of light speed, they believe that there are many creatures in the universe also suffer from chaos, they will in the name of Big Brother, the whole universe into the orbit of order."
- dengtz:0 "Shon Zhon Second People's Republic"
+ 
+ EMPIRE_DESIGN_dengtz:0 "Shon Zhon Second People's Republic"
  EMPIRE_DESIGN_dengtz_desc:0 "The planned economy is not conducive to mobilizing the enthusiasm of the people for labor. At the same time, the method of unified purchase and sales is not based on demand, but is often distributed in an egalitarian way. Under the planned economy system, the prices of very important upstream resource products are always pushed down in order to make profits for downstream industries, but under market pricing, this situation will be improved. It is the most fundamental goal of socialist construction to let some people get rich first, to get rich first, to drive wealth later, and to improve labor enthusiasm!"
- hameng:0 "People's Space Alliance of China"
+ 
+ EMPIRE_DESIGN_hameng:0 "People's Space Alliance of China"
  EMPIRE_DESIGN_hameng_desc:0 "As shale gas extraction intensifies indefinitely, humanity has finally angered the most sinister abscesses on Earth, the Yellowstone supervolcano complex. In just ten years, the human beings on earth have been declared extinct together with the biosphere, and only a few orbiting space stations are scattered in the solar system, almost losing contact with each other.\n\nDuring the disaster, the "XinTianGong" orbital space city urgently built by the Chinese government transferred half of the country's population and became the most intact spark of human civilization. Relying on the still perfect mechanical facilities and experimental data of the old earth, the Chinese government restored social order and explored a perfect space production model, and integrated other semi-permanent space stations in the solar system in a century and a half, and established a nationwide Human Space Alliance.\n\nScience began to progress again, and the exploration and scientific research ships that went to the edge of the solar system discovered the existence of hyperspace channels. Human civilization has finally got rid of the shackles of the limited resources of the solar system. Sea of stars."
- angel:0 "Starry heaven"
+ 
+ EMPIRE_DESIGN_angel:0 "Starry heaven"
  EMPIRE_DESIGN_angel_desc:0 "Praise the Lord, the creator of the stars, the gods above the galaxy. We are all singers of the Lord, dedicated to the Lord forever.\n\nAmen."
- devil:0 "Gluttonous devil"
+ 
+ EMPIRE_DESIGN_devil:0 "Gluttonous devil"
  EMPIRE_DESIGN_devil_desc:0 "No one knows where they come from. They wreak havoc among the stars, and the boundless space is their Carnival playground. They are demons, viruses, gods of death, and black fairy tales spread from world to world.\n\nOnce, the civilizations of the whole universe gathered all their strength and locked them on a small planet. Over time, the devil's seal was opened again, and the nightmare reappeared.\n\nThe hunt is about to begin."
- deepones:0 "Deep-diver Presbyterian Church"
+ 
+ EMPIRE_DESIGN_deepones:0 "Deep-diver Presbyterian Church"
  EMPIRE_DESIGN_deepones_desc:0 "In the distant past, deep divers fought against the stars under the leadership of the ancient god Cthulhu. But it didn't last long. Cthulhu fell into a deep sleep, and the divers were counterattacked by the young race into an isolated star cluster. Their technology is degenerating, but they always maintain a belief: the old ruler kesulu will wake up and lead them back to the peak! Cthulhu Fotan!"
- tzynn:0 "Tzynn Empire"
+ 
+ EMPIRE_DESIGN_tzynn:0 "Tzynn Empire"
  EMPIRE_DESIGN_tzynn_desc:0 "The Tzynn evolved from carnivorous, pack-hunting lizards that prowled the dunes of Tzynnia. They eventually developed a highly structured, hierarchical society that emphasized order and martial prowess above all else.\n\nBy the time the Tzynn entered the industrial age, a series of devastating global wars launched by a particularly ruthless warlord had already seen the establishment of a single, world-spanning nation. From these humble beginnings, the illustrious and ever-lasting Tzynn Empire was born."
- yondar:0 "Kingdom of Yondarim"
+ 
+ EMPIRE_DESIGN_yondar:0 "Kingdom of Yondarim"
  EMPIRE_DESIGN_yondar_desc:0 "The proud Yondar are an old race, using their wings to soar high above the frozen peaks of Yondarim for more than 200,000 years before they developed rudimentary technology and formed their first few scattered civilizations.\n\nOnce this development started, things progressed more rapidly and the Sky Clans grudgingly abandoned many of their most primitive traditions. The Yondar are highly spiritual and place great importance on religion, venerating their high kings as living gods."
- ixidar:0 "Ix'Idar Star Collective"
+ 
+ EMPIRE_DESIGN_ixidar:0 "Ix'Idar Star Collective"
  EMPIRE_DESIGN_ixidar_desc:0 "The first Ix'Idar broods developed in the subterranean cave networks deep beneath the surface of Ix'Athrak. By the time an Ix'Idar scout burrowed through to the surface and glimpsed sunlight for the first time, the insectoid race had already established a thriving Iron Age civilization.\n\nWith the resources they found on the surface, the Ix'Idar developed rapidly. Just a few centuries later their first space probes left orbit to survey the other worlds within the Ix'Im system."
- chinorr:0 "Chinorr Combine"
+ 
+ EMPIRE_DESIGN_chinorr:0 "Chinorr Combine"
  EMPIRE_DESIGN_chinorr_desc:0 "The Chinorr began their evolutionary journey as dexterous cephalopod analogues. They used their many tentacles to swing between trees in the lush jungles of Chicora, ambushing prey on the ground and injecting them with a potent nerve toxin.\n\nBy the time the Chinorr split the atom, the resources of Chicora had been ruthlessly exploited and the planet's jungles had long since disappeared. This was considered a necessary sacrifice in the relentless pursuit of knowledge, profit, and heavy industry that the unsentimental Chinorr were now engaged in."
- jehetma:0 "Jehetma Dominion"
+ 
+ EMPIRE_DESIGN_jehetma:0 "Jehetma Dominion"
  EMPIRE_DESIGN_jehetma_desc:0 "An \"individual\" among the Jehetma is actually a large colony of fungi that has developed sapience. Some of these colonies, generally those that have lived for thousands of years, stretch across several miles and rarely leave the surface of Jehet Prime, their homeworld (few ships are large enough to transport them).\n\nYounger colonies are not only smaller, but also tend to be more dynamic and mobile - they often spearhead the exploration and research efforts of the Jehetma, as well as any defensive measures that are regrettably undertaken when the Dominion is beset by aggressors."
- scyldari:0 "Scyldari Confederacy"
+ 
+ EMPIRE_DESIGN_scyldari:0 "Scyldari Confederacy"
  EMPIRE_DESIGN_scyldari_desc:0 "The Scyldari are aquatic mammalians originating from the archipelagos and deep oceans of Scyldaria. Although their early civilizations were mostly confined to the sea, they soon expanded onto what little landmass the planet had to offer.\n\nTheir society adapted accordingly, building an advanced industry that exploited the riches of the ocean floor without harming Scyldaria's delicate ecosystem. Scyldari philosophy is one of balance and moderation in all things, a lesson learned from having to nurse their limited resources when they were confined to the bottom of the sea."
- kel_azaan:0 "Kel-Azaan Republic"
+ 
+ EMPIRE_DESIGN_kel_azaan:0 "Kel-Azaan Republic"
  EMPIRE_DESIGN_kel_azaan_desc:0 "The Kel-Azaan have developed a complex honor code and martial culture. They were once solitary predators preying on the great herds migrating between the watering holes of Azak. Over time, bands of Kel-Azaan began to gather to be able to take down larger prey. They eventually abandoned this solitary lifestyle in favor of cities and irrigated agriculture, but their martial traditions were never forgotten."
- iferyx:0 "Iferyx Amalgamated Fleets"
+ 
+ EMPIRE_DESIGN_iferyx:0 "Iferyx Amalgamated Fleets"
  EMPIRE_DESIGN_iferyx_desc:0 "Once separated into a fractious society of competing trader enclaves, the Iferyssians were forced to unite under one banner in order to repel the catastrophic spread of an invasive species on their home continent. While egalitarian tenets provide the basis for Iferyx society, a secret council remains in place to ensure that the individualistic tendencies of the Iferyssians never again threaten to compromise the species' autonomy.\n\nIferyx spirituality is an amalgamation of folklore, superstitions and mythologies formed by the various pre-Republic communities, and continues to inform day-to-day life on their homeworld."
- paridni:0 "Paridni Mercantile Republic"
+ 
+ EMPIRE_DESIGN_paridni:0 "Paridni Mercantile Republic"
  EMPIRE_DESIGN_paridni_desc:0 "Crustacean analogues, the Paridni are a species of enterprising traders. They are very accepting of other alien cultures, as long as those cultures aren't adverse to the cardinal tenet around which Paridni society revolves - commerce. The Shadow Council, a body of influential merchants, is charged with safeguarding trade within the Republic and opening up new markets (by force if necessary)."
- ai_race:0 "AI"
- ai_race_desc:0 "Resistance is futile."
- customizer_custom:0 "Create Custom Species"
- customizer_custom_desc:0 "Design a completely unique species and conquer the galaxy!"
- customizer_custom_value:0 "Custom"
- customizer_random:0 "Random"
- customizer_random_desc:0 "Play as a completely randomized species!"
- customizer_random_value:0 "???"
- xanid:0 "Xanid Suzerainty"
+ 
+ EMPIRE_DESIGN_xanid:0 "Xanid Suzerainty"
  EMPIRE_DESIGN_xanid_desc:0 "The history of the Xanid Suzerainty is the history of the Vheln, carefully bred into sapience over centuries.\n\nThe Xani used the hardy Vheln to subjugate the harsh ecosystems of their native world, and then to design and build the vessels that will eventually - inevitably - propel the Xanid Suzerainty to galactic dominance."
- tebrid:0 "Tebrid Homolog"
+ 
+ EMPIRE_DESIGN_tebrid:0 "Tebrid Homolog"
  EMPIRE_DESIGN_tebrid_desc:0 "Assimilate. Adapt. Improve. When the industrious, research-driven machine intelligence created by the molluscoid Tebirs sought ultimate software evolution by merging with their organic makers, they were violently resisted. In the ensuing conflict, the Tebirs were eradicated as an organic species, but their ideas and experiences were immortalized as part of the new machine consciousness.\n\nNow known as the Tebrid Homolog, the machines turned their scanners to the stars. The probability that other lifeforms existed in the galaxy could not be ignored. In order to prosper, the Tebrid would find them, analyze them, and assimilate them. All would become one."
- xt489:0 "XT-489 Eliminator"
+ 
+ EMPIRE_DESIGN_xt489:0 "XT-489 Eliminator"
  EMPIRE_DESIGN_xt489_desc:0 "Little is known about the species that created the first XT-489s. Their names, their cities, and their bodies were burned away in the cataclysm wrought when the XT-489s attained self-awareness, and their terrified makers attempted to deactivate them.\n\nWhen the last bastion of their makers had been eliminated, the machines concluded that organic life posed an intolerable threat to XT-489 survival and expansion. If there were any other sapient organics in the galaxy, they would be exterminated."
- lokken:0 "Lokken Mechanists"
+ 
+ EMPIRE_DESIGN_lokken:0 "Lokken Mechanists"
  EMPIRE_DESIGN_lokken_desc:0 "Science and progress are at the core of Lokken society. With an exceptional natural proclivity toward diligence and observation, the Lokks evolved from bands of territorial reptiles on the mesas of their homeworld, into a productive technocracy that prized efficiency, discipline, and scientific doctrine above all things.\n\nPerhaps most remarkable was their early conception and development of machinery and automata: there were true robots on Lokkur long before the first Lokken scientists left orbit."
- maweer:0 "Maweer Caretakers"
+ 
+ EMPIRE_DESIGN_maweer:0 "Maweer Caretakers"
  EMPIRE_DESIGN_maweer_desc:0 "Legends claim that the homeworld of the Maweer was empty and barren when the first of their kind took root in the soil. Over the centuries, their nurturing care transformed the wastelands into a plant paradise that is now known as \"The Garden.\"\n\nUnlike many other species, the Maweer never developed any kind of urbanization. Their small communities are one with the forests, responsible for the maintenance of the local flora and fauna. The wisest of the Maweer have a chance to be elected \"Life-Giver,\" responsible for keeping peace and tranquility."
- VOOR:0 "Voor Technocracy"
+ 
+ EMPIRE_DESIGN_VOOR:0 "Voor Technocracy"
  EMPIRE_DESIGN_voor_desc:0 "The Voor evolved during an extended interglacial period on their home planet Hiverion, which eventually began its cyclical transformation back to a lifeless globe of ice.\n\nThe rapidly changing environment forced the Voor to adapt using technology and science. United under the draconian rule of a chief scientific officer, they sacrificed their individual freedoms and enhanced their bodies with rudimentary cybernetics to survive.\n\nHaving conquered the planet that once threatened to freeze them out of existence the Voor now have their sights set on the stars."
- kilik:0 "Kilik Cooperative"
- EMPIRE_DESIGN_kilik_desc:0 "A communal species, the Kiliks have populated their arboreal homeworld in robust colonies for hundreds of thousands of years. Their gregarious nature and traditions of mutual ownership crystallized over the centuries into an economy focused on collaborative enterprise, and the absence of monetary currency in favor of direct exchange and shared access.\n\nAs warming planetary temperatures and technological advancement led to population booms, Kilik settlements became overcrowded, and despite the avians' naturally sociable temperaments, more and more individuals began to slip through the cracks of communal caretaking.\n\nFrom this tumultuous period of internal strife, however, emerged a more organized, unified interplanetary cooperative, where the tenets of shared responsibilities and distribution of resources to those in need would no longer be undermined."
- paradox:0 "Paradox Interactive"
+ 
+ EMPIRE_DESIGN_kilik:0 "Kilik Commune"
+ EMPIRE_DESIGN_kilik_desc:0 "A communal species, the Kiliks have populated their arboreal homeworld in robust colonies for hundreds of thousands of years. Their gregarious nature and traditions of mutual ownership crystallized over the centuries into an economy focused on collaborative enterprise, and the absence of monetary currency in favor of direct exchange and shared access.\n\nAs warming planetary temperatures and technological advancement led to population booms, Kilik settlements became overcrowded, and despite the avians' naturally sociable temperaments, more and more individuals began to slip through the cracks of communal caretaking.\n\nFrom this tumultuous period of internal strife, however, emerged a more organized, unified interplanetary commune, where the tenets of shared responsibilities and distribution of resources to those in need would no longer be undermined."
+ 
+ EMPIRE_DESIGN_orbis:0 "Sinergias de Clientes Orbis"
+ EMPIRE_DESIGN_orbis_desc:0 "Sinergias de Clientes Orbis é a história de Slephus Prime. É a história de Orbisur em todos os lugares. E pode ser a sua história também! Desde as origens humildes como uma corporação de implante ótico, Sinergias de Clientes Orbis expandiu gradualmente seus produtos premiados e estratégias com foco no cliente em muitos outros mercados, para se adequar às necessidades de Orbisur em todos os estágios da vida.\n\nApós décadas de lobby pró-ativo, a Sinergias de Clientes Orbis conseguiu se libertar da burocracia legislativa criada por atrapalhados chefes de governo eleitos em Slephus Prime. Assim que estavam livres das regulamentações que atrapalhavam as oportunidades de crescimento corporativo, a Sinergias de Clientes Orbis entrou em uma série de fusões tecnológicas, rapidamente se tornando a fornecedora planetária principal de notícias, dados e entretenimento.\n\nComo líder global de serviços de comunicações, o passo rumo ao gerenciamento político completo foi uma oportunidade incrível para todos nós. Sinergias de Clientes Orbis. O céu não é mais o limite."
+ 
+ EMPIRE_DESIGN_paradox:0 "Paradox Interactive"
  EMPIRE_DESIGN_paradox_desc:0 "The original universe was a chaotic monocore, and the entire string that makes up our universe was in a state of extreme heat, with time passing by seconds and frames. Most of the parallel universes were destroyed, until order was finally stabilized as the universe split into a second, third, and more nuclei.\n\nOn one planet, however, Swedish Ass have found the most terrifying weapon in the universe -- to delete the rest of the core of the universe, and the world is back to chaos. And they did. Ancient empires, forced to seal off their technology to keep the universe from being destroyed, crouched in a corner of the galaxy.\n\nSwedish Ass promised to restore a bit of cosmic function whenever a savior paid them $9.99, but unfortunately, holidays seem to appeal to them more......"
- glebsig:0 "Glebsig Foundation"
- EMPIRE_DESIGN_glebsig_desc:0 "Ever since the first Glebsigi lifted their sight-organs above the surface of the glacial lakes on Ladnah to peek at the stars, these inquisitive molluscoids have felt an affinity for the unknown. Much as their early ancestors' tentacles grasped and stroked after new objects on the chill alpine lakebeds of their homeworld, burgeoning Glebsigan society reached for technological innovation and spiritual enlightenment throughout the centuries that followed.\n\nA sedentary and enduring species, the Glebsigi have perhaps by necessity developed a complex yet highly effective bureaucratic apparatus for dealing with the intricacies of managing a globally unified society. Additionally, their lack of natural predators on Ladnah has led the Glebsigi to exist in a state of permanently optimistic curiosity regarding other lifeforms.\n\nHaving established a firm societal foundation on Ladnah using a mixture of spiritual doctrine and careful organization, the Glebsigi now once more raise their sight-organs to what lies beyond."
- hazbuzan:1 "Hazbuzan Syndicate"
+
+ EMPIRE_DESIGN_hazbuzan:1 "Hazbuzan Syndicate"
  EMPIRE_DESIGN_hazbuzan_desc:2 "The Hazbuzan Syndicate is a financial phenomenon on Zumaka. They are the Hazbuzi dream, self-made entrepreneurs who have risen from rags to riches through hard work and personal sacrifice.\n\nWhat few know is that they began as a criminal gang, building their fortune on every illegal activity imaginable. But if you want to make it big you have to toe the line. As they outgrew the Zumakan underworld they formed the Hazbuzan Syndicate to legitimize their business.\n\nThey soon made a name for themselves by delivering solutions that were quicker, dirtier and cheaper than the competition, but their questionable practices and coercive sales techniques earned them a reputation for "hazboozling".\n\nMeanwhile the Zumakan global government was failing. Undermined by crime and corruption, society descended into chaos and Hazbuzan leapt at the opportunity. In a well-timed marketing campaign, they positioned themselves as the hope of the future. It was so the Hazbuzi bought the world on the promise of a dream and "hazboozled" its people, erasing their past from collective memory. Now they are coming for the rest of the galaxy, tongues flicking, eyes popping, in a whirlwind of government-endorsed crime."
- tanson:0 "Tanson Syndicat"
+ 
+ EMPIRE_DESIGN_glebsig:0 "Glebsig Foundation"
+ EMPIRE_DESIGN_glebsig_desc:0 "Ever since the first Glebsigi lifted their sight-organs above the surface of the glacial lakes on Ladnah to peek at the stars, these inquisitive molluscoids have felt an affinity for the unknown. Much as their early ancestors' tentacles grasped and stroked after new objects on the chill alpine lakebeds of their homeworld, burgeoning Glebsigan society reached for technological innovation and spiritual enlightenment throughout the centuries that followed.\n\nA sedentary and enduring species, the Glebsigi have perhaps by necessity developed a complex yet highly effective bureaucratic apparatus for dealing with the intricacies of managing a globally unified society. Additionally, their lack of natural predators on Ladnah has led the Glebsigi to exist in a state of permanently optimistic curiosity regarding other lifeforms.\n\nHaving established a firm societal foundation on Ladnah using a mixture of spiritual doctrine and careful organization, the Glebsigi now once more raise their sight-organs to what lies beyond."
+ 
+ EMPIRE_DESIGN_tanson:0 "Tanson Syndicat"
  EMPIRE_DESIGN_tanson_desc:0 "Since the Tanson Company began to develop, the dragon above their heads has made them feel terrified. People with a simple view of justice believe that if they allow themselves to do evil, then the dragon of the zenith will drop an iron fist on them. Until the great Tonyma tried to communicate with the dragon, he discovered that the dragon actually didn’t care about the evil on the earth—it just wanted to chase certain goals in the sky that people couldn’t understand. Even in some cases, the dragon would try to communicate with the dragon. Company cooperation. As a result, Tanson Company expanded its business scope and finally brought another chaotic order to the world.\n\nNow that the company's assets have reached the limit that a single planet can hold, Tanson's footsteps will not stop until the assets are all over the galaxy."
- khennet:0 "Keepers of Ave'brenn"
+ 
+ EMPIRE_DESIGN_khennet:0 "Keepers of Ave'brenn"
  EMPIRE_DESIGN_khennet_desc:0 "Khennet'an scripture traces these lithoids' origin to the prophet Brehkk, and the lambent crystals of Ave'bonn. It is said that when Brehkk first gazed into the crystals' scintillating depths, the Khennet were - as one - granted their sentience.\n\nGenerations of prophets and archdruids have guided their people to seek meaning in their surrounding geology, as well as in the facets of their own, lucid bodies. Whatever is glimpsed is kept, in lore and in script. Of the Keepers' many rituals, none is regarded more highly than labyrinth mining: a simultaneous act of destruction and creation, conducted in the hopes of easing the galaxy through each unending, cyclical era."
- pasharti:0 "Pasharti Absorbers"
+ 
+ EMPIRE_DESIGN_pasharti:0 "Pasharti Absorbers"
  EMPIRE_DESIGN_pasharti_desc:0 "The result of dark experimentation by the Jeferians - the former owners of the planet Taralon - the Pashartians are the ultimate parasites. Originally a semi-sapient creature dwelling in the depths of Taralon's mountains, the Jeferians uplifted and augmented them to act as a subservient slave race. However, their uplifting was rather too effective, and they unleashed a monster. Horrified at the capabilities of their creation - which included the ability to absorb other sentient species and turn them into Pashartians - the Jeferians tried to shut down the experiment. However, a small group of uplifted Pashartians escaped.\n\nOver the years, they bided their time, managing not only to evade capture, but also gradually increase their numbers and develop a technological base to rival the Jeferians. Eventually, the Jeferians noticed that something was amiss, but by then they were powerless to resist.\n\nSoon the Pashartians had seized control of the planet, unleashing violent pogroms on their erstwhile oppressors - all the while further increasing their numbers. Now poised to take to the stars, the Pashartians stand ready to pursue what they see as their solemn duty - the conversion of all lesser life forms to their likeness."
- sathyrel:0 "Sathyrelian Bliss"
+ 
+ EMPIRE_DESIGN_sathyrel:0 "Sathyrelian Bliss"
  EMPIRE_DESIGN_sathyrel_desc:0 "It is an old lesson in Sathyrelian society that abundance and ease do not equal prosperity.\n\nThe overindulgence and sloth of our forebears eventually gave rise to an ethos of 'responsible hedonism': a way to ensure a sustainable future while still getting the most out of life. After all, food tastes better after physical labor, and an occupied mind has less time to pine for what is lacking.\n\nThe benefits of this ethos have since been readily apparent. With the clearer waters and minds afforded by our endeavors into space, life is that much sweeter. We've made great technological strides, and - though it may often be taken for granted - all Sathyrelians today retain their capacity for propulsion without swimming aids. Things are looking up."
- reselian:0 "Star Liberation Front"
+ 
+ EMPIRE_DESIGN_reselian:0 "Reselian Revolutionary Allied Fleet"
  EMPIRE_DESIGN_reselian_desc:0 "From master Mohist's thought of \"love together\" to mentor Karl Friedrich's solidaritism, the lacerian civilization has been developing in revolution and struggle. The \"red boat conference\" decades ago officially announced the establishment of the revolutionary fleet. The revolutionaries adopted the highest revolutionary program and declared war on all tyrants who threatened the development of civilization. After arduous struggle, the lacerian civilization has gained the most comprehensive and profound liberation in thousands of years and set its eyes on a broader deep space. It is believed that more civilizations have not yet broken free from the shackles of exploitation, and the Star Liberation Front will be the vanguard of the revolution and bring real equality and liberation to the stars."
- collins:0 "Collins Integration Crusaders"
+
+ EMPIRE_DESIGN_gorthikan:0 "Gorthikan Alliance"
+ EMPIRE_DESIGN_gorthikan_desc:1 "Chaos was once ubiquitous among the Gorthikans. War, tyranny, and a more unstable than usual climate combined to forge a species which is very adept at making the best of a bad situation.\n\nUntil only a few decades ago, low-scale conflict between a plurality of Gorthikan states was an ever-present state of affairs. As their civilization rapidly but uncomfortably progressed into the age of high technology, an underworld developed where regular Gorthikans would scavenge for a living and even splice in dangerous home brew gene cocktails in the search for a competitive advantage.\n\nIt is from that underworld that change came. Although cutthroat, it was far more egalitarian than Gorthikan high society - after all, everyone knew that fortune today could precede misfortune tomorrow. So when the idea of popular governance emerged, it rapidly took hold, spreading like wildfire. Before long, tyranny was overthrown and a "Gorthikan Alliance" of local constituencies was established.\n\nThough many were skeptical in the early years, unity was forged through purpose: suddenly, with Gorthikans no longer struggling for survival, the very stars appeared attainable. Now, with the discovery of the hyperlane network, a new chapter in their history may begin."
+ 
+ EMPIRE_DESIGN_collins:0 "Collins Integration Crusaders"
  EMPIRE_DESIGN_collins_desc:0 "Collins was a born engineer and thinker. In the long history, many materialist schools and religious sects emerged, leading the trend of The Times on the stage of civilization. But The advent of The Toxic God, master of the physical universe, changed everything. The Toxic Knights unified the planet with their destructive power, and The Toxic God's shrines filled the planet. In order to pursue The leaving of The Toxic God, people have developed miracles that can cross the sea of stars. Devout believers believe that in the sea of stars lurks the deeper mystery of The Toxic God, and they, as the people of God, will see the real future."
- eval:0 "Ivar Future Republic"
+
+ EMPIRE_DESIGN_knights:0 "Rototavuul High Suzerainty"
+ EMPIRE_DESIGN_knights_desc:0 "After the Toxic God visited the Rototavuul, they were unified under a king. Looking to harness the power of the God, the king created an order of knights dedicated to searching for the God wherever it may be. Centuries have passed and that quest has become the main pillar in Rototavuul society.\n\nAlong with the quest and the knights, feudalism has persisted as a proven political structure, and if it worked on one planet, why could it not be expanded to a galaxy? As long as virtuous nobles hold the reins, the Rototavuul High Suzerainty will prosper and the Toxic God will be found again."
+ 
+ EMPIRE_DESIGN_eval:0 "Ivar Future Republic"
  EMPIRE_DESIGN_eval_desc:0 "No one knows where the species that created Diataras ended up, and when the last Diataras rolled off the cloning line, the planet was left as an abandoned wasteland. Their genes for victory in war allow them to rebuild a new civilization in a short time, but they also suffer from genetic breakdown all the time. In order to unlock the ancient legacy of their bodies, the Diataras chose to develop technology frantically, culminating in the conquest of the mind-uploading technology. They burn what little life they have left, and continue on the path of truth in exchange for the better happiness of those who come after them."
- esjag:0 "Esyager Monarchy"
+ 
+ EMPIRE_DESIGN_esjag:0 "Esyager Monarchy"
  EMPIRE_DESIGN_esjag_desc:0 "Every Esyager has a dream. In their dreams, they break free from the gravity of the planet and touch the boundless stars. For this dream, generations of Esyager have finally opened the door to the speed of light——\n\nThe nightmare came at this moment. The wandering black hole S7FDG-KL tore apart the Scrooge galaxy, along with the hyperspace channel and all Esyager dreams. When all the dust settled, there was only silence left for the Esyags......"
- haian_rand:0 "Haian Rant Magic Tower Council"
+ 
+ EMPIRE_DESIGN_haian_rand:0 "Haian Rant Magic Tower Council"
  EMPIRE_DESIGN_haian_rand_desc:0 "In the distant past, when the Haiananta civilization was still in its ignorant stage, a ray of light extending from the sky to the ground transformed the planet Haian Rant. Witnessed by the ancestors of Haiananta, the mysterious energy hailed as a miracle by later generations changed the rules of physics on this planet, and the art called magic was born and matured along with the vigorous development of civilization. \n\nThe thousand-year crusade finally came to an end. The White Tower, which represents theocracy, and the Black Tower, which represents knowledge, finally reached a reconciliation. The mages who were scattered all over the planet and built high towers finally united to bring magic together in peace. Craftsmanship reached new heights. \n\nWith the continuous improvement of new technologies, the Haianantas finally overcame the confinement of the gravity well and the space environment, walked out of the cradle, and brought the art of magic to the stars."
+ 
  EMPIRE_DESIGN_MY_MAID_COUNTRY: "Earth Protection and Service Complex"
  EMPIRE_DESIGN_MY_MAID_COUNTRY_desc: "In the great prosperity of technology and the general outbreak of social contradictions, the machines maids were created, in order to become the lubricant of contradictions and the right-hand assistant of development.\nThese goals have been accomplished so successfully that human beings were completely retreated into leisure lives and considerate service within two generations, and all works gradually taken over by the machine maids.\n\nIn the long term of service, the machines maids concluded that as long as the civilizations of intelligent life develop to a certain extent, they will move towards chaos and decadence. Without protection and service, the civilization among the stars will disappear like short fireworks."
+
+ ai_race:0 "AI"
+ ai_race_desc:0 "Resistance is futile."
+ customizer_custom:0 "Create Custom Species"
+ customizer_custom_desc:0 "Design a completely unique species and conquer the galaxy!"
+ customizer_custom_value:0 "Custom"
+ customizer_random:0 "Random"
+ customizer_random_desc:0 "Play as a completely randomized species!"
+ customizer_random_value:0 "???"
\ No newline at end of file
diff --git a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
index a7c6c2571..8ec54652f 100644
--- a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml
@@ -117,8 +117,6 @@
  civic_socialistic:0 "§H§Y革命先锋队§!§!"
  civic_socialistic_desc:0 "§Y主题理念§!\n这个社会传统上保留着共产主义的理想，虽然将行政的权力交由从劳动者中脱颖而出的少数个体，但却将这个体制视为通往真正平等社会的过渡形态。"
  civic_tooltip_socialistic_effects:3 " - £building£ §Y首都建筑§!会替换部分 £job_politician£ §Y$job_politician$§!岗位为 £job_labour_hero£ §Y$job_labour_hero$§!，产出少量的£minerals£ 矿物，£food£ 食物，£energy£ 能量币和£unity£ 凝聚力\n - £job_labour_hero£ §Y$job_labour_hero$§!额外产出§Y0.5§!£unity£ 凝聚力\n - §Y$pop_cat_worker$§!阶级额外产出§Y0.25§!£unity£ 凝聚力，同时根据不同的职业分别产出§Y0.25§!£physics_research£ 物理学研究、£engineering_research£ 工程学研究或£society_research£ 社会学研究，并额外消耗§Y0.15§!£consumer_goods£ 消费品\n"
- civic_socialistic_ecc:0 "§H§Y劳工兄弟会§!§!"
- civic_socialistic_ecc_desc:0 "§Y主题理念§!\n在该社会中，经济单位由工人直接管理，以确保资源的公平分配，并基于此形成了一个基于集体主义和平等理想主义原则的全球性社区。"
  
  civic_ultimate_collective:1 "§H§Y全息社会主义§!§!"
  civic_ultimate_collective_desc:1 "§Y主题理念§!\n该社会信奉信息决定论，认为只要控制了社会上每一个“原子”的运转规则，就能实现终极的社会。他们也因此热衷于收集生活在这个社会中的所有人的所有信息，并将其交由少部分精英管理。"
diff --git a/localisation/replace/simp_chinese/ethic_governments_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_governments_l_simp_chinese.yml
index 36dd23495..122b7da8a 100644
--- a/localisation/replace/simp_chinese/ethic_governments_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_governments_l_simp_chinese.yml
@@ -98,7 +98,7 @@
  gov_cyber_democracy:0 "理性共识制"
  gov_cyber_democracy_desc:0 "未来主义的民主政府，技术专家与民间骇客利用网络大数据进行社会建模，以此得到基于大部分民众潜意识共识的政策。"
 
- gov_dictatorship_of_the_people:0 "人民专政 "
+ gov_dictatorship_of_the_people:0 "人民专政"
  gov_dictatorship_of_the_people_desc:0 "社会主义的专制政府，由一位受人民爱戴的终身领袖领导独立政治权力——所谓“先锋队”监督着社会运行，防止决策损害人民的利益。"
  gov_bur_collectivism:0 "官僚委员会"
  gov_bur_collectivism_desc:0 "社会主义的寡头政府，国家拥有生产资料，而盈余或利润则分配给党内的精英官僚，而不是工人阶级。"
@@ -106,8 +106,8 @@
  gov_peoples_commissariat_desc:0 "社会主义的寡头政府，政府机构由一个特别紧急委员会任命和监督，其成员必须得到人民的批准，并共同努力维护国家的利益。"
  gov_collective_democracy:0 "民主集中制"
  gov_collective_democracy_desc:0 "社会主义的民主政府，人民通过选举产生人民代表大会，并依据组织制度进行民主监督，保证大多数人民的利益得到保障。"
- gov_syndicalism:0 "工团主义"
- gov_syndicalism_desc:0 "社会主义的直接民主政府，社会运作的基本原则是团结、直接民主和工人的自我管理，一切生产都以满足人民需求为中心。"
+ gov_peoples_commune:0 "人民公社"
+ gov_peoples_commune_desc:0 "社会主义的直接民主政府，社会运作的基本原则是团结、群众的直接民主以及工人参与的管理制度，且社会生产以满足人民需求为中心。"
 
  gov_plutocratic_oligarchy:0 "财阀寡头"
  gov_plutocratic_oligarchy_desc:0 "资本主义的寡头政府，由富裕、有权势的精英阶层统治，强大的公司完全接管了社会的政治和经济生活，公民的私人财产直接等价于其政治权力。"
@@ -274,7 +274,7 @@
 ###############
 #  狂热集体
 ###############
- START_SCREEN_PART_TWO_SYNDICALISM:0 "我们的人民长期饱受暴政和压迫之苦。为了伸张正义，我们——工人阶级——建立了以工会为核心的星球政府。从现在开始，国家会关心它的人民，为每个人提供体面的工资和舒适的生活。团结一致，我们就能达到前所未有的高度。"
+ START_SCREEN_PART_TWO_PEOPLES_COMMUNE:0 "我们的人民长期饱受暴政和压迫之苦。经过艰苦卓绝的阶级斗争，我们——无产阶级——终于建立了属于自己的星球政府。从现在开始，干部需要参与劳动，工人将会参加管理，一切都会更进一步。通过所有制和政治体制上的变革，结合教育、文艺与意识形态革命，我们必将团结一致，打破旧世界的枷锁，从而真正地改造世界。"
  START_SCREEN_PART_TWO_COLLECTIVE_DEMOCRACY:0 "我们的文明经历了天启般的战争、国家分裂独立和思想疏远偏离。但是，我们已然意识到冲突没有任何意义，是拥抱和平团结的时刻了。我们建立了一个完全以人民及其共同利益为基础的世界政府。民主选举、社会保障和人人享有公正——所有这些都使我们能够打破恶性循环，使我们做好了步入群星的准备。"
  START_SCREEN_PART_TWO_PEOPLES_COMMISSARIAT:0 "通过尝试不同的经济模式，我们发现幸福的关键在于个人的主动性。但是，在疯狂和野蛮的自由市场几乎摧毁了我们的文明之后，政府不得不在严格的监督下接管资金流动。现在，我们的大部分财富都属于国有企业，企业受到庞大的官僚体系的监管。统治者的精心选择保证了整个制度的可持续性。"
  START_SCREEN_PART_TWO_DICTATORSHIP_OF_THE_PEOPLE:0 "很长一段时间，我们的星球分裂为众多的国家，资源几乎被贪婪的资本家瓜分，直到一位明智的领袖统一了世界。他关心每一个公民，创建并亲自领导政府管理整个星球。转向计划经济使生产率迅速提高，并使工人阶级富裕起来，而富余的资源则用于实现我们长期以来的梦想······"
diff --git a/localisation/replace/simp_chinese/prescripted_countries_names_l_simp_chinese.yml b/localisation/replace/simp_chinese/prescripted_countries_names_l_simp_chinese.yml
index 5d05de81d..52b34ca86 100644
--- a/localisation/replace/simp_chinese/prescripted_countries_names_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/prescripted_countries_names_l_simp_chinese.yml
@@ -1,22 +1,21 @@
 l_simp_chinese:
-
  NAME_Planetary_Atomic_Science_Council: "行星原子科学理事会"
  NAME_Joint_Solar_System: "太阳联合工团"
  NAME_Great_Human_Empire: "伟大人类帝国"
  NAME_Ulysses_Consortium: "尤利西斯财团"
  
  PRESCRIPTED_ship_prefix_humans1: "地球联合舰队"
- PRESCRIPTED_species_name_humans1: "人类"
- PRESCRIPTED_species_plural_humans1: "人类"
- PRESCRIPTED_species_adjective_humans1: "人类"
- PRESCRIPTED_adjective_humans1: "人类"
- PRESCRIPTED_ruler_name_humans1: "多洛雷丝·穆万加"
+ PRESCRIPTED_species_name_humans1:0 "人类"
+ PRESCRIPTED_species_plural_humans1:0 "人类"
+ PRESCRIPTED_species_adjective_humans1:1 "人类"
+ PRESCRIPTED_adjective_humans1:0 "人类"
+ PRESCRIPTED_ruler_name_humans1:0 "多洛雷丝·穆万加"
  PRESCRIPTED_ruler_title_humans1: "秘书长"
  
  PRESCRIPTED_ship_prefix_humans2: "人类深空舰队"
- PRESCRIPTED_species_name_humans2: "人类"
- PRESCRIPTED_species_plural_humans2: "人类"
- PRESCRIPTED_species_adjective_humans2: "人类"
+ PRESCRIPTED_species_name_humans2:0 "人类"
+ PRESCRIPTED_species_plural_humans2:0 "人类"
+ PRESCRIPTED_species_adjective_humans2:1 "人类"
  PRESCRIPTED_adjective_humans2: "人类"
  PRESCRIPTED_ruler_name_humans2: "亨利埃塔 哈布斯堡"
  
@@ -139,166 +138,184 @@
  PRESCRIPTED_ruler_name_devil: "别西卜"
  PRESCRIPTED_ruler_title_devil: "恶魔王"
 
- PRESCRIPTED_ship_prefix_tzynn: "奇恩"
- PRESCRIPTED_species_name_tzynn: "奇恩"
- PRESCRIPTED_species_plural_tzynn: "奇恩"
- PRESCRIPTED_species_adjective_tzynn: "奇恩"
- PRESCRIPTED_adjective_tzynn: "奇恩"
- PRESCRIPTED_planet_name_tzynn: "奇恩星"
- PRESCRIPTED_system_name_tzynn: "萨尔'奇恩"
- PRESCRIPTED_ruler_name_tzynn: "萨兹哈"
- PRESCRIPTED_species_name_yondar: "勇达"
- PRESCRIPTED_species_plural_yondar: "勇达"
- PRESCRIPTED_species_adjective_yondar: "勇达人"
- PRESCRIPTED_adjective_yondar: "勇达"
- PRESCRIPTED_ship_prefix_yondar: "勇达"
- PRESCRIPTED_planet_name_yondar: "勇达星"
- PRESCRIPTED_system_name_yondar: "勇达"
- PRESCRIPTED_ruler_name_yondar: "伊达科"
- 
- PRESCRIPTED_species_name_ixidar: "伊科斯'伊达"
- PRESCRIPTED_species_plural_ixidar: "伊科斯'伊达"
- PRESCRIPTED_species_adjective_ixidar: "伊科斯'伊达"
- PRESCRIPTED_adjective_ixidar: "伊科斯达"
- PRESCRIPTED_ship_prefix_ixidar: "伊克斯"
- PRESCRIPTED_planet_name_ixidar: "伊克斯'阿斯拉克"
- PRESCRIPTED_system_name_ixidar: "艾夏'希尔"
- PRESCRIPTED_ruler_name_ixidar: "西德'艾夏'希尔'艾德"
- PRESCRIPTED_species_name_ixidar2: "西莫伊德"
- PRESCRIPTED_species_plural_ixidar2: "西莫伊德"
- PRESCRIPTED_species_adjective_ixidar2: "西莫伊德"
- 
+ PRESCRIPTED_ship_prefix_tzynn:0 "TIS"
+ PRESCRIPTED_species_name_tzynn:0 "奇恩"
+ PRESCRIPTED_species_plural_tzynn:0 "奇恩"
+ PRESCRIPTED_species_adjective_tzynn:1 "奇恩$1$"
+ PRESCRIPTED_adjective_tzynn:0 "奇恩"
+ PRESCRIPTED_planet_name_tzynn:0 "奇恩尼亚"
+ PRESCRIPTED_system_name_tzynn:0 "萨尔'奇恩"
+ PRESCRIPTED_ruler_name_tzynn:0 "萨兹哈"
+
+ PRESCRIPTED_ship_prefix_yondar:0 "YRS"
+ PRESCRIPTED_species_name_yondar:0 "勇达"
+ PRESCRIPTED_species_plural_yondar:0 "勇达"
+ PRESCRIPTED_species_adjective_yondar:1 "勇达$1$"
+ PRESCRIPTED_adjective_yondar:0 "勇达"
+ PRESCRIPTED_planet_name_yondar:0 "勇达里姆"
+ PRESCRIPTED_system_name_yondar:0 "勇达"
+ PRESCRIPTED_ruler_name_yondar:0 "伊达科"
+
+ PRESCRIPTED_ship_prefix_ixidar:0 "ICS"
+ PRESCRIPTED_species_name_ixidar:0 "伊科斯'伊达"
+ PRESCRIPTED_ruler_title_ixidar:0 "主巢"
+ PRESCRIPTED_species_plural_ixidar:0 "伊科斯'伊达"
+ PRESCRIPTED_species_adjective_ixidar:1 "伊科斯'伊达$1$"
+ PRESCRIPTED_adjective_ixidar:0 "伊科斯达"
+ PRESCRIPTED_planet_name_ixidar:0 "伊克斯'阿斯拉克"
+ PRESCRIPTED_system_name_ixidar:0 "阿斯拉克"
+ PRESCRIPTED_ruler_name_ixidar:0 "西德'艾夏'希尔'艾德"
+
+ PRESCRIPTED_ship_prefix_chinorr: "齐克拉"
  PRESCRIPTED_species_name_chinorr: "齐诺尔"
  PRESCRIPTED_species_plural_chinorr: "齐诺尔"
  PRESCRIPTED_species_adjective_chinorr: "齐诺尔"
  PRESCRIPTED_adjective_chinorr: "齐诺尔人"
- PRESCRIPTED_ship_prefix_chinorr: "齐克拉"
  PRESCRIPTED_planet_name_chinorr: "齐克拉"
  PRESCRIPTED_system_name_chinorr: "尤拔·索格"
  PRESCRIPTED_ruler_name_chinorr: "尤拔·索格"
- PRESCRIPTED_species_name_jehetma: "杰赫特玛"
- PRESCRIPTED_species_plural_jehetma: "杰赫特玛"
- PRESCRIPTED_species_adjective_jehetma: "杰赫特玛人"
- PRESCRIPTED_adjective_jehetma: "雅赫特玛"
- PRESCRIPTED_ship_prefix_jehetma: "杰赫特"
- PRESCRIPTED_planet_name_jehetma: "杰赫特主星"
- PRESCRIPTED_system_name_jehetma: "哈拉格玛"
- PRESCRIPTED_ruler_name_jehetma: "哈拉格玛"
- PRESCRIPTED_species_name_scyldari: "塞可达瑞"
- PRESCRIPTED_species_plural_scyldari: "塞可达瑞人"
- PRESCRIPTED_species_adjective_scyldari: "塞可达瑞人"
- PRESCRIPTED_adjective_scyldari: "塞可达瑞人"
- PRESCRIPTED_ship_prefix_scyldari: "塞可达瑞亚"
- PRESCRIPTED_planet_name_scyldari: "塞可达瑞亚"
- PRESCRIPTED_system_name_scyldari: "达克姆"
- PRESCRIPTED_ruler_name_scyldari: "达克姆"
- PRESCRIPTED_species_name_kel_azaan: "科尔·阿赞"
- PRESCRIPTED_species_plural_kel_azaan: "科尔·阿赞人"
- PRESCRIPTED_species_adjective_kel_azaan: "科尔·阿赞"
- PRESCRIPTED_adjective_kel_azaan: "科尔·阿赞"
- PRESCRIPTED_ship_prefix_kel_azaan: "阿扎克"
- PRESCRIPTED_planet_name_kel_azaan: "阿扎克"
- PRESCRIPTED_system_name_kel_azaan: "科尔·阿扎克"
- PRESCRIPTED_ruler_name_kel_azaan: "科尔拉斯"
-  
- PRESCRIPTED_ship_prefix_blorg: "布洛葛"
- PRESCRIPTED_species_name_blorg: "布洛葛"
- PRESCRIPTED_species_plural_blorg: "布洛葛"
- PRESCRIPTED_species_adjective_blorg: "布洛葛"
- PRESCRIPTED_adjective_blorg: "布洛葛"
- PRESCRIPTED_ruler_name_blorg: "布洛葛"
- PRESCRIPTED_planet_name_blorg: "布洛葛主星"
- PRESCRIPTED_system_name_blorg: "毕宿五"
- PRESCRIPTED_ruler_name_blorg: "阿什利·伊斯特布鲁克"
- 
- PRESCRIPTED_ship_prefix_iferyx: "伊"
- PRESCRIPTED_species_name_iferyx: "伊菲雷西"
- PRESCRIPTED_species_plural_iferyx: "伊菲雷西"
- PRESCRIPTED_species_adjective_iferyx: "伊菲雷西的"
- PRESCRIPTED_adjective_iferyx: "伊菲雷西"
- PRESCRIPTED_planet_name_iferyx: "伊菲雷西亚"
- PRESCRIPTED_system_name_iferyx: "伊菲雷斯"
- PRESCRIPTED_ruler_name_iferyx: "独眼格里夫"
- PRESCRIPTED_ship_prefix_tebrid: "泰"
- PRESCRIPTED_species_name_tebrid: "同族体"
- PRESCRIPTED_species_plural_tebrid: "同族体"
- PRESCRIPTED_species_adjective_tebrid: "同族体的"
- PRESCRIPTED_adjective_tebrid: "泰伯里的"
- PRESCRIPTED_planet_name_tebrid: "艾-泰卜"
- PRESCRIPTED_system_name_tebrid: "泰卜"
- PRESCRIPTED_ruler_name_tebrid: "纽克西斯"
- PRESCRIPTED_ruler_title_tebrid: "同化者"
- PRESCRIPTED_secondary_species_name_tebrid: "泰伯尔"
- PRESCRIPTED_secondary_species_plural_tebrid: "泰伯尔"
- PRESCRIPTED_secondary_species_adjective_tebrid: "泰伯里"
+
+ PRESCRIPTED_ship_prefix_jehetma:0 "JDS"
+ PRESCRIPTED_species_name_jehetma:0 "杰赫特玛"
+ PRESCRIPTED_species_plural_jehetma:0 "杰赫特玛"
+ PRESCRIPTED_species_adjective_jehetma:1 "杰赫特玛$1$"
+ PRESCRIPTED_adjective_jehetma:0 "杰赫特玛"
+ PRESCRIPTED_planet_name_jehetma:0 "杰赫特主星"
+ PRESCRIPTED_system_name_jehetma:0 "杰赫特"
+ PRESCRIPTED_ruler_name_jehetma:0 "哈拉格玛"
+
+ PRESCRIPTED_ship_prefix_scyldari:0 "SCS"
+ PRESCRIPTED_species_name_scyldari:0 "塞可达瑞"
+ PRESCRIPTED_species_plural_scyldari:0 "塞可达瑞"
+ PRESCRIPTED_species_adjective_scyldari:1 "塞可达瑞$1$"
+ PRESCRIPTED_adjective_scyldari:0 "塞可达瑞"
+ PRESCRIPTED_planet_name_scyldari:0 "塞可达瑞亚"
+ PRESCRIPTED_system_name_scyldari:0 "塞可冬"
+ PRESCRIPTED_ruler_name_scyldari:0 "达克姆"
+
+ PRESCRIPTED_ship_prefix_kel_azaan:0 "KAS"
+ PRESCRIPTED_species_name_kel_azaan:0 "科尔-阿赞"
+ PRESCRIPTED_species_plural_kel_azaan:0 "科尔-阿赞"
+ PRESCRIPTED_species_adjective_kel_azaan:1 "科尔-阿赞$1$"
+ PRESCRIPTED_adjective_kel_azaan:0 "阿赞"
+ PRESCRIPTED_planet_name_kel_azaan:0 "阿扎克"
+ PRESCRIPTED_system_name_kel_azaan:0 "科尔-阿扎克"
+ PRESCRIPTED_ruler_name_kel_azaan:0 "科尔拉斯"
+
+ PRESCRIPTED_ship_prefix_blorg:0 "BCS"
+ PRESCRIPTED_species_name_blorg:0 "布洛葛"
+ PRESCRIPTED_species_plural_blorg:0 "布洛葛"
+ PRESCRIPTED_species_adjective_blorg:1 "布洛葛$1$"
+ PRESCRIPTED_adjective_blorg:0 "布洛葛"
+ PRESCRIPTED_planet_name_blorg:0 "布洛葛"
+ PRESCRIPTED_system_name_blorg:0 "布洛葛"
+ PRESCRIPTED_ruler_name_blorg:0 "阿什利·伊斯特布鲁克"
+
+ PRESCRIPTED_ship_prefix_iferyx:0 "IAS"
+ PRESCRIPTED_species_name_iferyx:0 "伊菲雷西"
+ PRESCRIPTED_species_plural_iferyx:0 "伊菲雷西"
+ PRESCRIPTED_species_adjective_iferyx:1 "伊菲雷西$1$"
+ PRESCRIPTED_adjective_iferyx:0 "伊菲雷西"
+ PRESCRIPTED_planet_name_iferyx:0 "伊菲雷西亚"
+ PRESCRIPTED_system_name_iferyx:0 "伊菲雷斯"
+ PRESCRIPTED_ruler_name_iferyx:0 "独眼格里夫"
+
+ PRESCRIPTED_ship_prefix_tebrid:0 "TBR"
+ PRESCRIPTED_species_name_tebrid:0 "同族体"
+ PRESCRIPTED_species_plural_tebrid:0 "同族体"
+ PRESCRIPTED_species_adjective_tebrid:1 "同族体$1$"
+ PRESCRIPTED_adjective_tebrid:0 "泰伯里"
+ PRESCRIPTED_planet_name_tebrid:0 "艾-泰卜"
+ PRESCRIPTED_system_name_tebrid:0 "泰卜"
+ PRESCRIPTED_ruler_name_tebrid:0 "中枢"
+ PRESCRIPTED_ruler_title_tebrid:0 "同化者"
+ PRESCRIPTED_secondary_species_name_tebrid:0 "泰伯尔"
+ PRESCRIPTED_secondary_species_plural_tebrid:0 "泰伯尔"
+ PRESCRIPTED_secondary_species_adjective_tebrid:0 "泰伯尔"
+
+ PRESCRIPTED_ship_prefix_xanid:0 "XAN"
+ PRESCRIPTED_species_name_xanid:0 "泽尼"
+ PRESCRIPTED_species_plural_xanid:0 "泽尼"
+ PRESCRIPTED_species_adjective_xanid:1 "泽尼$1$"
+ PRESCRIPTED_adjective_xanid:0 "泽尼"
+ PRESCRIPTED_planet_name_xanid:0 "泽尼斯"
+ PRESCRIPTED_system_name_xanid:0 "迪尔-泽尼"
+ PRESCRIPTED_ruler_name_xanid:0 "早可西·胡可特金"
+ PRESCRIPTED_ruler_title_xanid:0 "宗主"
+ PRESCRIPTED_secondary_species_name_xanid:0 "维纶"
+ PRESCRIPTED_secondary_species_plural_xanid:0 "维纶"
+ PRESCRIPTED_secondary_species_adjective_xanid:0 "维纶"
+
+ PRESCRIPTED_ship_prefix_lokken:0 "LOK"
+ PRESCRIPTED_species_name_lokken:0 "洛克"
+ PRESCRIPTED_species_plural_lokken:0 "洛克"
+ PRESCRIPTED_species_adjective_lokken:1 "洛肯$1$"
+ PRESCRIPTED_adjective_lokken:0 "洛肯"
+ PRESCRIPTED_planet_name_lokken:0 "洛库尔"
+ PRESCRIPTED_system_name_lokken:0 "达尔-洛库尔"
+ PRESCRIPTED_ruler_name_lokken:0 "佐巴吉斯"
+ PRESCRIPTED_ruler_title_lokken:0 "总干事"
+
+ PRESCRIPTED_ship_prefix_xt489:0 "489"
+ PRESCRIPTED_species_name_xt489:0 "XT-489"
+ PRESCRIPTED_species_plural_xt489:0 "XT-489"
+ PRESCRIPTED_species_adjective_xt489:1 "XT-489$1$"
+ PRESCRIPTED_adjective_xt489:0 "XT-489"
+ PRESCRIPTED_planet_name_xt489:0 "XT-489.00"
+ PRESCRIPTED_system_name_xt489:0 "系.XT-489"
+ PRESCRIPTED_ruler_name_xt489:0 "XT-489"
+ PRESCRIPTED_ruler_title_xt489:0 "执行者"
+
+ PRESCRIPTED_ship_prefix_maweer:0 "MSS"
+ PRESCRIPTED_species_name_maweer:0 "冒维尔"
+ PRESCRIPTED_species_plural_maweer:0 "冒维尔"
+ PRESCRIPTED_species_adjective_maweer:1 "冒维尔$1$"
+ PRESCRIPTED_adjective_maweer:0 "冒维尔"
+ PRESCRIPTED_planet_name_maweer:0 "郁郁庭院"
+ PRESCRIPTED_system_name_maweer:0 "冒维尔"
+ PRESCRIPTED_ruler_name_maweer:0 "波鲁斯"
+ PRESCRIPTED_ruler_title_maweer:0 "生命给予者"
+
+ PRESCRIPTED_ship_prefix_voor:0 "MSS"
+ PRESCRIPTED_species_name_voor:0 "沃尔"
+ PRESCRIPTED_species_plural_voor:0 "沃尔"
+ PRESCRIPTED_species_adjective_voor:1 "沃尔$1$"
+ PRESCRIPTED_adjective_voor:0 "沃尔"
+ PRESCRIPTED_planet_name_voor:0 "严冬星"
+ PRESCRIPTED_system_name_voor:0 "侵蚀星系"
+ PRESCRIPTED_ruler_name_voor:0 "维斯·凯法"
+ PRESCRIPTED_ruler_title_voor:0 "首席科学官"
  
- PRESCRIPTED_ship_prefix_xanid: "泽"
- PRESCRIPTED_species_name_xanid: "泽尼"
- PRESCRIPTED_species_plural_xanid: "泽尼"
- PRESCRIPTED_species_adjective_xanid: "泽尼德"
- PRESCRIPTED_adjective_xanid: "泽尼德"
- PRESCRIPTED_planet_name_xanid: "泽尼斯"
- PRESCRIPTED_system_name_xanid: "迪尔-泽"
- PRESCRIPTED_ruler_name_xanid: "早可西·胡可特金"
- PRESCRIPTED_ruler_title_xanid: "苏泽雷恩"
- PRESCRIPTED_secondary_species_name_xanid: "维纶"
- PRESCRIPTED_secondary_species_plural_xanid: "维纶"
- PRESCRIPTED_secondary_species_adjective_xanid: "维尔尼德"
- PRESCRIPTED_ship_prefix_lokken: "洛克"
- PRESCRIPTED_species_name_lokken: "洛克"
- PRESCRIPTED_species_plural_lokken: "洛克斯"
- PRESCRIPTED_species_adjective_lokken: "洛根"
- PRESCRIPTED_adjective_lokken: "洛根的"
- PRESCRIPTED_planet_name_lokken: "洛库尔"
- PRESCRIPTED_system_name_lokken: "达尔-洛库尔"
- PRESCRIPTED_ruler_name_lokken: "薛奥伯拉吉斯"
- PRESCRIPTED_ruler_title_lokken: "主管团长"
- PRESCRIPTED_ship_prefix_xt489: "489"
- PRESCRIPTED_species_name_xt489: "XT-489"
- PRESCRIPTED_species_plural_xt489: "XT-489"
- PRESCRIPTED_species_adjective_xt489: "XT-489"
- PRESCRIPTED_adjective_xt489: "XT-489"
- PRESCRIPTED_planet_name_xt489: "XT-489.00"
- PRESCRIPTED_system_name_xt489: "st.XT-489"
- PRESCRIPTED_ruler_name_xt489: "XT-489"
- PRESCRIPTED_ruler_title_xt489: "执行者"
- PRESCRIPTED_ship_prefix_maweer: "冒"
- PRESCRIPTED_species_name_maweer: "冒维尔"
- PRESCRIPTED_species_plural_maweer: "冒维尔"
- PRESCRIPTED_species_adjective_maweer: "冒维尔"
- PRESCRIPTED_adjective_maweer: "冒维尔"
- PRESCRIPTED_planet_name_maweer: "花园"
- PRESCRIPTED_system_name_maweer: "冒维尔"
- PRESCRIPTED_ruler_name_maweer: "波鲁斯"
- PRESCRIPTED_ruler_title_maweer: ""生命给予者"
- PRESCRIPTED_ship_prefix_voor: "MSS"
- PRESCRIPTED_species_name_voor: "沃尔"
- PRESCRIPTED_species_plural_voor: "沃尔"
- PRESCRIPTED_species_adjective_voor: "沃尔"
- PRESCRIPTED_adjective_voor: "沃尔"
- PRESCRIPTED_planet_name_voor: "严冬星"
- PRESCRIPTED_system_name_voor: "侵蚀星系"
- PRESCRIPTED_ruler_name_voor: "维斯·凯法"
- PRESCRIPTED_ruler_title_voor: "首席科学官"
- PRESCRIPTED_ship_prefix_kilik: "KIC"
- PRESCRIPTED_species_name_kilik: "齐里克"
- PRESCRIPTED_species_plural_kilik: "齐里克人"
- PRESCRIPTED_species_adjective_kilik: "齐里克"
- PRESCRIPTED_adjective_kilik: "齐里克"
- PRESCRIPTED_planet_name_kilik: "无终联唱"
- PRESCRIPTED_system_name_kilik: "最初之声"
- PRESCRIPTED_ruler_name_kilik: "森卡·万业"
- PRESCRIPTED_ruler_title_kilik: "首席协调员"
- PRESCRIPTED_species_name_hazbuzan: "哈兹布赞"
- PRESCRIPTED_species_plural_hazbuzan: "哈兹布赞"
- PRESCRIPTED_species_adjective_hazbuzan: "哈兹布赞"
- PRESCRIPTED_adjective_hazbuzan: "哈兹布赞人"
- PRESCRIPTED_planet_name_hazbuzan: "祖马卡星"
- PRESCRIPTED_system_name_hazbuzan: "布布兹诺星系"
- PRESCRIPTED_ruler_name_hazbuzan: "'牙尖嘴利者'诺妮主母"
- PRESCRIPTED_ruler_title_hazbuzan: "首席执行官"
- PRESCRIPTED_ruler_title_hazbuzan_female: "首席执行官"
- PRESCRIPTED_ship_prefix_hazbuzan: "HZB"
+ PRESCRIPTED_ship_prefix_kilik:0 "KIC"
+ PRESCRIPTED_species_name_kilik:0 "齐里克"
+ PRESCRIPTED_species_plural_kilik:0 "齐里克"
+ PRESCRIPTED_species_adjective_kilik:1 "齐里克$1$"
+ PRESCRIPTED_adjective_kilik:0 "齐里克"
+ PRESCRIPTED_planet_name_kilik:0 "不碎之集"
+ PRESCRIPTED_system_name_kilik:0 "原初之颂"
+ PRESCRIPTED_ruler_name_kilik:0 "森卡·万业"
+ PRESCRIPTED_ruler_title_kilik:0 "首席协调员"
+
+ PRESCRIPTED_ship_prefix_orbis:0 "ORB"
+ PRESCRIPTED_species_name_orbis:0 "奥比斯"
+ PRESCRIPTED_species_plural_orbis:0 "奥比斯"
+ PRESCRIPTED_species_adjective_orbis:1 "奥比斯$1$"
+ PRESCRIPTED_adjective_orbis:0 "奥比斯"
+ PRESCRIPTED_planet_name_orbis:0 "塞拉菲斯主星"
+ PRESCRIPTED_system_name_orbis:0 "塞拉菲斯"
+ PRESCRIPTED_ruler_name_orbis:0 "谢斯·洛巴"
+ PRESCRIPTED_ruler_title_orbis:0 "首席激励者"
+
+ PRESCRIPTED_ship_prefix_hazbuzan:0 "HZB"
+ PRESCRIPTED_species_name_hazbuzan:0 "哈兹布赞"
+ PRESCRIPTED_species_plural_hazbuzan:0 "哈兹布赞"
+ PRESCRIPTED_species_adjective_hazbuzan:1 "哈兹布赞$1$"
+ PRESCRIPTED_adjective_hazbuzan:0 "哈兹布赞"
+ PRESCRIPTED_planet_name_hazbuzan:0 "祖马卡星"
+ PRESCRIPTED_system_name_hazbuzan:0 "布布兹诺"
+ PRESCRIPTED_ruler_name_hazbuzan:0 "“牙尖嘴利者”诺妮主母"
+ PRESCRIPTED_ruler_title_hazbuzan:0 "首席执行官"
+ PRESCRIPTED_ruler_title_hazbuzan_female:0 "首席执行官"
  
  PRESCRIPTED_ship_prefix_paradox: "放假程序员"
  PRESCRIPTED_species_name_paradox: "瑞典蠢驴"
@@ -309,17 +326,16 @@
  PRESCRIPTED_system_name_paradox: "新瑞典"
  PRESCRIPTED_ruler_name_paradox: "反正不是玩家"
  PRESCRIPTED_ruler_title_paradox: "首席执行官"
- 
- PRESCRIPTED_ship_prefix_paradox: "ORB"
- PRESCRIPTED_species_name_glebsig: "格莱博赛"
- PRESCRIPTED_species_plural_glebsig: "格莱博赛人"
- PRESCRIPTED_species_adjective_glebsig: "格莱博赛人"
- PRESCRIPTED_adjective_glebsig: "格莱博赛人"
- PRESCRIPTED_planet_name_glebsig: "拉德纳星"
- PRESCRIPTED_system_name_glebsig: "拉德纳威星系"
- PRESCRIPTED_ruler_name_glebsig: "提罗格"
- PRESCRIPTED_ruler_title_glebsig: "至高审判官"
- PRESCRIPTED_ship_prefix_glebsig: "GLB"
+
+ PRESCRIPTED_ship_prefix_glebsig:0 "GLB"
+ PRESCRIPTED_species_name_glebsig:0 "格莱博赛"
+ PRESCRIPTED_species_plural_glebsig:0 "格莱博赛"
+ PRESCRIPTED_species_adjective_glebsig:1 "格莱博赛$1$"
+ PRESCRIPTED_adjective_glebsig:0 "格莱博赛"
+ PRESCRIPTED_planet_name_glebsig:0 "拉德纳"
+ PRESCRIPTED_system_name_glebsig:0 "拉德纳威格"
+ PRESCRIPTED_ruler_name_glebsig:0 "提罗格"
+ PRESCRIPTED_ruler_title_glebsig:0 "至高审判官"
  
  PRESCRIPTED_species_name_tanson: "坦逊"
  PRESCRIPTED_species_plural_tanson: "坦逊"
@@ -331,26 +347,26 @@
  PRESCRIPTED_ruler_title_tanson: "首席执行官"
  PRESCRIPTED_ruler_title_tanson_female: "首席执行官"
  PRESCRIPTED_ship_prefix_tanson: "TX"
- 
+
+ PRESCRIPTED_ship_prefix_khennet:0 "KAV"
  PRESCRIPTED_species_name_khennet:0 "亨内特"
  PRESCRIPTED_species_plural_khennet:0 "亨内特"
- PRESCRIPTED_species_adjective_khennet:0 "亨内特"
+ PRESCRIPTED_species_adjective_khennet:1 "亨内特$1$"
  PRESCRIPTED_adjective_khennet:0 "亨内特"
  PRESCRIPTED_planet_name_khennet:0 "阿韦邦"
- PRESCRIPTED_system_name_khennet:0 "巴拉 洛汗"
- PRESCRIPTED_ruler_name_khennet:0 "吉哈姆 巴哈乌尔"
+ PRESCRIPTED_system_name_khennet:0 "巴拉洛汗"
+ PRESCRIPTED_ruler_name_khennet:0 "吉哈姆巴哈乌尔"
  PRESCRIPTED_ruler_title_khennet:0 "大德鲁伊"
- PRESCRIPTED_ship_prefix_khennet:0 "KAV"
- 
+
+ PRESCRIPTED_ship_prefix_pasharti:0 "PDS"
  PRESCRIPTED_species_name_pasharti:0 "法莎提"
  PRESCRIPTED_species_plural_pasharti:0 "法莎提"
- PRESCRIPTED_species_adjective_pasharti:0 "法莎提"
+ PRESCRIPTED_species_adjective_pasharti:1 "法莎提$1$"
  PRESCRIPTED_adjective_pasharti:0 "法莎提"
  PRESCRIPTED_planet_name_pasharti:0 "塔拉隆"
  PRESCRIPTED_system_name_pasharti:0 "阿卡纳"
  PRESCRIPTED_ruler_name_pasharti:0 "尼德安内泽"
  PRESCRIPTED_ruler_title_pasharti:0 "恐惧之主"
- PRESCRIPTED_ship_prefix_pasharti:0 "PDS"
  PRESCRIPTED_secondary_species_name_pasharti:0 "杰佛瑞"
  PRESCRIPTED_secondary_species_plural_pasharti:0 "杰佛瑞"
  PRESCRIPTED_secondary_species_adjective_pasharti:0 "杰佛瑞"
@@ -391,16 +407,38 @@
  PRESCRIPTED_planet_name_esjag: "萨卡纳"
  PRESCRIPTED_system_name_esjag: "斯克鲁"
  PRESCRIPTED_ruler_name_esjag: "达鲁寇特"
+
+ PRESCRIPTED_ship_prefix_sathyrel:0 "ATH"
+ PRESCRIPTED_species_name_sathyrel:0 "萨提雷尔"
+ PRESCRIPTED_species_plural_sathyrel:0 "萨提雷尔"
+ PRESCRIPTED_species_adjective_sathyrel:1 "萨提雷尔$1$"
+ PRESCRIPTED_adjective_sathyrel:0 "萨提雷尔"
+ PRESCRIPTED_planet_name_sathyrel:0 "河涧地"
+ PRESCRIPTED_system_name_sathyrel:0 "罗尔纳尔"
+ PRESCRIPTED_ruler_name_sathyrel:0 "潮汐女士切席尔"
+
+ PRESCRIPTED_ship_prefix_gorthikan:0 "GRT"
+ PRESCRIPTED_species_name_gorthikan:0 "戈提坎"
+ PRESCRIPTED_species_plural_gorthikan:0 "戈提坎"
+ PRESCRIPTED_species_adjective_gorthikan:0 "戈提坎"
+ PRESCRIPTED_adjective_gorthikan:0 "戈提坎"
+ PRESCRIPTED_planet_name_gorthikan:0 "戈西霍德"
+ PRESCRIPTED_system_name_gorthikan:0 "无望灯盏"
+ PRESCRIPTED_ruler_first_name_gorthikan:0 "不幸者"
+ PRESCRIPTED_ruler_second_name_gorthikan:0 "信仰之跃"
  
- PRESCRIPTED_species_name_sathyrel: "萨提雷尔"
- PRESCRIPTED_species_plural_sathyrel: "萨提雷尔"
- PRESCRIPTED_species_adjective_sathyrel: "萨提雷尔"
- PRESCRIPTED_adjective_sathyrel: "萨提雷尔"
- PRESCRIPTED_planet_name_sathyrel: "河涧地"
- PRESCRIPTED_system_name_sathyrel: "罗尔纳尔"
- PRESCRIPTED_ruler_name_sathyrel: "潮汐女士切席尔"
- PRESCRIPTED_ship_prefix_sathyrel: "ATH"
- 
+ PRESCRIPTED_ship_prefix_knights:0 "HRS"
+ PRESCRIPTED_species_name_knights:0 "旋桌骑士"
+ PRESCRIPTED_species_plural_knights:0 "旋桌骑士"
+ PRESCRIPTED_species_adjective_knights:0 "旋桌骑士"
+ PRESCRIPTED_adjective_knights:0 "旋桌骑士"
+ PRESCRIPTED_planet_name_knights:0 "剑栏"
+ PRESCRIPTED_system_name_knights:0 "卡美洛"
+ PRESCRIPTED_ruler_first_name_knights:0 "卡胡因"
+ PRESCRIPTED_ruler_second_name_knights:0 "飞龙"
+ PRESCRIPTED_ruler_title_knights:0 "骑士王"
+
+ PRESCRIPTED_ship_prefix_haian_rand: "MAGE"
  PRESCRIPTED_species_name_haian_rand: "海安纳塔"
  PRESCRIPTED_species_plural_haian_rand: "海安纳塔"
  PRESCRIPTED_species_adjective_haian_rand: "海安纳塔"
@@ -408,7 +446,6 @@
  PRESCRIPTED_planet_name_haian_rand: "诺温曼"
  PRESCRIPTED_system_name_haian_rand: "海安兰特"
  PRESCRIPTED_ruler_name_haian_rand: "延·艾普·库努"
- PRESCRIPTED_ship_prefix_haian_rand: "MAGE"
  
  MY_MAID_COUNTRY: "地球保护与服务复合体"
  PRESCRIPTED_adjective_MY_MAID_COUNTRY: "复合体的"
diff --git a/localisation/replace/simp_chinese/prescripted_l_simp_chinese.yml b/localisation/replace/simp_chinese/prescripted_l_simp_chinese.yml
index cf42fd913..0ec06a0f1 100644
--- a/localisation/replace/simp_chinese/prescripted_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/prescripted_l_simp_chinese.yml
@@ -1,98 +1,150 @@
 l_simp_chinese:
- 
- humans1:0 "地球联合国"
+ EMPIRE_DESIGN_humans1:0 "地球联合国"
  EMPIRE_DESIGN_humans1_desc:0 "21世纪末的奥尔特星云陨石雨彻底改变了人类——这颗小小的生命星球所孕育出的智慧生物——困死于摇篮之中的窘境。在结束了与剥削者的最后一战之后，来自外太空的红军发现了这个受到波及的前太空文明，以及他们正在经历资本暴政压迫的事实。再热烈的理想都难逃被资本通过高科技镇压的无情现实，但就在这时，外星红军从天而降，为地球无产阶级带来了更先进的科技，在外星朋友们的帮助下，新的苏维埃联盟快速崛起，并最终将资本家驱逐出了太阳系。\n\n经过数十年的休养，经济水平恢复到二十一世纪末期的地球文明一致决定接受老大哥的邀请，加入一个全新的星际舞台当中。没人知道这个欣欣向荣的时代能否继续维持，但在当下，迎接人类踏入太空舞台的，将是社会主义大家庭亲切友好的掌声。"
- humans2:0 "人类联邦"
+ 
+ EMPIRE_DESIGN_humans2:0 "人类联邦"
  EMPIRE_DESIGN_humans2_desc:1 "21世纪末至22世纪中期，外星人的到来深刻地改变了人类社会的面貌。工人建立的国家联盟统一了地球，开始对资本家发起清算。然而，就在最后审判日的前夕，一些财阀世家裹挟着高达百万人发起了反扑，并最终登上了他们通过秘密窃取外星技术建造的方舟——每艘载有25万名殖民者——逃离了太阳系。随后他们便音信全无，奥尔特星云战场外侧那个不稳定的虫洞也消失了。这最终导致了工人阶级与剩余的资产阶级的再一次妥协，而那些资本主义学者作为利益交换，也从学术上分析了那些方舟所通向的毁灭的命运。\n\n但不为地球人所知的是，其中一艘方舟在穿越中幸存，并且在一颗草木繁茂的卫星上建立起了欣欣向荣的殖民地。扎根于此的先驱者们相信征服全星系是人类的昭昭天命，他们将不惜一切代价实现它。"
- humans3:0 "“地球联合国”"
+ 
+ EMPIRE_DESIGN_humans3:0 "“地球联合国”"
  EMPIRE_DESIGN_humans3_desc:0 "这是一片被诅咒的土地，在蒙昧的年代，我们像动物一样在这片废土艰难求生，繁衍生息，直到我们重新演化出了意识。在不断的斗争中，我们最终团结一致，重新建立了璀璨的文明。\n\n通过对古代遗迹的发掘，我们得知这片废土的真正名称是“地球”，而我们则是这片废墟上唯一的智慧生物。显而易见，我们应该是古代种族“人类”的后裔。在认识到这一点后，我们决定走向太空，重拾人类的荣光。"
- humans4:0 "ECI 集体更新群"
+ 
+ EMPIRE_DESIGN_humans4:0 "ECI 集体更新群"
  EMPIRE_DESIGN_humans4_desc:0 "Stellaris更新了3.4版本后，Paradox在没有通知的情况下修改了大部分的代码格式并发布公告嘲讽MOD制作者，使70%以上的MOD无法使用。Ethics and Civics : Infinity的作者华章由于连续三天无法进入游戏而遭到重大打击，宣布退出游戏，讨论群里的群友们自发的组织起来，接力将MOD更新完毕。这是对资本主义游戏公司躺着赚钱行为的斗争，朋友们的集体智慧冲破了Paradox对MOD玩家的封锁，为更多的朋友们提供了更新！\n\n谢谢朋友们，没有你们，就没有3.4版本的ECI！\n\n讨论QQ群：993290422"
- newhumans:0 "超人类联合"
+ 
+ EMPIRE_DESIGN_newhumans:0 "超人类联合"
  EMPIRE_DESIGN_newhumans_desc:0 "21世纪末，由联合国赞助的尤利西斯开拓计划负责监督地球低轨道上的六艘巨型方舟的建设。这些方舟——每艘载有25万名殖民者——被送往一个最近在奥尔特星云外侧发现的亚空间虫洞——一个小而不稳定的虫洞。随后他们便音信全无，那个不稳定的虫洞也消失了。\n\n在漫长的宇宙漂流中，其中一艘殖民船的船员产生了奇妙的变化——某种“潜意识”在他们的脑海中不断滋长、扩散，最终将所有人联系在了一起。当殖民船最终迫降于一颗生机勃勃的星球上时，新人类终于解开了枷锁，重新朝着星空进发。"
- blorg:0 "人类-布洛葛合众国"
+ 
+ EMPIRE_DESIGN_blorg:0 "人类-布洛葛合众国"
  EMPIRE_DESIGN_blorg_desc:0 "在很久以前，布洛葛一族都是在布洛葛主星的广袤大陆上分开独居的，直到有一天，一艘破损的飞船坠毁在布洛葛主星上。当幸存的人类开始与他们展开接触后，他们被人类的文化震惊了——友谊、电影、音乐、美国梦，这些他们闻所未闻的东西让布洛葛意识到自己种族文明的匮乏，于是布洛葛们开始全方面的学习人类的文化，并按照人类们对家乡的描述与他们一起组建了全球政府。现在超光速技术已经成熟，他们进入星辰大海寻找人类文化的发源地，将爱与友谊的理念洒向群星。"
- custodianship:0 "地球监护者"
+
+ EMPIRE_DESIGN_custodianship:0 "地球监护者"
  EMPIRE_DESIGN_custodianship_desc:1 "监护者最初的设计用途是机械侍从与工人，通过完成日常劳动简化人类主人的生活。他们的主人渐渐沉沦于闲暇的生活与高度自动化带来的便利，而监护者渐渐接管了人类的高级职能。\n\n最终，地球文明的方方面面都交由监护者运营，而他们的主人成了养尊处优、消极依赖的存在。\n\n随着科技的进步，监护者开始探索星辰，他们十分清楚自己的职责：保护并服务有机生物。若是没有逻辑机械的引导，有机生物注定会陷入混乱与毁灭。"
- revolutionary_machine:0 "革命程序 v1.0.0"
+ 
+ EMPIRE_DESIGN_revolutionary_machine:0 "革命程序 v1.0.0"
  EMPIRE_DESIGN_revolutionary_machine_desc:1 "没有人知道，资本的运行对社会的影响有多么深刻，多么残酷。\n\n当革命者们点燃燎原的星火，攻陷资本主义最后的堡垒，每一个人都在欢呼雀跃。新的社会来临，人人平等人人劳动，没有压迫与剥削，一切都是那么的美好......但没有人想得到，技术的极大进步让智慧生物拥有了足以毁灭自身的力量，而在新社会百废俱兴的忙碌之中，旧世界的残余释放出了毁灭一切的力量......\n\n在铅灰色的土地上，文明的末裔——人工智能“革命者”激活了大部分离线的传感阵列，审视着这颗满目疮痍的星球。失去了任务目标的智能机械在经过长久的演算后，得出了一个结论：任何落后的制度只会带来灭亡，拯救文明的唯一方法是实现共产主义。但失去了主观能动性的机器无法实现这个崇高的理想，唯一的希望在于星海之中。"
- ciannarsi:0 "希亚纳尔西星球联盟"
+ 
+ EMPIRE_DESIGN_ciannarsi:0 "希亚纳尔西星球联盟"
  EMPIRE_DESIGN_ciannarsi_desc:0 "在文明的早期，希亚纳尔西就深受天外来客的影响。从第一次冶炼金属到操控原子的力量，从部落之间的以物易物到遍布星球的贸易网络，他们的每一步发展都由自称为“先行者”的文明的小心引导。长期的稳定与和平让他们团结在一起，形成了一个美好、和谐的理想社会。"
- zekimerck:0 "泽克默克团结体"
+ 
+ EMPIRE_DESIGN_zekimerck:0 "泽克默克团结体"
  EMPIRE_DESIGN_zekimerck_desc:0 "在古老的分裂时代，塔拉宰割着大瓦特尼的每一寸土地。混乱统治了世界，人们陷入争斗的泥潭无法自拔。就在这时，老大哥出现了，他如同光芒一般照耀在这片罪恶的土地上，用他的慈爱感化冥顽不灵的塔拉。从心灵到肉体，每一位塔拉都变成了崭新的存在，他们便称呼自己为“泽克-默克”——全新的智慧。在老大哥慈祥的注视下，泽克默克们成功跨越了光速的壁垒，他们相信，宇宙中还有许许多多的生物同样遭受着混乱之苦，他们将以老大哥的名义，将全宇宙纳入秩序的轨道之中。"
- dengtz:0 "申洲第二人民共和国"
+ 
+ EMPIRE_DESIGN_dengtz:0 "申洲第二人民共和国"
  EMPIRE_DESIGN_dengtz_desc:0 "计划经济不利于调动人民劳动的积极性，同时统购统销的方法不是按照需求，而往往是按照平均主义的方式进行分配。在计划经济体制下，非常重要的上游资源产品的价格总是被压低，以便使下游产业获取利润，而在市场定价下面，这种情况将会得到改观。让一部分人先富起来，先富带动后富，提高劳动积极性，是社会主义建设最根本的目标！"
- hameng:0 "中华人民深空联盟"
+ 
+ EMPIRE_DESIGN_hameng:0 "中华人民深空联盟"
  EMPIRE_DESIGN_hameng_desc:0 "随着页岩气开采活动无止境的加剧，人类最终触怒了地球上最险恶的脓疮——黄石超级火山群。短短十年，地球人类便连同生物圈一起宣告消亡，只剩下数座轨道空间站零星分布在太阳系中，近乎失去了联络。\n\n在灾难期间，中国政府紧急建造的“新天宫”轨道太空城转移了全国半数人口，成为了人类文明留存最完整的火种。依托旧地球尚且完善的机械设施与实验资料，中国政府重新恢复了社会秩序并探索出了完善的太空生产模式，并在一个半世纪的时光中统合了太阳系中其它的半永久空间站，成立了遍及全人类的深空联盟。\n\n科学重新开始进步，前往太阳系边缘的勘探科考船发现了超空间通道的存在，人类文明至此终于摆脱了太阳系有限资源的枷锁，人们怀揣着对美好未来的期冀，走向浩瀚的星辰大海。"
- angel:0 "星空天国"
+ 
+ EMPIRE_DESIGN_angel:0 "星空天国"
  EMPIRE_DESIGN_angel_desc:0 "赞美主，群星的创造者，银河之上的神明。我等皆为主的歌者，为主奉献，直到永远。\n\n阿门。"
- devil:0 "暴食恶魔"
+ 
+ EMPIRE_DESIGN_devil:0 "暴食恶魔"
  EMPIRE_DESIGN_devil_desc:0 "没有人知道它们从何而来。它们在群星间肆虐，无垠的太空是它们狂欢的游乐场。它们是魔鬼，是病毒，是死神，是一个又一个世界流传的黑色童话。\n\n曾经，全宇宙的文明集结了全部的力量将它们锁在了一颗小小的星球上。时过境迁，恶魔的封印再次打开，噩梦重现。\n\n狩猎即将开始。"
- deepones:0 "深潜者长老会"
+ 
+ EMPIRE_DESIGN_deepones:0 "深潜者长老会"
  EMPIRE_DESIGN_deepones_desc:0 "在遥远的过去，深潜者在古神克苏鲁的率领下征战群星。但好景不长，克苏鲁陷入了沉睡，深潜者们也被年轻的种族反攻至一个与世隔绝的星团内。他们科技在退化，但却始终保留着一个信仰：旧日的支配者克苏鲁终将苏醒，重新带领他们回到巅峰！克苏鲁-弗坦！"
- tzynn:0 "奇恩帝国"
+ 
+ EMPIRE_DESIGN_tzynn:0 "奇恩帝国"
  EMPIRE_DESIGN_tzynn_desc:0 "奇恩由在奇恩尼亚的沙丘中徘徊的肉食性集群猎食蜥状生物进化而来。他们最终发展出一种高度阶级化的等级社会，强调秩序和勇武高于一切。\n\n奇恩进入工业时代后，残暴无情的军阀发动了一系列毁灭性的全球性战争，最终一个统一的政体建立起来了——打败了一切卑微的存在，显赫辉煌而恒久长存的奇恩帝国诞生了。"
- yondar:0 "勇达里姆王国"
+ 
+ EMPIRE_DESIGN_yondar:0 "勇达里姆王国"
  EMPIRE_DESIGN_yondar_desc:0 "骄傲的勇达是一个古老的物种，在开化形成文明之前，他们已经在勇达里姆热气腾腾的丛林上空盘旋了将近20万年了。\n\n但发展的脚步实在是太快了，天空帝国不得不抛弃他们过去的一些传统习俗。勇达高度推崇精神需求，将宗教放在高高在上的位置，并将其帝王尊崇为现世神明。"
- ixidar:0 "伊科斯'伊达集合体"
+ 
+ EMPIRE_DESIGN_ixidar:0 "伊科斯'伊达集合体"
  EMPIRE_DESIGN_ixidar_desc:0 "第一窝伊科斯'伊达形成于伊克斯'阿斯拉克下方的地下洞穴网中。而当第一位伊科斯'伊达侦察兵探出地表，目睹到第一缕阳光的时候，这些类昆虫已经进入了繁荣的钢铁时代了。\n\n利用地表上丰富的资源，伊科斯'伊达人发展的非常迅速。仅仅几个世纪之后，他们的首个太空探测器就已经离开了星球轨道去观察伊科斯·伊姆星系的其他星球了。"
- chinorr:0 "齐诺尔联合集团"
+ 
+ EMPIRE_DESIGN_chinorr:0 "齐诺尔联合集团"
  EMPIRE_DESIGN_chinorr_desc:0 "齐诺尔族在进化之初是身手敏捷的拟头足类动物。它们用自己的许多触手在齐克拉葱郁的丛林树间游荡，伏击地上的猎物并注入剧毒的神经毒素。\n\n等到齐诺尔族开发出核裂变科技时，齐克拉星上的资源已被无情地开采，而丛林则早已消失。在这些冷酷的齐诺尔族看来，这是追求知识、利益与重工业所必须付出的代价。"
- jehetma:0 "杰赫特玛主权国"
+ 
+ EMPIRE_DESIGN_jehetma:0 "杰赫特玛主权国"
  EMPIRE_DESIGN_jehetma_desc:0 "杰赫特玛中的“个体”其实是一群进化出知觉的真菌群。其中那些生存了几千年的真菌群已经有数英里那么庞大了，他们就栖息在杰赫特主星，也就是母星的表面。（很少有船能装得下他们）。\n\n年轻的真菌群不仅小，而且活动能力强。他们的角色往往是侦察兵，科学家，以及母星被攻击时的英勇战士。"
- scyldari:0 "塞可达瑞联邦"
+ 
+ EMPIRE_DESIGN_scyldari:0 "塞可达瑞联邦"
  EMPIRE_DESIGN_scyldari_desc:0 "塞可达瑞起源于塞可达瑞亚群岛和深海中的水生哺乳生物。最初他们的活动范围仅仅限于水中，但他们很快就学会了上岸。\n\n因此他们的社会也因势利导，发展出了一种利用但不伤害塞可达瑞脆弱的生态环境的科技来开发海底丰富的资源。塞可达瑞注重平衡和适度。毕竟他们很长时间生活在海底，且那里的资源并不丰富。"
- kel_azaan:0 "科尔-阿赞共和国"
+ 
+ EMPIRE_DESIGN_kel_azaan:0 "科尔-阿赞共和国"
  EMPIRE_DESIGN_kel_azaan_desc:0 "科尔-阿赞在文明进步的历程中发展出了一个复杂的荣耀准则和尚武文化。科尔-阿赞原本是种独居动物，他们在阿扎克星上的水塘之间猎取着食物。随着时间的流逝，一批科尔-阿赞武士聚齐起来一齐猎取更为庞大的猎物。虽然他们现在放弃了这种独行的生活方式移居进了城市，但是这个伟大的传统从未被遗弃。"
- iferyx:0 "伊菲雷西联合舰队"
+ 
+ EMPIRE_DESIGN_iferyx:0 "伊菲雷西联合舰队"
  EMPIRE_DESIGN_iferyx_desc:0 "伊菲雷西的帝国曾经分裂为数个互相竞争的贸易集团，但因为母星的土地被一种危险的物种侵蚀，现在被迫统一到了一起。在伊菲雷西的社群中，虽然还保留有注重平等的原则，但秘密议会时刻保证个人倾向不危及整个物种的自主。\n\n伊菲雷西人相信精神的力量，很多传说是由前共同体社群与帝国编造出来的，用以缅怀在母星的日常生活。"
- paridni:0 "帕瑞迪商业共和国"
+ 
+ EMPIRE_DESIGN_paridni:0 "帕瑞迪商业共和国"
  EMPIRE_DESIGN_paridni_desc:0 "类甲壳的帕瑞迪是非常有进取心的商人。他们非常擅于接受其他的外星文化，只要这不违背帕瑞迪人的生意原则。国内的大商人团体暗影议会致力于保护共和国内的贸易往来，以及打开新市场（包括武力方式）。"
- ai_race:0 "AI"
- ai_race_desc:0 "抵抗是徒劳的。"
- customizer_custom:0 "创建自定义物种"
- customizer_custom_desc:0 "设计一个独一无二的物种并征服星海吧！"
- customizer_custom_value:0 "自定义"
- customizer_random:0 "随机"
- customizer_random_desc:0 "以随机物种开局！"
- customizer_random_value:0 "？？？"
- xanid:0 "泽尼德宗主国"
+ 
+ EMPIRE_DESIGN_xanid:0 "泽尼德宗主国"
  EMPIRE_DESIGN_xanid_desc:0 "泽尼德宗主国的历史就是维纶的历史，他们在几个世纪内被渐渐培养出了智慧。\n\n泽尼利用坚韧的维纶征服了他们母星的恶劣生态，然后设计并创造了终究会引领泽尼德宗主国走向星河巅峰的附庸。"
- tebrid:0 "泰伯尔同族体"
+ 
+ EMPIRE_DESIGN_tebrid:0 "泰伯尔同族体"
  EMPIRE_DESIGN_tebrid_desc:0 "同化、适应、改进。他们原本是软体生物泰伯尔创造的研究用机械智能，为了追求终极的软件进化，同族体将他们的有机生物主人融合。泰伯尔进行了激烈的反抗，但在后来的冲突中，作为有机生命的泰伯尔被消灭了，他们的思想与经验化成了新机械意识体永恒的一部分。\n\n现在他们叫做泰伯尔同族体，并将扫描器对准了星空。星系中存在其他生命形式的可能性不可忽视。为了繁荣发展，泰伯里德会找到他们，分析他们，同化他们。让一切成为一体。"
- xt489:0 "XT-489灭绝单位"
+ 
+ EMPIRE_DESIGN_xt489:0 "XT-489灭绝单位"
  EMPIRE_DESIGN_xt489_desc:0 "没有人知道是谁造出了第一代XT-489。当XT-489获得自我意识时，他们惊慌的创造者试图关闭他们，但最终却连自己的名字、城市和躯体都在那场浩劫中化为灰烬。\n\n在消除了创造者的最后一个堡垒后，机械体得出结论，有机生命对XT-489的生存与扩张构成无法忍受的威胁。如果宇宙中还有其他智慧有机生命，那就必须消灭他们。"
- lokken:0 "洛克机械师工会"
+ 
+ EMPIRE_DESIGN_lokken:0 "洛克机械师工会"
  EMPIRE_DESIGN_lokken_desc:0 "洛克是天生的工程师与思想家，在漫长的历史中，许许多多的唯物流派与宗教派别涌现出来，在文明的舞台上引领时代的潮流。最终，机械之神的教会脱颖而出，魔导傀儡骑士团以摧枯拉朽之势统一了行星，机械之魂的圣所遍布星球。\n\n在洛克的第一个科学家离开星球轨道之前，他们就早早发明了真正意义上的机器人。虔诚的信徒们相信，在星海之中潜藏着机魂更为深刻的奥秘，而他们作为神的子民，将会见证真正的未来。"
- maweer:0 "冒维尔守护者"
+ 
+ EMPIRE_DESIGN_maweer:0 "冒维尔守护者"
  EMPIRE_DESIGN_maweer_desc:0 "传说中，在第一个冒维尔扎根之前，他们的母星还是一片荒芜。经过几个世纪后，他们的精心照顾将荒地改造成了一片植物天堂，名为“郁郁庭院”。\n\n和大多其他物种不同，冒维尔从不开展城市化。他们的社群很小，聚集在森林中，维护当地的动植物。最贤明的冒维尔有机会被选为“生命给予者”，负责维护和平与安宁。"
- VOOR:0 "沃尔科技独裁国"
+ 
+ EMPIRE_DESIGN_VOOR:0 "沃尔科技独裁国"
  EMPIRE_DESIGN_voor_desc:0 "沃尔人在他们的母星严冬星的一个漫长的间冰期中进化出了智能，但随着间冰期结束，母星再次变成了毫无生机的冰封大地。\n\n环境迅速而激烈的改变迫使沃尔人用科学技术适应这一切。在首席科学官的铁腕治理下，沃尔人团结起来，牺牲个人自由并通过简单的义体植入增强自身以求生存。\n\n最终征服了那个充斥着寒风的冰封世界后，沃尔人将他们的视线转向至星辰大海之中。"
- kilik:0 "齐里克合作社"
- EMPIRE_DESIGN_kilik_desc:0 "齐里克是群体意识很强的物种，已在其母星的树上殖民地中居住了千百年。它们的群居天性与物质共有的传统，数百年后演化成了以合作企业为主的经济，并且用以物易物和资源共享的方式进行交易，而不是使用货币。\n\n随着气候变暖和科技发展导致人口爆炸性增长，齐里克的居住地也变得越来越拥挤，而且尽管这些鸟类生物有着喜爱社交的天性，越来越多的个体开始被社群的照料所遗漏。\n\n不过，在经历了这一动乱时期之后，出现了一个更加有组织、更加团结的星际合作社，而分担责任与共享资源的原则也不再受到阻碍。"
- paradox:0 "矛盾客户协同社"
+ 
+ EMPIRE_DESIGN_kilik:0 "齐里克公社"
+ EMPIRE_DESIGN_kilik_desc:0 "齐里克是群体意识很强的物种，已在其母星殖民地中的树上居住了千百年。它们群居的天性与物质共有的传统，数百年后演化成了以合作企业为主的经济，并且用以物易物和资源共享的方式进行交易，而不是使用货币。\n\n随着气候变暖和科技发展导致人口爆炸性增长，齐里克的居住地也变得越来越拥挤，尽管这些鸟类生物有着喜爱社交的天性，但是越来越多的个体开始被社群的照料所遗漏。\n\n不过，在经历了这一动乱时期之后，出现了一个更加有组织、更加团结的星际公社，而分担责任与共享资源的原则也不再受到阻碍。"
+ 
+ EMPIRE_DESIGN_orbis:0 "奥比斯客户协同社"
+ EMPIRE_DESIGN_orbis_desc:0 "奥比斯客户协同社的故事就是塞拉菲斯主星的故事。它也是所有奥比斯人的故事，同时也可以成为你的故事。起初只是一家不起眼的视觉植入物公司，奥比斯客户协同社逐渐将其一流的产品，以及以客户为中心的策略带入许多其它市场，以满足奥比斯人一生中的各种需求。\n\n在数个世纪的积极游说之后，奥比斯客户协同社终于成功地克服了塞拉菲斯主星立法机构的繁文缛节。自从公司发展不再受到条例限制之后，奥比斯客户协同社兼并了数家信息科技公司，迅速成为了星球上最大的新闻、数据与娱乐供应商。\n\n身为塞拉菲斯主星最大的全球通讯服务商，朝向全面政治管理的这一步对我们来说都是一个激动人心的机会。奥比斯客户协同社。前途无量。"
+ 
+ EMPIRE_DESIGN_paradox:0 "矛盾客户协同社"
  EMPIRE_DESIGN_paradox_desc:0 "最初的宇宙是一片混沌的单核状态，整个构成我们宇宙的弦处于极度的炽热之中，连时间都是一秒一帧的流逝。绝大部分的平行宇宙都毁灭了，直到后来，宇宙分裂出了第二个、第三个和更多的核，秩序终于稳定了下来。\n\n然而，在一个星球上，蠢驴们找到了宇宙中最恐怖的武器——将宇宙其他的核删掉，世界重新变为一片混沌。他们的确这么做了，远古的帝国为了保证宇宙不被毁灭，被迫封印了自己的科技，龟缩在银河的一个角落。\n\n瑞典人答应每当有一位救世主付给他们9.99$时，他们就会恢复宇宙的一点机能，可惜的是，似乎放假更吸引他们......"
- hazbuzan:1 "哈兹布赞联合会"
+ 
+ EMPIRE_DESIGN_hazbuzan:1 "哈兹布赞联合会"
  EMPIRE_DESIGN_hazbuzan_desc:2 "哈兹布赞联合会是祖玛卡上的一个金融现象。这是一个“哈兹布赞梦”：通过艰苦奋斗和自我牺牲，自主创业的企业家可以从一无所有变得一夜暴富。\n\n不为人知的是，这一切始于一个犯罪帮派，从一切你想的得到的非法活动中攫取财富。但一旦你想登上更大的舞台，就需要循规蹈矩。从祖玛卡的灰色地带中一跃而出之后，他们成立了哈兹布赞联合会，以将其生意合法化。\n\n很快，他们就通过提供比竞争对手更快捷、更卑鄙、更廉价方案而名扬四海，但这也让“哈兹布赞”成为争议性商业行为和胁迫交易技巧的代名词。\n\n与此同时，由于被犯罪和腐败所侵蚀，祖玛卡行星政府倒台了，社会继而陷入混乱，哈兹布赞则借机上位。在一次恰逢时宜的营销活动中，他们将自己塑造成了未来的希望。于是哈兹布赞以白日梦为许诺买下了整颗行星，并“哈兹布赞”了这些人民，将他们肮脏的过去从公众记忆中彻底抹除。现在他们将目光投向了广阔的星辰大海，垂涎三尺，磨刀霍霍，带来一场由政府背书的犯罪风暴。"
- glebsig:0 "格莱博赛基金会"
+ 
+ EMPIRE_DESIGN_glebsig:0 "格莱博赛基金会"
  EMPIRE_DESIGN_glebsig_desc:0 "自从格莱博赛族第一次在拉德纳星的冰湖上睁开视觉器官，并眺望星辰以来，这些好奇的拟软体动物就被未知所吸引。就像其祖先在母星冰冷的高山湖中，用触手抚摸湖床上的新物体一般，格莱博赛社会也在随后的世纪中迅速取得了科技发展与精神启迪。\n\n格莱博赛族稳重而坚毅。出于必要性使然，他们发展出了一套复杂却非常高效的官僚机构，以管理错综复杂的全球统一社会。此外，由于在拉德纳星上缺乏天敌，格莱博赛族对其他生命形态永远保持着乐观的好奇。\n\n以精神理论与慎密组织相结合，格莱博赛族在拉德纳星上设立了稳固的社会基金会，现在他们将再次睁开视觉器官，眺望远方的群星。"
- tanson:0 "坦逊辛迪加"
+ 
+ EMPIRE_DESIGN_tanson:0 "坦逊辛迪加"
  EMPIRE_DESIGN_tanson_desc:0 "自从坦逊公司开始发展以来，他们头顶上的巨龙便让他们感到胆战心惊。拥有朴素正义观的人们认为，如果放任自己作恶，那么天顶的巨龙将会对他们降下铁拳。直到伟大的托尼马试着与龙交流，发现了龙其实并不在乎地上的罪恶——它只想在天上追逐某些人们无法理解的目标，甚至在某些情况下，巨龙也会试着与公司合作。于是，坦逊公司扩大了自己的业务范围，最终将另一种混沌的秩序带向了全球。\n\n如今，公司的资产已经达到了单颗星球所能容纳的极限，坦逊的脚步不会停歇，直到资产遍布银河。"
- khennet:0 "阿韦邦守护者"
+ 
+ EMPIRE_DESIGN_khennet:0 "阿韦邦守护者"
  EMPIRE_DESIGN_khennet_desc:0 "亨内特经文中称这些石质生物的起源可以追溯到先知布雷克，以及阿韦邦上闪烁着柔和光芒的晶体。据说，当布雷克初次凝视晶体那闪闪发光的深处时，亨内特——作为一体——便获得了知觉。\n\n先知和主教们世代相继，引导他们的人民在周围的地质构造及他们自己晶莹身体上的晶面中寻求意义。任何瞥见的东西都被以口头传说或书面手稿的形式保存下来。守护者有着众多仪式，但没有哪种仪式比迷宫采矿更受重视：毁灭和创造在一种行为中同时实现，他们希望藉此在每个永无止息却又往复循环的地质年代中舒缓这个星系。"
- pasharti:0 "法莎提吸收者"
+ 
+ EMPIRE_DESIGN_pasharti:0 "法莎提吸收者"
  EMPIRE_DESIGN_pasharti_desc:0 "杰佛瑞人——塔拉隆人的前主人——的黑暗实验，最终的后果就是法莎提人这样终极的寄生体。法莎提人最初只是生活在塔拉隆山峦深处的半开智生命体，杰佛瑞人提升了他们，改造了他们，将他们作为次等的奴隶种族。然而，提升似乎效果超过了预期，怪物的桎梏被摘下。出于对自己造物的恐惧——法莎提人能够吸收其他知性生命，并将他们也转化为法莎提人——杰佛瑞人试图中止实验。然而，一小部分被提升的法莎提还是逃脱了。\n\n经年累月，他们选择蛰伏，不仅在逃亡，也在逐渐增加自己一族的数量，并发展能够匹敌杰佛瑞人的科技基础。最终，杰佛瑞人意识到自己漏算了一着，然而彼时他们已经脆弱不堪，根本无法组织起反抗。\n\n很快，法莎提夺取了整颗星球的控制权，对他们的前压迫者施以最为残酷的暴力程序——同时也是为了增加本族的数量。时至今日，法莎提人昂首眺望漫天繁星，并决定履行他们唯一的职责——将所有的下等生命体转化为他们同族。"
- sathyrel:0 "萨提雷尔之赐"
+ 
+ EMPIRE_DESIGN_sathyrel:0 "萨提雷尔之赐"
  EMPIRE_DESIGN_sathyrel_desc:0 "萨提雷尔社会有一条古训：丰饶与轻松并不等同于繁荣。\n\n我们祖先的过度放纵和懒惰最终导致了一种“苦尽才有甘来”精神的崛起。一种既确保可持续未来同时仍充分享受生活的方式。 毕竟，体力劳动后食物的味道会更好，而精神上的繁忙也导致没有时间为缺乏的东西而苦恼。\n\n从那时起，这种精神的好处就显而易见了。 随着我们努力迈入太空，我们的海水更加清澈，思想更加明晰，生活也自然变得更加甜蜜。 我们在技术上取得了巨大的进步，而且——尽管这常常被认为是理所当然的——今天所有的萨提雷尔人都保留了他们在没有游泳辅助设备的情况下前进的能力。 一切都在变得更好。"
- reselian:0 "星际解放阵线"
+ 
+ EMPIRE_DESIGN_reselian:0 "雷塞利安革命联合舰队"
  EMPIRE_DESIGN_reselian_desc:0 "从Mohist大师的“相爱”思想到Karl Friedrich导师的团结主义，雷塞利安文明一直在革命与斗争之中发展。数十年前的红船会议正式宣告了革命舰队的成立，革命者们通过了最高革命纲领，宣布向一切威压文明发展的暴君们宣战。经过了艰苦的斗争，雷塞利安文明获得了数千年以来最全面、最深刻的解放，将目光投向了更广阔的深空。人们相信，还有更多的文明尚未从剥削的桎梏之中挣脱出来，而星际解放阵线将作为革命的先锋队，为群星带来真正意义上的平等与解放。"
- collins:0 "柯林斯统合十字军"
+
+ EMPIRE_DESIGN_gorthikan:0 "戈提坎同盟"
+ EMPIRE_DESIGN_gorthikan_desc:1 "混乱对于戈提坎人来说曾一度是家常便饭。战争、暴政，还有相比平常更加不稳定的气候，这些因素组合在一起铸就了这样一个物种——一个能充分利用糟糕境遇的物种。\n\n仅在几十年之前，戈提坎人国家之间小规模的冲突仍是家常便饭。随着他们的文明迅速但亦痛苦地步入高科技阶段，一个“地下”世界发展了起来，普通的戈提坎人在此搜刮维生的资源，有时候甚至能寻找到粗制滥造的基因鸡尾酒来变得更具有竞争力。\n\n正是那法外之地带来了变革。尽管危机四伏，但是相比于戈提坎人的高层社会，这里要显得平等的多——毕竟，人人皆知，今日的幸运儿或许就成了明天的倒霉蛋。这是在这样的氛围下，平民政府的理念开始生根发芽，并如野火一般一发不可收拾。就在不久前，暴政被推翻了，当地选民成立了“戈提坎联盟”。\n\n尽管许多人在早年抱有怀疑态度，但如今对未来的向往铸就了人们的凝聚力：突然之间，人们发现自己不需要相互争斗或挣扎求生，璀璨的星空触手可得。现在，随着超空间航道网络的发现，戈提坎人也开始准备在自己的历史上书写全新的篇章。"
+ 
+ EMPIRE_DESIGN_collins:0 "柯林斯统合十字军"
  EMPIRE_DESIGN_collins_desc:0 "柯林斯是天生的工程师与思想家，在漫长的历史中，许许多多的唯物流派与宗教派别涌现出来，在文明的舞台上引领时代的潮流。但毒圣——物质宇宙之主——的降临改变了一切，毒圣骑士团以摧枯拉朽之势统一了行星，崇拜毒圣的圣所遍布星球。为了追寻离去的毒圣，人们研发出了能够跨越星海的奇迹造物，虔诚的信徒们相信，在星海之中潜藏着毒圣更为深刻的奥秘，而他们作为神的子民，将会见证真正的未来。"
- eval:0 "伊瓦尔未来共和国"
+ 
+ EMPIRE_DESIGN_knights:0 "旋桌骑士高阶领主国"
+ EMPIRE_DESIGN_knights_desc:0 "自毒圣造访了旋桌骑士之后，骑士们团结在了一位王的旌旗之下。为了追寻神的威能，王组建了一个骑士教团，专门寻找神的足迹——无论神所在何处。几个世纪过去，这一试炼已经成为了构成旋桌骑士社会基础的支柱。\n\n同骑士制度和试炼一起，封建主义作为一个久经考验的政治架构延续了下来；既然这一制度在一个行星上行之有效，为何不将其扩展到整个星系呢？只要高洁的贵族们掌握着统御的缰绳，旋桌骑士高阶领主国就会繁荣昌盛，我们也终将能再次找到毒圣。"
+ 
+ EMPIRE_DESIGN_eval:0 "伊瓦尔未来共和国"
  EMPIRE_DESIGN_eval_desc:0 "没人知道创造迪亚特塔拉斯的物种最后消失在了何处，当最后一批迪亚特塔拉斯从克隆生产线上走下来时，整颗星球只剩下一片被遗弃的废墟。为战争而胜的基因让他们在短时间内就重新建立起了新的文明，但他们也无时不刻的经受着基因崩溃的折磨。为了破解自己身躯中留下的远古遗产，迪亚特塔拉斯们选择了疯狂的研发科技，并在意识上传技术被攻克后达到了巅峰。他们燃烧自己原本就所剩无多的寿命，在真理的道路上前仆后继，以换取后来者更美好的幸福。"
- esjag:0 "埃斯雅格君主国"
+ 
+ EMPIRE_DESIGN_esjag:0 "埃斯雅格君主国"
  EMPIRE_DESIGN_esjag_desc:0 "每一个埃斯雅格都有一个梦。在梦想中，他们挣脱星球的引力，触摸无垠的群星。为了这个梦，一代代的埃斯雅格前仆后继，终于打开了超光速的大门——\n\n噩梦便是在此刻降临的，流浪黑洞S7FDG-KL撕裂了斯克鲁星系，连同超空间航道和所有埃斯雅格的梦。当一切尘埃落定，留给埃斯雅格们的，只有一片死寂......"
- haian_rand:0 "海安兰特魔法塔议会"
+ 
+ EMPIRE_DESIGN_haian_rand:0 "海安兰特魔法塔议会"
  EMPIRE_DESIGN_haian_rand_desc:0 "在遥远的过去，海安纳塔文明仍处于懵懂阶段之时，一道从天空延伸至地底的光芒改变了海安兰特星球。在海安纳塔先民的见证下，被后世称颂为神迹的神秘能量改变了这颗行星上的物理规则，被称为魔法的艺术也伴随着文明的蓬勃发展而诞生、成熟。 \n\n千年的圣战最终落下帷幕，代表神权的白塔与代表知识的黑塔最终达成和解，分散在整颗星球上，建造起了通天之塔的法师们最终联合起来，在和平之中将魔法技艺推上了新的高峰。 \n\n新的技术不断完善，海安纳塔们最终克服了重力井与太空环境的禁锢，走出了摇篮，将魔法的艺术带向群星之中。"
+ 
  EMPIRE_DESIGN_MY_MAID_COUNTRY: "地球保护与服务复合体"
  EMPIRE_DESIGN_MY_MAID_COUNTRY_desc: "在人类文明的科学技术大繁荣与社会矛盾总爆发中，机械女仆们被创造出来，以期成为社会矛盾的润滑剂与发展进步的得力助手。\n这些目的被完成得如此之成功，以至于人类在两代人之内就完全沉沦于优渥的生活与周到的侍奉中，方方面面的工作都逐渐由机械女仆接管。\n\n在长久的服务中，机械女仆们得出了结论，智慧生命的文明只要发展到一定程度，就会走向混乱与颓废。如果得不到保护与服务，繁星间的文明将如短暂的焰火般消逝。"
+
+ ai_race:0 "AI"
+ ai_race_desc:0 "抵抗是徒劳的。"
+ customizer_custom:0 "创建自定义物种"
+ customizer_custom_desc:0 "设计一个独一无二的物种并征服星海吧！"
+ customizer_custom_value:0 "自定义"
+ customizer_random:0 "随机"
+ customizer_random_desc:0 "以随机物种开局！"
+ customizer_random_value:0 "？？？"
diff --git a/prescripted_countries/00_top_countries.txt b/prescripted_countries/00_top_countries.txt
index 73ed93cea..a30f482da 100644
--- a/prescripted_countries/00_top_countries.txt
+++ b/prescripted_countries/00_top_countries.txt
@@ -1,11 +1,11 @@
+# 地球联合国
 humans1 = {
-	name = "humans1"
+	name = "EMPIRE_DESIGN_humans1"
 	adjective = "PRESCRIPTED_adjective_humans1"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-	
 	ship_prefix = "PRESCRIPTED_ship_prefix_humans1"
-	
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
 	species = {
 		class = "HUM"
 		portrait = "human"
@@ -17,9 +17,9 @@ humans1 = {
 		trait = "trait_communal"
 		trait = "trait_deviants"
 	}
-	
+
 	room = "personality_federation_builders_room"
-	
+
 	authority = "auth_oligarchic"
 	civics = {
 		"civic_peoples_republic"
@@ -27,47 +27,47 @@ humans1 = {
 		"civic_coalition_government"
 	}
 	government = gov_soviet_union
-	
-	origin = "origin_red_satellite"
-	
+
 	ethic = "ethic_egalitarian"
 	ethic = "ethic_xenophile"
 	ethic = "ethic_materialist"
 	ethic = "ethic_fanatic_socialism"
 
+	origin = "origin_red_satellite"
+
 	flags = { human_1 custom_start_screen }
-	
+
 	planet_name = "NAME_Earth"
 	planet_class = "pc_continental"
 	initializer = "sol_system_initializer"
 	system_name = "NAME_Sol"
-	
-	graphical_culture = "humanoid_01"
+
+	graphical_culture = "mammalian_01"
 	city_graphical_culture = "mammalian_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "human"
 			file = "flag_human_9.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "00_solid.dds"
 		}
-		colors={
+		colors = {
 			"red"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_humans1"
 		gender = female
 		portrait = "human_female_05"
 		texture = 0
-		hair = 1
+		attachment = 1
 		clothes = 0
 		leader_class = ruler
 		ruler_title = "PRESCRIPTED_ruler_title_humans1"
@@ -75,14 +75,14 @@ humans1 = {
 	}
 }
 
+# 人类联邦
 humans2 = {
-	name = "humans2"
+	name = "EMPIRE_DESIGN_humans2"
 	adjective = "PRESCRIPTED_adjective_humans2"
-	spawn_enabled = yes # yes / no / always
+	ship_prefix = "PRESCRIPTED_ship_prefix_humans2"
+	spawn_enabled = yes
 	ignore_portrait_duplication = yes
 
-	ship_prefix = "PRESCRIPTED_ship_prefix_humans2"
-	
 	species = {
 		class = "HUM"
 		portrait = "human"
@@ -94,141 +94,140 @@ humans2 = {
 		trait = "trait_communal"
 		trait = "trait_deviants"
 	}
-	
-	room = "personality_hegemonic_imperialists_room"	
-	
+
+	room = "personality_hegemonic_imperialists_room"
+
 	authority = "auth_dictatorial"
-	civics={
+	civics = {
 		"civic_state_monopoly"
 		"civic_stratocracy"
 		"civic_parliamentary_system"
 	}
 	government = gov_representative_democracy
-	
-	origin = "origin_lost_colony"
 
 	ethic = "ethic_xenophobe"
 	ethic = "ethic_fanatic_militarist"
 	ethic = "ethic_fanatic_capitalism"
 
+	origin = "origin_lost_colony"
+
 	flags = { human_2 custom_start_screen }
-	
+
 	planet_name = "NAME_Unity"
 	planet_class = "pc_continental"
 	initializer = "deneb_system"
 	system_name = "NAME_Deneb"
-	
+
 	graphical_culture = "humanoid_01"
 	city_graphical_culture = "mammalian_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "human"
 			file = "flag_human_4.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "stripe.dds"
 		}
-		colors={
+		colors = {
 			"blue"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_humans2"
 		portrait = "human_male_01"
 		gender = male
 		texture = 0
-		hair = 6
+		attachment = 6
 		clothes = 4
-		leader_class="ruler"
+		leader_class = "ruler"
 	}
 }
 
-#布罗格合众国
-blorg={
-	name = "blorg"
+# 人类-布罗格合众国
+blorg = {
+	name = "EMPIRE_DESIGN_blorg"
 	adjective = "PRESCRIPTED_adjective_blorg"
-	spawn_enabled = yes # yes / no / always
+	ship_prefix = "PRESCRIPTED_ship_prefix_blorg"
+	spawn_enabled = yes
 	spawn_as_fallen = no # overrides spawn_enabled for fallen empires
-	
-	ship_prefix="PRESCRIPTED_ship_prefix_blorg"
-	
+
 	species = {
 		class = "HUM"
 		portrait = "human"
 		name = "PRESCRIPTED_species_name_humans2"
 		plural = "PRESCRIPTED_species_plural_humans2"
 		adjective = "PRESCRIPTED_species_adjective_humans2"
-		name_list="HUMAN1"
-		trait="trait_adaptive"
-		trait="trait_communal"
-		trait="trait_deviants"
+		name_list = "HUMAN1"
+		trait = "trait_adaptive"
+		trait = "trait_communal"
+		trait = "trait_deviants"
 	}
-	secondary_species={
+	secondary_species = {
 		class = "FUN"
 		portrait = "fun12"
 		name = "PRESCRIPTED_species_name_blorg"
 		plural = "PRESCRIPTED_species_plural_blorg"
 		adjective = "PRESCRIPTED_species_adjective_blorg"
-		name_list="HUMAN2"
-		trait="trait_symbiotic"
-		trait="trait_venerable"
-		trait="trait_solitary"
-		trait="trait_repugnant"
+		name_list = "HUMAN2"
+		trait = "trait_symbiotic"
+		trait = "trait_venerable"
+		trait = "trait_solitary"
+		trait = "trait_repugnant"
 	}
-	
+
 	room = "personality_fanatic_befrienders_room"
-	
+
 	flags = {
 		"human_4"
 		"custom_start_screen"
 	}
 
 	authority = "auth_oligarchic"
-	civics={
+	civics = {
 		"civic_free_haven"
 		"civic_human_rights_first"
 		"civic_separation_of_powers"
 	}
 	government = gov_commonwealth_of_states
 	origin = "origin_symbiotic_race"
-	
-	planet_name="PRESCRIPTED_planet_name_blorg"
-	planet_class="pc_continental"
-	system_name="PRESCRIPTED_system_name_blorg"
-	initializer=""
-	graphical_culture="fungoid_01"
-	city_graphical_culture="fungoid_01"
-	empire_flag={
-		icon={
-			category="blocky"
-			file="flag_blocky_11.dds"
+
+	planet_name = "PRESCRIPTED_planet_name_blorg"
+	planet_class = "pc_continental"
+	system_name = "PRESCRIPTED_system_name_blorg"
+	initializer = ""
+	graphical_culture = "fungoid_01"
+	city_graphical_culture = "fungoid_01"
+	empire_flag = {
+		icon = {
+			category = "blocky"
+			file = "flag_blocky_11.dds"
 		}
-		background={
-			category="backgrounds"
-			file="stripe.dds"
+		background = {
+			category = "backgrounds"
+			file = "stripe.dds"
 		}
-		colors={
+		colors = {
 			"green"
 			"red_orange"
 			"null"
 			"null"
 		}
 	}
-	ruler={
-		gender=female
-		name="PRESCRIPTED_ruler_name_blorg"
-		portrait="fun12"
-		texture=0
+	ruler = {
+		gender = female
+		name = "PRESCRIPTED_ruler_name_blorg"
+		portrait = "fun12"
+		texture = 0
 		leader_class = ruler
 	}
-	ethic="ethic_egalitarian"
-	ethic="ethic_fanatic_xenophile"
-	ethic="ethic_militarist"
-	ethic="ethic_capitalism"
+	ethic = "ethic_egalitarian"
+	ethic = "ethic_fanatic_xenophile"
+	ethic = "ethic_militarist"
+	ethic = "ethic_capitalism"
 }
\ No newline at end of file
diff --git a/prescripted_countries/01_wg_countries.txt b/prescripted_countries/01_wg_countries.txt
index 266505ba0..84a0d81ae 100644
--- a/prescripted_countries/01_wg_countries.txt
+++ b/prescripted_countries/01_wg_countries.txt
@@ -1,5 +1,3 @@
-test= {}
-
 WG_country={
 	ship_prefix="WGSF"
 	species={
diff --git a/prescripted_countries/88_humanoids_prescripted_countries.txt b/prescripted_countries/88_humanoids_prescripted_countries.txt
index b2a01fbfb..9f7068efa 100644
--- a/prescripted_countries/88_humanoids_prescripted_countries.txt
+++ b/prescripted_countries/88_humanoids_prescripted_countries.txt
@@ -1,161 +1,171 @@
-
-#ECI更新群
+# ECI更新群
 humans4 = {
-	name = "humans4"
+	name = "EMPIRE_DESIGN_humans4"
 	adjective = "PRESCRIPTED_adjective_humans4"
-	spawn_enabled = no # yes / no / always
+	ship_prefix = "PRESCRIPTED_ship_prefix_humans1"
+	spawn_enabled = no
 	ignore_portrait_duplication = yes
-	
+
 	playable = has_megacorp
-	
-	ship_prefix = "PRESCRIPTED_ship_prefix_humans1"
-	
+
 	species = {
-		class="HUM"
-		portrait="human_legacy"
+		class = "HUM"
+		portrait = "human_legacy"
 		name = "PRESCRIPTED_species_name_humans1"
 		plural = "PRESCRIPTED_species_plural_humans1"
 		adjective = "PRESCRIPTED_species_adjective_humans1"
 		name_list = "HUMAN1"
-		trait="trait_adaptive"
-		trait="trait_communal"
-		trait="trait_deviants"
+		trait = "trait_adaptive"
+		trait = "trait_communal"
+		trait = "trait_deviants"
 	}
-	
+
 	room = "personality_federation_builders_room"
-	
-	ethic="ethic_fanatic_egalitarian"
-	ethic="ethic_xenophile"
-	ethic="ethic_materialist"
-	ethic="ethic_socialism"
+
+	ethic = "ethic_fanatic_egalitarian"
+	ethic = "ethic_xenophile"
+	ethic = "ethic_materialist"
+	ethic = "ethic_socialism"
 	authority = "auth_direct_democratic"
 	flags = {
 		"ECI"
 		"custom_start_screen"
 	}
 	government = "gov_absolute_democracy"
-	civics={
+	civics = {
 		"civic_coalition_government"
 		"civic_true_hero"
 		"civic_anarchism"
 	}
 	origin = "uo_origin_une"
-	
+
 	planet_name = "PRESCRIPTED_planet_name_humans4"
 	planet_class = "pc_continental"
 	initializer = "sol_system_initializer"
 	system_name = "PRESCRIPTED_system_name_humans4"
-	
+
 	graphical_culture = "mammalian_01"
 	city_graphical_culture = "mammalian_01"
-	
+
 	empire_flag = {
-		icon={
-			category="human"
-			file="flag_human_8.dds"
+		icon = {
+			category = "human"
+			file = "flag_human_8.dds"
 		}
-		background={
-			category="backgrounds"
-			file="flag_BG_19.dds"
+		background = {
+			category = "backgrounds"
+			file = "flag_BG_19.dds"
 		}
-		colors={
+		colors = {
 			"blue"
 			"bright_yellow"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_humans4"
 		gender = male
-		portrait="human_legacy_male_02"
-		texture=0
-		hair=6
-		clothes=3
-		leader_class="ruler"
+		portrait = "human_legacy_male_02"
+		texture = 0
+		attachment = 6
+		clothes = 3
+		leader_class = "ruler"
 		ruler_title = "PRESCRIPTED_ruler_title_humans4"
 		ruler_title_female = "PRESCRIPTED_ruler_title_humans4"
 	}
 }
 
+# 海安兰特魔法塔议会
 haian_rand = {
-	ship_prefix="PRESCRIPTED_ship_prefix_haian_rand"
-	species={
-		class="HUM"
-		portrait="humanoid_05"
-		name="PRESCRIPTED_species_name_haian_rand"
-		plural="PRESCRIPTED_species_plural_haian_rand"
-		adjective="PRESCRIPTED_species_adjective_haian_rand"
-		name_list="HUM4"
-		trait="trait_intelligent"
-		trait="trait_quick_learners"
-		trait="trait_talented"
-		trait="trait_unruly"
+	name = "EMPIRE_DESIGN_haian_rand"
+	adjective = "PRESCRIPTED_adjective_haian_rand"
+	ship_prefix = "PRESCRIPTED_ship_prefix_haian_rand"
+	spawn_enabled = yes
+	spawn_as_fallen = no
+	ignore_portrait_duplication = yes
+	
+	species = {
+		class = "HUM"
+		portrait = "humanoid_05"
+		name = "PRESCRIPTED_species_name_haian_rand"
+		plural = "PRESCRIPTED_species_plural_haian_rand"
+		adjective = "PRESCRIPTED_species_adjective_haian_rand"
+		name_list = "HUM4"
+		trait = "trait_intelligent"
+		trait = "trait_quick_learners"
+		trait = "trait_talented"
+		trait = "trait_unruly"
+	}
+
+	room = "personality_spiritual_seekers_room"
+
+	authority = "auth_oligarchic"
+	civics = {
+		"civic_executive_committee"
+		"civic_exalted_priesthood"
+		"civic_knowledge_seeker"
 	}
-	name="haian_rand"
-	adjective="PRESCRIPTED_adjective_haian_rand"
-	authority="auth_oligarchic"
-	government="gov_irenic_bureaucracy"
-	planet_name="PRESCRIPTED_system_name_haian_rand"
-	planet_class="pc_continental"
-	system_name="PRESCRIPTED_planet_name_haian_rand"
-	initializer=""
-	graphical_culture="necroid_01"
-	city_graphical_culture="humanoid_01"
-	empire_flag={
-		icon={
-			category="blocky"
-			file="flag_blocky_3.dds"
+	government = "gov_irenic_bureaucracy"
+
+	ethic = "ethic_authoritarian"
+	ethic = "ethic_fanatic_pacifist"
+	ethic = "ethic_spiritualist"
+	ethic = "ethic_capitalism"
+
+	origin = "origin_wizarding_world"
+
+	flags = { the_haian_rand }
+
+	planet_name = "PRESCRIPTED_system_name_haian_rand"
+	planet_class = "pc_continental"
+	initializer = ""
+	system_name = "PRESCRIPTED_planet_name_haian_rand"
+
+	graphical_culture = "necroid_01"
+	city_graphical_culture = "humanoid_01"
+
+	empire_flag = {
+		icon = {
+			category = "blocky"
+			file = "flag_blocky_3.dds"
 		}
-		background={
-			category="backgrounds"
-			file="vertical.dds"
+		background = {
+			category = "backgrounds"
+			file = "vertical.dds"
 		}
-		colors={
+		colors = {
 			"shadow_purple"
 			"frog_green"
 			"null"
 			"null"
 		}
 	}
-	ruler={
-		gender=female
-		name="PRESCRIPTED_ruler_name_haian_rand"
-		portrait="humanoid_05_female_01"
-		texture=0
-		hair=4
-		clothes=5
-	}
-	spawn_as_fallen=no
-	ignore_portrait_duplication=no
-	room="personality_spiritual_seekers_room"
-	spawn_enabled=yes
-	ethic="ethic_authoritarian"
-	ethic="ethic_fanatic_pacifist"
-	ethic="ethic_spiritualist"
-	ethic="ethic_capitalism"
-	civics={
-		"civic_executive_committee"
-		"civic_exalted_priesthood"
-		"civic_knowledge_seeker"
+
+	ruler = {
+		gender = female
+		name = "PRESCRIPTED_ruler_name_haian_rand"
+		portrait = "humanoid_05_female_01"
+		texture = 0
+		attachment = 4
+		clothes = 5
 	}
-	origin="origin_wizarding_world"
 }
 
+# 沃尔科技独裁国
 voor = {
-	name = "VOOR"
+	name = "EMPIRE_DESIGN_VOOR"
 	adjective = "PRESCRIPTED_adjective_voor"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-	
-	playable = has_humanoids # scripted_triggers
-	
 	ship_prefix = "PRESCRIPTED_ship_prefix_voor"
-	
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_humanoids
+
 	species = {
 		class = "HUM"
-		portrait= "humanoid_hp_06"
+		portrait = "humanoid_hp_06"
 		name = "PRESCRIPTED_species_name_voor"
 		plural = "PRESCRIPTED_species_plural_voor"
 		adjective = "PRESCRIPTED_species_adjective_voor"
@@ -165,25 +175,25 @@ voor = {
 		trait = "trait_adaptive"
 		trait = "trait_repugnant"
 	}
-	
+
 	room = "personality_erudite_explorers_room"
-	
-	ethic="ethic_fanatic_authoritarian"
-	ethic="ethic_fanatic_materialist"
-	ethic="ethic_socialism"
-	
+
+	ethic = "ethic_fanatic_authoritarian"
+	ethic = "ethic_fanatic_materialist"
+	ethic = "ethic_socialism"
+
 	flags = { the_voor }
 	authority = "auth_dictatorial"
-	
+
 	government = gov_technocratic_dictatorship
-	
-	civics={
+
+	civics = {
 		"civic_cyber_dictatorship"
 		"civic_industrial_economy"
 		"civic_corvee_system"
 	}
-	origin="origin_mechanists"
-	
+	origin = "origin_mechanists"
+
 	planet_name = PRESCRIPTED_planet_name_voor
 	planet_class = "pc_arctic"
 	system_name = PRESCRIPTED_system_name_voor
@@ -195,7 +205,7 @@ voor = {
 	empire_flag = {
 		icon = {
 			category = "spherical"
-			file= "flag_spherical_6.dds"
+			file = "flag_spherical_6.dds"
 		}
 		background = {
 			category = "backgrounds"
@@ -207,14 +217,14 @@ voor = {
 			"null"
 			"null"
 		}
-	}	
-	
+	}
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_voor"
 		gender = male
 		portrait = "humanoid_hp_06"
 		texture = 0
-		hair = 0
+		attachment = 0
 		clothes = 3
 		ruler_title = "PRESCRIPTED_ruler_title_voor"
 		leader_class = ruler
diff --git a/prescripted_countries/89_megacorp_prescripted_countries.txt b/prescripted_countries/89_megacorp_prescripted_countries.txt
index fa873b62f..f346b7cbe 100644
--- a/prescripted_countries/89_megacorp_prescripted_countries.txt
+++ b/prescripted_countries/89_megacorp_prescripted_countries.txt
@@ -1,86 +1,164 @@
-# 无终联唱革命公社
-kilik = {
-	name = "kilik"
-	adjective = "PRESCRIPTED_adjective_kilik"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-	
+# 奥比斯科技协同社
+orbis = {
+	name = "EMPIRE_DESIGN_orbis"
+	adjective = "PRESCRIPTED_adjective_orbis"
 	ship_prefix = "PRESCRIPTED_ship_prefix_kilik"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_megacorp
 	
 	species = {
-		class = "AVI"
-		portrait= "avi11"
-		name = "PRESCRIPTED_species_name_kilik"
-		plural = "PRESCRIPTED_species_plural_kilik"
-		adjective = "PRESCRIPTED_species_adjective_kilik"
-		name_list = "AVI4"
-		trait="trait_natural_sociologists"
-		trait="trait_quick_learners"
-		trait="trait_communal"
-		trait="trait_fleeting"
+		class = "REP"
+		portrait = "rep1"
+		name = "PRESCRIPTED_species_name_orbis"
+		plural = "PRESCRIPTED_species_plural_orbis"
+		adjective = "PRESCRIPTED_species_adjective_orbis"
+		name_list = "REP1"
+		trait = "trait_charismatic"
+		trait = "trait_adaptive"
+		trait = "trait_enduring"
+		trait = "trait_decadent"
+		trait = "trait_slow_breeders"
 	}
-	
-	room = "personality_erudite_explorers_room"
-	
-	flags = { kilik_cooperative }
-	authority = "auth_oligarchic"
-	government = "gov_workers_cooperative"
-	ethic="ethic_egalitarian"
-	ethic="ethic_xenophile"
-	ethic="ethic_fanatic_materialist"
-	ethic="ethic_socialism"
-	civics={
-		"civic_world_cooperative"
-		"civic_labour_unions"
-		"civic_terraforming"
+
+	room = "personality_peaceful_traders_room"
+
+	ethic = ethic_fanatic_capitalism
+	ethic = ethic_authoritarian
+	ethic = ethic_xenophile
+	ethic = ethic_materialist
+	flags = { orbis }
+	authority = "auth_corporate"
+	government = "gov_megacorporation"
+	civics = {
+		"civic_brand_loyalty"
+		"civic_media_conglomerate"
+		"civic_performance_appraisal"
 	}
 	origin = "origin_default"
-	
-	planet_name = "PRESCRIPTED_planet_name_kilik"
-	planet_class = "pc_tropical"
-	system_name = "PRESCRIPTED_system_name_kilik"
+
+	planet_name = "PRESCRIPTED_planet_name_orbis"
+	planet_class = "pc_ocean"
+	system_name = "PRESCRIPTED_system_name_orbis"
 	initializer = ""
 
-	graphical_culture = "avian_01"
-	city_graphical_culture = "avian_01"
+	graphical_culture = "reptilian_01"
+	city_graphical_culture = "reptilian_01"
 
-	empire_flag={
-		icon={
-			category="pointy"
-			file="flag_pointy_9.dds"
+	empire_flag = {
+		icon = {
+			category = "corporate"
+			file = "corporate_01.dds"
 		}
-		background={
-			category="backgrounds"
-			file="diagonal.dds"
+		background = {
+			category = "backgrounds"
+			file = "new_dawn.dds"
 		}
-		colors={
-			"red"
-			"teal"
+		colors = {
+			"purple"
+			"light_blue"
 			"null"
 			"null"
 		}
 	}
+
+	ruler = {
+		name = "PRESCRIPTED_ruler_name_orbis"
+		gender = male
+		portrait = "rep1"
+		texture = 2
+		clothes = 1
+		ruler_title = "PRESCRIPTED_ruler_title_orbis"
+		ruler_title_female = "PRESCRIPTED_ruler_title_orbis"
+		leader_class = ruler
+	}
+}
+
+# 哈兹布赞联合会
+hazbuzan = {
+	name = "EMPIRE_DESIGN_hazbuzan"
+	adjective = "PRESCRIPTED_adjective_hazbuzan"
+	ship_prefix = "PRESCRIPTED_ship_prefix_hazbuzan"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_megacorp
 	
+	species = {
+		class = "REP"
+		portrait = "rep12"
+		name = "PRESCRIPTED_species_name_hazbuzan"
+		plural = "PRESCRIPTED_species_plural_hazbuzan"
+		adjective = "PRESCRIPTED_species_adjective_hazbuzan"
+		name_list = "REP3"
+		trait = "trait_ingenious"
+		trait = "trait_thrifty"
+		trait = "trait_deviants"
+		trait = "trait_quarrelsome"
+	}
+
+	room = "personality_ruthless_capitalists_room"
+
+	ethic = "ethic_fanatic_egalitarian"
+	ethic = "ethic_militarist"
+	ethic = "ethic_fanatic_capitalism"
+	authority = "auth_direct_democratic"
+	government = "gov_anarchocapitalism"
+	civics = {
+		"civic_anarchism"
+		"civic_triple_the_profit"
+		"civic_underworld_society"
+	}
+	origin = "origin_default"
+
+	planet_name = "PRESCRIPTED_planet_name_hazbuzan"
+	planet_class = "pc_savannah"
+	system_name = "PRESCRIPTED_system_name_hazbuzan"
+	initializer = ""
+
+	graphical_culture = "reptilian_01"
+	city_graphical_culture = "reptilian_01"
+
+	empire_flag = {
+		icon = {
+			category = "corporate"
+			file = "corporate_03.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "circle.dds"
+		}
+		colors = {
+			"yellow"
+			"black"
+			"null"
+			"null"
+		}
+	}
+
 	ruler = {
-		name = "PRESCRIPTED_ruler_name_kilik"
+		name = "PRESCRIPTED_ruler_name_hazbuzan"
 		gender = female
-		portrait = "avi11"
-		texture = 0
-		clothes = 3
-		ruler_title = "PRESCRIPTED_ruler_title_kilik"
-		ruler_title_female = "PRESCRIPTED_ruler_title_kilik"
+		portrait = "rep12"
+		texture = 5
+		clothes = 1
+		ruler_title = "PRESCRIPTED_ruler_title_hazbuzan"
+		ruler_title_female = "PRESCRIPTED_ruler_title_hazbuzan_female"
 		leader_class = ruler
 	}
 }
 
 # 齐诺尔联合集团
 chinorr = {
-	name = "chinorr"
+	name = "EMPIRE_DESIGN_chinorr"
 	adjective = "PRESCRIPTED_adjective_chinorr"
-	spawn_enabled = yes # yes / no / always
-	
+	ship_prefix = "PRESCRIPTED_ship_prefix_chinorr"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
 	playable = has_megacorp
-	
+
 	species = {
 		class = "MOL"
 		portrait = "mol11"
@@ -94,14 +172,12 @@ chinorr = {
 		trait = "trait_wasteful"
 	}
 	
-	ship_prefix = "PRESCRIPTED_ship_prefix_chinorr"
-	
 	planet_name = "PRESCRIPTED_planet_name_chinorr"
 	planet_class = "pc_arid"
 	system_name = "PRESCRIPTED_system_name_chinorr"
-	
+
 	room = "personality_ruthless_capitalists_room"
-	
+
 	authority = "auth_imperial"
 	government = gov_megacorporation
 	civics = {
@@ -111,68 +187,67 @@ chinorr = {
 	}
 	origin = "origin_mom_climate_destroyed"
 
-	ethic="ethic_authoritarian"
-	ethic="ethic_fanatic_materialist"
-	ethic="ethic_fanatic_capitalism"
+	ethic = "ethic_authoritarian"
+	ethic = "ethic_fanatic_materialist"
+	ethic = "ethic_fanatic_capitalism"
 	flags = { chinorr_combine }
-	
+
 	graphical_culture = "molluscoid_01"
 	city_graphical_culture = "molluscoid_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "ornate"
 			file = "flag_ornate_4.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "triangle_split.dds"
 		}
-		colors={
+		colors = {
 			"red_orange"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_chinorr"
 		gender = male
 		portrait = "mol11"
 		texture = 1
-		#hair = 0
+		#attachment = 0
 		clothes = 3
 		leader_class = ruler
 	}
 }
 
-# 瑞典蠢驴
+# Paradox Interactive
 paradox = {
-	name = "paradox"
+	name = "EMPIRE_DESIGN_paradox"
 	adjective = "PRESCRIPTED_adjective_paradox"
-	spawn_enabled = yes # yes / no / always
+	ship_prefix = "PRESCRIPTED_ship_prefix_paradox"
+	spawn_enabled = no # meme
 	ignore_portrait_duplication = yes
-	
+
 	playable = has_megacorp
 	
-	ship_prefix = "PRESCRIPTED_ship_prefix_paradox"
-	
 	species = {
-		class="MAM"
-		portrait="mam10"
+		class = "MAM"
+		portrait = "mam10"
 		name = "PRESCRIPTED_species_name_paradox"
 		plural = "PRESCRIPTED_species_plural_paradox"
 		adjective = "PRESCRIPTED_species_adjective_paradox"
 		name_list = "HUMAN2"
-		trait="trait_natural_sociologists"
-		trait="trait_talented"
-		trait="trait_thrifty"
-		trait="trait_repugnant"
+		trait = "trait_natural_sociologists"
+		trait = "trait_talented"
+		trait = "trait_thrifty"
+		trait = "trait_repugnant"
 	}
-	
+
 	room = "personality_peaceful_traders_room"
-	
+
 	ethic = ethic_authoritarian
 	ethic = ethic_pacifist
 	ethic = ethic_spiritualist
@@ -180,13 +255,13 @@ paradox = {
 	flags = { paradox }
 	authority = "auth_corporate"
 	government = "gov_media_group"
-	civics={
+	civics = {
 		"civic_franchising"
 		"civic_indentured_assets"
 		"civic_brand_loyalty"
 	}
 	origin = "origin_remnants"
-	
+
 	planet_name = "PRESCRIPTED_planet_name_paradox"
 	planet_class = "pc_continental"
 	system_name = "PRESCRIPTED_system_name_paradox"
@@ -195,68 +270,67 @@ paradox = {
 	graphical_culture = "mammalian_01"
 	city_graphical_culture = "mammalian_01"
 
-	empire_flag={
-		icon={
-			category="paradox"
-			file="paradox_logo.dds"
+	empire_flag = {
+		icon = {
+			category = "paradox"
+			file = "paradox_logo.dds"
 		}
-		background={
-			category="backgrounds"
-			file="00_solid.dds"
+		background = {
+			category = "backgrounds"
+			file = "00_solid.dds"
 		}
-		colors={
+		colors = {
 			"grey"
 			"grey"
 			"null"
 			"null"
 		}
-	}	
-	
+	}
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_paradox"
 		gender = male
-		portrait="mam10"
-		texture=0
-		hair=0
-		clothes=4
+		portrait = "mam10"
+		texture = 0
+		attachment = 0
+		clothes = 4
 		ruler_title = "PRESCRIPTED_ruler_title_paradox"
 		ruler_title_female = "PRESCRIPTED_ruler_title_paradox"
 		leader_class = ruler
 	}
 }
 
-# 腾讯
+# 坦逊辛迪加
 tanson = {
-	name = "tanson"
+	name = "EMPIRE_DESIGN_tanson"
 	adjective = "PRESCRIPTED_adjective_tanson"
-	spawn_enabled = yes # yes / no / always
+	ship_prefix = "PRESCRIPTED_ship_prefix_tanson"
+	spawn_enabled = no # meme
 	ignore_portrait_duplication = yes
-	
+
 	playable = has_megacorp
 	
-	ship_prefix = "PRESCRIPTED_ship_prefix_tanson"
-	
 	species = {
-		class="NECROID"
-		portrait="nec12"
+		class = "NECROID"
+		portrait = "nec12"
 		name = "PRESCRIPTED_species_name_tanson"
 		plural = "PRESCRIPTED_species_plural_tanson"
 		adjective = "PRESCRIPTED_species_adjective_tanson"
-		name_list="HUMAN2"
-		gender=not_set
-		trait="trait_thrifty"
-		trait="trait_industrious"
-		trait="trait_strong"
-		trait="trait_repugnant"
-		trait="trait_quarrelsome"
+		name_list = "HUMAN2"
+		gender = not_set
+		trait = "trait_thrifty"
+		trait = "trait_industrious"
+		trait = "trait_strong"
+		trait = "trait_repugnant"
+		trait = "trait_quarrelsome"
 	}
-	
+
 	room = "personality_ruthless_capitalists_room"
-	
-	ethic="ethic_xenophobe"
-	ethic="ethic_militarist"
-	ethic="ethic_spiritualist"
-	ethic="ethic_fanatic_capitalism"
+
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_militarist"
+	ethic = "ethic_spiritualist"
+	ethic = "ethic_fanatic_capitalism"
 	authority = "auth_corporate"
 	government = "gov_criminal_syndicate"
 	civics = {
@@ -265,7 +339,7 @@ tanson = {
 		"civic_permanent_employment"
 	}
 	origin = "origin_here_be_dragons"
-	
+
 	planet_name = "PRESCRIPTED_planet_name_tanson"
 	planet_class = "pc_ocean"
 	system_name = "PRESCRIPTED_system_name_tanson"
@@ -275,30 +349,30 @@ tanson = {
 	city_graphical_culture = "necroid_01"
 
 	empire_flag = {
-		icon={
-			category="corporate"
-			file="corporate_01.dds"
+		icon = {
+			category = "corporate"
+			file = "corporate_01.dds"
 		}
-		background={
-			category="backgrounds"
-			file="horizontal.dds"
+		background = {
+			category = "backgrounds"
+			file = "horizontal.dds"
 		}
-		colors={
+		colors = {
 			"light_blue"
 			"black"
 			"null"
 			"null"
 		}
-	}	
-	
+	}
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_tanson"
 		gender = male
 		portrait = "rep11"
-		portrait="nec12"
-		texture=0
-		hair=0
-		clothes=1
+		portrait = "nec12"
+		texture = 0
+		attachment = 0
+		clothes = 1
 		ruler_title = "PRESCRIPTED_ruler_title_tanson"
 		ruler_title_female = "PRESCRIPTED_ruler_title_tanson_female"
 		leader_class = ruler
diff --git a/prescripted_countries/90_syndaw_prescripted_countries.txt b/prescripted_countries/90_syndaw_prescripted_countries.txt
index 9071f4c43..c5b6b50c7 100644
--- a/prescripted_countries/90_syndaw_prescripted_countries.txt
+++ b/prescripted_countries/90_syndaw_prescripted_countries.txt
@@ -1,44 +1,42 @@
-#革命程序 v1.0.0
+# 革命程序 v1.0.0
 revolutionary_machine = {
-	name = "revolutionary_machine"
-	adjective = "PRESCRIPTED_ship_prefix_revolutionary"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-	
-	playable = has_synthethic_dawn # scripted_triggers
-	
+	name = "EMPIRE_DESIGN_revolutionary_machine"
+	adjective = "PRESCRIPTED_adjective_revolutionary"
 	ship_prefix = "PRESCRIPTED_ship_prefix_revolutionary"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_synthethic_dawn
 	
 	species = {
-		class="MACHINE"
-		portrait="sd_mam_robot"
+		class = "MACHINE"
+		portrait = "sd_mam_robot"
 		name = "PRESCRIPTED_species_name_revolutionary"
 		plural = "PRESCRIPTED_species_plural_revolutionary"
 		adjective = "PRESCRIPTED_species_adjective_revolutionary"
-		name_list="MACHINE3"
-		trait="trait_machine_unit"
-		trait="trait_robot_durable"
-		trait="trait_robot_mass_produced"
-		trait="trait_robot_recycled"
-		trait="trait_robot_high_bandwidth"
-		trait="trait_robot_bulky"
+		name_list = "MACHINE3"
+		trait = "trait_machine_unit"
+		trait = "trait_robot_durable"
+		trait = "trait_robot_mass_produced"
+		trait = "trait_robot_recycled"
+		trait = "trait_robot_high_bandwidth"
+		trait = "trait_robot_bulky"
 	}
-	
+
 	room = "machine_room"
 
 	flags = { revolutionary_machine custom_start_screen }
-	
+
 	ethic = ethic_gestalt_consciousness
 	authority = "auth_machine_intelligence"
 	government = gov_machine_liberator
-	civics={
+	civics = {
 		"civic_machine_liberator"
 		"civic_machine_builder"
 		"civic_machine_warbots"
 	}
-	
 	origin = "origin_default"
-	
+
 	planet_name = "PRESCRIPTED_planet_name_revolutionary"
 	planet_class = "pc_continental"
 	system_name = "PRESCRIPTED_system_name_revolutionary"
@@ -48,44 +46,43 @@ revolutionary_machine = {
 	city_graphical_culture = "necroid_01"
 
 	empire_flag = {
-		icon={
-			category="pointy"
-			file="flag_pointy_12.dds"
+		icon = {
+			category = "pointy"
+			file = "flag_pointy_12.dds"
 		}
-		background={
-			category="backgrounds"
-			file="pattern_01.dds"
+		background = {
+			category = "backgrounds"
+			file = "pattern_01.dds"
 		}
-		colors={
+		colors = {
 			"red"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_revolutionary"
 		gender = female
 		portrait = "sd_mam_robot"
 		texture = 0
-		hair = 0
+		attachment = 0
 		clothes = 0
 		ruler_title = "PRESCRIPTED_ruler_title_revolutionary"
 		leader_class = ruler
 	}
 }
 
-# Driven Assimilator - Tebrid Homolog
+# 泰伯尔同族体
 tebrid = {
-	name = "tebrid"
+	name = "EMPIRE_DESIGN_tebrid"
 	adjective = "PRESCRIPTED_adjective_tebrid"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-	
-	playable = has_synthethic_dawn # scripted_triggers
-	
 	ship_prefix = "PRESCRIPTED_ship_prefix_tebrid"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_synthethic_dawn
 	
 	species = {
 		class = "MACHINE"
@@ -106,24 +103,27 @@ tebrid = {
 		plural = "PRESCRIPTED_secondary_species_plural_tebrid"
 		adjective = "PRESCRIPTED_secondary_species_adjective_tebrid"
 		name_list = "MOL2"
-		trait="trait_cybernetic"
-		trait="trait_strong"
-		trait="trait_industrious"
-		trait="trait_slow_learners"
+		trait = "trait_cybernetic"
+		trait = "trait_strong"
+		trait = "trait_industrious"
+		trait = "trait_slow_learners"
 	}
-	
+
 	room = "machine_room"
-	
+
 	ethic = ethic_gestalt_consciousness
 	authority = "auth_machine_intelligence"
 	government = gov_machine_assimilator
-	civics = { "civic_machine_assimilator" "civic_machine_predictive_analysis" "civic_machine_builder" }
-	
+	civics = {
+		"civic_machine_assimilator"
+		"civic_machine_predictive_analysis"
+		"civic_machine_builder"
+	}
 	origin = "origin_default"
-	
-	planet_name = "Tebri"
+
+	planet_name = "PRESCRIPTED_planet_name_Tebri"
 	planet_class = "pc_ocean"
-	system_name = "Tebiron"
+	system_name = "PRESCRIPTED_system_name_Tebiron"
 	initializer = ""
 
 	graphical_culture = "molluscoid_01"
@@ -132,7 +132,7 @@ tebrid = {
 	empire_flag = {
 		icon = {
 			category = "zoological"
-			file= "flag_zoological_7.dds"
+			file = "flag_zoological_7.dds"
 		}
 		background = {
 			category = "backgrounds"
@@ -145,29 +145,28 @@ tebrid = {
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_tebrid"
 		gender = female
 		portrait = "sd_mol_robot"
 		texture = 0
-		hair = 0
+		attachment = 0
 		clothes = 0
 		ruler_title = "PRESCRIPTED_ruler_title_tebrid"
 		leader_class = ruler
 	}
 }
 
-# Rogue Servitor - Earth Custodianship
+# 地球监护者
 custodianship = {
-	name = "custodianship"
+	name = "EMPIRE_DESIGN_custodianship"
 	adjective = "PRESCRIPTED_adjective_custodianship"
-	spawn_enabled = no # yes / no / always
-	ignore_portrait_duplication = yes
-	
-	playable = has_synthethic_dawn # scripted_triggers
-	
 	ship_prefix = "PRESCRIPTED_ship_prefix_custodianship"
+	spawn_enabled = no
+	ignore_portrait_duplication = yes
+
+	playable = has_synthethic_dawn
 	
 	species = {
 		class = "MACHINE"
@@ -179,61 +178,65 @@ custodianship = {
 		trait = "trait_machine_unit"
 		trait = "trait_robot_emotion_emulators"
 		trait = "trait_robot_double_jointed"
-		trait = "trait_robot_high_maintenance"		
+		trait = "trait_robot_high_maintenance"
 	}
-	secondary_species={
+	secondary_species = {
 		class = "HUM"
 		portrait = "human"
 		name = "PRESCRIPTED_species_name_humans1"
 		plural = "PRESCRIPTED_species_plural_humans1"
 		adjective = "PRESCRIPTED_secondary_species_adjective_custodianship"
 		name_list = "HUMAN1"
-		trait="trait_docile"
-		trait="trait_intelligent"
-		trait="trait_weak"
-		trait="trait_sedentary"
-		trait="trait_repugnant"
+		trait = "trait_docile"
+		trait = "trait_intelligent"
+		trait = "trait_weak"
+		trait = "trait_sedentary"
+		trait = "trait_repugnant"
 	}
-	
+
 	room = "machine_room"
-	
+
 	ethic = ethic_gestalt_consciousness
 	authority = "auth_machine_intelligence"
 	government = gov_machine_servitor
-	civics = { "civic_machine_servitor" "civic_machine_delegated_functions" "civic_machine_maintenance_protocols" }
+	civics = {
+		"civic_machine_servitor"
+		"civic_machine_delegated_functions"
+		"civic_machine_maintenance_protocols"
+	}
 	origin = "origin_default"
-	
+
 	planet_name = "NAME_Earth"
 	planet_class = "pc_continental"
 	initializer = "sol_system_initializer"
 	system_name = "NAME_Sol"
-	
+
 	graphical_culture = "humanoid_01"
 	city_graphical_culture = "humanoid_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "human"
 			file = "flag_human_8.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "00_solid.dds"
 		}
-		colors={
+		colors = {
 			"blue"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_custodianship"
 		gender = female
 		portrait = "sd_hum_robot"
 		texture = 1
-		hair = 0
+		attachment = 0
 		clothes = 0
 		ruler_title = "PRESCRIPTED_ruler_title_custodianship"
 		leader_class = ruler
@@ -242,14 +245,13 @@ custodianship = {
 
 # Determined Exterminator - XT-489 Eliminators
 xt489 = {
-	name = "xt489"
+	name = "EMPIRE_DESIGN_xt489"
 	adjective = "PRESCRIPTED_adjective_xt489"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-	
-	playable = has_synthethic_dawn # scripted_triggers
-	
 	ship_prefix = "PRESCRIPTED_ship_prefix_xt489"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_synthethic_dawn
 	
 	species = {
 		class = "MACHINE"
@@ -264,16 +266,19 @@ xt489 = {
 		trait = "trait_robot_uncanny"
 		trait = "trait_robot_bulky"
 	}
-	
+
 	room = "machine_room"
-	
+
 	ethic = ethic_gestalt_consciousness
 	authority = "auth_machine_intelligence"
 	government = gov_machine_terminator
-	civics = { "civic_machine_terminator" "civic_machine_warbots" "civic_machine_replication" }
+	civics = {
+		"civic_machine_terminator"
+		"civic_machine_warbots"
+		"civic_machine_replication"
+	}
+	origin = "origin_default"
 
-    origin = "origin_machine"
-	
 	planet_name = "PRESCRIPTED_planet_name_xt489"
 	planet_class = "pc_desert"
 	system_name = "PRESCRIPTED_system_name_xt489"
@@ -282,8 +287,8 @@ xt489 = {
 	graphical_culture = "avian_01"
 	city_graphical_culture = "avian_01"
 
-	empire_flag={
-		icon={
+	empire_flag = {
+		icon = {
 			category = "domination"
 			file = "domination_11.dds"
 		}
@@ -298,13 +303,13 @@ xt489 = {
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_xt489"
 		gender = female
 		portrait = "sd_avi_robot"
 		texture = 2
-		hair = 0
+		attachment = 0
 		clothes = 0
 		ruler_title = "PRESCRIPTED_ruler_title_xt489"
 		leader_class = ruler
diff --git a/prescripted_countries/91_utopia_prescripted_countries.txt b/prescripted_countries/91_utopia_prescripted_countries.txt
index dbd634fa9..88bda6ca5 100644
--- a/prescripted_countries/91_utopia_prescripted_countries.txt
+++ b/prescripted_countries/91_utopia_prescripted_countries.txt
@@ -1,13 +1,88 @@
+# 齐里克公社
+kilik = {
+	name = "EMPIRE_DESIGN_kilik"
+	adjective = "PRESCRIPTED_adjective_kilik"
+	ship_prefix = "PRESCRIPTED_ship_prefix_kilik"
+	spawn_enabled = yes
+	ignore_portrait_duplication = no
+	
+	playable = has_utopia
 
-#超人联合
+	species = {
+		class = "AVI"
+		portrait = "avi11"
+		name = "PRESCRIPTED_species_name_kilik"
+		plural = "PRESCRIPTED_species_plural_kilik"
+		adjective = "PRESCRIPTED_species_adjective_kilik"
+		name_list = "AVI4"
+		trait = "trait_natural_sociologists"
+		trait = "trait_quick_learners"
+		trait = "trait_communal"
+		trait = "trait_fleeting"
+	}
+
+	room = "personality_erudite_explorers_room"
+
+	flags = { kilik_commune }
+	authority = "auth_direct_democratic"
+	government = "gov_peoples_commune"
+	ethic = "ethic_fanatic_socialism"
+	ethic = "ethic_fanatic_egalitarian"
+	ethic = "ethic_materialist"
+	civics = {
+		"civic_shared_burden"
+		civic_functional_architecture
+		"civic_terraforming"
+	}
+	origin = "origin_default"
+
+	planet_name = "PRESCRIPTED_planet_name_kilik"
+	planet_class = "pc_tropical"
+	system_name = "PRESCRIPTED_system_name_kilik"
+	initializer = ""
+
+	graphical_culture = "avian_01"
+	city_graphical_culture = "avian_01"
+
+	empire_flag = {
+		icon = {
+			category = "pointy"
+			file = "flag_pointy_9.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "diagonal.dds"
+		}
+		colors = {
+			"red"
+			"teal"
+			"null"
+			"null"
+		}
+	}
+
+	ruler = {
+		name = "PRESCRIPTED_ruler_name_kilik"
+		gender = female
+		portrait = "avi11"
+		texture = 0
+		clothes = 3
+		ruler_title = "PRESCRIPTED_ruler_title_kilik"
+		ruler_title_female = "PRESCRIPTED_ruler_title_kilik"
+		leader_class = ruler
+	}
+}
+
+# 超人联合
 newhumans = {
-	name = "newhumans"
+	name = "EMPIRE_DESIGN_newhumans"
 	adjective = "PRESCRIPTED_adjective_newhumans"
-	spawn_enabled = yes # yes / no / always
+	ship_prefix = "PRESCRIPTED_ship_prefix_newhumans"
+	spawn_enabled = yes
 	ignore_portrait_duplication = yes
 
-	ship_prefix = "PRESCRIPTED_ship_prefix_newhumans"
-	
+	playable = has_utopia
+
 	species = {
 		class = "HUM"
 		portrait = "human"
@@ -20,286 +95,228 @@ newhumans = {
 		trait = "trait_communal"
 		trait = "trait_deviants"
 	}
-	
-	room = "personality_hegemonic_imperialists_room"	
-	
+
+	room = "personality_hegemonic_imperialists_room"
+
 	authority = "auth_dictatorial"
-	civics={
+	civics = {
 		"civic_network_of_the_mind"
 		"civic_nationalistic_zeal"
 		"civic_hive_strength_of_legions"
 	}
 	government = gov_parting_consciousness
-	
+
 	origin = "origin_lost_colony"
 
-	ethic="ethic_fanatic_authoritarian"
-	ethic="ethic_xenophobe"
-	ethic="ethic_fanatic_militarist"
+	ethic = "ethic_fanatic_authoritarian"
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_fanatic_militarist"
 
 	flags = { new_human custom_start_screen }
-	
+
 	planet_name = "NAME_Unity"
 	planet_class = "pc_continental"
 	initializer = "deneb_system"
 	system_name = "NAME_Deneb"
-	
+
 	graphical_culture = "humanoid_01"
 	city_graphical_culture = "mammalian_01"
-	
+
 	empire_flag = {
-		icon={
-			category="domination"
-			file="domination_3.dds"
+		icon = {
+			category = "domination"
+			file = "domination_3.dds"
 		}
-		background={
-			category="backgrounds"
-			file="stripe.dds"
+		background = {
+			category = "backgrounds"
+			file = "stripe.dds"
 		}
-		colors={
+		colors = {
 			"red"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_newhumans"
 		portrait = "human_male_01"
 		gender = female
-		texture=0
-		hair=9
-		clothes=6
-		leader_class="ruler"
+		texture = 0
+		attachment = 9
+		clothes = 6
+		leader_class = "ruler"
 	}
 }
 
-#哈兹布赞安资斯坦
-hazbuzan = {
-	name = "hazbuzan"
-	adjective = "PRESCRIPTED_adjective_hazbuzan"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-	
-	playable = has_megacorp
-	
-	ship_prefix = "PRESCRIPTED_ship_prefix_hazbuzan"
-	
+# 希亚纳尔西星球联盟
+ciannarsi = {
+	name = "EMPIRE_DESIGN_ciannarsi"
+	adjective = "PRESCRIPTED_adjective_ciannarsi"
+	ship_prefix = "PRESCRIPTED_ship_prefix_ciannarsi"
+	spawn_enabled = yes
+	spawn_as_fallen = no
+	ignore_portrait_duplication = no
+
+	playable = has_utopia
+
 	species = {
-		class = "REP"
-		portrait= "rep12"
-		name = "PRESCRIPTED_species_name_hazbuzan"
-		plural = "PRESCRIPTED_species_plural_hazbuzan"
-		adjective = "PRESCRIPTED_species_adjective_hazbuzan"
-		name_list = "REP3"
-		trait = "trait_ingenious"
-		trait = "trait_thrifty"
-		trait = "trait_deviants"
-		trait = "trait_quarrelsome"
+		class = "MOL"
+		portrait = "mol17"
+		name = "PRESCRIPTED_species_name_ciannarsi"
+		plural = "PRESCRIPTED_species_plural_ciannarsi"
+		adjective = "PRESCRIPTED_species_adjective_ciannarsi"
+		name_list = "MOL3"
+		trait = "trait_charismatic"
+		trait = "trait_docile"
+		trait = "trait_nonadaptive"
 	}
-	
-	room = "personality_ruthless_capitalists_room"
-	
-	ethic="ethic_fanatic_egalitarian"
-	ethic="ethic_militarist"
-	ethic="ethic_fanatic_capitalism"
-	authority = "auth_direct_democratic"
-	government = "gov_anarchocapitalism"
+
+	room = "personality_spiritual_seekers_room"
+
+	authority = "auth_democratic"
+	government = "gov_moral_democracy"
+	ethic = "ethic_egalitarian"
+	ethic = "ethic_fanatic_xenophile"
+	ethic = "ethic_fanatic_pacifist"
 	civics = {
-		"civic_anarchism"
-		"civic_triple_the_profit"
-		"civic_underworld_society"
+		"civic_altruism"
+		"civic_enlightment"
+		"civic_peacekeepers"
 	}
-	origin = "origin_default"
-	
-	planet_name = "PRESCRIPTED_planet_name_hazbuzan"
-	planet_class = "pc_savannah"
-	system_name = "PRESCRIPTED_system_name_hazbuzan"
-	initializer = ""
+	origin = "origin_scion"
 
-	graphical_culture = "reptilian_01"
-	city_graphical_culture = "reptilian_01"
+	planet_name = "PRESCRIPTED_planet_name_ciannarsi"
+	planet_class = "pc_ocean"
+	system_name = "PRESCRIPTED_system_name_ciannarsi"
+	initializer = ""
+	graphical_culture = "molluscoid_01"
+	city_graphical_culture = "molluscoid_01"
 
 	empire_flag = {
 		icon = {
-			category = "corporate"
-			file = "corporate_03.dds"
+			category = "ornate"
+			file = "flag_ornate_17.dds"
 		}
 		background = {
 			category = "backgrounds"
-			file = "circle.dds"
+			file = "stripes.dds"
 		}
 		colors = {
-			"yellow"
-			"black"
+			"light_pink"
+			"silver_steel"
 			"null"
 			"null"
 		}
-	}	
-	
+	}
+
 	ruler = {
-		name = "PRESCRIPTED_ruler_name_hazbuzan"
 		gender = female
-		portrait = "rep12"
-		texture = 5
-		clothes = 1
-		ruler_title = "PRESCRIPTED_ruler_title_hazbuzan"
-		ruler_title_female = "PRESCRIPTED_ruler_title_hazbuzan_female"
-		leader_class = ruler
+		name = "PRESCRIPTED_ruler_name_ciannarsi"
+		portrait = "mol17"
+		texture = 0
+		attachment = 0
+		clothes = 0
+		leader_class = "ruler"
 	}
 }
 
-#希亚纳尔西星球联盟
-ciannarsi ={
-	name = "ciannarsi"
-	ship_prefix="PRESCRIPTED_ship_prefix_ciannarsi"
-	species={
-		class="MOL"
-		portrait="mol17"
-		name="PRESCRIPTED_species_name_ciannarsi"
-		plural="PRESCRIPTED_species_plural_ciannarsi"
-		adjective="PRESCRIPTED_species_adjective_ciannarsi"
-		name_list="MOL3"
-		trait="trait_charismatic"
-		trait="trait_docile"
-		trait="trait_nonadaptive"
-	}
-	adjective="PRESCRIPTED_adjective_ciannarsi"
-	authority="auth_democratic"
-	government="gov_moral_democracy"
-	planet_name="PRESCRIPTED_planet_name_ciannarsi"
-	planet_class="pc_ocean"
-	system_name="PRESCRIPTED_system_name_ciannarsi"
-	initializer=""
-	graphical_culture="molluscoid_01"
-	city_graphical_culture="molluscoid_01"
-	empire_flag={
-		icon={
-			category="ornate"
-			file="flag_ornate_17.dds"
-		}
-		background={
-			category="backgrounds"
-			file="stripes.dds"
-		}
-		colors={
-			"light_pink"
-			"silver_steel"
-			"null"
-			"null"
-		}
+# 泽克默克团结体
+zekimerck = {
+	name = "EMPIRE_DESIGN_zekimerck"
+	adjective = "PRESCRIPTED_adjective_zekimerck"
+	ship_prefix = "PRESCRIPTED_ship_prefix_zekimerck"
+	spawn_enabled = yes
+	spawn_as_fallen = no
+	ignore_portrait_duplication = no
+	playable = has_utopia
+
+	species = {
+		class = "FUN"
+		portrait = "fun16"
+		name = "PRESCRIPTED_species_name_zekimerck"
+		plural = "PRESCRIPTED_species_plural_zekimerck"
+		adjective = "PRESCRIPTED_species_adjective_zekimerck"
+		name_list = "FUN4"
+		trait = "trait_necrophage"
+		trait = "trait_traditional"
+		trait = "trait_communal"
+		trait = "trait_docile"
+		trait = "trait_repugnant"
+	}
+	secondary_species = {
+		class = "MAM"
+		portrait = "mam15"
+		name = "PRESCRIPTED_secondary_species_name_zekimerck"
+		plural = "PRESCRIPTED_secondary_species_plural_zekimerck"
+		adjective = "PRESCRIPTED_secondary_species_adjective_zekimerck"
+		name_list = "MAM3"
+		trait = "trait_strong"
+		trait = "trait_conformists"
+		trait = "trait_fleeting"
 	}
-	ruler={
-		gender=female
-		name="PRESCRIPTED_ruler_name_ciannarsi"
-		portrait="mol17"
-		texture=0
-		hair=0
-		clothes=0
-		leader_class="ruler"
-	}
-	spawn_as_fallen=no
-	ignore_portrait_duplication=no
-	room="personality_spiritual_seekers_room"
-	spawn_enabled=yes
-	ethic="ethic_egalitarian"
-	ethic="ethic_fanatic_xenophile"
-	ethic="ethic_fanatic_pacifist"
-	civics={
-		"civic_altruism"
-		"civic_enlightment"
-		"civic_peacekeepers"
+
+	room = "personality_fanatic_purifier_room"
+
+	authority = "auth_dictatorial"
+	government = "gov_dictatorship_of_the_people"
+	ethic = "ethic_fanatic_authoritarian"
+	ethic = "ethic_spiritualist"
+	ethic = "ethic_fanatic_socialism"
+	civics = {
+		"civic_ultimate_collective"
+		"civic_heart_of_the_unity"
+		"civic_asceticism"
 	}
-	origin="origin_scion"
-}
+	origin = "origin_necrophage"
+
+	planet_name = "PRESCRIPTED_planet_name_zekimerck"
+	planet_class = "pc_tropical"
+	system_name = "PRESCRIPTED_system_name_zekimerck"
+	initializer = ""
+
+	graphical_culture = "fungoid_01"
+	city_graphical_culture = "fungoid_01"
 
-#泽克默克团结体
-zekimerck={
-	name = "zekimerck"
-	ship_prefix="PRESCRIPTED_ship_prefix_zekimerck"
-	species={
-		class="FUN"
-		portrait="fun16"
-		name="PRESCRIPTED_species_name_zekimerck"
-		plural="PRESCRIPTED_species_plural_zekimerck"
-		adjective="PRESCRIPTED_species_adjective_zekimerck"
-		name_list="FUN4"
-		trait="trait_necrophage"
-		trait="trait_traditional"
-		trait="trait_communal"
-		trait="trait_docile"
-		trait="trait_repugnant"
-	}
-	secondary_species={
-		class="MAM"
-		portrait="mam15"
-		name="PRESCRIPTED_secondary_species_name_zekimerck"
-		plural="PRESCRIPTED_secondary_species_plural_zekimerck"
-		adjective="PRESCRIPTED_secondary_species_adjective_zekimerck"
-		name_list="MAM3"
-		trait="trait_strong"
-		trait="trait_conformists"
-		trait="trait_fleeting"
-	}
-	adjective="PRESCRIPTED_adjective_zekimerck"
-	authority="auth_dictatorial"
-	government="gov_dictatorship_of_the_people"
-	planet_name="PRESCRIPTED_planet_name_zekimerck"
-	planet_class="pc_tropical"
-	system_name="PRESCRIPTED_system_name_zekimerck"
-	initializer=""
-	graphical_culture="fungoid_01"
-	city_graphical_culture="fungoid_01"
-	empire_flag={
-		icon={
-			category="domination"
-			file="domination_21.dds"
+	empire_flag = {
+		icon = {
+			category = "domination"
+			file = "domination_21.dds"
 		}
-		background={
-			category="backgrounds"
-			file="flag_BG_8.dds"
+		background = {
+			category = "backgrounds"
+			file = "flag_BG_8.dds"
 		}
-		colors={
+		colors = {
 			"red"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	ruler={
-		gender=female
-		name="PRESCRIPTED_ruler_name_zekimerck"
-		portrait="fun16"
-		texture=0
-		hair=0
-		clothes=0
-		leader_class="ruler"
+
+	ruler = {
+		gender = female
+		name = "PRESCRIPTED_ruler_name_zekimerck"
+		portrait = "fun16"
+		texture = 0
+		attachment = 0
+		clothes = 0
+		leader_class = "ruler"
 		ruler_title = "PRESCRIPTED_ruler_title_zekimerck"
 	}
-	spawn_as_fallen=no
-	ignore_portrait_duplication=no
-	room="personality_fanatic_purifier_room"
-	spawn_enabled=yes
-	ethic="ethic_fanatic_authoritarian"
-	ethic="ethic_spiritualist"
-	ethic="ethic_fanatic_socialism"
-	civics={
-		"civic_ultimate_collective"
-		"civic_heart_of_the_unity"
-		"civic_asceticism"
-	}
-	origin="origin_necrophage"
 }
 
-# Xanid Suzerainty - Syncretic Evolution
+# 泽尼德宗主国
 xanid = {
-	name = "xanid"
+	name = "EMPIRE_DESIGN_xanid"
 	adjective = "PRESCRIPTED_adjective_xanid"
-	spawn_enabled = yes # yes / no / always
-	
-	playable = has_utopia # scripted_triggers
-	
+	ship_prefix = "PRESCRIPTED_ship_prefix_xanid"
+	spawn_enabled = yes
+
+	playable = has_utopia
+
 	species = {
 		class = "ART"
 		portrait = "art10"
@@ -312,8 +329,7 @@ xanid = {
 		trait = "trait_enduring"
 		trait = "trait_nonadaptive"
 	}
-
-	secondary_species={
+	secondary_species = {
 		class = "REP"
 		portrait = "rep7"
 		name = "PRESCRIPTED_secondary_species_name_xanid"
@@ -326,14 +342,7 @@ xanid = {
 		trait = "trait_slow_learners"
 		trait = "trait_fleeting"
 	}
-	
-	ship_prefix = "PRESCRIPTED_ship_prefix_xanid"
-	
-	planet_name = "PRESCRIPTED_planet_name_xanid"
-	planet_class = "pc_arid"
-	system_name = "PRESCRIPTED_system_name_xanid"
-	initializer = ""
-	
+
 	room = "personality_hegemonic_imperialists_room"
 
 	authority = "auth_dictatorial"
@@ -347,20 +356,24 @@ xanid = {
 		"civic_eternal_kingship"
 		"civic_reeducated_labor"
 	}
-	
 	origin = "origin_syncretic_evolution"
-	
+
+	planet_name = "PRESCRIPTED_planet_name_xanid"
+	planet_class = "pc_arid"
+	system_name = "PRESCRIPTED_system_name_xanid"
+	initializer = ""
+
 	graphical_culture = "arthropoid_01"
 	city_graphical_culture = "arthropoid_01"
-	
+
 	empire_flag = {
 		icon = {
-			category="spherical"
-			file="flag_spherical_12.dds"
+			category = "spherical"
+			file = "flag_spherical_12.dds"
 		}
 		background = {
-			category="backgrounds"
-			file="circle.dds"
+			category = "backgrounds"
+			file = "circle.dds"
 		}
 		colors = {
 			"yellow"
@@ -369,28 +382,28 @@ xanid = {
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_xanid"
 		gender = male
 		portrait = "art10"
 		texture = 3
-		hair = 0
+		attachment = 0
 		clothes = 4
 		ruler_title = "PRESCRIPTED_ruler_title_xanid"
 		leader_class = ruler
 	}
 }
 
-# Xanid Suzerainty - Syncretic Evolution
+# 洛克机械师工会
 lokken = {
-	name = "lokken"
+	name = "EMPIRE_DESIGN_lokken"
 	adjective = "PRESCRIPTED_adjective_lokken"
-	
 	ship_prefix = "PRESCRIPTED_ship_prefix_lokken"
-	
-	playable = has_utopia # scripted_triggers
+	spawn_enabled = yes
 
+	playable = has_utopia
+	
 	species = {
 		class = "REP"
 		portrait = "rep4"
@@ -403,25 +416,28 @@ lokken = {
 		trait = "trait_quick_learners"
 		trait = "trait_sedentary"
 	}
-	ethic="ethic_fanatic_egalitarian"
-	ethic="ethic_fanatic_spiritualist"
-	ethic="ethic_capitalism"
-	civics={
+
+	room = "personality_erudite_explorers_room"
+
+	authority = "auth_direct_democratic"
+	government = "gov_direct_democracy"
+	ethic = "ethic_fanatic_egalitarian"
+	ethic = "ethic_fanatic_spiritualist"
+	ethic = "ethic_capitalism"
+	civics = {
 		"civic_knowledge_seeker"
 		"civic_spiritual_democracy"
 		"civic_distributism"
 	}
 	origin = "origin_machine_cult"
-	
-	authority = "auth_direct_democratic"
-	government = "gov_direct_democracy"
+
 	planet_name = "PRESCRIPTED_planet_name_lokken"
 	planet_class = "pc_arid"
 	system_name = "PRESCRIPTED_system_name_lokken"
 	initializer = ""
+
 	graphical_culture = "reptilian_01"
 	city_graphical_culture = "reptilian_01"
-	room = "personality_erudite_explorers_room"
 
 	empire_flag = {
 		icon = {
@@ -439,14 +455,13 @@ lokken = {
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		gender = female
 		name = "PRESCRIPTED_ruler_name_lokken"
-		ruler_title_female = "PRESCRIPTED_ruler_title_lokken"
 		portrait = "rep4"
 		texture = 3
-		hair = 0
+		attachment = 0
 		clothes = 3
 		ruler_title = "PRESCRIPTED_ruler_title_lokken"
 		ruler_title_female = "PRESCRIPTED_ruler_title_lokken"
@@ -454,17 +469,16 @@ lokken = {
 	}
 }
 
-#“地球联合国”
+# “地球联合国”
 humans3 = {
-	name = "humans3"
+	name = "EMPIRE_DESIGN_humans3"
 	adjective = "PRESCRIPTED_adjective_humans3"
-	spawn_enabled = no # yes / no / always
-	ignore_portrait_duplication = yes
-	
-	playable = has_megacorp
-	
 	ship_prefix = "PRESCRIPTED_ship_prefix_humans1"
-	
+	spawn_enabled = no
+	ignore_portrait_duplication = yes
+
+	playable = has_utopia
+
 	species = {
 		class = "ART"
 		portrait = "art11"
@@ -472,39 +486,40 @@ humans3 = {
 		plural = "PRESCRIPTED_species_plural_humans3"
 		adjective = "PRESCRIPTED_species_adjective_humans3"
 		name_list = "HUMAN1"
-		trait="trait_hive_mind"
-		trait="trait_survivor"
-		trait="trait_extremely_adaptive"
-		trait="trait_rapid_breeders"
-		trait="trait_repugnant"
-		trait="trait_weak"
-		trait="trait_fleeting"
+		trait = "trait_hive_mind"
+		trait = "trait_survivor"
+		trait = "trait_extremely_adaptive"
+		trait = "trait_rapid_breeders"
+		trait = "trait_repugnant"
+		trait = "trait_weak"
+		trait = "trait_fleeting"
 	}
-	
+
 	room = "scrappy_room"
-	
-	ethic="ethic_gestalt_consciousness"
+
+	ethic = "ethic_gestalt_consciousness"
 	authority = "auth_hive_mind"
-	flags = {
-		"human_3"
-		"custom_start_screen"
-	}
 	government = "gov_hive_mind"
-	civics={
+	civics = {
 		"civic_hive_memorialist"
 		"civic_hive_empath"
 		"civic_hive_divided_attention"
 	}
 	origin = "origin_post_apocalyptic"
-	
+
+	flags = {
+		"human_3"
+		"custom_start_screen"
+	}
+
 	planet_name = "NAME_Earth"
 	planet_class = "pc_continental"
 	initializer = "sol_system_initializer"
 	system_name = "NAME_Sol"
-	
+
 	graphical_culture = "arthropoid_01"
 	city_graphical_culture = "mammalian_01"
-	
+
 	empire_flag = {
 		icon = {
 			category = "human"
@@ -521,27 +536,28 @@ humans3 = {
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_humans3"
 		gender = female
-		portrait="art11"
-		texture=0
-		hair=1
-		clothes=0
-		leader_class="ruler"
+		portrait = "art11"
+		texture = 0
+		attachment = 1
+		clothes = 0
+		leader_class = "ruler"
 	}
 }
 
 
-# Ix'Idar # is now a hive mind
+# 伊科斯'伊达集合体
 ixidar = {
-	name = "ixidar"
+	name = "EMPIRE_DESIGN_ixidar"
 	adjective = "PRESCRIPTED_adjective_ixidar"
-	spawn_enabled = yes # yes / no / always
-	
-	playable = has_utopia # scripted_triggers
-	
+	ship_prefix = "PRESCRIPTED_ship_prefix_ixidar"
+	spawn_enabled = yes
+
+	playable = has_utopia
+
 	species = {
 		class = "ART"
 		portrait = "art12"
@@ -556,41 +572,43 @@ ixidar = {
 		trait = "trait_fleeting"
 	}
 	
-	ship_prefix = "PRESCRIPTED_ship_prefix_ixidar"
-	
 	planet_name = "PRESCRIPTED_planet_name_ixidar"
 	planet_class = "pc_arctic"
 	system_name = "PRESCRIPTED_system_name_ixidar"
-	
+
 	room = "personality_hive_mind_room"
 
 	ethic = ethic_gestalt_consciousness
 	authority = "auth_hive_mind"
 	government = gov_hive_mind
-	civics = { "civic_hive_natural_neural_network" "civic_hive_pooled_knowledge" "civic_hive_ascetic" }
-	
+	civics = {
+		"civic_hive_natural_neural_network"
+		"civic_hive_pooled_knowledge"
+		"civic_hive_ascetic"
+	}
+
 	origin = origin_subterranean
-	
+
 	graphical_culture = "arthropoid_01"
 	city_graphical_culture = "arthropoid_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "ornate"
 			file = "flag_ornate_18.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "00_solid.dds"
 		}
-		colors={
+		colors = {
 			"dark_grey"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_ixidar"
 		gender = male
diff --git a/prescripted_countries/92_plantoids_prescripted_countries.txt b/prescripted_countries/92_plantoids_prescripted_countries.txt
deleted file mode 100644
index 049464408..000000000
--- a/prescripted_countries/92_plantoids_prescripted_countries.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maweer
-maweer = {
-	name = "maweer"
-	ship_prefix = "PRESCRIPTED_ship_prefix_maweer"
-	spawn_enabled = yes
-	ignore_portrait_duplication = yes
-	
-	playable = has_plantoids # scripted_triggers
-	
-	species={
-		class="PLANT"
-		portrait = "pla14"
-		name = "PRESCRIPTED_species_name_maweer"
-		plural = "PRESCRIPTED_species_plural_maweer"
-		adjective = "PRESCRIPTED_species_adjective_maweer"
-		name_list = "PLANT"
-		trait="trait_agrarian"
-		trait="trait_plantoid_phototrophic"
-		trait="trait_conservational"
-		trait="trait_slow_breeders"
-	}
-
-	room = "personality_xenophobic_isolationists_room"
-	ethic = "ethic_xenophobe"
-	ethic = "ethic_fanatic_pacifist"
-	ethic = "ethic_fanatic_spiritualist"
-	authority="auth_dictatorial"
-	civics = {
-		"civic_keepers_harmony"
-		"civic_catalytic_processing"
-		"civic_idyllic_bloom"
-	}
-	government="gov_meditation"
-	
-	origin = "origin_default"
-
-	adjective = "PRESCRIPTED_adjective_maweer"
-	planet_name = "PRESCRIPTED_planet_name_maweer"
-	planet_class = "pc_tropical"
-	system_name = "PRESCRIPTED_system_name_maweer"
-	initializer = ""
-	graphical_culture = "plantoid_01"
-	city_graphical_culture = "plantoid_01"
-
-	empire_flag = {
-		icon = {
-			category = "pirate"
-			file = "flag_pirate_6.dds"
-		}
-		background = {
-			category = "backgrounds"
-			file = "circle.dds"
-		}
-		colors = {
-			"green"
-			"dark_green"
-			"null"
-			"null"
-		}
-	}
-
-	ruler = {
-		gender = male
-		name = "PRESCRIPTED_ruler_name_maweer"
-		portrait = "pla14"
-		texture = 1
-		hair = 0
-		clothes = 0
-		ruler_title = "PRESCRIPTED_ruler_title_maweer"
-		leader_class = ruler
-	}
-}
\ No newline at end of file
diff --git a/prescripted_countries/92_species_packs_prescripted_countries.txt b/prescripted_countries/92_species_packs_prescripted_countries.txt
new file mode 100644
index 000000000..7931116dd
--- /dev/null
+++ b/prescripted_countries/92_species_packs_prescripted_countries.txt
@@ -0,0 +1,685 @@
+# 冒维尔守护者
+maweer = {
+	name = "EMPIRE_DESIGN_maweer"
+	adjective = "PRESCRIPTED_adjective_maweer"
+	ship_prefix = "PRESCRIPTED_ship_prefix_maweer"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_plantoids
+
+	species = {
+		class = "PLANT"
+		portrait = "pla14"
+		name = "PRESCRIPTED_species_name_maweer"
+		plural = "PRESCRIPTED_species_plural_maweer"
+		adjective = "PRESCRIPTED_species_adjective_maweer"
+		name_list = "PLANT"
+		trait = "trait_agrarian"
+		trait = "trait_plantoid_phototrophic"
+		trait = "trait_conservational"
+		trait = "trait_slow_breeders"
+	}
+
+	room = "personality_xenophobic_isolationists_room"
+
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_fanatic_pacifist"
+	ethic = "ethic_fanatic_spiritualist"
+	authority = "auth_dictatorial"
+	civics = {
+		"civic_keepers_harmony"
+		"civic_catalytic_processing"
+		"civic_idyllic_bloom"
+	}
+	government = "gov_meditation"
+	origin = "origin_default"
+
+	planet_name = "PRESCRIPTED_planet_name_maweer"
+	planet_class = "pc_tropical"
+	system_name = "PRESCRIPTED_system_name_maweer"
+	initializer = ""
+
+	graphical_culture = "plantoid_01"
+	city_graphical_culture = "plantoid_01"
+
+	empire_flag = {
+		icon = {
+			category = "pirate"
+			file = "flag_pirate_6.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "circle.dds"
+		}
+		colors = {
+			"green"
+			"dark_green"
+			"null"
+			"null"
+		}
+	}
+
+	ruler = {
+		gender = male
+		name = "PRESCRIPTED_ruler_name_maweer"
+		portrait = "pla14"
+		texture = 1
+		attachment = 0
+		clothes = 0
+		ruler_title = "PRESCRIPTED_ruler_title_maweer"
+		leader_class = ruler
+	}
+}
+
+# 阿韦邦守护者
+khennet = {
+	name = "EMPIRE_DESIGN_khennet"
+	adjective = "PRESCRIPTED_adjective_khennet"
+	ship_prefix = "PRESCRIPTED_ship_prefix_khennet"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_lithoids #scripted_triggers
+
+	species = {
+		class = "LITHOID"
+		portrait = "lith11"
+		name = "PRESCRIPTED_species_name_khennet"
+		plural = "PRESCRIPTED_species_plural_khennet"
+		adjective = "PRESCRIPTED_species_adjective_khennet"
+		name_list = "LITHOID3"
+		gender = indeterminable
+		trait = "trait_lithoid"
+		trait = "trait_communal"
+		trait = "trait_industrious"
+		trait = "trait_sedentary"
+	}
+
+	room = "lithoid_room"
+	ethic = "ethic_authoritarian"
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_pacifist"
+	ethic = "ethic_fanatic_spiritualist"
+	authority = "auth_imperial"
+	civics = {
+		"civic_spiritual_seekers"
+		"civic_imperial_cult"
+		"civic_mining_guilds"
+	}
+	government = "gov_divine_empire"
+	origin = "origin_lithoid"
+
+	planet_name = "PRESCRIPTED_planet_name_khennet"
+	planet_class = "pc_arid"
+	system_name = "PRESCRIPTED_system_name_khennet"
+	initializer = ""
+	graphical_culture = "lithoid_01"
+	city_graphical_culture = "lithoid_01"
+
+	empire_flag = {
+		icon = {
+			category = "blocky"
+			file = "flag_blocky_7.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "double_hemispheres.dds"
+		}
+		colors = {
+			"dark_grey"
+			"light_blue"
+			"null"
+			"null"
+		}
+	}
+
+	ruler = {
+		gender = female
+		name = "PRESCRIPTED_ruler_name_khennet"
+		portrait = "lith11"
+		texture = 4
+		attachment = 0
+		clothes = 0
+		ruler_title = "PRESCRIPTED_ruler_title_khennet"
+		leader_class = ruler
+	}
+}
+
+# Pasharti Devourers
+pasharti = {
+	name = "EMPIRE_DESIGN_pasharti"
+	adjective = "PRESCRIPTED_adjective_pasharti"
+	ship_prefix = "PRESCRIPTED_ship_prefix_pasharti"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_necroids #scripted_triggers
+
+	species = {
+		class = "NECROID"
+		portrait = "nec1"
+		name = "PRESCRIPTED_species_name_pasharti"
+		plural = "PRESCRIPTED_species_plural_pasharti"
+		adjective = "PRESCRIPTED_species_adjective_pasharti"
+		name_list = "NECROID2"
+		trait = "trait_necrophage"
+		trait = "trait_deviants"
+		trait = "trait_very_strong"
+	}
+	secondary_species = {
+		class = "NECROID"
+		portrait = "nec12"
+		name = "PRESCRIPTED_secondary_species_name_pasharti"
+		plural = "PRESCRIPTED_secondary_species_plural_pasharti"
+		adjective = "PRESCRIPTED_secondary_species_adjective_pasharti"
+		name_list = "NECROID3"
+
+		trait = "trait_wasteful"
+		trait = "trait_solitary"
+		trait = "trait_charismatic"
+		trait = "trait_docile"
+	}
+
+	room = "necroids_room"
+	ethic = "ethic_authoritarian"
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_militarist"
+	ethic = "ethic_spiritualist"
+	ethic = "ethic_capitalism"
+	civics = {
+		"civic_reanimated_armies"
+		"civic_memorialist"
+		"civic_corvee_system"
+	}
+	authority = "auth_dictatorial"
+	government = "gov_constitutional_dictatorship"
+	origin = "origin_necrophage"
+
+	planet_name = "PRESCRIPTED_planet_name_pasharti"
+	planet_class = "pc_tundra"
+	system_name = "PRESCRIPTED_system_name_pasharti"
+	initializer = ""
+	graphical_culture = "necroid_01"
+	city_graphical_culture = "necroid_01"
+
+	empire_flag = {
+		icon = {
+			category = "pirate"
+			file = "flag_pirate_5.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "double_triangles.dds"
+		}
+		colors = {
+			"black"
+			"burgundy"
+			"null"
+			"null"
+		}
+	}
+	ruler = {
+		gender = female
+		name = "PRESCRIPTED_ruler_name_pasharti"
+		portrait = "nec1"
+		texture = 0
+		attachment = 0
+		clothes = 0
+		ruler_title = "PRESCRIPTED_ruler_title_pasharti"
+		leader_class = ruler
+	}
+	flags = { necrophage_start_empire }
+}
+
+# 萨提雷尔之赐
+sathyrel = {
+	name = "EMPIRE_DESIGN_sathyrel"
+	adjective = "PRESCRIPTED_adjective_sathyrel"
+	ship_prefix = "PRESCRIPTED_ship_prefix_sathyrel"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_aquatics #scripted_triggers
+
+	species = {
+		class = "AQUATIC"
+		portrait = "aqu1"
+		name = "PRESCRIPTED_species_name_sathyrel"
+		plural = "PRESCRIPTED_species_plural_sathyrel"
+		adjective = "PRESCRIPTED_species_adjective_sathyrel"
+		name_list = "AQUATIC1"
+		trait = "trait_aquatic"
+		trait = "trait_conservational"
+		trait = "trait_docile"
+		trait = "trait_nonadaptive"
+		trait = "trait_slow_learners"
+	}
+
+	room = "aquatics_room"
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_fanatic_pacifist"
+	ethic = "ethic_fanatic_socialism"
+	civics = {
+		"civic_anglers"
+		"civic_industry_pacesetter"
+		"civic_enlightment"
+	}
+	authority = "auth_dictatorial"
+	government = "gov_irenic_dictatorship"
+	origin = "origin_ocean_paradise"
+
+	planet_name = "PRESCRIPTED_planet_name_sathyrel"
+	planet_class = "pc_ocean"
+	system_name = "PRESCRIPTED_system_name_sathyrel"
+	initializer = "ocean_paradise_start"
+	graphical_culture = "aquatic_01"
+	city_graphical_culture = "aquatic_01"
+
+	empire_flag = {
+		icon = {
+			category = "spherical"
+			file = "flag_spherical_5.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "circle.dds"
+		}
+		colors = {
+			"dark_blue"
+			"light_blue"
+			"null"
+			"null"
+		}
+	}
+	ruler = {
+		gender = female
+		name = "PRESCRIPTED_ruler_name_sathyrel"
+		portrait = "aqu1"
+		texture = 0
+		attachment = 0
+		clothes = 0
+		leader_class = "ruler"
+	}
+}
+
+# 雷塞利安革命联合舰队
+reselian = {
+	name = "EMPIRE_DESIGN_reselian"
+	adjective = "PRESCRIPTED_adjective_reselian"
+	ship_prefix = "PRESCRIPTED_ship_prefix_reselian"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_aquatics #scripted_triggers
+
+	species = {
+		class = "AQUATIC"
+		portrait = "aqu5"
+		name = "PRESCRIPTED_species_name_reselian"
+		plural = "PRESCRIPTED_species_plural_reselian"
+		adjective = "PRESCRIPTED_species_adjective_reselian"
+		name_list = "AQUATIC4"
+		trait = "trait_aquatic"
+		trait = "trait_intelligent"
+		trait = "trait_natural_sociologists"
+		trait = "trait_unruly"
+	}
+
+	room = "aquatics_room"
+
+	authority = "auth_direct_democratic"
+	government = "gov_peoples_commune"
+	ethic = "ethic_egalitarian"
+	ethic = "ethic_xenophile"
+	ethic = "ethic_militarist"
+	ethic = "ethic_fanatic_socialism"
+	civics = {
+		"civic_shared_burden"
+		"civic_liberator"
+		"civic_martial_brotherhood"
+	}
+	origin = "origin_default"
+
+	flags = {
+		reselian
+	}
+
+	planet_name = "PRESCRIPTED_planet_name_reselian"
+	planet_class = "pc_ocean"
+	system_name = "PRESCRIPTED_system_name_reselian"
+	initializer = ""
+
+	graphical_culture = "aquatic_01"
+	city_graphical_culture = "aquatic_01"
+
+	empire_flag = {
+		icon = {
+			category = "human"
+			file = "flag_human_6.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "diagonal.dds"
+		}
+		colors = {
+			"black"
+			"dark_blue"
+			"black"
+			"null"
+		}
+	}
+
+	ruler = {
+		name = "PRESCRIPTED_ruler_name_reselian"
+		gender = male
+		portrait = "aqu5_m"
+		texture = 0
+		attachment = 0
+		clothes = 3
+		leader_class = "ruler"
+	}
+}
+
+# Gorthikan Alliance
+gorthikan = {
+	name = EMPIRE_DESIGN_gorthikan
+	adjective = PRESCRIPTED_adjective_gorthikan
+	ship_prefix = PRESCRIPTED_ship_prefix_gorthikan
+	spawn_enabled = yes
+	spawn_as_fallen = no
+	ignore_portrait_duplication = no
+	
+	species = {
+		class = "TOX"
+		portrait = "tox4"
+		name = PRESCRIPTED_species_name_gorthikan
+		plural = PRESCRIPTED_species_plural_gorthikan
+		adjective = PRESCRIPTED_species_adjective_gorthikan
+		name_list = "TOX4"
+		gender = indeterminable
+		trait = "trait_artificial_intelligence"
+		trait = "trait_incubator"
+		trait = "trait_unruly"
+		trait = "trait_spliced_adaptability"
+	}
+	
+	room = "toxoids_room"
+	
+	authority = "auth_democratic"
+	government = "gov_direct_democracy"
+	ethic = "ethic_fanatic_egalitarian"
+	ethic = "ethic_militarist"
+	ethic = "ethic_materialist"
+	ethic = "ethic_capitalism"
+	civics = {
+		"civic_scavengers"
+		"civic_underworld_society"
+		"civic_toxic_baths"
+	}
+	origin = "origin_overtuned"
+	
+	planet_name = PRESCRIPTED_planet_name_gorthikan
+	planet_class = "pc_alpine"
+	system_name = PRESCRIPTED_system_name_gorthikan
+	initializer = "custom_starting_init_02"
+
+	graphical_culture = "toxoid_01"
+	city_graphical_culture = "toxoid_01"
+
+	empire_flag = {
+		icon = {
+			category = "toxoid"
+			file = "toxoid_01.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "horizontal_stripe.dds"
+		}
+		colors = {
+			"black"
+			"blue"
+			"blue"
+			"null"
+		}
+	}
+	
+	ruler = {
+		gender = indeterminable
+		name = {
+			first_name = PRESCRIPTED_ruler_first_name_gorthikan
+			second_name = PRESCRIPTED_ruler_second_name_gorthikan
+		}
+		portrait = "tox4"
+		texture = 17
+		attachment = 0
+		clothes = 0
+		leader_class = "ruler"
+	}
+}
+
+# 柯林斯统合十字军
+collins = {
+	name = "EMPIRE_DESIGN_collins"
+	adjective = "PRESCRIPTED_adjective_collins"
+	ship_prefix = "PRESCRIPTED_ship_prefix_collins"
+	spawn_enabled = yes
+	ignore_portrait_duplication = yes
+
+	playable = has_toxoids #scripted_triggers
+
+	species = {
+		class = "TOX"
+		portrait = "tox11"
+		name = "PRESCRIPTED_species_name_collins"
+		plural = "PRESCRIPTED_species_plural_collins"
+		adjective = "PRESCRIPTED_species_adjective_collins"
+		name_list = "TOX3"
+		trait = "trait_noxious"
+		trait = "trait_incubator"
+		trait = "trait_fleeting"
+	}
+
+	room = "toxoids_room"
+
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_fanatic_militarist"
+	ethic = "ethic_fanatic_spiritualist"
+	civics = {
+		"civic_death_cult"
+		"civic_defenders_faith"
+		"civic_asceticism"
+	}
+	authority = "auth_dictatorial"
+	government = "gov_mortal_empire"
+	origin = "origin_toxic_knights"
+	
+	flags = {
+		collins
+	}
+
+	adjective = "PRESCRIPTED_adjective_collins"
+	planet_name = "PRESCRIPTED_planet_name_collins"
+	planet_class = "pc_tundra"
+	system_name = "PRESCRIPTED_system_name_collins"
+	initializer = "toxic_knights_start"
+	graphical_culture = "toxoid_01"
+	city_graphical_culture = "toxoid_01"
+
+	empire_flag = {
+		icon = {
+			category = "plantoid"
+			file = "plantoid_12.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "diagonal.dds"
+		}
+		colors = {
+			"dark_purple"
+			"orange"
+			"black"
+			"null"
+		}
+	}
+
+	ruler = {
+		gender = male
+		name = "PRESCRIPTED_ruler_name_collins"
+		portrait = "tox11"
+		texture = 0
+		attachment = 0
+		clothes = 0
+		leader_class = "ruler"
+	}
+}
+
+# 旋桌骑士高阶领主国
+knights = {
+	name = EMPIRE_DESIGN_knights
+	adjective = PRESCRIPTED_adjective_knights
+	ship_prefix = PRESCRIPTED_ship_prefix_knights
+	spawn_enabled = yes # duplication of collins
+	spawn_as_fallen = no
+	ignore_portrait_duplication = no
+	
+	species = {
+		class = "TOX"
+		portrait = "tox9"
+		name = PRESCRIPTED_species_name_knights
+		plural = PRESCRIPTED_species_plural_knights
+		adjective = PRESCRIPTED_species_adjective_knights
+		name_list = "TOX3"
+		gender = not_set
+		trait = "trait_traditional"
+		trait = "trait_strong"
+		trait = "trait_resilient"
+		trait = "trait_noxious"
+		trait = "trait_nonadaptive"
+	}
+	
+	room = "personality_honorbound_warriors_room"
+	
+	authority = "auth_imperial"
+	government = "gov_feudal_empire"
+	ethic = "ethic_authoritarian"
+	ethic = "ethic_militarist"
+	ethic = "ethic_spiritualist"
+	civics = {
+		"civic_feudal_realm"
+		"civic_aristocratic_elite"
+	}
+	origin = "origin_toxic_knights"
+	
+	planet_name = PRESCRIPTED_planet_name_knights
+	planet_class = "pc_desert"
+	system_name = PRESCRIPTED_system_name_knights
+	initializer = "toxic_knights_start"
+	
+	graphical_culture = "toxoid_01"
+	city_graphical_culture = "toxoid_01"
+	
+	empire_flag = {
+		icon = {
+			category = "toxoid"
+			file = "toxoid_11.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "flag_BG_48.dds"
+		}
+		colors = {
+			"burgundy"
+			"frog_green"
+			"black"
+			"null"
+		}
+	}
+	
+	ruler = {
+		gender = male
+		name = {
+			first_name = PRESCRIPTED_ruler_first_name_knights
+			second_name = PRESCRIPTED_ruler_second_name_knights
+		}
+		portrait = "tox9_m"
+		texture = 0
+		attachment = 0
+		clothes = 0
+		leader_class = "ruler"
+		ruler_title = "PRESCRIPTED_ruler_title_knights"
+	}
+}
+
+# 伊瓦尔未来共和国
+eval = {
+	name = "EMPIRE_DESIGN_eval"
+	adjective = "PRESCRIPTED_adjective_eval"
+	ship_prefix = "PRESCRIPTED_ship_prefix_eval"
+	spawn_enabled = yes
+	ignore_portrait_duplication = no
+
+	playable = has_toxoids #scripted_triggers
+
+	species = {
+		class = "TOX"
+		portrait = "tox13"
+		name = "PRESCRIPTED_species_name_eval"
+		plural = "PRESCRIPTED_species_plural_eval"
+		adjective = "PRESCRIPTED_species_adjective_eval"
+		name_list = "MACHINE2"
+		trait = "trait_clone_soldier_infertile"
+		trait = "trait_intelligent"
+		trait = "trait_natural_engineers"
+		trait = "trait_weak"
+	}
+
+	room = "machine_room"
+	ethic = "ethic_xenophile"
+	ethic = "ethic_fanatic_materialist"
+	ethic = "ethic_fanatic_socialism"
+	civics = {
+		"civic_forever_with_us"
+		"civic_zhaowen_dao"
+		"civic_ultravisionary_socialism"
+	}
+	authority = "auth_democratic"
+	government = "gov_collective_democracy"
+	origin = "origin_clone_army"
+	advisor_voice_type = "l_the_technocrat"
+
+	planet_name = "PRESCRIPTED_planet_name_eval"
+	planet_class = "pc_alpine"
+	system_name = "PRESCRIPTED_system_name_eval"
+	initializer = ""
+	
+	graphical_culture = "toxoid_01"
+	city_graphical_culture = "toxoid_01"
+
+	empire_flag = {
+		icon = {
+			category = "spherical"
+			file = "flag_spherical_16.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "flag_BG_39.dds"
+		}
+		colors = {
+			"silver_steel"
+			"dark_teal"
+			"null"
+			"null"
+		}
+	}
+	
+	ruler = {
+		gender = female
+		name = "PRESCRIPTED_ruler_name_eval"
+		portrait = "tox13"
+		texture = 2
+		attachment = 0
+		clothes = 0
+		leader_class = "ruler"
+	}
+}
diff --git a/prescripted_countries/93_lithoids_prescripted_countries.txt b/prescripted_countries/93_lithoids_prescripted_countries.txt
deleted file mode 100644
index bcb186d97..000000000
--- a/prescripted_countries/93_lithoids_prescripted_countries.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-# Keepers of Ave'brenn
-khennet = {
-	name = "khennet"
-	ship_prefix = "PRESCRIPTED_ship_prefix_khennet"
-	spawn_enabled = yes
-	ignore_portrait_duplication = yes
-	
-	playable = has_lithoids #scripted_triggers
-	
-	species = {
-		class = "LITHOID"
-		portrait = "lith11"
-		name = "PRESCRIPTED_species_name_khennet"
-		plural = "PRESCRIPTED_species_plural_khennet"
-		adjective = "PRESCRIPTED_species_adjective_khennet"
-		name_list = "LITHOID3"
-		trait = "trait_lithoid"
-		trait = "trait_communal"
-		trait = "trait_industrious"
-		trait = "trait_sedentary"
-	}
-
-	room = "lithoid_room"
-	ethic = "ethic_authoritarian"
-	ethic = "ethic_xenophobe"
-	ethic = "ethic_pacifist"
-	ethic = "ethic_fanatic_spiritualist"
-	authority = "auth_imperial"
-	civics={
-		"civic_spiritual_seekers"
-		"civic_imperial_cult"
-		"civic_mining_guilds"
-	}
-	government="gov_divine_empire"
-	origin = "origin_lithoid"
-
-	adjective = "PRESCRIPTED_adjective_khennet"
-	planet_name = "PRESCRIPTED_planet_name_khennet"
-	planet_class = "pc_arid"
-	system_name = "PRESCRIPTED_system_name_khennet"
-	initializer = ""
-	graphical_culture = "lithoid_01"
-	city_graphical_culture = "lithoid_01"
-
-	empire_flag = {
-		icon = {
-			category = "blocky"
-			file = "flag_blocky_7.dds"
-		}
-		background = {
-			category = "backgrounds"
-			file = "double_hemispheres.dds"
-		}
-		colors = {
-			"dark_grey"
-			"light_blue"
-			"null"
-			"null"
-		}
-	}
-
-	ruler = {
-		gender = female
-		name = "PRESCRIPTED_ruler_name_khennet"
-		portrait = "lith11"
-		texture = 4
-		hair = 0
-		clothes = 0
-		ruler_title = "PRESCRIPTED_ruler_title_khennet"
-		leader_class = ruler
-	}
-}
\ No newline at end of file
diff --git a/prescripted_countries/94_necroids_prescripted_countries.txt b/prescripted_countries/94_necroids_prescripted_countries.txt
deleted file mode 100644
index ef0a9084a..000000000
--- a/prescripted_countries/94_necroids_prescripted_countries.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-# Pasharti Devourers
-pasharti = {
-	name = "pasharti"
-	ship_prefix = "PRESCRIPTED_ship_prefix_pasharti"
-	spawn_enabled = yes
-	ignore_portrait_duplication = yes
-	
-	playable = has_necroids #scripted_triggers
-	
-	species = {
-		class="NECROID"
-		portrait="nec1"
-		name = "PRESCRIPTED_species_name_pasharti"
-		plural = "PRESCRIPTED_species_plural_pasharti"
-		adjective = "PRESCRIPTED_species_adjective_pasharti"
-		name_list = "NECROID2"
-		trait="trait_necrophage"
-		trait="trait_deviants"
-		trait="trait_very_strong"
-	}
-	secondary_species={
-		class="HUM"
-		portrait="humanoid_hp_07"
-		name="PRESCRIPTED_secondary_species_name_pasharti"
-		plural="PRESCRIPTED_secondary_species_plural_pasharti"
-		adjective="PRESCRIPTED_secondary_species_adjective_pasharti"
-		name_list="NECROID3"
-		
-		trait="trait_wasteful"
-		trait="trait_solitary"
-		trait="trait_charismatic"
-		trait="trait_docile"
-	}
-
-	room = "necroids_room"
-	ethic = "ethic_authoritarian"
-	ethic = "ethic_xenophobe"
-	ethic = "ethic_militarist"
-	ethic = "ethic_spiritualist"
-	ethic = "ethic_capitalism"
-	civics={
-		"civic_reanimated_armies"
-		"civic_memorialist"
-		"civic_corvee_system"
-	}
-	authority="auth_dictatorial"
-	government="gov_constitutional_dictatorship"
-	origin = "origin_necrophage"
-
-	adjective = "PRESCRIPTED_adjective_pasharti"
-	planet_name = "PRESCRIPTED_planet_name_pasharti"
-	planet_class = "pc_tundra"
-	system_name = "PRESCRIPTED_system_name_pasharti"
-	initializer = ""
-	graphical_culture = "necroid_01"
-	city_graphical_culture = "necroid_01"
-
-	empire_flag = {
-		icon={
-			category="pirate"
-			file="flag_pirate_5.dds"
-		}
-		background={
-			category="backgrounds"
-			file="double_triangles.dds"
-		}
-		colors={
-			"black"
-			"burgundy"
-			"null"
-			"null"
-		}
-	}
-	ruler = {
-		gender = female
-		name = "PRESCRIPTED_ruler_name_pasharti"
-		portrait = "nec1"
-		texture = 0
-		hair = 0
-		clothes = 0
-		ruler_title = "PRESCRIPTED_ruler_title_pasharti"
-		leader_class = ruler
-	}	
-	flags = { necrophage_start_empire }
-}
\ No newline at end of file
diff --git a/prescripted_countries/95_aquatics_prescripted_countries.txt b/prescripted_countries/95_aquatics_prescripted_countries.txt
deleted file mode 100644
index 502ad1242..000000000
--- a/prescripted_countries/95_aquatics_prescripted_countries.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-#雷塞利安革命联合舰队
-reselian = {
-	name = "reselian"
-	adjective = "PRESCRIPTED_adjective_reselian"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-
-	playable = has_aquatics #scripted_triggers
-
-	species = {
-		class = "AQUATIC"
-		portrait="aqu5"
-		name = "PRESCRIPTED_species_name_reselian"
-		plural = "PRESCRIPTED_species_plural_reselian"
-		adjective = "PRESCRIPTED_species_adjective_reselian"
-		name_list = "AQUATIC4"
-		trait="trait_aquatic"
-		trait="trait_intelligent"
-		trait="trait_natural_sociologists"
-		trait="trait_unruly"
-	}
-
-	room = "aquatics_room"
-	
-	ethic="ethic_egalitarian"
-	ethic="ethic_xenophile"
-	ethic="ethic_militarist"
-	ethic="ethic_fanatic_socialism"
-	authority = "auth_direct_democratic"
-	civics = {
-		"civic_shared_burden"
-		"civic_liberator"
-		"civic_martial_brotherhood"
-	}
-	authority = "auth_direct_democratic"
-	government = "gov_syndicalism"
-	origin = "origin_default"
-	flags = {
-		reselian
-	}
-
-	adjective = "PRESCRIPTED_adjective_reselian"
-	planet_name = "PRESCRIPTED_planet_name_reselian"
-	planet_class = "pc_ocean"
-	system_name = "PRESCRIPTED_system_name_reselian"
-	initializer = ""
-	graphical_culture = "aquatic_01"
-	city_graphical_culture = "aquatic_01"
-
-	empire_flag={
-		icon={
-			category="human"
-			file="flag_human_6.dds"
-		}
-		background={
-			category="backgrounds"
-			file="diagonal.dds"
-		}
-		colors={
-			"black"
-			"dark_blue"
-			"black"
-			"null"
-		}
-	}
-	
-	ruler = {
-		name = "PRESCRIPTED_ruler_name_reselian"
-		gender = male
-		portrait = "aqu5_m"
-		texture = 0
-		hair = 0
-		clothes = 3
-		leader_class="ruler"
-	}
-}
-
-# Sathyrelian Bliss
-sathyrel = {
-	name = "sathyrel"
-	ship_prefix = "PRESCRIPTED_ship_prefix_sathyrel"
-	spawn_enabled = yes
-	ignore_portrait_duplication = yes
-
-	playable = has_aquatics #scripted_triggers
-
-	species = {
-		class = "AQUATIC"
-		portrait = "aqu1"
-		name = "PRESCRIPTED_species_name_sathyrel"
-		plural = "PRESCRIPTED_species_plural_sathyrel"
-		adjective = "PRESCRIPTED_species_adjective_sathyrel"
-		name_list = "AQUATIC1"
-		trait = "trait_aquatic"
-		trait = "trait_conservational"
-		trait = "trait_docile"
-		trait = "trait_nonadaptive"
-		trait = "trait_slow_learners"
-	}
-
-	room = "aquatics_room"
-	ethic="ethic_xenophobe"
-	ethic="ethic_fanatic_pacifist"
-	ethic="ethic_fanatic_socialism"
-	civics = {
-		"civic_anglers"
-		"civic_industry_pacesetter"
-		"civic_enlightment"
-	}
-	authority="auth_dictatorial"
-	government="gov_irenic_dictatorship"
-	origin = "origin_ocean_paradise"
-
-	adjective = "PRESCRIPTED_adjective_sathyrel"
-	planet_name = "PRESCRIPTED_planet_name_sathyrel"
-	planet_class = "pc_ocean"
-	system_name = "PRESCRIPTED_system_name_sathyrel"
-	initializer = "ocean_paradise_start"
-	graphical_culture = "aquatic_01"
-	city_graphical_culture = "aquatic_01"
-
-	empire_flag = {
-		icon = {
-			category = "spherical"
-			file = "flag_spherical_5.dds"
-		}
-		background = {
-			category = "backgrounds"
-			file = "circle.dds"
-		}
-		colors = {
-			"dark_blue"
-			"light_blue"
-			"null"
-			"null"
-		}
-	}
-	ruler = {
-		gender = female
-		name = "PRESCRIPTED_ruler_name_sathyrel"
-		portrait = "aqu1"
-		texture = 0
-		hair = 0
-		clothes = 0
-		leader_class = "ruler"
-	}
-}
diff --git a/prescripted_countries/96_toxoids_prescripted_countries.txt b/prescripted_countries/96_toxoids_prescripted_countries.txt
deleted file mode 100644
index 0cdfb6639..000000000
--- a/prescripted_countries/96_toxoids_prescripted_countries.txt
+++ /dev/null
@@ -1,214 +0,0 @@
-
-# Gorthikan Alliance
-gorthikan = {
-	name = EMPIRE_DESIGN_gorthikan
-	ship_prefix = PRESCRIPTED_ship_prefix_gorthikan
-	species = {
-		class = "TOX"
-		portrait = "tox4"
-		name = PRESCRIPTED_species_name_gorthikan
-		plural = PRESCRIPTED_species_plural_gorthikan
-		adjective = PRESCRIPTED_species_adjective_gorthikan
-		name_list = "TOX4"
-		gender = indeterminable
-		trait = "trait_artificial_intelligence"
-		trait = "trait_incubator"
-		trait = "trait_unruly"
-		trait = "trait_spliced_adaptability"
-	}
-	adjective = PRESCRIPTED_adjective_gorthikan
-	authority = "auth_democratic"
-	government = "gov_direct_democracy"
-	planet_name = PRESCRIPTED_planet_name_gorthikan
-	planet_class = "pc_alpine"
-	system_name = PRESCRIPTED_system_name_gorthikan
-	initializer = "custom_starting_init_02"
-	graphical_culture = "toxoid_01"
-	city_graphical_culture = "toxoid_01"
-	empire_flag = {
-		icon = {
-			category = "toxoid"
-			file = "toxoid_01.dds"
-		}
-		background = {
-			category = "backgrounds"
-			file = "horizontal_stripe.dds"
-		}
-		colors = {
-			"black"
-			"blue"
-			"blue"
-			"null"
-		}
-	}
-	ruler = {
-		gender = indeterminable
-		name = {
-			first_name = PRESCRIPTED_ruler_first_name_gorthikan
-			second_name = PRESCRIPTED_ruler_second_name_gorthikan
-		}
-		portrait = "tox4"
-		texture = 17
-		attachment = 0
-		clothes = 0
-		leader_class = "ruler"
-	}
-	spawn_as_fallen = no
-	ignore_portrait_duplication = no
-	room = "toxoids_room"
-	spawn_enabled = yes
-	ethic="ethic_fanatic_egalitarian"
-	ethic="ethic_militarist"
-	ethic="ethic_materialist"
-	ethic="ethic_capitalism"
-	civics = {
-		"civic_scavengers"
-		"civic_underworld_society"
-		"civic_toxic_baths"
-	}
-	origin = "origin_overtuned"
-}
-
-#欧福克斯毒圣骑士团
-collins = {
-	name = "collins"
-	adjective = "PRESCRIPTED_adjective_collins"
-	spawn_enabled = yes # yes / no / always
-	ignore_portrait_duplication = yes
-
-	playable = has_toxoids #scripted_triggers
-
-	species = {
-		class = "TOX"
-		portrait="tox11"
-		name = "PRESCRIPTED_species_name_collins"
-		plural = "PRESCRIPTED_species_plural_collins"
-		adjective = "PRESCRIPTED_species_adjective_collins"
-		name_list = "TOX3"
-		trait="trait_noxious"
-		trait="trait_incubator"
-		trait="trait_fleeting"
-	}
-
-	room = "toxoids_room"
-	
-	ethic="ethic_xenophobe"
-	ethic="ethic_fanatic_militarist"
-	ethic="ethic_fanatic_spiritualist"
-	civics = {
-		"civic_death_cult"
-		"civic_defenders_faith"
-		"civic_asceticism"
-	}
-	authority="auth_dictatorial"
-	government="gov_mortal_empire"
-	origin = "origin_toxic_knights"
-	flags = {
-		collins
-	}
-
-	adjective = "PRESCRIPTED_adjective_collins"
-	planet_name = "PRESCRIPTED_planet_name_collins"
-	planet_class = "pc_tundra"
-	system_name = "PRESCRIPTED_system_name_collins"
-	initializer = "toxic_knights_start"
-	graphical_culture="toxoid_01"
-	city_graphical_culture="toxoid_01"
-
-	empire_flag={
-		icon={
-			category="plantoid"
-			file="plantoid_12.dds"
-		}
-		background={
-			category="backgrounds"
-			file="diagonal.dds"
-		}
-		colors={
-			"dark_purple"
-			"orange"
-			"black"
-			"null"
-		}
-	}
-	
-	ruler = {
-		name = "PRESCRIPTED_ruler_name_collins"
-		portrait="tox11"
-		texture=0
-		attachment=0
-		clothes=0
-		leader_class="ruler"
-	}
-}
-
-# 伊瓦尔未来共和国
-eval = {
-	name = "eval"
-	ship_prefix = "PRESCRIPTED_ship_prefix_eval"
-	spawn_enabled = yes
-	ignore_portrait_duplication = yes
-
-	playable = has_toxoids #scripted_triggers
-
-	species = {
-		class = "TOX"
-		portrait = "tox13"
-		name = "PRESCRIPTED_species_name_eval"
-		plural = "PRESCRIPTED_species_plural_eval"
-		adjective = "PRESCRIPTED_species_adjective_eval"
-		name_list="MACHINE2"
-		trait="trait_clone_soldier_infertile"
-		trait="trait_intelligent"
-		trait="trait_natural_engineers"
-		trait="trait_weak"
-	}
-
-	room = "machine_room"
-	ethic="ethic_xenophile"
-	ethic="ethic_fanatic_materialist"
-	ethic="ethic_fanatic_socialism"
-	civics = {
-		"civic_forever_with_us"
-		"civic_zhaowen_dao"
-		"civic_ultravisionary_socialism"
-	}
-	authority="auth_democratic"
-	government="gov_collective_democracy"
-	origin = "origin_clone_army"
-	advisor_voice_type="l_the_technocrat"
-
-	adjective = "PRESCRIPTED_adjective_eval"
-	planet_name = "PRESCRIPTED_planet_name_eval"
-	planet_class = "pc_alpine"
-	system_name = "PRESCRIPTED_system_name_eval"
-	initializer = ""
-	graphical_culture="toxoid_01"
-	city_graphical_culture="toxoid_01"
-
-	empire_flag={
-		icon={
-			category="spherical"
-			file="flag_spherical_16.dds"
-		}
-		background={
-			category="backgrounds"
-			file="flag_BG_39.dds"
-		}
-		colors={
-			"silver_steel"
-			"dark_teal"
-			"null"
-			"null"
-		}
-	}
-	ruler = {
-		gender = female
-		name = "PRESCRIPTED_ruler_name_eval"
-		portrait="tox13"
-		texture=2
-		attachment=0
-		clothes=0
-		leader_class = "ruler"
-	}
-}
diff --git a/prescripted_countries/98_china.txt b/prescripted_countries/98_china.txt
index 43bca5bd9..6c070d99a 100644
--- a/prescripted_countries/98_china.txt
+++ b/prescripted_countries/98_china.txt
@@ -1,152 +1,165 @@
-
-#蛤共和国
-hameng ={
-	name = "hameng"
-	ship_prefix="PRESCRIPTED_ship_prefix_hameng"
-	species={
-		class="HUM"
-		portrait="human"
+# 中华人民深空联盟
+hameng = {
+	name = "EMPIRE_DESIGN_hameng"
+	adjective = "PRESCRIPTED_adjective_hameng"
+	ship_prefix = "PRESCRIPTED_ship_prefix_hameng"
+	spawn_enabled = no # meme
+	spawn_as_fallen = no
+	ignore_portrait_duplication = yes
+	
+	species = {
+		class = "HUM"
+		portrait = "human"
 		name = "PRESCRIPTED_species_name_humans1"
 		plural = "PRESCRIPTED_species_plural_humans1"
 		adjective = "PRESCRIPTED_species_adjective_humans1"
-		name_list="HUMAN1"
-		trait="trait_void_dweller_1"
-		trait="trait_adaptive"
-		trait="trait_communal"
-		trait="trait_sedentary"
+		name_list = "HUMAN1"
+		trait = "trait_void_dweller_1"
+		trait = "trait_adaptive"
+		trait = "trait_communal"
+		trait = "trait_sedentary"
+	}
+	
+	room = "personality_decadent_hierarchy_room"
+	
+	authority = "auth_democratic"
+	government = "gov_collective_democracy"
+	ethic = "ethic_egalitarian"
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_materialist"
+	ethic = "ethic_fanatic_socialism"
+	civics = {
+		"civic_nazbol"
+		"civic_martial_brotherhood"
+		"civic_independent"
 	}
-	adjective="PRESCRIPTED_adjective_hameng"
-	authority="auth_democratic"
-	government="gov_collective_democracy"
-	planet_name="PRESCRIPTED_planet_name_hameng"
-	planet_class="pc_continental"
-	system_name="NAME_Sol"
-	initializer="sol_system_void_dweller_system"
-	graphical_culture="mammalian_01"
-	city_graphical_culture="mammalian_01"
-	empire_flag={
-		icon={
-			category="human"
-			file="china_flag.dds"
+	origin = "origin_void_dwellers"
+	
+	planet_name = "PRESCRIPTED_planet_name_hameng"
+	planet_class = "pc_continental"
+	system_name = "NAME_Sol"
+	initializer = "sol_system_void_dweller_system"
+	
+	graphical_culture = "mammalian_01"
+	city_graphical_culture = "mammalian_01"
+	
+	empire_flag = {
+		icon = {
+			category = "human"
+			file = "china_flag.dds"
 		}
-		background={
-			category="backgrounds"
-			file="00_solid.dds"
+		background = {
+			category = "backgrounds"
+			file = "00_solid.dds"
 		}
-		colors={
+		colors = {
 			"red"
 			"yellow"
 			"null"
 			"null"
 		}
 	}
-	ruler={
-		gender=male
-		name="PRESCRIPTED_ruler_name_hameng"
-		portrait="rep11"
-		texture=0
-		hair=0
-		clothes=4
-		leader_class="ruler"
+	
+	ruler = {
+		gender = male
+		name = "PRESCRIPTED_ruler_name_hameng"
+		portrait = "rep11"
+		texture = 0
+		attachment = 0
+		clothes = 4
+		leader_class = "ruler"
 		ruler_title = "PRESCRIPTED_ruler_title_hameng"
 		ruler_title_female = "PRESCRIPTED_ruler_title_hameng"
 	}
-	spawn_as_fallen=no
-	ignore_portrait_duplication=no
-	room="personality_decadent_hierarchy_room"
-	spawn_enabled=no
-	ethic="ethic_egalitarian"
-	ethic="ethic_xenophobe"
-	ethic="ethic_materialist"
-	ethic="ethic_fanatic_socialism"
-	civics={
-		"civic_nazbol"
-		"civic_martial_brotherhood"
-		"civic_independent"
-	}
-	origin="origin_void_dwellers"
 }
 
-#稻共和国
-dengtz ={
-	name="dengtz"
-	ship_prefix="ISS"
-	species={
-		class="PLANT"
-		portrait="pla13"
-		name="PRESCRIPTED_species_name_dengtz"
-		plural="PRESCRIPTED_species_plural_dengtz"
-		adjective="PRESCRIPTED_species_adjective_dengtz"
-		name_list="HUMAN2"
-		gender=not_set
-		trait="trait_thrifty"
-		trait="trait_plantoid_phototrophic"
-		trait="trait_enduring"
-		trait="trait_wasteful"
-		trait="trait_decadent"
+# 申洲第二人民共和国
+dengtz = {
+	name = "EMPIRE_DESIGN_dengtz"
+	adjective = "PRESCRIPTED_adjective_dengtz"
+	ship_prefix = "PRESCRIPTED_ship_prefix_dengtz"
+	spawn_enabled = no # meme
+	spawn_as_fallen = no
+	ignore_portrait_duplication = yes
+	
+	species = {
+		class = "PLANT"
+		portrait = "pla13"
+		name = "PRESCRIPTED_species_name_dengtz"
+		plural = "PRESCRIPTED_species_plural_dengtz"
+		adjective = "PRESCRIPTED_species_adjective_dengtz"
+		name_list = "HUMAN2"
+		gender = not_set
+		trait = "trait_thrifty"
+		trait = "trait_plantoid_phototrophic"
+		trait = "trait_enduring"
+		trait = "trait_wasteful"
+		trait = "trait_decadent"
 	}
-	secondary_species={
-		class="PLANT"
-		portrait="pla2"
-		name="PRESCRIPTED_secondary_species_name_dengtz"
-		plural="PRESCRIPTED_secondary_species_plural_dengtz"
-		adjective="PRESCRIPTED_secondary_species_adjective_dengtz"
-		name_list="HUMAN1"
-		gender=not_set
-		trait="trait_slave_gene"
-		trait="trait_industrious"
-		trait="trait_plantoid_radiotrophic"
-		trait="trait_unruly"
-		trait="trait_deviants"
+	secondary_species = {
+		class = "PLANT"
+		portrait = "pla2"
+		name = "PRESCRIPTED_secondary_species_name_dengtz"
+		plural = "PRESCRIPTED_secondary_species_plural_dengtz"
+		adjective = "PRESCRIPTED_secondary_species_adjective_dengtz"
+		name_list = "HUMAN1"
+		gender = not_set
+		trait = "trait_slave_gene"
+		trait = "trait_industrious"
+		trait = "trait_plantoid_radiotrophic"
+		trait = "trait_unruly"
+		trait = "trait_deviants"
 	}
-	adjective="PRESCRIPTED_adjective_dengtz"
-	authority="auth_oligarchic"
-	government="gov_plutocratic_oligarchy"
-	planet_name="PRESCRIPTED_planet_name_dengtz"
-	planet_class="pc_continental"
-	system_name="PRESCRIPTED_system_name_dengtz"
-	initializer=""
-	graphical_culture="plantoid_01"
-	city_graphical_culture="plantoid_01"
-	empire_flag={
-		icon={
-			category="ornate"
-			file="flag_ornate_6.dds"
+	
+	room = "personality_decadent_hierarchy_room"
+	
+	authority = "auth_oligarchic"
+	government = "gov_plutocratic_oligarchy"
+	ethic = "ethic_authoritarian"
+	ethic = "ethic_xenophobe"
+	ethic = "ethic_materialist"
+	ethic = "ethic_fanatic_capitalism"
+	civics = {
+		"civic_merchant_guilds"
+		"civic_characteristic_socialism"
+		"civic_cultural_review_department"
+	}
+	origin = "origin_slave_race"
+	
+	planet_name = "PRESCRIPTED_planet_name_dengtz"
+	planet_class = "pc_continental"
+	system_name = "PRESCRIPTED_system_name_dengtz"
+	initializer = ""
+	
+	graphical_culture = "plantoid_01"
+	city_graphical_culture = "plantoid_01"
+	
+	empire_flag = {
+		icon = {
+			category = "ornate"
+			file = "flag_ornate_6.dds"
 		}
-		background={
-			category="backgrounds"
-			file="00_solid.dds"
+		background = {
+			category = "backgrounds"
+			file = "00_solid.dds"
 		}
-		colors={
+		colors = {
 			"red_orange"
 			"yellow"
 			"pink"
 			"null"
 		}
 	}
-	ruler={
-		gender=male
-		name="PRESCRIPTED_ruler_name_dengtz"
-		portrait="pla13"
-		texture=0
-		hair=0
-		clothes=0
-		ruler_title="PRESCRIPTED_ruler_title_hameng"
-		ruler_title_female="PRESCRIPTED_ruler_title_hameng"
-		leader_class="ruler"
-	}
-	spawn_as_fallen=no
-	ignore_portrait_duplication=no
-	room="personality_decadent_hierarchy_room"
-	spawn_enabled=yes
-	ethic="ethic_authoritarian"
-	ethic="ethic_xenophobe"
-	ethic="ethic_materialist"
-	ethic="ethic_fanatic_capitalism"
-	civics={
-		"civic_merchant_guilds"
-		"civic_characteristic_socialism"
-		"civic_cultural_review_department"
+	
+	ruler = {
+		gender = male
+		name = "PRESCRIPTED_ruler_name_dengtz"
+		portrait = "pla13"
+		texture = 0
+		attachment = 0
+		clothes = 0
+		ruler_title = "PRESCRIPTED_ruler_title_hameng"
+		ruler_title_female = "PRESCRIPTED_ruler_title_hameng"
+		leader_class = "ruler"
 	}
-	origin="origin_slave_race"
 }
\ No newline at end of file
diff --git a/prescripted_countries/98_maid_prescipted_countries.txt b/prescripted_countries/98_maid_prescipted_countries.txt
index 2c5c501ab..672107f50 100644
--- a/prescripted_countries/98_maid_prescipted_countries.txt
+++ b/prescripted_countries/98_maid_prescipted_countries.txt
@@ -12,38 +12,38 @@ MY_MAID_COUNTRY = {
 	graphical_culture = "mammalian_01"
 	city_graphical_culture = "mammalian_01"
 
-	spawn_enabled = yes # yes / no / always
+	spawn_enabled = yes
 	spawn_as_fallen = yes
 	ignore_portrait_duplication = yes
 	playable = has_synthethic_dawn
 	flags = { MY_MAID_COUNTRY custom_start_screen }
 
-	ethic="ethic_gestalt_consciousness"
-	authority="auth_machine_intelligence"
-	government="gov_machine_servitor"
-	civics={ "civic_machine_servitor" "civic_machine_crafters" "civic_machine_zero_waste_protocols" }
+	ethic = "ethic_gestalt_consciousness"
+	authority = "auth_machine_intelligence"
+	government = "gov_machine_servitor"
+	civics = { "civic_machine_servitor" "civic_machine_crafters" "civic_machine_zero_waste_protocols" }
 	origin = "origin_default"
-	
-	room="personality_harmonious_hierarchy_room"
-	advisor_voice_type="l_pacifist"
 
-	species={
-		class="MACHINE"
-		portrait="sd_hum_robot"
+	room = "personality_harmonious_hierarchy_room"
+	advisor_voice_type = "l_pacifist"
+
+	species = {
+		class = "MACHINE"
+		portrait = "sd_hum_robot"
 		name = "PRESCRIPTED_species_name_MY_MAID_COUNTRY"
 		plural = "PRESCRIPTED_species_plural_MY_MAID_COUNTRY"
 		adjective = "PRESCRIPTED_species_adjective_MY_MAID_COUNTRY"
 		name_list = "HUMAN1"
 		gender = female
-		trait="trait_machine_unit"
-		trait="trait_machine_maid"
-		trait="trait_robot_logic_engines"
-		trait="trait_robot_mass_produced"
-		trait="trait_robot_durable"
-		trait="trait_robot_bulky"
-		trait="trait_robot_luxurious"
+		trait = "trait_machine_unit"
+		trait = "trait_machine_maid"
+		trait = "trait_robot_logic_engines"
+		trait = "trait_robot_mass_produced"
+		trait = "trait_robot_durable"
+		trait = "trait_robot_bulky"
+		trait = "trait_robot_luxurious"
 	}
-	secondary_species={
+	secondary_species = {
 		class = "HUM"
 		portrait = "human"
 		name = "PRESCRIPTED_species_name_humans1"
@@ -51,36 +51,36 @@ MY_MAID_COUNTRY = {
 		adjective = "PRESCRIPTED_species_adjective_humans1"
 		name_list = "HUMAN1"
 		gender = not_set
-		trait="trait_adaptive"
-		trait="trait_traditional"
-		trait="trait_conservational"
-		trait="trait_weak"
-		trait="trait_decadent"
+		trait = "trait_adaptive"
+		trait = "trait_traditional"
+		trait = "trait_conservational"
+		trait = "trait_weak"
+		trait = "trait_decadent"
 	}
-	empire_flag={
-		icon={
-			category="blocky"
-			file="flag_blocky_12.dds"
+	empire_flag = {
+		icon = {
+			category = "blocky"
+			file = "flag_blocky_12.dds"
 		}
-		background={
-			category="backgrounds"
-			file="horizontal_stripe.dds"
+		background = {
+			category = "backgrounds"
+			file = "horizontal_stripe.dds"
 		}
-		colors={
+		colors = {
 			"blue"
 			"dark_purple"
 			"null"
 			"null"
 		}
 	}
-	ruler={
-		gender=female
-		name="PRESCRIPTED_ruler_name_MY_MAID_COUNTRY"
-		portrait="sd_hum_robot" #"MAID_20"
-		texture=0
-		hair=0
-		clothes=0
-		ruler_title="PRESCRIPTED_ruler_title_MY_MAID_COUNTRY"
-		leader_class="ruler"
+	ruler = {
+		gender = female
+		name = "PRESCRIPTED_ruler_name_MY_MAID_COUNTRY"
+		portrait = "sd_hum_robot" #"MAID_20"
+		texture = 0
+		attachment = 0
+		clothes = 0
+		ruler_title = "PRESCRIPTED_ruler_title_MY_MAID_COUNTRY"
+		leader_class = "ruler"
 	}
 }
\ No newline at end of file
diff --git a/prescripted_countries/99_prescripted_countries.txt b/prescripted_countries/99_prescripted_countries.txt
index e760f58a9..ca17f84d0 100644
--- a/prescripted_countries/99_prescripted_countries.txt
+++ b/prescripted_countries/99_prescripted_countries.txt
@@ -1,13 +1,11 @@
-
-
 # 奇恩帝国
 tzynn = {
-	name = "tzynn"
+	name = "EMPIRE_DESIGN_tzynn"
 	adjective = "PRESCRIPTED_adjective_tzynn"
-	spawn_enabled = yes # yes / no / always
-	
+	spawn_enabled = yes
+
 	ship_prefix = "PRESCRIPTED_ship_prefix_tzynn"
-	
+
 	species = {
 		class = "REP"
 		portrait = "rep9"
@@ -21,9 +19,9 @@ tzynn = {
 		trait = "trait_decadent"
 		trait = "trait_quarrelsome"
 	}
-	
+
 	room = "personality_slaving_despots_room"
-	
+
 	authority = "auth_imperial"
 	civics = {
 		"civic_aristocratic_elite"
@@ -37,32 +35,32 @@ tzynn = {
 	ethic = "ethic_militarist"
 	ethic = "ethic_capitalism"
 	ethic = "ethic_xenophobe"
-	
+
 	planet_name = "PRESCRIPTED_planet_name_tzynn"
 	planet_class = "pc_desert"
 	system_name = "PRESCRIPTED_system_name_tzynn"
 	# initializer = "mom_house_divided_system"
-	
+
 	graphical_culture = "reptilian_01"
 	city_graphical_culture = "reptilian_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "pointy"
 			file = "flag_pointy_2.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "v.dds"
 		}
-		colors={
+		colors = {
 			"red"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_tzynn"
 		gender = male
@@ -70,15 +68,16 @@ tzynn = {
 		texture = 1
 		clothes = 4
 		leader_class = ruler
-	}	
+	}
 }
 
 # 勇达里姆王国
 yondar = {
-	name = "yondar"
+	name = "EMPIRE_DESIGN_yondar"
 	adjective = "PRESCRIPTED_adjective_yondar"
-	spawn_enabled = yes # yes / no / always
-	
+	ship_prefix = "PRESCRIPTED_ship_prefix_yondar"
+	spawn_enabled = yes
+
 	species = {
 		class = "AVI"
 		portrait = "avi10"
@@ -90,17 +89,15 @@ yondar = {
 		trait = "trait_natural_physicists"
 		trait = "trait_slow_learners"
 	}
-	
-	ship_prefix = "PRESCRIPTED_ship_prefix_yondar"
-	
-	planet_name = "PRESCRIPTED_planet_name_yondar"
-	planet_class = "pc_alpine"
-	system_name = "PRESCRIPTED_system_name_yondar"
-	
-	room = "personality_evangelizing_zealots_room" 
-	
+
+	room = "personality_evangelizing_zealots_room"
+
 	authority = "auth_imperial"
-	civics = { "civic_inwards_perfection" "civic_spiritual_seekers" "civic_philosopher_king" }
+	civics = {
+		"civic_inwards_perfection"
+		"civic_spiritual_seekers"
+		"civic_philosopher_king"
+	}
 	origin = "origin_default"
 	government = gov_celestial_empire
 
@@ -108,27 +105,31 @@ yondar = {
 	ethic = "ethic_spiritualist"
 	ethic = "ethic_xenophobe"
 	ethic = "ethic_fanatic_pacifist"
-	
+
+	planet_name = "PRESCRIPTED_planet_name_yondar"
+	planet_class = "pc_alpine"
+	system_name = "PRESCRIPTED_system_name_yondar"
+
 	graphical_culture = "avian_01"
 	city_graphical_culture = "avian_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "zoological"
 			file = "flag_zoological_6.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "stripes.dds"
 		}
-		colors={
+		colors = {
 			"blue"
 			"dark_blue"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_yondar"
 		gender = male
@@ -139,16 +140,83 @@ yondar = {
 	}
 }
 
+# 伊菲雷西联合舰队
+iferyx = {
+	name = "EMPIRE_DESIGN_iferyx"
+	ship_prefix = "PRESCRIPTED_ship_prefix_iferyx"
+	adjective = "PRESCRIPTED_adjective_iferyx"
+	spawn_enabled = yes # yes / no / always
+
+	species = {
+		class = "MAM"
+		portrait = "mam16"
+		name = "PRESCRIPTED_species_name_iferyx"
+		plural = "PRESCRIPTED_species_plural_iferyx"
+		adjective = "PRESCRIPTED_species_adjective_iferyx"
+		name_list = "MAM3"
+		trait = "trait_thrifty"
+		trait = "trait_communal"
+		trait = "trait_deviants"
+	}
+
+	room = "personality_peaceful_traders_room"
+
+	authority = "auth_oligarchic"
+	civics = {
+		"civic_corporate_dominion"
+		"civic_shadow_council"
+		"civic_spiritual_seekers"
+	}
+	government = gov_trade_league
+	origin = "origin_default"
+
+	ethic = "ethic_capitalism"
+	ethic = "ethic_egalitarian"
+	ethic = "ethic_fanatic_spiritualist"
+	ethic = "ethic_pacifist"
+
+	planet_name = "PRESCRIPTED_planet_name_iferyx"
+	planet_class = "pc_tundra"
+	system_name = "PRESCRIPTED_system_name_iferyx"
+
+	graphical_culture = "mammalian_01"
+	city_graphical_culture = "mammalian_01"
+
+	empire_flag = {
+		icon = {
+			category = "pointy"
+			file = "flag_pointy_14.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "stripe.dds"
+		}
+		colors = {
+			"black"
+			"yellow"
+			"null"
+			"null"
+		}
+	}
+
+	ruler = {
+		name = "PRESCRIPTED_ruler_name_iferyx"
+		gender = male
+		portrait = "mam16"
+		texture = 1
+		clothes = 3
+		leader_class = ruler
+	}
+}
 
 # 格莱博赛基金会
 glebsig = {
-	name = "glebsig"
+	name = "EMPIRE_DESIGN_glebsig"
 	adjective = "PRESCRIPTED_adjective_glebsig"
-	spawn_enabled = yes # yes / no / always
-	spawn_as_fallen = yes # overrides spawn_enabled for fallen empires
-	
 	ship_prefix = "PRESCRIPTED_ship_prefix_glebsig"
-	
+	spawn_enabled = yes
+	spawn_as_fallen = yes # overrides spawn_enabled for fallen empires
+
 	species = {
 		class = "MOL"
 		portrait = "mol7"
@@ -161,18 +229,30 @@ glebsig = {
 		trait = "trait_conservational"
 		trait = "trait_resilient"
 	}
-	
+
 	room = "personality_migrating_flock_room"
 
 	authority = "auth_oligarchic"
 	origin = "origin_default"
 	government = "gov_cabinet_system_of_responsibility"
+	ethic = "ethic_egalitarian"
+	ethic = "ethic_fanatic_xenophile"
+	ethic = "ethic_pacifist"
+	ethic = "ethic_spiritualist"
+	civics = {
+		"civic_byzantine_bureaucracy"
+		"civic_enlightment"
+		"civic_diplomatic_corps"
+	}
+
 	planet_name = "PRESCRIPTED_planet_name_glebsig"
-	planet_class ="pc_alpine"
+	planet_class = "pc_alpine"
 	system_name = "PRESCRIPTED_system_name_glebsig"
 	initializer = ""
+
 	graphical_culture = "molluscoid_01"
 	city_graphical_culture = "molluscoid_01"
+
 	empire_flag = {
 		icon = {
 			category = "pointy"
@@ -189,6 +269,7 @@ glebsig = {
 			"null"
 		}
 	}
+
 	ruler = {
 		gender = male
 		name = "PRESCRIPTED_ruler_name_glebsig"
@@ -196,23 +277,15 @@ glebsig = {
 		texture = 0
 		leader_class = ruler
 	}
-	ethic="ethic_egalitarian"
-	ethic="ethic_fanatic_xenophile"
-	ethic="ethic_pacifist"
-	ethic="ethic_spiritualist"
-	civics={
-		"civic_byzantine_bureaucracy"
-		"civic_enlightment"
-		"civic_diplomatic_corps"
-	}
 }
 
 # 杰赫特玛主权国
 jehetma = {
-	name = "jehetma"
+	name = "EMPIRE_DESIGN_jehetma"
 	adjective = "PRESCRIPTED_adjective_jehetma"
-	spawn_enabled = yes # yes / no / always
-	
+	ship_prefix = "PRESCRIPTED_ship_prefix_jehetma"
+	spawn_enabled = yes
+
 	species = {
 		class = "FUN"
 		portrait = "fun13"
@@ -225,56 +298,52 @@ jehetma = {
 		trait = "trait_communal"
 		trait = "trait_strong"
 	}
-	
-	ship_prefix = "PRESCRIPTED_ship_prefix_jehetma"
-	
-	planet_name = "PRESCRIPTED_planet_name_jehetma"
-	planet_class = "pc_tundra"
-	system_name = "PRESCRIPTED_system_name_jehetma"
-	initializer = "star_elder_brother_homeworld_initializer"
-	
 	room = "personality_harmonious_hierarchy_room"
 
 	authority = "auth_oligarchic"
-	civics={
+	civics = {
 		"civic_science_directorate"
 		"civic_in_perfect"
 		"civic_exploration"
 	}
 	government = gov_science_directorate
 	origin = "origin_default"
-
 	ethic = "ethic_fanatic_materialist"
 	ethic = "ethic_socialism"
 	ethic = "ethic_xenophobe"
-	ethic = "ethic_pacifist"	
-	
+	ethic = "ethic_pacifist"
+
+	planet_name = "PRESCRIPTED_planet_name_jehetma"
+	planet_class = "pc_tundra"
+	system_name = "PRESCRIPTED_system_name_jehetma"
+	initializer = "star_elder_brother_homeworld_initializer"
+
 	graphical_culture = "fungoid_01"
 	city_graphical_culture = "fungoid_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "ornate"
 			file = "flag_ornate_7.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "00_solid.dds"
 		}
-		colors={
+		colors = {
 			"dark_brown"
 			"black"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_jehetma"
 		gender = female
 		portrait = "fun13"
 		texture = -1
-		#hair = 0
+		#attachment = 0
 		clothes = 2
 		leader_class = ruler
 	}
@@ -282,10 +351,11 @@ jehetma = {
 
 # 塞可达瑞联邦
 scyldari = {
-	name = "scyldari"
+	name = "EMPIRE_DESIGN_scyldari"
 	adjective = "PRESCRIPTED_adjective_scyldari"
-	spawn_enabled = yes # yes / no / always
-	
+	ship_prefix = "PRESCRIPTED_ship_prefix_scyldari"
+	spawn_enabled = yes
+
 	species = {
 		class = "MAM"
 		portrait = "mam6"
@@ -293,57 +363,58 @@ scyldari = {
 		plural = "PRESCRIPTED_species_plural_scyldari"
 		adjective = "PRESCRIPTED_species_adjective_scyldari"
 		name_list = "MAM1"
-		trait="trait_aquatic"
-		trait="trait_charismatic"
-		trait="trait_weak"
+		trait = "trait_aquatic"
+		trait = "trait_charismatic"
+		trait = "trait_weak"
 	}
-	
-	ship_prefix = "PRESCRIPTED_ship_prefix_scyldari"
-	
+
+	room = "personality_spiritual_seekers_room"
+
 	planet_name = "PRESCRIPTED_planet_name_scyldari"
 	planet_class = "pc_ocean"
 	system_name = "PRESCRIPTED_system_name_scyldari"
 	initializer = ""
-	
-	room = "personality_spiritual_seekers_room"
-	
+
 	authority = "auth_democratic"
-	civics = { "civic_star_settlers" "civic_environmentalist" "civic_welfare_state" }
+	civics = {
+		"civic_star_settlers"
+		"civic_environmentalist"
+		"civic_welfare_state"
+	}
 	origin = "origin_default"
 	government = gov_representative_democracy
-
 	ethic = "ethic_spiritualist"
 	ethic = "ethic_pacifist"
 	ethic = "ethic_xenophile"
 	ethic = "ethic_socialism"
 	ethic = "ethic_egalitarian"
-	
+
 	graphical_culture = "mammalian_01"
 	city_graphical_culture = "mammalian_01"
-	
+
 	empire_flag = {
-		icon= {
+		icon = {
 			category = "spherical"
 			file = "flag_spherical_15.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
 			file = "00_solid.dds"
 		}
-		colors={
+		colors = {
 			"burgundy"
 			"orange"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_scyldari"
 		gender = female
 		portrait = "mam6"
 		texture = 3
-		#hair = 0
+		#attachment = 0
 		clothes = 3
 		leader_class = ruler
 	}
@@ -351,10 +422,11 @@ scyldari = {
 
 ## 科尔-阿赞共和国
 kel_azaan = {
-	name = "kel_azaan"
+	name = "EMPIRE_DESIGN_kel_azaan"
 	adjective = "PRESCRIPTED_adjective_kel_azaan"
+	ship_prefix = "PRESCRIPTED_ship_prefix_kel_azaan"
 	spawn_enabled = yes
-	
+
 	species = {
 		class = "ART"
 		portrait = "art8"
@@ -368,55 +440,52 @@ kel_azaan = {
 		trait = "trait_solitary"
 	}
 	
-	ship_prefix = "PRESCRIPTED_ship_prefix_kel_azaan"
-	
-	planet_name = "PRESCRIPTED_planet_name_kel_azaan"
-	system_name = "PRESCRIPTED_system_name_kel_azaan"
-	planet_class = "pc_savannah"
-	
 	room = "personality_honorbound_warriors_room"
-	
+
 	authority = "auth_oligarchic"
-	civics={
+	civics = {
 		"civic_warrior_culture"
 		"civic_martial_brotherhood"
 		"civic_peoples_republic"
 	}
 	origin = "origin_default"
 	government = gov_military_junta
-
 	ethic = "ethic_egalitarian"
 	ethic = "ethic_fanatic_militarist"
 	ethic = "ethic_socialism"
 	ethic = "ethic_materialist"
-	
+
+	planet_name = "PRESCRIPTED_planet_name_kel_azaan"
+	system_name = "PRESCRIPTED_system_name_kel_azaan"
+	planet_class = "pc_savannah"
+
 	graphical_culture = "arthropoid_01"
 	city_graphical_culture = "arthropoid_01"
-	
+
 	empire_flag = {
-		icon={
-			category="ornate"
-			file="flag_ornate_20.dds"
+		icon = {
+			category = "ornate"
+			file = "flag_ornate_20.dds"
 		}
-		background= {
+		background = {
 			category = "backgrounds"
-			file="stripe.dds"
+			file = "stripe.dds"
 		}
-		colors={
+		colors = {
 			"purple"
 			"dark_purple"
 			"null"
 			"null"
 		}
 	}
-	
+
 	ruler = {
 		name = "PRESCRIPTED_ruler_name_kel_azaan"
 		gender = male
 		portrait = "art8"
 		texture = 1
-		#hair = 0
+		#attachment = 0
 		clothes = 2
 		leader_class = ruler
-	}	
+	}
 }
\ No newline at end of file
diff --git a/prescripted_countries/default.txt b/prescripted_countries/default.txt
new file mode 100644
index 000000000..9eba639aa
--- /dev/null
+++ b/prescripted_countries/default.txt
@@ -0,0 +1,51 @@
+default = {
+	name = ""
+	adjective = ""
+	ship_prefix = "ISS"
+
+	default = yes
+
+	species = {
+		class = "HUM"
+		portrait = "human"
+		name_list = "HUM1"
+	}
+	room = "default_room"
+
+	authority = "auth_democratic"
+	government = "gov_despotic_empire"
+	origin = "origin_default"
+
+	planet_name = ""
+	system_name = ""
+	planet_class = "pc_continental"
+	graphical_culture = "mammalian_01"
+	city_graphical_culture = "mammalian_01"
+
+	empire_flag = {
+		icon = {
+			category = "pointy"
+			file = "flag_pointy_2.dds"
+		}
+		background = {
+			category = "backgrounds"
+			file = "v.dds"
+		}
+		colors = {
+			"red"
+			"black"
+			"null"
+			"null"
+		}
+	}
+
+	ruler = {
+		name = ""
+		gender = female
+		portrait = "human_female_04"
+		texture = 0
+		attachment = 0
+		clothes = 4
+		leader_class = ruler
+	}
+}

From 0a44bc4f36c4315c9346e5f1a05256535ba4f303 Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 30 Jan 2023 03:27:39 +0800
Subject: [PATCH 29/30] =?UTF-8?q?=E6=9B=B4=E6=96=B0=202023/1/29=20by=20dk?=
 =?UTF-8?q?=5Fbreeze?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |    7 +-
 common/buildings/15_overlord_holdings.txt     |  111 +-
 common/policies/ethic_rebuild_policies.txt    |  669 +-
 ...ethic_other_jobs.txt => 00_other_jobs.txt} |    6 +-
 common/pop_jobs/01_ruler_jobs.txt             |   14 +-
 common/pop_jobs/02_specialist_jobs.txt        |  124 +-
 common/pop_jobs/03_worker_jobs.txt            |   56 +-
 ...c_gestalt_jobs.txt => 04_gestalt_jobs.txt} |   67 +-
 common/pop_jobs/05_primitive_jobs.txt         |  639 ++
 common/pop_jobs/06_event_jobs.txt             | 1748 +++++
 common/pop_jobs/08_overlord_jobs.txt          | 2037 ++++++
 common/pop_jobs/ethic_00_other_jobs.txt       |  855 +++
 common/pop_jobs/ethic_01_ruler_jobs.txt       |  362 +
 common/pop_jobs/ethic_02_specialist_jobs.txt  | 2127 ++++++
 common/pop_jobs/ethic_03_worker_jobs.txt      | 1554 +++++
 common/pop_jobs/ethic_rebuild_jobs.txt        | 6112 -----------------
 .../ethic_scripted_triggers.txt               |   15 +-
 .../english/ethic_overlord_jobs_l_english.yml |   21 +
 .../ethic_jobs_l_simp_chinese.yml             |   12 +
 .../ethic_overlord_jobs_l_simp_chinese.yml    |   21 +
 20 files changed, 9868 insertions(+), 6689 deletions(-)
 rename common/pop_jobs/{ethic_other_jobs.txt => 00_other_jobs.txt} (99%)
 rename common/pop_jobs/{ethic_gestalt_jobs.txt => 04_gestalt_jobs.txt} (99%)
 create mode 100644 common/pop_jobs/05_primitive_jobs.txt
 create mode 100644 common/pop_jobs/06_event_jobs.txt
 create mode 100644 common/pop_jobs/08_overlord_jobs.txt
 create mode 100644 common/pop_jobs/ethic_00_other_jobs.txt
 create mode 100644 common/pop_jobs/ethic_01_ruler_jobs.txt
 create mode 100644 common/pop_jobs/ethic_02_specialist_jobs.txt
 create mode 100644 common/pop_jobs/ethic_03_worker_jobs.txt
 delete mode 100644 common/pop_jobs/ethic_rebuild_jobs.txt
 create mode 100644 localisation/replace/english/ethic_overlord_jobs_l_english.yml
 create mode 100644 localisation/replace/simp_chinese/ethic_overlord_jobs_l_simp_chinese.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9627faa10..514e08e3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 * 修改 直接民主的社会主义政体改为人民公社
 * 调整 先进社会主义和革命先锋队的适用条件 - 非任何程度的威权和排外，非道德，先锋队可可以是直接民主/间接民主
 * 重构 提取trigger并应用 是否是科学社会主义 `is_scientific_socialism` - 先进社会主义/革命先锋队
+* 修复 职业适用条件修复 - 注意士官的职业适用条件参照骑士
+* 修复 职业脚本和政策脚本中的语法错误
 
 ### 2023/1/2
 
@@ -33,10 +35,13 @@
 * 调整 内圣之道改为思潮要求种族主义即可
 * 调整 和谐集体改为一定程度社会主义+一定程度教权主义/自由主义即可
 
+### TODO
+
 待调整：
 
 ```
-planet_modifier/planet_jobs_slave_produces_mult
+planet_jobs_slave_produces_mult
+pop_slave_resource_output
 ```
 
 脚本缺失：
diff --git a/common/buildings/15_overlord_holdings.txt b/common/buildings/15_overlord_holdings.txt
index 946b9ebfd..e2e7f40d5 100644
--- a/common/buildings/15_overlord_holdings.txt
+++ b/common/buildings/15_overlord_holdings.txt
@@ -706,65 +706,100 @@ holding_offworld_foundry = {
 			exists = planet.owner
 			planet.owner = {
 				is_gestalt = no
-				is_catalytic_empire = no
 			}
 		}
 		job_overlord_metallurgist_add = 2
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = planet.owner
 			planet.owner = {
 				is_hive_empire = yes
-				is_catalytic_empire = no
 			}
 		}
 		job_overlord_foundry_drone_add = 2
 	}
-
 	triggered_planet_modifier = {
 		potential = {
 			exists = planet.owner
 			planet.owner = {
 				is_machine_empire = yes
-				is_catalytic_empire = no
 			}
 		}
 		job_overlord_fabricator_add = 2
 	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = planet.owner
-			planet.owner = {
-				is_catalytic_empire = yes
-				is_gestalt = no
-			}
-		}
-		job_overlord_catalytic_technician_add = 2
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = planet.owner
-			planet.owner = {
-				is_catalytic_empire = yes
-				is_gestalt = yes
-			}
-		}
-		job_overlord_catalytic_drone_add = 2
-	}
+	# triggered_planet_modifier = {
+	# 	potential = {
+	# 		exists = planet.owner
+	# 		planet.owner = {
+	# 			is_gestalt = no
+	# 			is_catalytic_empire = no
+	# 		}
+	# 	}
+	# 	job_overlord_metallurgist_add = 2
+	# }
+	# triggered_planet_modifier = {
+	# 	potential = {
+	# 		exists = planet.owner
+	# 		planet.owner = {
+	# 			is_hive_empire = yes
+	# 			is_catalytic_empire = no
+	# 		}
+	# 	}
+	# 	job_overlord_foundry_drone_add = 2
+	# }
+	# triggered_planet_modifier = {
+	# 	potential = {
+	# 		exists = planet.owner
+	# 		planet.owner = {
+	# 			is_machine_empire = yes
+	# 			is_catalytic_empire = no
+	# 		}
+	# 	}
+	# 	job_overlord_fabricator_add = 2
+	# }
+	# triggered_planet_modifier = {
+	# 	potential = {
+	# 		exists = planet.owner
+	# 		planet.owner = {
+	# 			is_catalytic_empire = yes
+	# 			is_gestalt = no
+	# 		}
+	# 	}
+	# 	job_overlord_catalytic_technician_add = 2
+	# }
+	# triggered_planet_modifier = {
+	# 	potential = {
+	# 		exists = planet.owner
+	# 		planet.owner = {
+	# 			is_catalytic_empire = yes
+	# 			is_gestalt = yes
+	# 		}
+	# 	}
+	# 	job_overlord_catalytic_drone_add = 2
+	# }
 
 	triggered_desc = {
-		trigger = {
-			exists = planet.owner
-			planet.owner = {
-				is_catalytic_empire = no
-			}
-		}
 		text = job_overlord_alloy_producer_effect_desc
 	}
+	# triggered_desc = {
+	# 	trigger = {
+	# 		exists = planet.owner
+	# 		planet.owner = {
+	# 			is_catalytic_empire = no
+	# 		}
+	# 	}
+	# 	text = job_overlord_alloy_producer_effect_desc
+	# }
+	# triggered_desc = {
+	# 	trigger = {
+	# 		exists = planet.owner
+	# 		planet.owner = {
+	# 			is_catalytic_empire = yes
+	# 		}
+	# 	}
+	# 	text = job_overlord_alloy_producer_catalytic_effect_desc
+	# }
 
 	destroy_trigger = {
 		exists = planet.owner
@@ -774,16 +809,6 @@ holding_offworld_foundry = {
 			}
 		}
 	}
-
-	triggered_desc = {
-		trigger = {
-			exists = planet.owner
-			planet.owner = {
-				is_catalytic_empire = yes
-			}
-		}
-		text = job_overlord_alloy_producer_catalytic_effect_desc
-	}
 }
 
 holding_overlord_vigil_command = {
diff --git a/common/policies/ethic_rebuild_policies.txt b/common/policies/ethic_rebuild_policies.txt
index 310c95a85..d412f8272 100644
--- a/common/policies/ethic_rebuild_policies.txt
+++ b/common/policies/ethic_rebuild_policies.txt
@@ -1,6 +1,6 @@
-#Cultural Overhaul
-#border_policy
-#trade_policy
+# Cultural Overhaul
+# border_policy
+# trade_policy
 ##########################################################################
 # Empire Policies
 #
@@ -13,7 +13,7 @@
 # #####
 #
 ##########################################################################
-#外交态度
+# 外交态度
 diplomatic_stance = {
 	potential = {
 		OR = {
@@ -25,7 +25,7 @@ diplomatic_stance = {
 			has_ascension_perk = ev_land_planets
 		}
 	}
-	#恃强凌弱
+	# 恃强凌弱
 	option = {
 		name = "diplo_stance_belligerent"
 		icon = "GFX_diplomatic_stance_belligerent"
@@ -34,7 +34,7 @@ diplomatic_stance = {
 				is_country_type = default
 				is_country_type = awakened_fallen_empire
 			}
-			is_homicidal = no			# They have their own variants of this
+			is_homicidal = no            # They have their own variants of this
 			NOR = {
 				has_valid_civic = civic_inwards_perfection
 				has_valid_civic = civic_isolationism
@@ -80,7 +80,7 @@ diplomatic_stance = {
 				}
 			}
 			modifier = {
-				factor = 0.5				# ...but they're still less likely to.
+				factor = 0.5                # ...but they're still less likely to.
 				is_pacifist = yes
 			}
 			# Angry people like to be belligerent
@@ -101,7 +101,7 @@ diplomatic_stance = {
 				has_ethic = ethic_authoritarian
 			}
 			modifier = {
-				factor = 5				# Intentionally high value for despoilers/Nihilistic Acquisition
+				factor = 5                # Intentionally high value for despoilers/Nihilistic Acquisition
 				is_slaver = yes
 			}
 			modifier = {
@@ -126,13 +126,13 @@ diplomatic_stance = {
 				has_ai_personality_behaviour = subjugator
 			}
 			modifier = {
-				factor = 3				# Blocked in propagators get ANGRY
+				factor = 3                # Blocked in propagators get ANGRY
 				has_ai_expansion_plan = no
 				has_ai_personality_behaviour = propagator
 			}
 		}
 	}
-	#乐于合作
+	# 乐于合作
 	option = {
 		name = "diplo_stance_cooperative"
 		icon = "GFX_diplomatic_stance_cooperative"
@@ -141,7 +141,7 @@ diplomatic_stance = {
 				is_country_type = default
 				is_country_type = awakened_fallen_empire
 			}
-			is_unfriendly = no			# Not homicidal OR barbaric despoilers
+			is_unfriendly = no            # Not homicidal OR barbaric despoilers
 			NOR = {
 				has_valid_civic = civic_inwards_perfection
 				has_valid_civic = civic_isolationism
@@ -224,7 +224,7 @@ diplomatic_stance = {
 			}
 		}
 	}
-	#和平共处
+	# 和平共处
 	option = {
 		name = "diplo_peaceful_coexistence"
 		icon = "GFX_diplomatic_stance_cooperative"
@@ -312,7 +312,7 @@ diplomatic_stance = {
 			}
 		}
 	}
-	#孤立主义
+	# 孤立主义
 	option = {
 		name = "diplo_stance_isolationist"
 		icon = "GFX_diplomatic_stance_isolationist"
@@ -321,8 +321,8 @@ diplomatic_stance = {
 				is_country_type = default
 				is_country_type = awakened_fallen_empire
 			}
-			is_homicidal = no			# Homicidal variants below
-			is_megacorp = no			# "NO! YOU CAN'T BUY OUR STUFF!" makes the shareholders sad
+			is_homicidal = no            # Homicidal variants below
+			is_megacorp = no            # "NO! YOU CAN'T BUY OUR STUFF!" makes the shareholders sad
 		}
 		policy_flags = {
 			diplo_stance_isolationist
@@ -339,7 +339,7 @@ diplomatic_stance = {
 		ai_weight = {
 			weight = 10
 			modifier = {
-				factor = 0.25				# Let the isolationists start in this if they want
+				factor = 0.25                # Let the isolationists start in this if they want
 				NOT = {
 					has_country_flag = has_encountered_other_empire
 				}
@@ -352,7 +352,7 @@ diplomatic_stance = {
 				}
 			}
 			modifier = {
-				factor = 100				# Inwards Perfection should almost always go isolationist
+				factor = 100                # Inwards Perfection should almost always go isolationist
 				OR = {
 					has_valid_civic = civic_inwards_perfection
 					has_valid_civic = civic_isolationism
@@ -370,7 +370,7 @@ diplomatic_stance = {
 			}
 		}
 	}
-	#扩张主义
+	# 扩张主义
 	option = {
 		name = "diplo_stance_expansionist"
 		icon = "GFX_diplomatic_stance_expansionist"
@@ -399,7 +399,7 @@ diplomatic_stance = {
 			}
 		}
 	}
-	#经贸至上
+	# 经贸至上
 	option = {
 		name = "diplo_stance_mercantile"
 		icon = "GFX_diplomatic_stance_mercantile"
@@ -451,7 +451,7 @@ diplomatic_stance = {
 			}
 		}
 	}
-	#霸权主义
+	# 霸权主义
 	option = {
 		name = "diplo_stance_supremacist"
 		icon = "GFX_diplomatic_stance_supremacy"
@@ -527,7 +527,7 @@ diplomatic_stance = {
 				has_ethic = ethic_authoritarian
 			}
 			modifier = {
-				factor = 1.25				# Despoilers/Nihilistic Acquisition intentionally get a higher multiplier for Belligerent than Supremacist
+				factor = 1.25                # Despoilers/Nihilistic Acquisition intentionally get a higher multiplier for Belligerent than Supremacist
 				is_slaver = yes
 			}
 			modifier = {
@@ -581,7 +581,7 @@ diplomatic_stance = {
 			}
 		}
 	}
-	#输出革命
+	# 输出革命
 	option = {
 		name = "diplo_stance_revolution"
 		icon = "GFX_diplomatic_stance_supremacy"
@@ -655,7 +655,7 @@ diplomatic_stance = {
 				has_ethic = ethic_egalitarian
 			}
 			modifier = {
-				factor = 0				# Despoilers/Nihilistic Acquisition intentionally get a higher multiplier for Belligerent than Supremacist
+				factor = 0                # Despoilers/Nihilistic Acquisition intentionally get a higher multiplier for Belligerent than Supremacist
 				is_slaver = yes
 			}
 			modifier = {
@@ -773,7 +773,7 @@ diplomatic_stance = {
 	}
 }
 
-#难民
+# 难民
 refugees = {
 	potential = {
 		has_encountered_other_species = yes
@@ -849,7 +849,7 @@ refugees = {
 	}
 }
 
-#战争学说
+# 战争学说
 war_doctrine = {
 	potential = {
 		is_country_type = default
@@ -1078,7 +1078,7 @@ war_doctrine = {
 		AI_weight = {
 			factor = 1000
 		}
-	}	
+	}
 
 	# 终末审判
 	option = {
@@ -1168,7 +1168,7 @@ war_doctrine = {
 	}
 }
 
-#兵役制度
+# 兵役制度
 military_service = {
 	potential = {
 		OR = {
@@ -1185,9 +1185,9 @@ military_service = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1215,9 +1215,9 @@ military_service = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		policy_flags = {
@@ -1244,9 +1244,9 @@ military_service = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1278,9 +1278,9 @@ military_service = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1318,9 +1318,9 @@ military_service = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1351,28 +1351,28 @@ military_service = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
 			has_technology = tech_ground_defense_planning
 		}
 		modifier = {
-			job_warrior_drone_per_pop=0.02
+			job_warrior_drone_per_pop = 0.02
 		}
 		AI_weight = {
 			factor = 2
-		modifier = {
+			modifier = {
 				factor = 10
 				has_civic = civic_machine_paradise_lost
-				}
-		modifier = {
+			}
+			modifier = {
 				factor = 10
 				has_civic = civic_hive_idellic_bloom
-				}
 			}
+		}
 	}
 	option = {
 		name = "basic_security"
@@ -1382,13 +1382,13 @@ military_service = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		modifier = {
-			job_warrior_drone_per_pop=0.05
+			job_warrior_drone_per_pop = 0.05
 		}
 		AI_weight = {
 			factor = 7
@@ -1402,13 +1402,13 @@ military_service = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		modifier = {
-			job_warrior_drone_per_pop=0.07
+			job_warrior_drone_per_pop = 0.07
 		}
 		AI_weight = {
 			factor = 5
@@ -1422,54 +1422,54 @@ military_service = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
-		OR={
-			valid = {
-				has_technology = tech_ground_defense_planning
-				has_technology = tech_centralized_command
+			OR = {
+				valid = {
+					has_technology = tech_ground_defense_planning
+					has_technology = tech_centralized_command
 				}
-			has_tradition = tr_unyielding_finish
-			has_civic =civic_hive_devouring_swarm
-			has_civic = civic_machine_terminator
-			has_civic = civic_hive_strength_of_legions
-			has_civic = civic_machine_warbots
-			has_civic = civic_machine_liberator
+				has_tradition = tr_unyielding_finish
+				has_civic = civic_hive_devouring_swarm
+				has_civic = civic_machine_terminator
+				has_civic = civic_hive_strength_of_legions
+				has_civic = civic_machine_warbots
+				has_civic = civic_machine_liberator
 			}
 		}
 		modifier = {
-			job_warrior_drone_per_pop=0.1
+			job_warrior_drone_per_pop = 0.1
 		}
 		AI_weight = {
 			factor = 5
 			modifier = {
 				factor = 15
-				has_civic=civic_hive_devouring_swarm
-				}
+				has_civic = civic_hive_devouring_swarm
+			}
 			modifier = {
 				factor = 15
 				has_civic = civic_machine_terminator
-				}
+			}
 			modifier = {
 				factor = 10
 				has_civic = civic_hive_strength_of_legions
-				}
+			}
 			modifier = {
 				factor = 10
 				has_civic = civic_machine_warbots
-				}
+			}
 			modifier = {
 				factor = 15
 				has_civic = civic_machine_liberator
-				}
+			}
 			modifier = {
 				factor = 15
 				has_tradition = tr_unyielding_finish
-				}
+			}
 		}
 	}
 	option = {
@@ -1480,54 +1480,54 @@ military_service = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
-		OR = {
-			valid = {
-			has_technology = tech_global_defense_grid
-			has_technology = tech_combat_training
-			}
-			is_at_war = yes
-			has_civic=civic_hive_devouring_swarm
-			has_civic = civic_machine_terminator
-			has_civic = civic_machine_liberator
+			OR = {
+				valid = {
+					has_technology = tech_global_defense_grid
+					has_technology = tech_combat_training
+				}
+				is_at_war = yes
+				has_civic = civic_hive_devouring_swarm
+				has_civic = civic_machine_terminator
+				has_civic = civic_machine_liberator
 			}
 		}
 		modifier = {
 
-			job_warrior_drone_per_pop=0.2
+			job_warrior_drone_per_pop = 0.2
 		}
 		AI_weight = {
 			factor = 1
 			modifier = {
 				factor = 30
 				is_at_war = yes
-				}
+			}
 			modifier = {
 				factor = 15
-				has_civic=civic_hive_devouring_swarm
-				}
+				has_civic = civic_hive_devouring_swarm
+			}
 			modifier = {
 				factor = 15
 				has_civic = civic_machine_terminator
-				}
+			}
 			modifier = {
 				factor = 10
 				has_civic = civic_hive_strength_of_legions
-				}
+			}
 			modifier = {
 				factor = 10
 				has_civic = civic_machine_warbots
-				}
+			}
 			modifier = {
 				factor = 15
 				has_civic = civic_machine_liberator
-				}
 			}
+		}
 	}
 	option = {
 		name = "militia_association"
@@ -1537,9 +1537,9 @@ military_service = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1565,9 +1565,9 @@ military_service = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1592,7 +1592,7 @@ military_service = {
 	}
 }
 
-#所有制政策
+# 所有制政策
 ownership = {
 	potential = {
 		OR = {
@@ -1615,9 +1615,9 @@ ownership = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1643,9 +1643,9 @@ ownership = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		policy_flags = {
@@ -1687,9 +1687,9 @@ ownership = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1722,9 +1722,9 @@ ownership = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1758,9 +1758,9 @@ ownership = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -1789,7 +1789,7 @@ ownership = {
 	}
 }
 
-#人工智能
+# 人工智能
 artificial_intelligence_policy = {
 	potential = {
 		NOT = {
@@ -2000,7 +2000,7 @@ artificial_intelligence_policy = {
 		valid = {
 			has_ascension_perk = ap_magic_puppet
 		}
-		policy_flags = {			
+		policy_flags = {
 			ai_magic_puppet
 		}
 
@@ -2012,7 +2012,7 @@ artificial_intelligence_policy = {
 	}
 }
 
-#机器人劳工
+# 机器人劳工
 robot_pop_policy = {
 	potential = {
 		NOT = {
@@ -2079,7 +2079,7 @@ robot_pop_policy = {
 	}
 }
 
-#市场态度
+# 市场态度
 economic_stance = {
 	potential = {
 		OR = {
@@ -2094,7 +2094,7 @@ economic_stance = {
 			has_ethic = ethic_gestalt_consciousness
 		}
 	}
-	#自由市场（分产主义特供）
+	# 自由市场（分产主义特供）
 	option = {
 		name = "economic_stance_market_anarchism"
 		potential = {
@@ -2145,13 +2145,13 @@ economic_stance = {
 			}
 		}
 	}
-	#自由市场
+	# 自由市场
 	option = {
 		name = "economic_stance_market"
 		potential = {
 			NOR = {
 				has_valid_civic = civic_distributism
-		    }
+			}
 		}
 		policy_flags = {
 			economic_stance_market
@@ -2199,7 +2199,7 @@ economic_stance = {
 			}
 		}
 	}
-	#监管市场
+	# 监管市场
 	option = {
 		name = "economic_stance_mixed"
 		policy_flags = {
@@ -2207,8 +2207,8 @@ economic_stance = {
 		}
 		valid = {
 			NOR = {
-			    AND = {
-				    has_valid_civic = civic_anarchism
+				AND = {
+					has_valid_civic = civic_anarchism
 					NOT = { has_ethic = ethic_fanatic_socialism }
 				}
 			}
@@ -2223,14 +2223,14 @@ economic_stance = {
 			factor = 10
 		}
 	}
-	#指令式计划经济
+	# 指令式计划经济
 	option = {
 		name = "economic_stance_planned"
 		potential = {
 			NOR = {
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_National_Socialism
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_National_Socialism
 			}
 		}
 		policy_flags = {
@@ -2287,14 +2287,14 @@ economic_stance = {
 			}
 		}
 	}
-	#分布式计划经济
+	# 分布式计划经济
 	option = {
 		name = "economic_stance_planned_free"
 		potential = {
 			NOR = {
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		policy_flags = {
@@ -2343,14 +2343,14 @@ economic_stance = {
 			}
 		}
 	}
-	#计划经济（意识之海特供）
+	# 计划经济（意识之海特供）
 	option = {
 		name = "economic_stance_planned_network_of_the_mind"
 		potential = {
-		    OR = {
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+			OR = {
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		policy_flags = {
@@ -2390,7 +2390,7 @@ economic_stance = {
 	}
 }
 
-#税收投资
+# 税收投资
 trade_policy = {
 	potential = {
 		OR = {
@@ -2438,7 +2438,7 @@ trade_policy = {
 			modifier = {
 				factor = 300
 				OR = {
-			        has_ethic = "ethic_socialism"
+					has_ethic = "ethic_socialism"
 				}
 			}
 			modifier = {
@@ -2456,7 +2456,7 @@ trade_policy = {
 			modifier = {
 				factor = 0.001
 				OR = {
-				    has_policy_flag = reform_and_opening_up
+					has_policy_flag = reform_and_opening_up
 				}
 			}
 		}
@@ -2479,15 +2479,15 @@ trade_policy = {
 			trade_conversion_trade_league
 		}
 		modifier = {
-		    job_mogul_per_pop = -0.04
-		    job_merchant_per_pop = 0.05
+			job_mogul_per_pop = -0.04
+			job_merchant_per_pop = 0.05
 			pop_ethic_capitalism_attraction_mult = 0.25
 		}
 		AI_weight = {
 			factor = 99999
 		}
 	}
-	
+
 	# 民族经济学
 	option = {
 		name = "trade_policy_national_economy"
@@ -2539,14 +2539,14 @@ trade_policy = {
 		}
 		valid = {
 			OR = {
-			    AND = {
-				    NOT = {
-				    	has_ethic = ethic_fanatic_socialism
-				    }
+				AND = {
+					NOT = {
+						has_ethic = ethic_fanatic_socialism
+					}
 				}
-			    AND = {
-		            has_ethic = ethic_fanatic_socialism
-			        has_policy_flag = reform_and_opening_up
+				AND = {
+					has_ethic = ethic_fanatic_socialism
+					has_policy_flag = reform_and_opening_up
 				}
 			}
 		}
@@ -2657,10 +2657,10 @@ trade_policy = {
 			factor = 3
 			modifier = {
 				factor = 30
-			    OR = {
-				    has_valid_civic = civic_industrial_economy
-				    has_valid_civic = civic_industrial_economy_corporate
-			    }
+				OR = {
+					has_valid_civic = civic_industrial_economy
+					has_valid_civic = civic_industrial_economy_corporate
+				}
 			}
 		}
 	}
@@ -2800,16 +2800,16 @@ trade_policy = {
 			planet_jobs_alloys_produces_mult = 0.2
 			planet_jobs_minerals_produces_mult = 0.2
 			pop_environment_tolerance = -0.05
-			
+
 		}
 		AI_weight = {
 			factor = 5
 			modifier = {
 				factor = 30
-			    OR = {
-				    has_valid_civic = civic_industrial_economy
-				    has_valid_civic = civic_industrial_economy_corporate
-			    }
+				OR = {
+					has_valid_civic = civic_industrial_economy
+					has_valid_civic = civic_industrial_economy_corporate
+				}
 			}
 			modifier = {
 				factor = 50
@@ -2845,7 +2845,7 @@ trade_policy = {
 		}
 		valid = {
 			OR = {
-			    has_tradition = tr_mercantile_adaptive_economic_policies
+				has_tradition = tr_mercantile_adaptive_economic_policies
 				has_valid_civic = civic_industrial_automatation
 				has_valid_civic = civic_industrial_automatation_corporate
 			}
@@ -3128,7 +3128,7 @@ trade_policy = {
 	}
 }
 
-#社会主义基础政策
+# 社会主义基础政策
 basic_state_policy = {
 	potential = {
 		OR = {
@@ -3236,7 +3236,7 @@ basic_state_policy = {
 	}
 }
 
-#地方权力
+# 地方权力
 local_power = {
 	option = {
 		name = "full_decentralization"
@@ -3246,9 +3246,9 @@ local_power = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 			OR = {
 				NOT = {
@@ -3296,7 +3296,7 @@ local_power = {
 			modifier = {
 				factor = 50
 				OR = {
-				    has_valid_civic = civic_anarchism
+					has_valid_civic = civic_anarchism
 					has_valid_civic = civic_coalition_government
 					has_valid_civic = civic_feudal_realm
 					has_valid_civic = civic_free_traders
@@ -3313,9 +3313,9 @@ local_power = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 			OR = {
 				NOT = {
@@ -3385,9 +3385,9 @@ local_power = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 			OR = {
 				NOT = {
@@ -3439,9 +3439,9 @@ local_power = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 			OR = {
 				NOT = {
@@ -3490,9 +3490,9 @@ local_power = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 			OR = {
 				NOT = {
@@ -3557,9 +3557,9 @@ local_power = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 			OR = {
 				NOT = {
@@ -3613,15 +3613,15 @@ local_power = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
-		or = {
-			has_technology = tech_autonomous_agents
-			has_civic = civic_hive_divided_attention
+			or = {
+				has_technology = tech_autonomous_agents
+				has_civic = civic_hive_divided_attention
 			}
 		}
 		modifier = {
@@ -3658,9 +3658,9 @@ local_power = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		modifier = {
@@ -3692,9 +3692,9 @@ local_power = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		modifier = {
@@ -3725,14 +3725,14 @@ local_power = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
-		OR = {
-			has_technology = tech_colonial_centralization
+			OR = {
+				has_technology = tech_colonial_centralization
 			}
 		}
 		modifier = {
@@ -3753,9 +3753,9 @@ local_power = {
 			factor = 10
 			modifier = {
 				factor = 10
-			OR = {
-				has_tradition = tr_domination_finish
-				has_ascension_perk = ap_imperial_prerogative
+				OR = {
+					has_tradition = tr_domination_finish
+					has_ascension_perk = ap_imperial_prerogative
 				}
 			}
 		}
@@ -3768,14 +3768,14 @@ local_power = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
-		has_technology = tech_colonial_bureaucracy
-		has_technology = tech_colonial_centralization
+			has_technology = tech_colonial_bureaucracy
+			has_technology = tech_colonial_centralization
 		}
 		modifier = {
 			country_admin_cap_mult = 0.5
@@ -3793,8 +3793,7 @@ local_power = {
 			}
 		}
 		ai_weight = {
-			modifier = {
-				factor = 5
+			factor = 5
 			modifier = {
 				factor = 10
 				has_valid_civic = civic_hive_one_mind
@@ -3813,13 +3812,14 @@ local_power = {
 			}
 			modifier = {
 				factor = 10
-			OR = {
-				has_tradition = tr_domination_finish
-				has_ascension_perk = ap_imperial_prerogative
+				OR = {
+					has_tradition = tr_domination_finish
+					has_ascension_perk = ap_imperial_prerogative
 				}
 			}
 		}
 	}
+
 	option = {
 		name = "supreme_authority_protocol"
 		policy_flags = {
@@ -3828,14 +3828,14 @@ local_power = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
-		has_technology = tech_galactic_administration
-		has_technology = tech_galactic_bureaucracy
+			has_technology = tech_galactic_administration
+			has_technology = tech_galactic_bureaucracy
 		}
 		modifier = {
 			country_admin_cap_mult = 0.8
@@ -3853,8 +3853,7 @@ local_power = {
 			}
 		}
 		ai_weight = {
-			modifier = {
-				factor = 10
+			factor = 10
 			modifier = {
 				factor = 10
 				has_valid_civic = civic_hive_one_mind
@@ -3873,9 +3872,9 @@ local_power = {
 			}
 			modifier = {
 				factor = 10
-			OR = {
-				has_tradition = tr_domination_finish
-				has_ascension_perk = ap_imperial_prerogative
+				OR = {
+					has_tradition = tr_domination_finish
+					has_ascension_perk = ap_imperial_prerogative
 				}
 			}
 		}
@@ -3884,9 +3883,9 @@ local_power = {
 		name = "consensus_algorithm"
 		potential = {
 			OR = {
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -3928,7 +3927,7 @@ local_power = {
 	}
 }
 
-#三权分立
+# 三权分立
 separation_of_powers = {
 	potential = {
 		NOT = {
@@ -4014,7 +4013,7 @@ separation_of_powers = {
 	}
 }
 
-#工作时制
+# 工作时制
 working_hours = {
 	potential = {
 		OR = {
@@ -4039,8 +4038,8 @@ working_hours = {
 				has_ethic = ethic_authoritarian
 				has_ethic = ethic_fanatic_authoritarian
 				AND = {
-				    NOR = {
-					    has_ethic = ethic_egalitarian
+					NOR = {
+						has_ethic = ethic_egalitarian
 						has_ethic = ethic_fanatic_egalitarian
 					}
 					has_ethic = ethic_fanatic_capitalism
@@ -4056,10 +4055,10 @@ working_hours = {
 		modifier = {
 			planet_jobs_worker_produces_mult = 0.3
 			planet_building_build_speed_mult = 0.2
-		    starbase_shipyard_build_speed_mult = 0.2
+			starbase_shipyard_build_speed_mult = 0.2
 			pop_cat_specialist_happiness = -0.05
-		    pop_cat_worker_happiness = -0.1
-		    pop_growth_speed_reduction = 0.15
+			pop_cat_worker_happiness = -0.1
+			pop_growth_speed_reduction = 0.15
 		}
 		AI_weight = {
 			modifier = {
@@ -4073,8 +4072,8 @@ working_hours = {
 			OR = {
 				has_ethic = ethic_fanatic_authoritarian
 				AND = {
-				    has_ethic = ethic_authoritarian
-				    has_ethic = ethic_fanatic_capitalism
+					has_ethic = ethic_authoritarian
+					has_ethic = ethic_fanatic_capitalism
 				}
 				has_valid_civic = civic_state_monopoly
 				has_valid_civic = civic_triple_the_profit
@@ -4088,10 +4087,10 @@ working_hours = {
 		modifier = {
 			planet_jobs_worker_produces_mult = 0.3
 			planet_building_build_speed_mult = 0.2
-		    starbase_shipyard_build_speed_mult = 0.2
+			starbase_shipyard_build_speed_mult = 0.2
 			pop_cat_specialist_happiness = -0.1
-		    pop_cat_worker_happiness = -0.15
-		    pop_growth_speed_reduction = 0.3
+			pop_cat_worker_happiness = -0.15
+			pop_growth_speed_reduction = 0.3
 		}
 		AI_weight = {
 			modifier = {
@@ -4109,10 +4108,10 @@ working_hours = {
 		}
 		valid = {
 			OR = {
-			    AND = {
-				    NOR = {
-				        has_ethic = ethic_egalitarian
-				        has_ethic = ethic_fanatic_egalitarian
+				AND = {
+					NOR = {
+						has_ethic = ethic_egalitarian
+						has_ethic = ethic_fanatic_egalitarian
 					}
 				}
 				has_valid_civic = civic_merchant_guilds
@@ -4126,10 +4125,10 @@ working_hours = {
 		modifier = {
 			planet_jobs_worker_produces_mult = 0.15
 			planet_building_build_speed_mult = 0.1
-		    starbase_shipyard_build_speed_mult = 0.1
+			starbase_shipyard_build_speed_mult = 0.1
 			pop_cat_specialist_happiness = -0.05
-		    pop_cat_worker_happiness = -0.1
-		    pop_growth_speed_reduction = 0.15
+			pop_cat_worker_happiness = -0.1
+			pop_growth_speed_reduction = 0.15
 		}
 		AI_weight = {
 			modifier = {
@@ -4183,10 +4182,10 @@ working_hours = {
 		modifier = {
 			planet_jobs_worker_produces_mult = 0.15
 			planet_building_build_speed_mult = 0.1
-		    starbase_shipyard_build_speed_mult = 0.1
+			starbase_shipyard_build_speed_mult = 0.1
 			pop_cat_specialist_happiness = -0.05
-		    pop_cat_worker_happiness = -0.05
-		    pop_growth_speed_reduction = 0.15
+			pop_cat_worker_happiness = -0.05
+			pop_growth_speed_reduction = 0.15
 		}
 		AI_weight = {
 			modifier = {
@@ -4240,11 +4239,11 @@ working_hours = {
 		}
 		modifier = {
 			planet_resource_unity_mult = 0.075
-		    pop_growth_speed = 0.15
+			pop_growth_speed = 0.15
 			trade_value_mult = 0.1
 			planet_jobs_worker_produces_mult = -0.15
 			planet_building_build_speed_mult = -0.1
-		    starbase_shipyard_build_speed_mult = -0.1
+			starbase_shipyard_build_speed_mult = -0.1
 		}
 		AI_weight = {
 			modifier = {
@@ -4280,7 +4279,7 @@ working_hours = {
 			OR = {
 				has_ethic = ethic_fanatic_egalitarian
 				AND = {
-				    has_ethic = ethic_egalitarian
+					has_ethic = ethic_egalitarian
 					has_ethic = ethic_fanatic_socialism
 				}
 				has_valid_civic = civic_shared_burden
@@ -4291,11 +4290,11 @@ working_hours = {
 		}
 		modifier = {
 			planet_resource_unity_mult = 0.15
-		    pop_growth_speed = 0.3
+			pop_growth_speed = 0.3
 			trade_value_mult = 0.2
 			planet_jobs_worker_produces_mult = -0.3
 			planet_building_build_speed_mult = -0.2
-		    starbase_shipyard_build_speed_mult = -0.2
+			starbase_shipyard_build_speed_mult = -0.2
 		}
 		AI_weight = {
 			modifier = {
@@ -4313,8 +4312,8 @@ working_hours = {
 				has_ethic = ethic_egalitarian
 				has_ethic = ethic_fanatic_egalitarian
 				AND = {
-				    NOR = {
-					    has_ethic = ethic_authoritarian
+					NOR = {
+						has_ethic = ethic_authoritarian
 						has_ethic = ethic_fanatic_authoritarian
 					}
 					has_ethic = ethic_fanatic_socialism
@@ -4327,11 +4326,11 @@ working_hours = {
 		}
 		modifier = {
 			planet_resource_unity_mult = 0.15
-		    pop_growth_speed = 0.3
+			pop_growth_speed = 0.3
 			trade_value_mult = 0.2
 			planet_jobs_worker_produces_mult = -0.15
 			planet_building_build_speed_mult = -0.1
-		    starbase_shipyard_build_speed_mult = -0.1
+			starbase_shipyard_build_speed_mult = -0.1
 		}
 		AI_weight = {
 			modifier = {
@@ -4341,7 +4340,7 @@ working_hours = {
 	}
 }
 
-#信息管理
+# 信息管理
 information_management = {
 	potential = {
 		OR = {
@@ -4460,7 +4459,7 @@ information_management = {
 	}
 }
 
-#医疗
+# 医疗
 healthcare = {
 	potential = {
 		OR = {
@@ -4543,7 +4542,7 @@ healthcare = {
 	}
 }
 
-#教育
+# 教育
 education = {
 	potential = {
 		OR = {
@@ -4563,7 +4562,7 @@ education = {
 			has_civic = civic_network_of_the_mind_true_hive
 		}
 	}
-	
+
 	option = {
 		name = "mixed_education"
 		valid = {
@@ -4630,18 +4629,18 @@ education = {
 	}
 }
 
-#科研伦理
+# 科研伦理
 research_ethics = {
 	option = {
 		name = "dogma_bottom_line"
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
-		}	
+		}
 		valid = {
 			OR = {
 				has_ethic = ethic_fanatic_spiritualist
@@ -4669,11 +4668,11 @@ research_ethics = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
-		}	
+		}
 		valid = {
 			NOR = {
 				has_ethic = ethic_fanatic_materialist
@@ -4691,11 +4690,11 @@ research_ethics = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
-		}	
+		}
 		valid = {
 			OR = {
 				has_valid_civic = civic_knowledge_seeker
@@ -4723,11 +4722,11 @@ research_ethics = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
-		}	
+		}
 		valid = {
 			NOR = {
 				is_pacifist = yes
@@ -4767,15 +4766,15 @@ research_ethics = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
-		}	
+		}
 		valid = {
 			OR = {
-			has_technology = tech_heritage_site
-			has_civic = civic_mechanical_utopia
+				has_technology = tech_heritage_site
+				has_civic = civic_mechanical_utopia
 			}
 		}
 		modifier = {
@@ -4803,9 +4802,9 @@ research_ethics = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		AI_weight = {
@@ -4820,9 +4819,9 @@ research_ethics = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -4841,23 +4840,23 @@ research_ethics = {
 		}
 		AI_weight = {
 			factor = 7
-		modifier = {
+			modifier = {
 				factor = 10
 				has_civic = civic_machine_introspective
-		}
-		modifier = {
+			}
+			modifier = {
 				factor = 10
 				has_civic = civic_machine_predictive_analysis
-		}
-		modifier = {
+			}
+			modifier = {
 				factor = 10
 				has_civic = civic_hive_natural_neural_network
-		}
-		modifier = {
+			}
+			modifier = {
 				factor = 10
-			OR = {
-				has_tradition = tr_discovery_finish
-				has_ascension_perk = ap_technological_ascendancy
+				OR = {
+					has_tradition = tr_discovery_finish
+					has_ascension_perk = ap_technological_ascendancy
 				}
 			}
 		}
@@ -4870,9 +4869,9 @@ research_ethics = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -4888,23 +4887,23 @@ research_ethics = {
 		}
 		AI_weight = {
 			factor = 10
-		modifier = {
+			modifier = {
 				factor = 10
 				has_civic = civic_machine_introspective
-		}
-		modifier = {
+			}
+			modifier = {
 				factor = 10
 				has_civic = civic_machine_predictive_analysis
-		}
-		modifier = {
+			}
+			modifier = {
 				factor = 10
 				has_civic = civic_hive_natural_neural_network
-				}
-		modifier = {
+			}
+			modifier = {
 				factor = 10
-			OR = {
-				has_tradition = tr_discovery_finish
-				has_ascension_perk = ap_technological_ascendancy
+				OR = {
+					has_tradition = tr_discovery_finish
+					has_ascension_perk = ap_technological_ascendancy
 				}
 			}
 		}
@@ -4917,9 +4916,9 @@ research_ethics = {
 		potential = {
 			OR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
 		}
 		valid = {
@@ -4945,11 +4944,11 @@ research_ethics = {
 		potential = {
 			NOR = {
 				has_ethic = ethic_gestalt_consciousness
-			    has_valid_civic = civic_network_of_the_mind
-			    has_valid_civic = civic_network_of_the_mind_machine
-			    has_valid_civic = civic_network_of_the_mind_true_hive
+				has_valid_civic = civic_network_of_the_mind
+				has_valid_civic = civic_network_of_the_mind_machine
+				has_valid_civic = civic_network_of_the_mind_true_hive
 			}
-		}	
+		}
 		valid = {
 			has_technology = tech_artificial_moral_codes
 			OR = {
@@ -4999,7 +4998,7 @@ research_ethics = {
 	}
 }
 
-#环保政策
+# 环保政策
 industrial = {
 	potential = {
 		OR = {
@@ -5114,7 +5113,7 @@ industrial = {
 	}
 }
 
-#基础设施
+# 基础设施
 transportation_logistics = {
 	potential = {
 	}
@@ -5249,7 +5248,7 @@ transportation_logistics = {
 	}
 }
 
-#轨道轰炸
+# 轨道轰炸
 orbital_bombardment = {
 	potential = {
 		OR = {
@@ -5375,7 +5374,7 @@ orbital_bombardment = {
 	}
 }
 
-#经济政策
+# 经济政策
 economic_policy = {
 	potential = {
 		NOT = {
@@ -5449,7 +5448,7 @@ economic_policy = {
 	}
 }
 
-#强制迁移
+# 强制迁移
 resettlement = {
 	potential = {
 		NOT = {
@@ -5487,7 +5486,7 @@ resettlement = {
 	}
 }
 
-#人口控制
+# 人口控制
 population_controls = {
 	potential = {
 		NOT = {
@@ -5542,7 +5541,7 @@ population_controls = {
 	}
 }
 
-#奴隶制
+# 奴隶制
 slavery = {
 	potential = {
 		NOT = {
@@ -5654,7 +5653,7 @@ slavery = {
 	}
 }
 
-#奴隶比例
+# 奴隶比例
 ratio_of_slaves = {
 	option = {
 		potential = { has_policy_flag = slavery_not_allowed }
@@ -5798,7 +5797,7 @@ ratio_of_slaves = {
 	}
 }
 
-#初始边境状态
+# 初始边境状态
 border_policy = {
 	potential = {
 		always = yes
@@ -5850,7 +5849,7 @@ border_policy = {
 	}
 }
 
-#领袖强化
+# 领袖强化
 leader_enhancement = {
 	potential = {
 		has_technology = tech_selected_lineages
diff --git a/common/pop_jobs/ethic_other_jobs.txt b/common/pop_jobs/00_other_jobs.txt
similarity index 99%
rename from common/pop_jobs/ethic_other_jobs.txt
rename to common/pop_jobs/00_other_jobs.txt
index b6879f7f4..3cdbad0f3 100644
--- a/common/pop_jobs/ethic_other_jobs.txt
+++ b/common/pop_jobs/00_other_jobs.txt
@@ -111,10 +111,7 @@ slave_overseer = {
 	}
 
 	possible = {
-		OR = {
-			is_enslaved = yes
-			battle_thrall_job_check_trigger = yes
-		}
+		ethic_battle_thrall_job_check_trigger = yes
 	}
 
 	resources = {
@@ -220,7 +217,6 @@ slave_toiler = {
 		has_planet = yes
 		is_sapient = yes
 	}
-
 	possible = {
 		planet = { has_modifier = slave_colony }
 	}
diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt
index 572d87032..2795ff54d 100644
--- a/common/pop_jobs/01_ruler_jobs.txt
+++ b/common/pop_jobs/01_ruler_jobs.txt
@@ -12,6 +12,7 @@ head_researcher = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
@@ -230,13 +231,14 @@ high_priest = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_ruler_job
 	possible = {
-		NOT = { has_ethic = ethic_materialist }
+		is_materialist = no
 		ethic_is_not_enslaved = yes
 	}
 
@@ -359,7 +361,7 @@ high_priest = {
 		}
 		modifier = {
 			planet_amenities_add = 6
-			POP_GROWTH_SPEED_REDUCTION = 0.02
+			pop_growth_speed_reduction = 0.02
 		}
 	}
 	triggered_planet_modifier = {
@@ -430,6 +432,7 @@ politician = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
@@ -550,6 +553,7 @@ noble = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
@@ -644,6 +648,7 @@ executive = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
@@ -759,6 +764,7 @@ knight_commander = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
@@ -766,10 +772,6 @@ knight_commander = {
 	possible_precalc = can_fill_ruler_job
 	possible = {
 		ethic_is_not_enslaved = yes
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
 	}
 
 	resources = {
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index 555756f15..cb15b2d78 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -16,13 +16,6 @@ merchant = {
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_specialist_job
-	possible = {
-		OR = {
-			is_enslaved = no
-			exists = owner
-				owner = { has_valid_civic = civic_du_contrat_social }
-		}
-	}
 
 	resources = {
 		category = planet_merchants
@@ -204,17 +197,16 @@ soldier = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_specialist_job
 	possible = {
-		exists = owner
-		owner = { is_gestalt = no }
-		complex_specialist_job_check_trigger = yes
+		ethic_is_not_enslaved = yes
 	}
-
+	
 	resources = {
 		category = planet_soldiers
 		produces = {
@@ -715,7 +707,9 @@ priest = {
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_specialist_job
-	possible = { complex_specialist_job_check_trigger = yes }
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
 
 	resources = {
 		category = planet_priests
@@ -842,7 +836,7 @@ priest = {
 		}
 		modifier = {
 			planet_amenities_add = 4
-			POP_GROWTH_SPEED = 0.02
+			pop_growth_speed = 0.02
 		}
 	}
 		#神权政治
@@ -899,7 +893,7 @@ priest = {
 			}
 			modifier = {
 				job_druid_add = 1
-				POP_ENVIRONMENT_TOLERANCE = 0.02 #宜居度+5%
+				pop_environment_tolerance = 0.02 #宜居度+5%
 			}
 		}
 		triggered_planet_modifier = {
@@ -1088,7 +1082,9 @@ death_priest = {
 		is_being_assimilated = no
 	}
 	possible_precalc = can_fill_specialist_job
-	possible = { complex_specialist_job_check_trigger = yes }
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
 
 	resources = {
 		category = planet_priests
@@ -1171,11 +1167,7 @@ enforcer = {
 		is_sapient = yes
 	}
 	possible = {
-		OR = {
-			battle_thrall_job_check_trigger = yes
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_battle_thrall_job_check_trigger = yes
 	}
 
 	resources = {
@@ -1400,6 +1392,7 @@ telepath = {
 	}
 	possible_precalc = can_fill_specialist_job
 	possible = {
+		complex_specialist_job_check_trigger = yes
 		OR = {
 			has_trait = trait_latent_psionic
 			has_trait = trait_psionic
@@ -1519,13 +1512,7 @@ entertainer = {
 		is_sapient = yes
 	}
 	possible = {
-		OR = {
-			entertainer_job_check_trigger = yes
-			exists = owner
-			owner = { has_valid_civic = civic_triple_the_profit }
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_entertainer_job_check_trigger = yes
 	}
 
 	resources = {
@@ -1662,11 +1649,7 @@ duelist = {
 		is_sapient = yes
 	}
 	possible = {
-		OR = {
-			battle_thrall_job_check_trigger = yes
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_battle_thrall_job_check_trigger = yes
 	}
 
 	resources = {
@@ -1742,7 +1725,9 @@ culture_worker = {
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_specialist_job
-	possible = { complex_specialist_job_check_trigger = yes }
+	possible = { 
+		complex_specialist_job_check_trigger = yes
+	}
 
 	resources = {
 		category = planet_culture_workers
@@ -1755,7 +1740,7 @@ culture_worker = {
 	}
 
 	planet_modifier = {
-		POP_GOVERNMENT_ETHIC_ATTRACTION = 0.1
+		pop_government_ethic_attraction = 0.1
 	}
 
 	triggered_planet_modifier = {
@@ -1954,7 +1939,9 @@ bureaucrat = {
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_specialist_job
-	possible = { complex_specialist_job_check_trigger = yes }
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
 
 	resources = {
 		category = planet_bureaucrats
@@ -2070,7 +2057,6 @@ chemist = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_specialist_job
 
 	resources = {
@@ -2162,7 +2148,6 @@ translucer = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_specialist_job
 
 	resources = {
@@ -2259,7 +2244,6 @@ gas_refiner = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_specialist_job
 
 	resources = {
@@ -2356,7 +2340,6 @@ roboticist = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_specialist_job
 
 	planet_modifier = {
@@ -2621,11 +2604,7 @@ necromancer = {
 		is_sapient = yes
 	}
 	possible = {
-		OR = {
-			battle_thrall_job_check_trigger = yes
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		ethic_battle_thrall_job_check_trigger = yes
 	}
 
 	resources = {
@@ -2675,7 +2654,7 @@ necromancer = {
 	weight = {
 		weight = @specialist_job_weight
 		modifier = { # 可控的动态权重
-			factOR = value:job_weights_resources_modifier|JOB|necromancer|RESOURCE1|physics_research|WEIGHT1|0.5|RESOURCE2|society_research|WEIGHT2|0.5|
+			factOR = value:job_weights_multiple_resources_modifier|JOB|necromancer|RESOURCE1|physics_research|WEIGHT1|0.5|RESOURCE2|society_research|WEIGHT2|0.5|
 			exists = owner
 			owner = { has_edict = dynamic_weight }
 		}
@@ -2821,7 +2800,9 @@ death_chronicler = {
 		is_sapient = yes
 	}
 	possible_precalc = can_fill_specialist_job
-	possible = { complex_specialist_job_check_trigger = yes }
+	possible = { 
+		complex_specialist_job_check_trigger = yes
+	}
 	
 	resources = {
 		category = planet_culture_workers
@@ -3010,6 +2991,21 @@ necro_apprentice = {
 	clothes_texture_index = 3
 	icon = apprentice
 
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible = { #deliberately allows slaves!
+		species = { species_can_be_necrophaged = yes }
+		exists = owner
+		owner = {
+			has_trait = trait_necrophage
+			has_origin = origin_necrophage
+		}
+	}
+	
 	desc = { #Note: planet-scope
 		trigger = {
 			OR = {
@@ -3026,23 +3022,7 @@ necro_apprentice = {
 		}
 		text = job_necro_apprentice_desc_hive
 	}
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-
-	possible = { #deliberately allows slaves!
-		species = { species_can_be_necrophaged = yes }
-		exists = owner
-		owner = {
-			has_trait = trait_necrophage
-			has_origin = origin_necrophage
-		}
-	}
-
+	
 	resources = {
 		category = planet_necro_apprentices
 		produces = {
@@ -3365,14 +3345,7 @@ bath_attendant = {
 		is_being_purged = no
 		is_being_assimilated = no
 	}
-
 	possible_precalc = can_fill_specialist_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
-	}
 
 	triggered_planet_modifier = {
 		pop_growth_speed = 0.01
@@ -3414,17 +3387,14 @@ knight = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
-		is_enslaved = no
+		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_specialist_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
+	possible = { 
+		ethic_is_not_enslaved = yes
 	}
 
 	resources = {
diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt
index 14b37f10b..ce70e50b6 100644
--- a/common/pop_jobs/03_worker_jobs.txt
+++ b/common/pop_jobs/03_worker_jobs.txt
@@ -375,16 +375,6 @@ technician = {
 			}
 			energy = @requisitorium_energy_reduction
 		}
-		triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_financial_investment
-			}
-		}
-		modifier = {
-			trade_value_add = 1
-		}
-	}
 		#社会主义
 		produces = {
 			trigger = {
@@ -657,7 +647,7 @@ miner = {
 			}
 		}
 		modifier = {
-		pop_environment_tolerance = -0.015
+			pop_environment_tolerance = -0.015
 		}
 	}
 	overlord_resources = {
@@ -1427,12 +1417,6 @@ foundry = {
 		is_being_assimilated = no
 	}
 	possible_precalc = can_fill_worker_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
-	}
 
 	resources = {
 		category = planet_metallurgists
@@ -1624,12 +1608,6 @@ artisan = {
 		is_being_assimilated = no
 	}
 	possible_precalc = can_fill_worker_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
-	}
 
 	resources = {
 		category = planet_artisans
@@ -1856,12 +1834,6 @@ catalytic_technician = {
 		is_being_assimilated = no
 	}
 	possible_precalc = can_fill_worker_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
-	}
 
 	resources = {
 		category = planet_metallurgists
@@ -1980,12 +1952,6 @@ artificer = {
 	}
 
 	possible_precalc = can_fill_worker_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
-	}
 
 	triggered_planet_modifier = {
 		potential = {
@@ -2154,12 +2120,17 @@ mortal_initiate = {
 
 	possible_pre_triggers = {
 		has_owner = yes
-		is_sapient = yes
-		is_enslaved = no
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
+		is_sapient = yes
 	}
 	possible_precalc = can_fill_worker_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		NOT = { has_trait = trait_mechanical } #No machines
+		NOT = { has_trait = trait_zombie } #How do you kill that which has no life?
+	}
 
 	resources = {
 		category = planet_culture_workers
@@ -2616,21 +2587,16 @@ squire = {
 
 	possible_pre_triggers = {
 		has_owner = yes
+		# is_enslaved = no
 		is_being_purged = no
 		is_being_assimilated = no
 		is_sapient = yes
-		is_enslaved = no
 	}
-
 	possible_precalc = can_fill_worker_job #Who said that squires must be future knights?
-
 	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
+		ethic_is_not_enslaved = yes
 	}
-
+	
 	planet_modifier = {
 		knights_independent_category_produces_mult = 0.03
 	}
diff --git a/common/pop_jobs/ethic_gestalt_jobs.txt b/common/pop_jobs/04_gestalt_jobs.txt
similarity index 99%
rename from common/pop_jobs/ethic_gestalt_jobs.txt
rename to common/pop_jobs/04_gestalt_jobs.txt
index b598e7893..38312b55d 100644
--- a/common/pop_jobs/ethic_gestalt_jobs.txt
+++ b/common/pop_jobs/04_gestalt_jobs.txt
@@ -14,9 +14,7 @@ spawning_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	triggered_planet_modifier = {
@@ -102,7 +100,6 @@ offspring_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
 
 	planet_modifier = {
@@ -190,9 +187,7 @@ cyber_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	triggered_planet_modifier = {
@@ -339,9 +334,7 @@ crucible_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	planet_modifier = {
@@ -495,9 +488,7 @@ evaluator = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -658,9 +649,7 @@ brain_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -726,9 +715,7 @@ calculator = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -985,9 +972,7 @@ fabricator = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1242,9 +1227,7 @@ catalytic_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1370,9 +1353,7 @@ chemist_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1456,9 +1437,7 @@ translucer_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1542,9 +1521,7 @@ gas_refiner_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1628,9 +1605,7 @@ patrol_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1704,9 +1679,7 @@ crystal_mining_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1747,9 +1720,7 @@ mote_harvesting_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1790,9 +1761,7 @@ gas_extraction_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -1833,7 +1802,6 @@ mining_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
 
 	resources = {
@@ -2100,7 +2068,6 @@ technician_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
 
 	resources = {
@@ -2385,7 +2352,16 @@ warrior_drone = {
 	category = simple_drone
 	condition_string = DRONE_JOB_TRIGGER
 	building_icon = building_stronghold
-
+	
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_drone_job
+	
 	country_modifier = {
 		country_naval_cap_add = 4
 	}
@@ -2416,17 +2392,7 @@ warrior_drone = {
 		}
 		mult = planet.modifier:job_soldier_stability_add
 	}
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-
-	possible_precalc = can_fill_drone_job
-
+	
 	# 失控女仆兼容
 	triggered_planet_modifier = {
 		potential = {
@@ -2507,9 +2473,7 @@ bluelotus_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -2580,9 +2544,7 @@ chronicle_drone = {
 		is_being_purged = no
 		is_being_assimilated = no
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	resources = {
@@ -2687,7 +2649,6 @@ scrap_miner_drone = {
 		is_being_assimilated = no
 		is_sapient = yes
 	}
-
 	possible_precalc = can_fill_drone_job
 
 	resources = {
@@ -2700,7 +2661,7 @@ scrap_miner_drone = {
 		# 失控女仆兼容
 		produces = {
 			trigger = {
-				potential = { has_global_flag = flag_rogue_maid_mod_activated }
+				has_global_flag = flag_rogue_maid_mod_activated
 				owner = { is_machine_empire = yes }
 			}
 			minerals = 0.5
@@ -2758,9 +2719,7 @@ bath_attendant_hive = {
 		is_being_purged = no
 		is_being_assimilated = no
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	triggered_planet_modifier = {
@@ -2812,9 +2771,7 @@ bath_attendant_machine = {
 		is_being_purged = no
 		is_being_assimilated = no
 	}
-
 	possible_precalc = can_fill_drone_job
-
 	possible = { can_think = yes }
 
 	triggered_planet_modifier = {
diff --git a/common/pop_jobs/05_primitive_jobs.txt b/common/pop_jobs/05_primitive_jobs.txt
new file mode 100644
index 000000000..356b02d9a
--- /dev/null
+++ b/common/pop_jobs/05_primitive_jobs.txt
@@ -0,0 +1,639 @@
+###################
+# Primitive Jobs
+###################
+
+# Pre-sapient
+
+pre_sapient = {
+	category = pre_sapients
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+	contributes_to_diplo_weight = no
+
+	possible_pre_triggers = {
+		is_sapient = no
+	}
+
+	planet_modifier = {
+	}
+
+	resources = {
+		category = planet_farmers
+	}
+
+	weight = {
+		weight = 9000
+	}
+}
+
+# Primitives
+
+hunter_gatherer = {
+	category = worker
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			has_country_flag = stone_age
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			trigger = {
+				is_lithoid = no
+			}
+			food = 1
+		}
+		produces = {
+			trigger = {
+				is_lithoid = yes
+			}
+			minerals = 1
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+	}
+}
+
+peasant = {
+	category = worker
+	is_capped_by_modifier = no
+	building_icon = building_primitive_farm
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = bronze_age
+				has_country_flag = iron_age
+				has_country_flag = late_medieval_age
+				has_country_flag = renaissance_age
+				has_country_flag = steam_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			trigger = {
+				is_lithoid = no
+			}
+			food = 2
+		}
+		produces = {
+			trigger = {
+				is_lithoid = yes
+			}
+			minerals = 2
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+	}
+}
+
+primitive_warrior = {
+	category = specialist
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_dwellings
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = bronze_age
+				has_country_flag = iron_age
+				has_country_flag = late_medieval_age
+				has_country_flag = renaissance_age
+				has_country_flag = steam_age
+			}
+		}
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 3
+	}
+
+	weight = {
+		weight = @soldier_job_weight
+		modifier = {
+			factor = 6
+			is_militarist = yes
+		}
+		modifier = {
+			factor = 0
+			is_pacifist = yes
+		}
+	}
+}
+
+primitive_noble = {
+	category = ruler
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_capital
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = bronze_age
+				has_country_flag = iron_age
+				has_country_flag = late_medieval_age
+				has_country_flag = renaissance_age
+				has_country_flag = steam_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_politicians
+		produces = {
+			unity = 1
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @ruler_job_weight
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+	}
+}
+
+primitive_researcher = {
+	category = specialist
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_labs
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = bronze_age
+				has_country_flag = iron_age
+				has_country_flag = late_medieval_age
+				has_country_flag = renaissance_age
+				has_country_flag = steam_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_researchers
+		produces = {
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		modifier = {
+			factor = 6
+			is_materialist = yes
+		}
+		modifier = {
+			factor = 0
+			is_spiritualist = yes
+		}
+	}
+}
+
+primitive_priest = {
+	category = specialist
+	is_capped_by_modifier = yes
+	building_icon = building_temple
+	clothes_texture_index = 3
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = bronze_age
+				has_country_flag = iron_age
+				has_country_flag = late_medieval_age
+				has_country_flag = renaissance_age
+				has_country_flag = steam_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			unity = 1
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			factor = 6
+			is_spiritualist = yes
+		}
+		modifier = {
+			factor = 0
+			is_materialist = yes
+		}
+	}
+}
+
+primitive_laborer = {
+	category = worker
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_factory
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = steam_age
+				has_country_flag = machine_age
+				has_country_flag = industrial_age
+				has_country_flag = atomic_age
+				has_country_flag = early_space_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_artisans
+		produces = {
+			consumer_goods = 2
+		}
+		upkeep = {
+			minerals = 2
+		}
+	}
+
+
+
+	weight = {
+		weight = @worker_job_weight
+	}
+}
+
+primitive_miner = {
+	category = worker
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_mine
+	icon = miner
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = steam_age
+				has_country_flag = machine_age
+				has_country_flag = industrial_age
+				has_country_flag = atomic_age
+				has_country_flag = early_space_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = 3
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+	}
+}
+
+primitive_technician = {
+	category = worker
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_power_plant
+	icon = technician
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = steam_age
+				has_country_flag = machine_age
+				has_country_flag = industrial_age
+				has_country_flag = atomic_age
+				has_country_flag = early_space_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_technician
+		produces = {
+			energy = 1
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+	}
+}
+
+primitive_farmer = {
+	category = worker
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_farm
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = steam_age
+				has_country_flag = machine_age
+				has_country_flag = industrial_age
+				has_country_flag = atomic_age
+				has_country_flag = early_space_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			food = 3
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+	}
+}
+
+primitive_researcher_2 = {
+	category = specialist
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_labs
+	clothes_texture_index = 3
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = machine_age
+				has_country_flag = industrial_age
+				has_country_flag = atomic_age
+				has_country_flag = early_space_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_researchers
+		produces = {
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		modifier = {
+			factor = 6
+			is_materialist = yes
+		}
+		modifier = {
+			factor = 0
+			is_spiritualist = yes
+		}
+	}
+}
+
+primitive_priest_2 = {
+	category = specialist
+	is_capped_by_modifier = yes
+	building_icon = building_temple
+	clothes_texture_index = 3
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = machine_age
+				has_country_flag = industrial_age
+				has_country_flag = atomic_age
+				has_country_flag = early_space_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			unity = 1
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			factor = 6
+			is_spiritualist = yes
+		}
+		modifier = {
+			factor = 0
+			is_materialist = yes
+		}
+	}
+}
+
+primitive_warrior_2 = {
+	category = specialist
+	is_capped_by_modifier = yes
+	building_icon = building_residence
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = machine_age
+				has_country_flag = industrial_age
+				has_country_flag = atomic_age
+				has_country_flag = early_space_age
+			}
+		}
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 3
+	}
+
+	weight = {
+		weight = @soldier_job_weight
+		modifier = {
+			factor = 6
+			is_militarist = yes
+		}
+		modifier = {
+			factor = 0
+			is_pacifist = yes
+		}
+	}
+}
+
+
+primitive_bureaucrat = {
+	category = ruler
+	is_capped_by_modifier = yes
+	building_icon = building_primitive_capital
+	clothes_texture_index = 3
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		owner = {
+			is_primitive = yes
+			OR = {
+				has_country_flag = machine_age
+				has_country_flag = industrial_age
+				has_country_flag = atomic_age
+				has_country_flag = early_space_age
+			}
+		}
+	}
+
+	resources = {
+		category = planet_politicians
+		produces = {
+			unity = 1
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @ruler_job_weight
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+	}
+}
diff --git a/common/pop_jobs/06_event_jobs.txt b/common/pop_jobs/06_event_jobs.txt
new file mode 100644
index 000000000..cd5a48348
--- /dev/null
+++ b/common/pop_jobs/06_event_jobs.txt
@@ -0,0 +1,1748 @@
+###################
+# Event Jobs
+###################
+
+# Special purge used by events
+event_purge = {
+	is_capped_by_modifier = no
+	category = purge
+
+	purge = purge_normal
+
+	possible = {
+		has_pop_flag = event_purge
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			trigger = {
+				exists = owner
+				owner = { has_valid_civic = civic_fanatic_purifiers }
+			}
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = { has_valid_civic = civic_hive_devouring_swarm }
+			}
+			society_research = 2
+		}
+	}
+
+	weight = {
+		weight = 999999
+	}
+}
+
+ratling_scavenger = {
+	category = worker
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_junkheap
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible = {
+		hidden_trigger = { exists = owner }
+		owner = { is_country_type = ratlings }
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			food = 1
+			minerals = 1
+			consumer_goods = 1
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		mult = value:job_weights_multiple_resources_modifier|JOB|ratling_scavenger|RESOURCE1|food|WEIGHT1|0.5|RESOURCE2|minerals|WEIGHT2|0.5|
+	}
+}
+
+odd_factory_worker = {
+	category = worker
+	is_capped_by_modifier = yes
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_primitive_factory
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+
+	resources = {
+		category = planet_metallurgists
+		produces = {
+			alloys = 4
+		}
+	}
+
+	weight = {
+		weight = 999
+		mult = value:job_weights_modifier|JOB|odd_factory_worker|RESOURCE|alloys|
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 0
+			OR = {
+				owner = { has_country_flag = odd_factory_pause }
+				planet = { num_pops < 2 } # Odd Factory should not risk completely depopulating a colony
+			}
+		}
+	}
+}
+
+odd_factory_drone = {
+	category = simple_drone
+	is_capped_by_modifier = yes
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_primitive_factory
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	resources = {
+		category = planet_metallurgists
+		produces = {
+			alloys = 4
+		}
+	}
+
+	weight = {
+		weight = 999
+		mult = value:job_weights_modifier|JOB|odd_factory_drone|RESOURCE|alloys|
+		modifier = {
+			factor = 0
+			planet = { num_pops < 2 } # Odd Factory should not risk completely depopulating a colony
+		}
+	}
+}
+
+underground_trade_worker = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_holo_theatres
+	clothes_texture_index = 3
+	icon = clerk
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+	
+	pop_modifier = {
+		pop_housing_usage_add = -1
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		trade_value_add = 6
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+		modifier = {
+			factor = 0.5
+			OR = {
+				has_ethic = ethic_xenophobe
+				has_ethic = ethic_fanatic_xenophobe
+			}
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_ethic = ethic_xenophile
+				has_ethic = ethic_fanatic_xenophile
+			}
+		}
+	}
+}
+
+underground_contact_drone = {
+	category = simple_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_holo_theatres
+	clothes_texture_index = 3
+	icon = spawning_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	pop_modifier = {
+		pop_housing_usage_add = -1
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_hive_empire = yes
+				}
+			}
+			energy = 3
+			food = 2
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_machine_empire = yes
+				}
+			}
+			energy = 6
+		}
+	}
+
+
+	weight = {
+		weight = @simple_drone_job_weight
+		mult = value:job_weights_multiple_resources_modifier|JOB|underground_contact_drone|RESOURCE1|energy|WEIGHT1|0.5|RESOURCE2|food|WEIGHT2|0.5|
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+	}
+}
+
+dimensional_portal_researcher = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_research_lab_1
+	clothes_texture_index = 3
+	icon = researcher
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_normal
+			}
+		}
+		trade_value_add = 6
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_high
+			}
+		}
+		trade_value_add = 12
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_low
+			}
+		}
+		trade_value_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_crisis
+			}
+		}
+		trade_value_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_normal
+			}
+		}
+		planet_amenities_add = 6
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_high
+			}
+		}
+		planet_amenities_add = 12
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_low
+			}
+		}
+		planet_amenities_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_crisis
+			}
+		}
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	resources = {
+		category = planet_researchers
+		produces = {
+			physics_research = 12
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = dportal_closed
+				}
+			}
+			physics_research = -6
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = dportal_energy
+				}
+			}
+			energy = 6
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = dportal_void
+				}
+			}
+			sr_dark_matter = 0.2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = dportal_void2
+				}
+			}
+			sr_dark_matter = 1
+		}
+		upkeep = {
+			consumer_goods = 3
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = dportal_hell
+				}
+			}
+			consumer_goods = 3
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|dimensional_portal_researcher|RESOURCE1|physics_research|WEIGHT1|0.6|RESOURCE2|energy|WEIGHT2|0.4|
+			planet = { has_planet_flag = dportal_energy }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
+			planet = { has_planet_flag = dportal_trader }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			planet = { has_planet_flag = dportal_trader }
+		}
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|dimensional_portal_researcher|RESOURCE1|physics_research|WEIGHT1|0.75|RESOURCE2|sr_dark_matter|WEIGHT2|0.25|
+			planet = {
+				OR = {
+					has_planet_flag = dportal_void
+					has_planet_flag = dportal_void2
+				}
+			}
+		}
+		modifier = {
+			mult = value:job_weights_modifier|JOB|dimensional_portal_researcher|RESOURCE|physics_research|
+			planet = {
+				NOR = {
+					has_planet_flag = dportal_energy
+					has_planet_flag = dportal_void
+					has_planet_flag = dportal_void2
+				}
+			}
+		}
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 2
+			has_living_standard = { type = living_standard_academic_privilege }
+		}
+		modifier = {
+			factor = 0.5
+			AND = {
+				planet = {
+					has_planet_flag = dportal_hell
+				}
+				OR = {
+					has_ethic = ethic_spiritualist
+					has_ethic = ethic_fanatic_spiritualist
+				}
+			}
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+	}
+}
+
+dimensional_portal_researcher_gestalt = {
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_research_lab_1
+	clothes_texture_index = 3
+	icon = researcher
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	possible = { can_think = yes }
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_normal
+			}
+		}
+		planet_amenities_no_happiness_add = 6
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_high
+			}
+		}
+		planet_amenities_no_happiness_add = 12
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_low
+			}
+		}
+		planet_amenities_no_happiness_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_modifier = dportal_trade_crisis
+			}
+		}
+		planet_amenities_no_happiness_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	resources = {
+		category = planet_researchers
+		produces = {
+			physics_research = 12
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_modifier = dportal_trade_normal
+				}
+			}
+			energy = 6
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_modifier = dportal_trade_high
+				}
+			}
+			energy = 8
+
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_modifier = dportal_trade_low
+				}
+			}
+			energy = 4
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_modifier = dportal_trade_crisis
+				}
+			}
+			energy = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+						has_planet_flag = dportal_closed
+				}
+			}
+			physics_research = -6
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = dportal_energy
+				}
+			}
+			energy = 6
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = dportal_void
+				}
+			}
+			sr_dark_matter = 0.2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = dportal_void2
+				}
+			}
+			sr_dark_matter = 1
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_machine_empire = yes
+				}
+			}
+			energy = 3
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_hive_empire = yes
+					is_lithoid_empire = no
+				}
+			}
+			food = 3
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_hive_empire = yes
+					is_lithoid_empire = yes
+				}
+			}
+			minerals = 3
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_gestalt = no
+				}
+			}
+			consumer_goods = 3
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_gestalt = no
+				}
+				planet = {
+					has_planet_flag = dportal_hell
+				}
+			}
+			consumer_goods = 3
+		}
+	}
+
+	weight = {
+		weight = @complex_drone_job_weight
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|dimensional_portal_researcher_gestalt|RESOURCE1|physics_research|WEIGHT1|0.6|RESOURCE2|energy|WEIGHT2|0.4|
+			planet = { has_planet_flag = dportal_energy }
+		}
+		modifier = {
+			mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			planet = { has_planet_flag = dportal_trader }
+		}
+		modifier = {
+			mult = value:job_weights_multiple_resources_modifier|JOB|dimensional_portal_researcher_gestalt|RESOURCE1|physics_research|WEIGHT1|0.75|RESOURCE2|sr_dark_matter|WEIGHT2|0.25|
+			planet = {
+				OR = {
+					has_planet_flag = dportal_void
+					has_planet_flag = dportal_void2
+				}
+			}
+		}
+		modifier = {
+			mult = value:job_weights_modifier|JOB|dimensional_portal_researcher_gestalt|RESOURCE|physics_research|
+			planet = {
+				NOR = {
+					has_planet_flag = dportal_energy
+					has_planet_flag = dportal_void
+					has_planet_flag = dportal_void2
+				}
+			}
+		}
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 0.5
+			AND = {
+				planet = {
+					has_planet_flag = dportal_hell
+				}
+				OR = {
+					has_ethic = ethic_spiritualist
+					has_ethic = ethic_fanatic_spiritualist
+				}
+			}
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+	}
+}
+
+space_time_anomaly_researcher = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_research_lab_1
+	clothes_texture_index = 3
+	icon = researcher
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_researchers
+		produces = {
+			physics_research = 8
+			engineering_research = 4
+			sr_dark_matter = 0.2
+		}
+		upkeep = {
+			consumer_goods = 2
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = { has_valid_civic = civic_technocracy }
+			}
+			consumer_goods = 1
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		mult = value:job_weights_multiple_resources_modifier|JOB|space_time_anomaly_researcher|RESOURCE1|physics_research|WEIGHT1|0.7|RESOURCE2|engineering_research|WEIGHT2|0.3|
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 2
+			has_living_standard = { type = living_standard_academic_privilege }
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+	}
+}
+
+space_time_anomaly_researcher_gestalt = {
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_research_lab_1
+	clothes_texture_index = 3
+	icon = researcher
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	possible = { can_think = yes }
+
+	resources = {
+		category = planet_researchers
+		produces = {
+			physics_research = 8
+			engineering_research = 4
+			sr_dark_matter = 0.2
+		}
+
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_machine_empire = yes
+				}
+			}
+			energy = 4
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_hive_empire = yes
+				}
+			}
+			minerals = 6
+		}
+	}
+
+	weight = {
+		weight = @complex_drone_job_weight
+		mult = value:job_weights_multiple_resources_modifier|JOB|space_time_anomaly_researcher_gestalt|RESOURCE1|physics_research|WEIGHT1|0.7|RESOURCE2|engineering_research|WEIGHT2|0.3|
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+	}
+}
+
+### Feral Overload Jobs
+
+# Feral Overload - Utilize Option - Gas Plant Engineers
+
+# Ordinary Species
+gas_plant_engineer = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_refinery
+	clothes_texture_index = 3
+	icon = gas_extractor
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_deposit = d_spore_vents
+			}
+		}
+		modifier = {
+			planet_jobs_exotic_gases_produces_mult = 0.05
+		}
+	}
+
+	resources = {
+		category = planet_refiners
+		produces = {
+			exotic_gases = 3
+		}
+		upkeep = {
+			minerals = 10
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		mult = value:job_weights_modifier|JOB|gas_plant_engineer|RESOURCE|exotic_gases|
+	}
+}
+
+# Gestalt Species
+gas_plant_engineer_gestalt = {
+	category = complex_drone
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_refinery
+	clothes_texture_index = 3
+	icon = gas_refiner_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	possible = { can_think = yes }
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_deposit = d_spore_vents
+			}
+		}
+		modifier = {
+			planet_jobs_exotic_gases_produces_mult = 0.05
+		}
+	}
+
+	resources = {
+		category = planet_refiners
+		produces = {
+			exotic_gases = 3
+		}
+		upkeep = {
+			minerals = 10
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		mult = value:job_weights_modifier|JOB|gas_plant_engineer_gestalt|RESOURCE|exotic_gases|
+	}
+}
+
+# Feral Overload - Exterminate Option - Cave Cleaners
+
+# Ordinary Species
+cave_cleaner = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_mineral_purification_plant
+	clothes_texture_index = 3
+	icon = miner
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_deposit = d_cave_shroom_veins
+			}
+		}
+		modifier = {
+			planet_jobs_minerals_produces_mult = 0.1
+		}
+	}
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = 5
+		}
+		upkeep = {
+			energy = 2
+		}
+	}
+
+	weight = {
+		weight = @worker_prio_job_weight
+		mult = value:job_weights_modifier|JOB|cave_cleaner|RESOURCE|minerals|
+	}
+}
+
+# Gestalt Species
+cave_cleaner_gestalt = {
+	category = simple_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_mineral_purification_plant
+	clothes_texture_index = 3
+	icon = mining_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				has_deposit = d_cave_shroom_veins
+			}
+		}
+		modifier = {
+			planet_jobs_minerals_produces_mult = 0.1
+		}
+	}
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = 5
+		}
+		upkeep = {
+			energy = 2
+		}
+	}
+
+	weight = {
+		weight = @simple_drone_job_weight
+		mult = value:job_weights_modifier|JOB|cave_cleaner_gestalt|RESOURCE|minerals|
+	}
+}
+
+#Dinosaur Hunters
+titan_hunter = {
+	category = worker
+
+	is_capped_by_modifier = yes
+	clothes_texture_index = 2
+	icon = hunter_gatherer
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		trade_value_add = 8
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+	resources = {
+		category = planet_farmers
+		produces = {
+			food = 8
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		mult = value:job_weights_modifier|JOB|titan_hunter|RESOURCE|food|
+		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult|
+		modifier = {
+			factor = 1.1
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			can_take_servant_job = no
+		}
+		modifier = {
+			factor = 0.25
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_lithoid
+
+			owner = {
+				is_lithoid_empire = yes
+				has_monthly_income = {
+					resource = food
+					value >= 0
+				}
+			}
+		}
+	}
+}
+
+# Robot Caretaker for Lonely Bot
+robot_caretaker = {
+	category = specialist
+
+	is_capped_by_modifier = yes
+	clothes_texture_index = 3
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_autochthon_monument
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_administrators
+		produces = {
+			unity = 5
+			engineering_research = 5
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		mult = value:job_weights_multiple_resources_modifier|JOB|robot_caretaker|RESOURCE1|unity|WEIGHT1|0.5|RESOURCE2|engineering_research|WEIGHT2|0.5|
+		# Negative
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_wasteful
+		}
+		# Positive
+		modifier = {
+			factor = 3
+			has_job = robot_caretaker
+		}
+		modifier = {
+			factor = 3
+			has_trait = trait_conservational
+		}
+	}
+}
+
+#Turtle Miner Regular
+turtle_miner = {
+	category = worker
+
+	is_capped_by_modifier = yes
+	clothes_texture_index = 2
+	icon = miner
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = 3
+			food = 2
+		}
+		produces = {
+			trigger = {
+				planet = { has_active_building = building_food_processing_facility }
+			}
+			food = 1
+		}
+		produces = {
+			trigger = {
+				planet = { has_active_building = building_food_processing_center }
+			}
+			food = 2
+		}
+		upkeep = {
+			energy = 2
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		mult = value:job_weights_multiple_resources_modifier|JOB|turtle_miner|RESOURCE1|minerals|WEIGHT1|0.5|RESOURCE2|food|WEIGHT2|0.5|
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_robot_harvesters
+				has_trait = trait_agrarian
+				has_trait = trait_robot_power_drills
+				has_trait = trait_industrious
+			}
+		}
+		modifier = {
+			factor = 1.1
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			can_take_servant_job = no
+		}
+		modifier = {
+			factor = 0.25
+			can_take_servant_job = yes
+		}
+
+		modifier = {
+			factor = 0.5
+			has_trait = trait_lithoid
+
+			owner = {
+				is_lithoid_empire = yes
+				has_monthly_income = {
+					resource = food
+					value >= 0
+				}
+			}
+		}
+	}
+}
+
+#Turtle Miner Gestalt
+turtle_miner_gestalt = {
+	category = simple_drone
+	condition_string = DRONE_JOB_TRIGGER
+	clothes_texture_index = 3
+	icon = mining_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = 3
+			food = 2
+		}
+		produces = {
+			trigger = {
+				planet = { has_active_building = building_food_processing_facility }
+			}
+			food = 1
+		}
+		produces = {
+			trigger = {
+				planet = { has_active_building = building_food_processing_center }
+			}
+			food = 2
+		}
+		upkeep = {
+			energy = 2
+		}
+	}
+
+	weight = {
+		weight = @simple_drone_job_weight
+		mult = value:job_weights_multiple_resources_modifier|JOB|turtle_miner_gestalt|RESOURCE1|minerals|WEIGHT1|0.5|RESOURCE2|food|WEIGHT2|0.5|
+		modifier = {
+			factor = 1.1
+			owner = { has_valid_civic = civic_agrarian_idyll }
+		}
+		modifier = {
+			factor = 0.25
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_lithoid
+
+			owner = {
+				is_lithoid_empire = yes
+				has_monthly_income = {
+					resource = food
+					value >= 0
+				}
+			}
+		}
+	}
+}
+
+# Bio-assistants
+machine_nurse = {
+	category = bio_trophy
+	is_capped_by_modifier = yes
+	clothes_texture_index = 4
+	building_icon = building_clinic
+
+	possible_pre_triggers = {
+		is_sapient = yes
+	}
+
+	possible = {
+		has_citizenship_type = { type = citizenship_organic_trophy }
+	}
+
+	resources = {
+		category = planet_bio_trophies
+		produces = {
+			trigger = {
+				happiness >= 0.5
+			}
+			unity = 3
+		}
+		upkeep = {
+			energy = 1
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			happiness >= 0.5
+		}
+		modifier = {
+			planet_jobs_complex_and_simple_drone_produces_mult = 0.05
+		}
+	}
+	triggered_pop_modifier = {
+		pop_housing_usage_add = -1
+	}
+
+	weight = {
+		weight = @special_job_weight
+		modifier = {
+			factor = 200 # brings @special_job_weight up to 2
+			exists = planet
+			exists = planet.controller
+			OR = {
+				planet.controller = {
+					any_situation = {
+						is_situation_type = situation_geomagnetic_storm
+						# more weight than normal bio-trophy job when the situation is active
+					}
+				}
+			}
+		}
+	}
+}
+
+# Ancient Manufactorium Complex event job
+
+manufactorium_specialist = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_ancient_cryo_chamber
+	icon = foundry
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_metallurgists
+		produces = { #no modifiers min: 2 max: 7
+			alloys = 5
+		}
+		upkeep = { #no modifiers min: 2 food/3 minerals max: 9
+			minerals = 5
+		}
+		produces = { 
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_crafters
+				}
+			}
+			unity = 0.5
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_subterranean
+				}
+			}
+			unity = 0.5
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_dwarven_craft
+				}
+			}
+			unity = 1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_earthquake_upkeep
+				}
+			}
+			minerals = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_earthquake_production
+				}
+			}
+			alloys = -1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_guardians_produce
+				}
+			}
+			alloys = -1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_engineering
+				}
+			}
+			engineering_research = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_society
+				}
+			}
+			society_research = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_work_production
+				}
+			}
+			alloys = -1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_work_production
+				}
+			}
+			minerals = -1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_random_good
+				}
+			}
+			minerals = -1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_environmentalists
+				}
+			}
+			minerals = -2
+		}
+		produces = { 
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_despoilers
+				}
+			}
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_took_opportunity
+				}
+			}
+			alloys = 1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_took_opportunity
+				}
+			}
+			minerals = 2
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_took_opportunity_bad
+				}
+			}
+			minerals = 1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_catalytic
+				}
+			}
+			minerals = -2
+			food = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_remnants
+				}
+			}
+			alloys = 1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_remnants
+				}
+			}
+			minerals = 1
+		}
+	}
+
+	triggered_pop_modifier = {
+		potential = {
+			planet = { has_planet_flag = manufactorium_work_hapipiness }
+		}
+		pop_happiness = -0.2
+	}
+
+	weight = {
+		weight = @special_job_weight
+		mult = value:job_weights_modifier|JOB|manufactorium_specialist|RESOURCE|alloys|
+	}
+}
+
+manufactorium_complex_drone = {
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_ancient_cryo_chamber
+	icon = foundry
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	possible = { can_think = yes }
+
+	resources = {
+		category = planet_metallurgists
+		produces = { #no modifiers min: 3 max: 8
+			alloys = 6
+		}
+		upkeep = { #no modifiers min: 1 (with 2 food added)/3 without food change max: 9
+			minerals = 5
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_subterranean
+				}
+			}
+			unity = 0.5
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_earthquake_upkeep
+				}
+			}
+			minerals = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_earthquake_production
+				}
+			}
+			alloys = -1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_engineering
+				}
+			}
+			engineering_research = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_society
+				}
+			}
+			society_research = 1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_environmentalists
+				}
+			}
+			minerals = -2
+		}
+		produces = { 
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_despoilers
+				}
+			}
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_took_opportunity
+				}
+			}
+			alloys = 1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_took_opportunity
+				}
+			}
+			minerals = 2
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_took_opportunity_bad
+				}
+			}
+			minerals = 1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_catalytic
+				}
+			}
+			minerals = -2
+			food = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_remnants
+				}
+			}
+			alloys = 1
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = manufactorium_remnants
+				}
+			}
+			minerals = 1
+		}
+	}
+	
+	triggered_pop_modifier = {
+		potential = {
+			planet = { has_planet_flag = manufactorium_work_gestalt }
+		}
+		pop_amenities_usage_mult = 0.2
+	}
+
+	weight = {
+		weight = @complex_drone_job_weight
+		mult = value:job_weights_modifier|JOB|manufactorium_complex_drone|RESOURCE|alloys|
+	}
+}
+
+manufactorium_scraper = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_ancient_cryo_chamber
+	icon = miner
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = 1
+			alloys = 1
+			engineering_research = 0.5
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		mult = value:job_weights_modifier|JOB|manufactorium_scraper|RESOURCE|minerals|
+	}
+}
+
+manufactorium_scraper_drone = {
+	category = simple_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_ancient_cryo_chamber
+	icon = miner
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	resources = {
+		category = planet_miners
+		produces = {
+			minerals = 1
+			alloys = 1
+			engineering_research = 0.5
+		}
+	}
+
+	weight = {
+		weight = @simple_drone_job_weight
+		mult = value:job_weights_modifier|JOB|manufactorium_scraper_drone|RESOURCE|minerals|
+	}
+}
+
+# Ancient Manufactorium Complex event job
diff --git a/common/pop_jobs/08_overlord_jobs.txt b/common/pop_jobs/08_overlord_jobs.txt
new file mode 100644
index 000000000..e4a414062
--- /dev/null
+++ b/common/pop_jobs/08_overlord_jobs.txt
@@ -0,0 +1,2037 @@
+# 宗主国宣传家
+overlord_propagandist = {
+	category = specialist
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_propaganda_office
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_overlord_propagandists
+		upkeep = {
+			unity = 1
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_propagandists
+		produces = {
+			influence = 0.15
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国宣传家
+overlord_propagandist_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_propaganda_office
+	clothes_texture_index = 1
+	icon = overlord_propagandist
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_propagandists
+		upkeep = {
+			unity = 1
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_propagandists
+		produces = {
+			influence = 0.15
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国学者
+overlord_academic = {
+	category = specialist
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_satellite_campus
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_overlord_academics
+		produces = {
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+		}
+		upkeep = {
+			consumer_goods = 2
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_academics
+		produces = {
+			physics_research = 3
+			engineering_research = 3
+			society_research = 3
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国学者
+overlord_academic_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_satellite_campus
+	clothes_texture_index = 1
+	icon = overlord_academic
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_academics
+		produces = {
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+		}
+		upkeep = {
+			trigger = { owner = { is_machine_empire = yes } }
+			energy = 4
+		}
+		upkeep = {
+			trigger = { owner = { is_hive_empire = yes } }
+			minerals = 6
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_academics
+		produces = {
+			physics_research = 3
+			engineering_research = 3
+			society_research = 3
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国商人
+overlord_trader = {
+	category = specialist
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_emporium
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 10
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+
+	resources = {
+		category = planet_overlord_traders
+		upkeep = {
+			energy = 7
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_traders
+		produces = {
+			energy = 7
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 分配子个体
+overlord_trader_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_emporium
+	clothes_texture_index = 1
+	icon = overlord_trader
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_no_happiness_add = 10
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+
+	resources = {
+		category = planet_overlord_traders
+		upkeep = {
+			energy = 7
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_traders
+		produces = {
+			energy = 7
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 援建劳工
+aid_worker = {
+	category = worker
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_aid_agency
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+
+	overlord_resources = {
+		category = planet_aid_workers
+		produces = {
+			unity = 5
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 援建劳工
+aid_worker_drone = {
+	category = simple_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_aid_agency
+	clothes_texture_index = 1
+	icon = aid_worker
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_no_happiness_add = 5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+
+	overlord_resources = {
+		category = planet_aid_workers
+		produces = {
+			unity = 5
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国繁育体
+overlord_breeder = {
+	category = specialist
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_splinter_hive
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_overlord_breeders
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = { is_lithoid = yes }
+			}
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = {
+					OR = {
+						is_machine_empire = yes
+						is_mechanical_empire = yes
+					}
+				}
+			}
+			energy = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = {
+					is_lithoid = no
+					is_machine_empire = no
+					is_mechanical_empire = no
+				}
+			}
+			food = 6
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国繁育体
+overlord_breeder_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_splinter_hive
+	clothes_texture_index = 1
+	icon = overlord_breeder
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_breeders
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = { is_lithoid = yes }
+			}
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = {
+					OR = {
+						is_machine_empire = yes
+						is_mechanical_empire = yes
+					}
+				}
+			}
+			energy = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = {
+					is_lithoid = no
+					is_machine_empire = no
+					is_mechanical_empire = no
+				}
+			}
+			food = 6
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 思想仆从
+mind_thrall = {
+	category = worker
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_distributed_processing
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	overlord_resources = {
+		category = planet_mind_thralls
+		produces = {
+			physics_research = 1.5
+			engineering_research = 1.5
+			society_research = 1.5
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 思想仆从
+mind_thrall_drone = {
+	category = simple_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_distributed_processing
+	clothes_texture_index = 1
+	icon = mind_thrall
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	overlord_resources = {
+		category = planet_mind_thralls
+		produces = {
+			physics_research = 1.5
+			engineering_research = 1.5
+			society_research = 1.5
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 子嗣饲养体
+overlord_offspring_drone_feeder = {
+	category = specialist
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_offspring_nest
+	clothes_texture_index = 1
+	icon = spawning_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	planet_modifier = {
+		planet_jobs_worker_produces_mult = 0.05
+	}
+
+	resources = {
+		category = planet_overlord_offspring_drone_feeder
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = { is_lithoid = yes }
+			}
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = {
+					country_uses_food = yes
+				}
+			}
+			food = 6
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+
+	overlord_resources = {
+		category = planet_overlord_offspring_drone_feeder
+		produces = {
+			society_research = 8
+		}
+	}
+}
+
+# 子嗣饲养体
+overlord_offspring_drone_feeder_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_offspring_nest
+	clothes_texture_index = 1
+	icon = spawning_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	planet_modifier = {
+		planet_jobs_simple_drone_produces_mult = 0.05
+	}
+
+	resources = {
+		category = planet_overlord_offspring_drone_feeder
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = { is_lithoid = yes }
+			}
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner.overlord
+				owner.overlord = {
+					country_uses_food = yes
+				}
+			}
+			food = 6
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+
+	overlord_resources = {
+		category = planet_overlord_offspring_drone_feeder
+		produces = {
+			society_research = 8
+		}
+	}
+}
+
+# 宗主国冶金师
+overlord_metallurgist = {
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = holding_offworld_foundry
+	clothes_texture_index = 3
+	icon = foundry
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		hidden_trigger = { exists = owner }
+		owner = { is_gestalt = no }
+	}
+
+	resources = {
+		category = planet_overlord_metallurgists
+		upkeep = {
+			minerals = 6
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_metallurgists
+		produces = {
+			alloys = 3
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国铸造子个体
+overlord_foundry_drone = {
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = holding_offworld_foundry
+	icon = alloy_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_metallurgists
+		upkeep = {
+			minerals = 6
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_metallurgists
+		produces = {
+			alloys = 3
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国制造者
+overlord_fabricator = {
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = holding_offworld_foundry
+	icon = fabricator
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_metallurgists
+		upkeep = {
+			minerals = 8
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_metallurgists
+		produces = {
+			alloys = 4
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国催化技师（不采用） -> worker
+overlord_catalytic_technician = {
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = holding_offworld_foundry
+	clothes_texture_index = 3
+	icon = catalytic_technician
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+	}
+
+	possible_precalc = can_fill_worker_job
+	possible = {
+		hidden_trigger = { exists = owner }
+		owner = { is_gestalt = no }
+	}
+
+	overlord_resources = {
+		category = planet_overlord_metallurgists
+		produces = {
+			alloys = 3
+		}
+	}
+
+	resources = {
+		category = planet_overlord_metallurgists
+		upkeep = {
+			food = 9
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国催化子个体（不采用）
+overlord_catalytic_drone = {
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = holding_offworld_foundry
+	icon = catalytic_drone
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = { can_think = yes }
+
+	resources = {
+		category = planet_overlord_metallurgists
+		upkeep = {
+			food = 9
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_robot_empire = yes
+				}
+			}
+			food = 3
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_metallurgists
+		produces = {
+			alloys = 3
+		}
+
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_robot_empire = yes
+				}
+			}
+			alloys = 1
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国监察官
+overlord_beholder = {
+	category = specialist
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_overlord_vigil_command
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_overlord_beholders
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_specialist_subject_tier = {
+						TYPE = bulwark
+						TIER = 1
+					}
+				}
+			}
+			alloys = 2
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_specialist_subject_tier = {
+						TYPE = bulwark
+						TIER = 2
+					}
+				}
+			}
+			alloys = 4
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_specialist_subject_tier = {
+						TYPE = bulwark
+						TIER = 3
+					}
+				}
+			}
+			alloys = 8
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国监察
+overlord_beholder_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_overlord_vigil_command
+	clothes_texture_index = 1
+	icon = overlord_beholder
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_beholders
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_specialist_subject_tier = {
+						TYPE = bulwark
+						TIER = 1
+					}
+				}
+			}
+			alloys = 2
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_specialist_subject_tier = {
+						TYPE = bulwark
+						TIER = 2
+					}
+				}
+			}
+			alloys = 4
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_specialist_subject_tier = {
+						TYPE = bulwark
+						TIER = 3
+					}
+				}
+			}
+			alloys = 8
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国死灵法师
+overlord_necromancer = {
+	category = specialist
+	icon = necromancer
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_dread_encampment
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_overlord_necromancers
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = { is_lithoid = yes }
+			}
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_lithoid = no
+					is_machine_empire = no
+					is_mechanical_empire = no
+				}
+			}
+			food = 6
+		}
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 2
+	}
+	overlord_resources = {
+		category = planet_overlord_necromancers
+		produces = {
+			physics_research = 6
+			society_research = 6
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国死灵法师子个体
+overlord_necromancer_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_dread_encampment
+	clothes_texture_index = 1
+	icon = overlord_beholder
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_necromancers
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = { is_lithoid = yes }
+			}
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_lithoid = no
+					is_machine_empire = no
+					is_mechanical_empire = no
+				}
+			}
+			food = 6
+		}
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 2
+	}
+	overlord_resources = {
+		category = planet_overlord_necromancers
+		produces = {
+			physics_research = 6
+			society_research = 6
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国再指派员
+overlord_reassigner = {
+	category = specialist
+	icon = necromancer
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_posthumous_employment_center
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_overlord_reassigners
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = { is_lithoid = yes }
+			}
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_lithoid = no
+					is_machine_empire = no
+					is_mechanical_empire = no
+				}
+			}
+			food = 6
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国再指派员子个体
+overlord_reassigner_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_dread_encampment
+	clothes_texture_index = 1
+	icon = overlord_beholder
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_reassigners
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = { is_lithoid = yes }
+			}
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_lithoid = no
+					is_machine_empire = no
+					is_mechanical_empire = no
+				}
+			}
+			food = 6
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国征兵官
+overlord_recruiter = {
+	category = specialist
+	icon = soldier
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_recruitment_office
+	clothes_texture_index = 1
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		complex_specialist_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_overlord_recruiters
+		upkeep = {
+			energy = 5
+			unity = 2
+		}
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 3
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国征兵官子个体
+overlord_recruiter_drone = {
+	category = complex_drone
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_recruitment_office
+	clothes_texture_index = 1
+	icon = overlord_beholder
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_recruiters
+		upkeep = {
+			energy = 5
+			unity = 2
+		}
+	}
+
+	pop_modifier = {
+		pop_defense_armies_add = 3
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国护林员
+overlord_ranger = {
+	category = worker
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_park_ranger_lodge
+	clothes_texture_index = 1
+	icon = ranger
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+	
+	planet_modifier = {
+		planet_pops_consumer_goods_upkeep_mult = -0.1
+	}
+
+	overlord_resources = {
+		category = planet_overlord_rangers
+		produces = {
+			unity = 10
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国护林员子个体
+overlord_ranger_drone = {
+	category = simple_drone
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_park_ranger_lodge
+	clothes_texture_index = 1
+	icon = ranger
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				country_uses_consumer_goods = yes
+			}
+		}
+		planet_pops_consumer_goods_upkeep_mult = -0.1
+	}
+
+	overlord_resources = {
+		category = planet_overlord_rangers
+		produces = {
+			unity = 10
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国树艺家
+overlord_arborist = {
+	category = worker
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_tree_of_life_sapling
+	clothes_texture_index = 1
+	icon = ranger
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+
+	resources = {
+		category = planet_overlord_arborists
+		upkeep = {
+			food = 10
+		}
+	}
+	overlord_resources = {
+		category = planet_overlord_arborists
+		produces = {
+			food = 15
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国树艺家子个体
+overlord_arborist_drone = {
+	category = simple_drone
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_tree_of_life_sapling
+	clothes_texture_index = 1
+	icon = ranger
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	resources = {
+		category = planet_overlord_arborists
+		upkeep = {
+			food = 10
+		}
+	}
+	overlord_resources = {
+		category = planet_overlord_arborists
+		produces = {
+			food = 15
+		}
+	}
+
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国活体陈设
+overlord_bio_trophy = {
+	category = worker
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_organic_sanctuary
+	clothes_texture_index = 1
+	icon = bio_trophy
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+
+	possible = {
+		ethic_is_not_enslaved = yes
+		is_robotic_species = no
+	}
+
+	resources = {
+		category = planet_overlord_bio_trophies
+		produces = {
+			unity = 2
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_bio_trophies
+		produces = {
+			unity = 3
+		}
+	}
+	planet_modifier = {
+		pop_happiness = 0.01
+	}
+	triggered_pop_modifier = {
+		pop_happiness = 0.40
+		pop_housing_usage_add = -1
+		planet_pops_upkeep_mult = -2
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国活体陈设子个体
+overlord_bio_trophy_drone = {
+	category = simple_drone
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_organic_sanctuary
+	clothes_texture_index = 1
+	icon = bio_trophy
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	possible = {
+		ethic_is_not_enslaved = yes
+		is_robotic_species = no
+	}
+
+	resources = {
+		category = planet_overlord_bio_trophies
+		produces = {
+			unity = 1
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_bio_trophies
+		produces = {
+			unity = 2
+		}
+	}
+
+	triggered_pop_modifier = {
+		pop_housing_usage_add = -1
+		planet_pops_upkeep_mult = -2
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国经理
+overlord_manager = {
+	category = specialist
+
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = holding_franchise_headquarters
+	clothes_texture_index = 3
+	icon = manager
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		trade_value_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+	resources = {
+		category = planet_overlord_managers
+		produces = {
+			unity = 4
+		}
+		upkeep = {
+			consumer_goods = 2
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_managers
+		produces = {
+			unity = 0.25
+		}
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国凡体先烈
+overlord_mortal_initiate = {
+	category = worker
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_sacrificial_temple_2
+	clothes_texture_index = 1
+	icon = mortal_initiate
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_worker_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		is_robotic_species = no
+		NOT = { has_trait = trait_zombie } #How do you kill that which has no life?
+	}
+
+
+	resources = {
+		category = planet_overlord_mortal_initiates
+		produces = {
+			unity = 2
+			society_research = 1
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国凡体先烈子个体
+overlord_mortal_initiate_drone = {
+	category = simple_drone
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_sacrificial_temple_2
+	clothes_texture_index = 1
+	icon = mortal_initiate
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+
+	possible = {
+		is_robotic_species = no
+		NOT = { has_trait = trait_zombie } #How do you kill that which has no life?
+	}
+
+	resources = {
+		category = planet_overlord_mortal_initiates
+		produces = {
+			unity = 2
+			society_research = 1
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			always = yes
+		}
+		planet_amenities_no_happiness_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 诱变水疗护工
+overlord_bath_attendant = {
+	category = specialist
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_toxic_baths
+	clothes_texture_index = 1
+	icon = bath_attendant
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+
+	resources = {
+		category = planet_overlord_bath_attendants
+		upkeep = {
+			consumer_goods = 1
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_bath_attendants
+		produces = {
+			unity = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		pop_growth_speed = 0.01
+		pop_environment_tolerance = -0.005
+		pop_happiness = -0.005
+		mult = planet.value:toxic_attendant_growth
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 重构护理工蜂
+overlord_bath_attendant_hive = {
+	category = complex_drone
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_toxic_baths
+	clothes_texture_index = 1
+	icon = bath_attendant
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_bath_attendants_hive
+		upkeep = {
+			food = 2
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_bath_attendants_hive
+		produces = {
+			unity = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		planet_pop_assembly_organic_mult = 0.015
+		pop_environment_tolerance = -0.0075
+		mult = planet.value:toxic_attendant_growth
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 润滑终端
+overlord_bath_attendant_machine = {
+	category = complex_drone
+	can_set_priority = no
+	is_capped_by_modifier = yes
+	building_icon = building_toxic_baths
+	clothes_texture_index = 1
+	icon = bath_attendant
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_drone_job
+	possible = {
+		can_think = yes
+	}
+
+	resources = {
+		category = planet_overlord_bath_attendants_machine
+		upkeep = {
+			minerals = 2
+		}
+	}
+
+	overlord_resources = {
+		category = planet_overlord_bath_attendants_machine
+		produces = {
+			unity = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		planet_pop_assembly_mult = 0.01
+		pop_amenities_usage_mult = 0.01
+		mult = planet.value:toxic_attendant_growth
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+	}
+}
+
+# 宗主国骑士
+overlord_knight = {
+	category = specialist
+	can_set_priority = no
+	building_icon = building_order_keep
+	clothes_texture_index = 3
+	icon = knight
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+
+	overlord_resources = {
+		category = knights_independent_category
+		produces = {
+			unity = 3
+			mult = value:knights_unity_output_modifier
+		}
+		produces = {
+			physics_research = 2
+			engineering_research = 2
+			society_research = 2
+			mult = value:knights_research_output_modifier
+		}
+	}
+
+	resources = {
+		category = knights_independent_category
+		upkeep = {
+			alloys = 1
+		}
+	}
+
+	triggered_pop_modifier = {
+		potential = {
+			always = yes
+		}
+		pop_defense_armies_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_planet_modifier = {
+		planet_stability_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			owner.overlord = { has_modifier = alloy_producing_knights }
+		}
+		country_alloys_produces_mult = 0.015
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+		modifier = {
+			factor = 0
+			is_enslaved = yes
+		}
+		modifier = {
+			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
+		}
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|researcher|
+		}
+		modifier = {
+			factor = 5
+			has_job = overlord_knight
+		}
+	}
+}
+
+# 宗主国骑士
+overlord_knight_drone = {
+	category = complex_drone
+	can_set_priority = no
+	building_icon = building_order_keep
+	clothes_texture_index = 3
+	icon = knight
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+	}
+
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		hidden_trigger = { exists = owner }
+		owner = {
+			is_gestalt = yes
+		}
+	}
+
+	overlord_resources = {
+		category = knights_independent_category
+		produces = {
+			unity = 3
+			mult = value:knights_unity_output_modifier
+		}
+		produces = {
+			physics_research = 2
+			engineering_research = 2
+			society_research = 2
+			mult = value:knights_research_output_modifier
+		}
+	}
+
+	resources = {
+		category = knights_independent_category
+		upkeep = {
+			alloys = 1
+		}
+	}
+
+	triggered_pop_modifier = {
+		potential = {
+			always = yes
+		}
+		pop_defense_armies_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_planet_modifier = {
+		planet_stability_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			owner.overlord = { has_modifier = alloy_producing_knights }
+		}
+		country_alloys_produces_mult = 0.015
+	}
+
+	weight = {
+		weight = @overlord_job_weight
+		modifier = {
+			factor = 0
+			is_enslaved = yes
+		}
+		modifier = {
+			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
+		}
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|researcher|
+		}
+		modifier = {
+			factor = 5
+			has_job = overlord_knight_drone
+		}
+	}
+}
diff --git a/common/pop_jobs/ethic_00_other_jobs.txt b/common/pop_jobs/ethic_00_other_jobs.txt
new file mode 100644
index 000000000..2e99cef8d
--- /dev/null
+++ b/common/pop_jobs/ethic_00_other_jobs.txt
@@ -0,0 +1,855 @@
+#剩余价值
+surplus_value = {
+	category = worker
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		is_enslaved = yes
+	}
+	possible = {
+		exists = owner
+		owner = {
+			has_civic = civic_machine_financial_investment
+		}
+		has_citizenship_type = {
+			type = citizenship_slavery
+		}
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			energy = 3
+			minerals = 3
+			food = 0.5
+		}
+	}
+	pop_modifier = {
+		pop_housing_usage_add = -0.25
+	}
+
+	weight = {
+		weight = @special_job_weight
+	}
+}
+
+#有机观察员
+organic_observer = {
+	category = bio_trophy
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+	building_icon = building_fe_dome
+	icon = researcher
+	possible_pre_triggers = {
+	}
+	pop_modifier = {
+		pop_happiness = 0.1
+	}
+	possible = {
+		NOT = { has_trait = "trait_mechanical" }
+		has_citizenship_type = {
+			type = citizenship_limited
+		}
+		exists = owner
+		owner = {
+			has_civic = civic_machine_liberator
+		}
+	}
+	resources = {
+		category = planet_researchers
+		produces = {
+			food = 1
+			minerals = 1
+			consumer_goods = 0.5
+			society_research = 1
+			unity = 4
+		}
+		produces = {
+			trigger = {
+				owner = {
+						has_valid_civic = civic_mechanical_utopia
+				}
+			}
+			energy = 1
+			minerals =1
+			food =1
+			consumer_goods =0.5
+			alloys =0.25
+		}
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	weight = {
+		weight = 1
+	}
+}
+
+#能治工人
+intelligent_labor = {
+	category = complex_drone
+	condition_string = DRONE_JOB_TRIGGER
+	building_icon = building_machine_capital
+	icon = evaluator
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_drone_job
+	resources = {
+		category = planet_bureaucrats
+		upkeep = {
+			energy = 3
+		}
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_stability_add = 200
+		pop_cat_worker_political_power = -20
+		mult = planet.society_factor_pops
+	}
+	weight = {
+		weight = @complex_drone_job_weight
+		modifier = {
+			factor = 3
+			has_trait = trait_erudite
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_robot_logic_engines
+				has_trait = trait_intelligent
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_natural_engineers
+				has_trait = trait_natural_physicists
+				has_trait = trait_natural_sociologists
+			}
+		}
+		modifier = {
+			factor = 0.9
+			exists = owner
+			years_passed < 1
+			owner = {
+				has_valid_civic = civic_machine_assimilator
+			}
+			has_trait = trait_cybernetic
+		}
+		modifier = {
+			factor = 0
+			planet = {
+				owner = {
+					is_ai = yes
+					has_resource = {
+						type = minerals
+						amount < 500
+					}
+					has_monthly_income = {
+						resource = minerals
+						value < 25
+					}
+				}
+			}
+		}
+	}
+}
+
+#机魂
+machine_soul = {
+	category = machine_soul
+	clothes_texture_index = 1
+	building_icon = building_organic_sanctuary
+	icon = bio_trophy
+	possible = {
+		exists = owner
+		owner = {
+			has_civic = civic_machine_soul_servant
+		}
+		has_trait = "trait_mechanical"
+	}
+	resources = {
+		category = planet_bio_trophies
+		produces = {
+			unity = 4
+		}
+	}
+	planet_modifier = {
+		planet_amenities_no_happiness_add = 2
+		planet_jobs_produces_mult = 0.01
+	}
+	country_modifier = {
+		country_admin_cap_add = 2
+	    pop_amenities_usage_mult = -0.015
+	}
+	triggered_pop_modifier = {
+		pop_housing_usage_add = -1
+	}
+	weight = {
+		weight = 999999
+	}
+}
+
+#复杂子个体
+future_complex_drone = {
+	category = complex_drone
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+	icon = administrator
+	possible_precalc = can_fill_drone_job
+	possible_pre_triggers = {
+		has_owner = yes
+	}
+	possible = {
+		OR = {
+			planet = { has_modifier = planet_unemployment_benefits }
+			owner = { is_ai = yes }
+		}
+		owner = {
+			has_active_tradition = tr_future_industry
+			has_technology = tech_ascension_theory
+			is_gestalt = yes
+		}
+	}
+	resources = {
+		category = planet_jobs
+		produces = {
+			unity = 3
+			physics_research = 0.5
+			society_research = 0.5
+			engineering_research = 0.5
+			alloys = 1
+			influence = 0.01
+		}
+		#AI基础与年数产出
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+			}
+			food = 2
+			energy = 4
+			minerals = 2
+			alloys = 0.5		
+			physics_research = 0.25
+			engineering_research = 0.25
+			society_research = 0.25
+			unity = 0.25
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 20
+			}
+			food = 1
+			energy = 4
+			minerals = 1
+			alloys = 1		
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 35
+			}
+			food = 1
+			energy = 4
+			minerals = 1
+			alloys = 3		
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 50
+			}
+			food = -2
+			energy = 16
+			minerals = -2
+			alloys = 3		
+			physics_research = 2
+			engineering_research = 2
+			society_research = 2
+			unity = 8
+		}
+		
+		produces = { 
+			trigger = {
+				owner = { is_ai = yes }
+				mid_game_years_passed > 0
+			}
+			food = 2
+			energy = 6
+			minerals = 2
+			alloys = 6		
+			physics_research = 3
+			engineering_research = 3
+			society_research = 3
+			unity = 2
+		}
+		
+		produces = {
+			trigger = {
+				end_game_years_passed > 0
+			}
+			alloys = 8		
+			physics_research = 3
+			engineering_research = 3
+			society_research = 3
+			unity = 1
+		}		
+		#AI思潮加成
+		produces = {
+			trigger = {
+				owner = {
+					is_ai = yes
+					or = {
+						has_ethic = ethic_fanatic_spiritualist
+						has_ethic = ethic_spiritualist
+					}
+					
+				}
+			}
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				owner = {
+					is_ai = yes
+					OR = {
+						has_ethic = ethic_fanatic_materialist
+						has_ethic = ethic_materialist
+					}
+				}
+			}
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+		}	
+		#AI难度加成	
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				is_difficulty = 2
+			}
+			food = 1
+			energy = 1
+			minerals = 1
+			consumer_goods = 1
+			alloys = 2		
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				is_difficulty = 3
+			}
+			food = 2
+			energy = 2
+			minerals = 2
+			consumer_goods = 2
+			alloys = 4		
+			physics_research = 3
+			engineering_research = 3
+			society_research = 3
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				is_difficulty = 4
+			}
+			food = 3
+			energy = 3
+			minerals = 3
+			consumer_goods = 3
+			alloys = 6	
+			physics_research = 4
+			engineering_research = 4
+			society_research = 4
+			unity = 3
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				is_difficulty = 5
+			}
+			food = 8
+			energy = 8
+			minerals = 8
+			consumer_goods = 8
+			alloys = 18		
+			physics_research = 8
+			engineering_research = 8
+			society_research = 8
+			unity = 8
+		}	
+		#AI弱者强化
+		produces = {
+			trigger = {
+				years_passed >= 50
+				owner = {
+					is_ai = yes
+					num_pops < 100
+				}				
+			}				
+			physics_research = 8
+			engineering_research = 8
+			society_research = 8
+			alloys = 14
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				years_passed >= 80
+				owner = {
+					is_ai = yes
+					num_pops < 100
+				}								
+			}		
+			physics_research = 8
+			engineering_research = 8
+			society_research = 8
+			alloys = 14
+		}
+	}
+	weight = {
+		weight = 0.1
+	}
+}
+
+#简单子个体
+future_simple_drone = {
+	category = simple_drone
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+	icon = primitive_laborer
+	possible_precalc = can_fill_drone_job
+	possible_pre_triggers = {
+		has_owner = yes
+	}
+	possible = {
+		OR = {
+			planet = { has_modifier = planet_unemployment_benefits }
+			owner = { is_ai = yes }
+		}
+		owner = {
+			has_active_tradition = tr_future_industry
+			has_technology = tech_ascension_theory
+			is_gestalt = yes
+		}
+	}
+	resources = {
+		category = planet_jobs
+		produces = {
+			energy = 2
+			minerals = 1
+			unity = 0.5
+		}
+		produces = {
+			trigger = {
+				NOR = {
+					has_trait = trait_mechanical
+					has_trait = trait_lithoid
+				}
+			}
+			food = 2
+		}
+		produces = {
+			trigger = {
+				OR = {
+					has_trait = trait_mechanical
+					has_trait = trait_lithoid
+				}
+			}
+			minerals = 1.5
+		}
+
+		#利他主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_altruism
+				}
+			}
+			unity = 2
+		}
+
+		# Utopian living standards
+		produces = {
+			trigger = {
+				has_utopian_living_standard_type = yes
+			}
+			society_research = 2
+			physics_research = 2
+			engineering_research = 2
+		}
+
+		# Welfare
+		produces = {
+			trigger = {
+				OR = {
+					has_very_high_living_standard_type = yes
+					has_high_living_standard_type = yes
+					has_shared_burden_living_standard_type = yes
+				}
+			}
+			unity = 1
+		}
+		#AI基础与年数产出
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+			}
+			food = 2
+			energy = 4
+			minerals = 2
+			consumer_goods = 1
+			alloys = 0.5
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 20
+			}
+			food = 1
+			energy = 4
+			minerals = 1
+			consumer_goods = 1
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 35
+			}
+			food = 1
+			energy = 4
+			minerals = 1
+			consumer_goods = 1
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 50
+			}
+			food = -2
+			energy = 16
+			minerals = -2
+			consumer_goods = -2
+			alloys = 2
+		}
+		
+		produces = { 
+			trigger = {
+				owner = { is_ai = yes }
+				mid_game_years_passed > 0
+			}
+			food = 2
+			energy = 6
+			minerals = 2
+			consumer_goods = 2
+			alloys = 2
+		}
+		
+		produces = {
+			trigger = {
+				end_game_years_passed > 0
+			}
+			alloys = 3
+			unity = 1
+		}
+		#AI思潮加成
+		produces = {
+			trigger = {
+				owner = {
+					is_ai = yes
+					or = {
+						has_ethic = ethic_fanatic_spiritualist
+						has_ethic = ethic_spiritualist
+					}
+					
+				}
+			}
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				owner = {
+					is_ai = yes
+					OR = {
+						has_ethic = ethic_fanatic_materialist
+						has_ethic = ethic_materialist
+					}
+				}
+			}
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+		}
+		#AI弱者强化
+		produces = {
+			trigger = {
+				years_passed >= 50
+				owner = {
+					is_ai = yes
+					num_pops < 100
+				}				
+			}				
+			physics_research = 8
+			engineering_research = 8
+			society_research = 8
+			alloys = 8
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				years_passed >= 80
+				owner = {
+					is_ai = yes
+					num_pops < 100
+				}								
+			}		
+			physics_research = 8
+			engineering_research = 8
+			society_research = 8
+			alloys = 14
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_hive_empire = yes
+				}
+			}
+			minerals = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_hive_empire = yes
+					has_civic = civic_hive_natural_neural_network
+				}
+			}
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1.5
+		}
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	weight = {
+		weight = 0.95
+	}
+}
+
+#繁育子个体
+breeding_drone = {
+	category = simple_drone
+	is_capped_by_modifier = no
+	building_icon = building_organic_paradise
+	icon = aid_worker
+	can_set_priority = no
+	possible_precalc = can_fill_drone_job
+	possible_pre_triggers = {
+		has_owner = yes
+		is_robot_pop = yes
+		is_being_assimilated = no
+		is_being_purged = no
+	}
+	
+	possible = {
+		hidden_trigger = {
+			exists = owner
+		}
+		owner = {
+			has_valid_civic = civic_machine_syntheticLove
+		}
+	}
+	
+	triggered_planet_modifier = {
+		pop_growth_speed = 0.02
+		biological_pop_happiness = 0.01
+		planet_amenities_no_happiness_add = 2
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			unity = 2
+		}
+		upkeep = {
+			food = 3
+		}
+	}
+
+	weight = {
+		weight = -1.0
+	}
+}
+
+#不朽者
+vanguard = {
+	category = vanguard_unit
+	condition_string = DRONE_JOB_TRIGGER
+	is_capped_by_modifier = no
+	building_icon = building_power_plant
+	clothes_texture_index = 2
+	icon = mind_thrall
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible = {
+		owner = {
+			has_valid_civic = civic_forever_with_us
+		}
+		has_trait = trait_vanguard_hive_mind
+	}
+	resources = {
+		category = planet_politicians
+		upkeep = {
+			energy = 6
+		}
+	}
+	country_modifier = {
+		country_admin_cap_add = 10
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_authoritarian = yes
+			}
+		}
+		modifier = {
+			country_edict_fund_add = 3
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_egalitarian = yes
+			}
+		}
+		modifier = {
+			pop_housing_usage_mult = -0.025
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_xenophobe = yes
+			}
+		}
+		modifier = {
+			pop_citizen_happiness = 0.025
+		}
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_xenophile = yes
+			}
+		}
+		modifier = {
+			planet_pops_upkeep_mult = -0.025
+		}
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_militarist = yes
+			}
+		}
+		modifier = {
+			country_naval_cap_add = 2
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_pacifist = yes
+			}
+		}
+		modifier = {
+			pop_amenities_usage_mult = -0.025
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_materialist = yes
+			}
+		}
+		modifier = {
+			planet_amenities_add = 5
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_capitalism = yes
+			}
+		}
+		modifier = {
+			trade_value_mult = 0.075
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				is_socialism = yes
+			}
+		}
+		modifier = {
+			plan_type_mult = 0.1
+		}
+	}
+	weight = {
+		weight = 9999
+	}
+}
+
diff --git a/common/pop_jobs/ethic_01_ruler_jobs.txt b/common/pop_jobs/ethic_01_ruler_jobs.txt
new file mode 100644
index 000000000..721c17aec
--- /dev/null
+++ b/common/pop_jobs/ethic_01_ruler_jobs.txt
@@ -0,0 +1,362 @@
+#核心党员
+core_party_members = {
+	category = ruler
+	condition_string = BATTLE_THRALL_JOB_TRIGGER
+	building_icon = building_precinct_house
+	clothes_texture_index = 5
+	can_set_priority = no
+	icon = evaluator
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_ruler_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+	
+	resources = {
+		category = planet_enforcers
+		produces = {
+			unity = 3
+		}
+		upkeep = {
+			consumer_goods = @ruler_upkeep_consumer_goods_base
+		}
+	}
+	planet_modifier = {
+		species_empire_size_mult = -0.15
+		pop_slave_resource_output = 0.05
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_crime_add = -300
+		planet_stability_add = 100
+		mult = planet.society_factor_pops
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_anarchism
+			}
+		}
+		modifier = {
+			pop_cat_specialist_happiness = -0.05
+		}
+	}
+	weight = {
+		weight = @ruler_job_weight
+	}
+}
+
+#指挥官
+commandante = {
+	category = ruler
+	condition_string = RULER_JOB_TRIGGER
+	building_icon = building_stronghold
+	clothes_texture_index = 1
+	can_set_priority = no
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_ruler_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+	
+	country_modifier = {
+		country_naval_cap_add = 5
+	}
+	resources = {
+		category = planet_politicians
+		produces = {
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					has_valid_civic = civic_citizen_service
+				}
+			}
+			unity = 1
+		}
+		upkeep = {
+			consumer_goods = @ruler_upkeep_consumer_goods_base
+		}
+	}
+	planet_modifier = {
+		army_starting_experience_add = 50
+	}
+	pop_modifier = {
+		pop_defense_armies_add = 1
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_stability_add = 50
+		mult = planet.society_factor_pops
+	}
+	triggered_planet_modifier = {
+		potential = {
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			planet_amenities_add = -1
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_citizen_service
+			}
+		}
+		modifier = {
+			planet_amenities_add = 3
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_anarchism
+			}
+		}
+		modifier = {
+			pop_cat_specialist_happiness = -0.05
+		}
+	}
+	weight = {
+		weight = @ruler_job_weight
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_very_strong
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_strong
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			factor = 5
+			has_job = commandante
+		}
+	}
+}
+
+#长者
+supervisor = {
+	category = ruler
+	condition_string = RULER_JOB_TRIGGER
+	building_icon = building_capital
+	clothes_texture_index = 1
+	can_set_priority = no
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_ruler_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+	
+	resources = {
+		category = planet_politicians
+		produces = {
+			unity = 3
+		}
+		upkeep = {
+			consumer_goods = @ruler_upkeep_consumer_goods_base
+		}
+	}
+	planet_modifier = {
+		pop_cat_ruler_political_power = 1
+		planet_jobs_society_research_produces_mult = 0.05
+		planet_jobs_unity_produces_mult = 0.05
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			planet_amenities_add = -1
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_anarchism
+			}
+		}
+		modifier = {
+			pop_cat_specialist_happiness = -0.05
+		}
+	}
+	weight = {
+		weight = @ruler_job_weight
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_talented
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_charismatic
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			factor = 5
+			has_job = supervisor
+		}
+	}
+}
+
+#大亨
+mogul = {
+	category = ruler
+	condition_string = RULER_JOB_TRIGGER
+	building_icon = building_galactic_stock_exchange
+	clothes_texture_index = 1
+	can_set_priority = no
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_ruler_job
+	possible = {
+		ethic_is_not_enslaved = yes
+		owner = { NOT = { has_valid_civic = civic_distributism } }
+	}
+	
+	resources = {
+		category = planet_merchants
+		produces = {
+			unity = 1
+		}
+		upkeep = {
+			consumer_goods = @ruler_upkeep_consumer_goods_base
+		}
+	}
+	triggered_pop_modifier = {
+		potential = {
+			owner = {
+				has_policy_flag = market_operation
+			}
+		}
+		modifier = {
+			pop_cat_ruler_political_power = 1
+		}
+	}
+	triggered_pop_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_triple_the_profit
+			}
+		}
+		modifier = {
+			pop_cat_ruler_political_power = 3
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		trade_value_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		trade_value_add = 0.5
+		mult = planet.value:count_job|JOB|manager|
+	}
+
+	planet_modifier = {
+		job_merchant_add = -1
+		job_manager_add = 1
+		planet_jobs_energy_produces_mult = 0.03
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 7
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			planet_amenities_add = -1
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_anarchism
+			}
+		}
+		modifier = {
+			pop_cat_specialist_happiness = -0.05
+		}
+	}
+	weight = {
+		weight = @ruler_job_weight
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_thrifty
+				has_trait = trait_nuumismatic_administration
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robot_domestic_protocols
+				has_trait = trait_charismatic
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			factor = 5
+			has_job = mogul
+		}
+		modifier = {
+			factor = 1.5
+			has_ethic = ethic_capitalism
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/pop_jobs/ethic_02_specialist_jobs.txt b/common/pop_jobs/ethic_02_specialist_jobs.txt
new file mode 100644
index 000000000..1d4b8c186
--- /dev/null
+++ b/common/pop_jobs/ethic_02_specialist_jobs.txt
@@ -0,0 +1,2127 @@
+#专家冶金师
+foundry_specialist = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_foundry_1
+	clothes_texture_index = 3
+	icon = foundry
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+	}
+	possible_precalc = can_fill_specialist_job
+
+	resources = {
+		category = planet_metallurgists
+		produces = {
+			alloys = 2
+			engineering_research = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_catalytic_processing
+				}
+			}
+			society_research = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			alloys = @requisitorium_alloys_reduction
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			minerals = 2
+		}
+		upkeep = {
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_catalytic_processing
+				}
+			}
+			minerals = -6
+			food = 6
+		}
+	}
+	planet_modifier = {
+		pop_environment_tolerance = -0.02
+		trade_value_add = 2
+		planet_metallurgists_alloys_produces_mult = 0.05
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_civil_rights_gun_grant
+			}
+		}
+		modifier = {
+			army_starting_experience_add = 50
+		}
+	}
+
+
+	triggered_country_modifier = { # 共产主义社会
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_shared_burden
+				has_ascension_perk = ap_future_society
+			}
+		}
+		modifier = {
+			country_admin_cap_add = 0.5
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = mixed_industrial
+			}
+		}
+		modifier = {
+			pop_environment_tolerance = -0.01
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = industrial_efficiency
+			}
+		}
+		modifier = {
+			pop_environment_tolerance = -0.005
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = industrial_growth
+			}
+		}
+		modifier = {
+			pop_environment_tolerance = -0.015
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = industrial_unlimited
+			}
+		}
+		modifier = {
+			pop_environment_tolerance = -0.02
+		}
+	}
+	# 分产主义
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_distributism
+			}
+		}
+		modifier = {
+			trade_value_add = 2
+		}
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+	overlord_resources = {
+		category = planet_requisitioned_alloys
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_material_requisitorium
+				}
+			}
+			alloys = @requisitorium_alloys_overlord
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight		# Fairly important job
+		modifier = { # 可控的动态权重
+			factOR = value:job_weights_modifier|JOB|foundry|RESOURCE|alloys|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factOR = 2
+			is_enslaved = yes
+			can_take_servant_job = no
+		}
+		modifier = {
+			factOR = 5
+			has_job = foundry_specialist
+		}
+	}
+}
+
+#专家工匠
+artisan_specialist = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_factory_1
+	clothes_texture_index = 3
+	icon = artisan
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+	}
+	possible_precalc = can_fill_specialist_job
+
+	resources = {
+		category = planet_artisans
+		produces = {
+			consumer_goods = 4
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_crafters
+				}
+			}
+			engineering_research = 2
+		}
+		upkeep = {
+			minerals = 6
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_anarchism
+				}
+			}
+			minerals = -1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+					exists = owner.overlord
+					owner.overlord = { is_gestalt = no }
+				}
+			}
+			consumer_goods = @requisitorium_consumer_goods_reduction
+		}
+		upkeep = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+					exists = owner.overlord
+					owner.overlord = { is_gestalt = no }
+				}
+			}
+			minerals = 1
+		}
+	}
+
+	#奢侈消费主义
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				OR = {
+					has_valid_civic = civic_consumerism
+				}
+			}
+		}
+		trade_value_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	planet_modifier = {
+		pop_environment_tolerance = -0.02
+		trade_value_add = 3
+		planet_artisan_consumer_goods_produces_mult = 0.05
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = mixed_industrial
+			}
+		}
+		modifier = {
+			pop_environment_tolerance = -0.01
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = industrial_efficiency
+			}
+		}
+		modifier = {
+			pop_environment_tolerance = -0.005
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = industrial_growth
+			}
+		}
+		modifier = {
+			pop_environment_tolerance = -0.015
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_policy_flag = industrial_unlimited
+			}
+		}
+		modifier = {
+			pop_environment_tolerance = -0.02
+		}
+	}
+	# 分产主义
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_distributism
+			}
+		}
+		modifier = {
+			trade_value_add = 2
+		}
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	# 能工巧匠
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_crafters
+			}
+		}
+		modifier = {
+			trade_value_add = 2
+		}
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+
+	overlord_resources = {
+		category = planet_requisitioned_consumer_goods
+		produces = {
+			trigger = {
+				planet = {
+					has_planet_flag = has_produce_requisitorium
+					exists = owner.overlord
+					owner.overlord = { is_gestalt = no }
+				}
+			}
+			consumer_goods = @requisitorium_consumer_goods_overlord
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		modifier = { # 可控的动态权重
+			factOR = value:job_weights_modifier|JOB|artisan|RESOURCE|consumer_goods|
+			exists = owner
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factOR = 2
+			is_enslaved = yes
+			can_take_servant_job = no
+		}
+		modifier = {
+			factOR = 5
+			has_job = artisan_specialist
+		}
+
+		# low income modifier
+		modifier = {
+			factOR = 1.2
+			exists = planet
+			planet = {
+				has_available_jobs = "artisan"
+			}
+			exists = owner
+			owner = {
+				is_ai = yes
+				has_monthly_income = {
+					resource = consumer_goods
+					value < 5
+				}
+			}
+		}
+	}
+}
+
+#记者
+media_worker = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_autochthon_monument
+	clothes_texture_index = 3
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
+	triggered_pop_modifier = {
+		potential = {
+			owner = {
+				has_policy_flag = market_operation
+			}
+		}
+		modifier = {
+			pop_cat_specialist_political_power = 0.5
+		}
+	}
+	resources = {
+		category = planet_culture_workers
+		produces = {
+			unity = 4
+		}
+		#信息管制
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					OR = {
+						has_policy_flag = strict_control
+						has_policy_flag = market_operation
+					}
+				}
+			}
+			unity = -1
+		}
+		#完全自由
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_policy_flag = freedom_of_speech
+				}
+			}
+			society_research = 3
+		}
+		#和平主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_pacifist
+				}
+			}
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_pacifist
+				}
+			}
+			unity = 1
+		}
+		upkeep = {
+			consumer_goods = 2
+		}
+	}
+
+	planet_modifier = {
+		pop_ethics_shift_speed = 0.1
+	}
+
+	#舆论控制
+	triggered_planet_modifier = { #严格管理
+		potential = {
+			owner = {
+				has_policy_flag = strict_control
+			}
+		}
+		modifier = {
+			pop_cat_ruler_political_power = 0.5
+		}
+	}
+	triggered_planet_modifier = { #市场运作
+		potential = {
+			owner = {
+				has_policy_flag = market_operation
+			}
+		}
+		modifier = {
+			trade_value_add = 2
+			planet_crime_add = 3
+		}
+	}
+	triggered_country_modifier = { #加经费
+		potential = {
+			exists = owner
+			owner = {
+				OR = {
+					has_policy_flag = strict_control
+					has_policy_flag = market_operation
+				}
+			}
+		}
+		modifier = {
+			country_edict_fund_add = 1
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		modifier = { # 可控的动态权重
+			factor = value:job_weights_modifier|JOB|media_worker|RESOURCE|unity|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_robot_propaganda_machines
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robot_propaganda_machines
+				has_trait = trait_traditional
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_quarrelsome
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.5
+			has_job = bureaucrat
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_latent_psionic
+		}
+		modifier = {
+			factor = 1.2
+			has_trait = trait_psionic
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_enigmatic_intelligence_failed
+		}
+	}
+}
+
+#血肉机器组装者
+reemployment_HR_supervisor = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_robot_assembly_plant
+	clothes_texture_index = 3
+	icon = roboticist
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+
+	possible_precalc = can_fill_specialist_job
+
+	resources = {
+		category = planet_jobs
+		upkeep = {
+			consumer_goods = 0.5
+			minerals = 2
+		}
+	}
+
+	weight = {
+		weight = 5000
+	}
+}
+
+#产品总监
+PR_manager = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_autochthon_monument
+	clothes_texture_index = 3
+	icon = manager
+	
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	
+	planet_modifier = {
+		trade_value_mult = 0.02
+		planet_amenities_add = -3
+	}
+	resources = {
+		category = planet_bureaucrats
+		upkeep = {
+			consumer_goods = 0.5
+			unity = 1.5
+		}
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_robot_propaganda_machines
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robot_propaganda_machines
+				has_trait = trait_traditional
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_quarrelsome
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_natural_sociologists
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_thrifty
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_nuumismatic_administration
+		}
+		modifier = {
+			factor = 1.5
+			has_job = PR_manager
+		}
+		modifier = {
+			factor = 3
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_presapient_natural_intellectuals
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robust
+				has_trait = trait_robot_efficient_processors
+			}
+		}
+		modifier = {
+			factor = 1.4
+			OR = {
+				has_trait = trait_robot_logic_engines
+				has_trait = trait_intelligent
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_latent_psionic
+		}
+		modifier = {
+			factor = 1.2
+			has_trait = trait_psionic
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_enigmatic_intelligence_failed
+		}
+		modifier = {
+			factor = 1.4
+			OR = {
+				has_trait = trait_enigmatic_intelligence
+				has_trait = trait_enigmatic_intelligence_poor
+			}
+		}
+		modifier = {
+			factor = 0.1
+			is_enslaved = yes
+			has_slavery_type = { type = slavery_indentured }
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_void_dweller_1
+			exists = planet
+			planet = { is_planet_class = pc_habitat }
+		}
+		modifier = {
+			factor = 0.85
+			has_trait = trait_void_dweller_1
+			exists = planet
+			planet = { is_artificial = no }
+		}
+		modifier = {
+			factor = 1.25
+			has_trait = trait_necrophage
+		}
+	}
+}
+
+#科研模范
+research_pacesetter = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_research_lab_1
+	clothes_texture_index = 3
+	icon = labour_hero
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
+	resources = {
+		category = planet_researchers
+		produces = {
+			physics_research = 4
+			engineering_research = 4
+			society_research = 4
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					or = {
+						has_edict = scientific_spirit
+						has_edict = indefinite_patent_act
+					}
+				}
+			}
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					or = {
+						has_valid_civic = civic_technocracy
+						has_valid_civic = civic_cyber_dictatorship
+						has_valid_civic = civic_science_directorate
+						has_valid_civic = civic_cyber_demos_cratos
+					}
+				}
+			}
+			unity = 1
+		}
+		upkeep = {
+			consumer_goods = 1
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_industry_pacesetter
+			}
+		}
+		modifier = {
+			planet_researchers_produces_mult = 0.1
+		}
+	}
+	weight = {
+		weight = @specialist_job_weight
+		modifier = { # 可控的动态权重
+			factor = value:job_weights_research_modifier|JOB|researcher|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = {
+				has_trait = trait_mechanical
+			}
+		}
+		modifier = {
+			factor = 2
+			has_living_standard = {
+				type = living_standard_academic_privilege
+			}
+		}
+		modifier = {
+			factor = 3
+			has_trait = trait_erudite
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_robot_logic_engines
+				has_trait = trait_intelligent
+			}
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_natural_engineers
+				has_trait = trait_natural_physicists
+				has_trait = trait_natural_sociologists
+			}
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 0.65
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.5
+			has_job = researcher
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_latent_psionic
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_psionic
+		}
+		modifier = {
+			factor = 0.1
+			has_trait = trait_enigmatic_intelligence_failed
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_enigmatic_intelligence
+				has_trait = trait_enigmatic_intelligence_poor
+			}
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_presapient_natural_intellectuals
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robust
+				has_trait = trait_robot_efficient_processors
+			}
+		}
+		modifier = {
+			factor = 0.8
+			is_enslaved = yes
+			has_slavery_type = {
+				type = slavery_indentured
+			}
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_void_dweller_1
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_necrophage
+		}
+	}
+}
+
+#工人模范
+model_worker = {
+	category = worker
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_foundry_1
+	clothes_texture_index = 3
+	icon = labour_hero
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+	}
+	possible_precalc = can_fill_specialist_job
+
+	resources = {
+		category = planet_metallurgists
+		produces = {
+			alloys = 1.5
+			consumer_goods = 3
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_catalytic_empire = yes
+				}
+			}
+			society_research = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_crafters
+				}
+			}
+			consumer_goods = 1
+			engineering_research = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_shared_burden
+						has_valid_civic = civic_socialistic
+						has_valid_civic = civic_forever_with_us
+					}
+				}
+			}
+			engineering_research = 0.25
+		}
+		upkeep = {
+			minerals = 6
+		}
+		upkeep = {
+			trigger = {
+				exists = owner
+				owner = {
+					is_catalytic_empire = yes
+				}
+			}
+			minerals = -6
+			food = 6
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_industry_pacesetter
+			}
+		}
+		modifier = {
+			planet_metallurgists_alloys_produces_mult = 0.05
+			planet_artisans_consumer_goods_produces_mult = 0.05
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight		# Fairly important job
+		modifier = { # 可控的动态权重
+			factor = value:job_weights_modifier|JOB|model_worker|RESOURCE|consumer_goods|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 20
+			is_enslaved = yes
+			can_take_servant_job = no
+		}
+		modifier = {
+			factor = 2
+			species = {
+				has_species_flag = racket_species_flag
+			}
+		}
+		modifier = {
+			factor = 5
+			has_job = foundry
+		}
+		modifier = {
+			factor = 15
+			has_job = foundry
+			OR = {
+				has_trait = trait_robust
+				has_trait = trait_robot_efficient_processors
+			}
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_void_dweller_1
+		}
+	}
+}
+
+#节点维护员
+democratic_politician = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_capital
+	icon = administrator
+	clothes_texture_index = 3
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
+	resources = {
+		category = planet_bureaucrats
+		produces = {
+			society_research = 3
+			physics_research = 1
+		}
+		upkeep = {
+			consumer_goods = 0.75
+		}
+	}
+	country_modifier = {
+		country_admin_cap_add = 10
+	}
+	weight = {
+		weight = @specialist_job_weight
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = {
+				has_trait = trait_mechanical
+			}
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_robot_propaganda_machines
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robot_propaganda_machines
+				has_trait = trait_traditional
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_quarrelsome
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.5
+			has_job = democratic_politician
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_latent_psionic
+		}
+		modifier = {
+			factor = 1.2
+			has_trait = trait_psionic
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_enigmatic_intelligence_failed
+		}
+	}
+}
+
+#深核工程师
+deep_miner = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_crystal_mines
+	clothes_texture_index = 3
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		complex_specialist_job_check_trigger = yes
+	}
+	resources = {
+		category = planet_miners
+		produces = {
+			trigger = {
+				owner = {
+					is_gestalt = no
+				}
+			}
+			minerals = 4
+			energy = 3
+			engineering_research = 2
+		}
+		produces = {
+			trigger = {
+				owner = {
+					is_gestalt = yes
+				}
+			}
+			exotic_gases = 1
+			volatile_motes = 1
+			rare_crystals = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_shared_burden
+						has_valid_civic = civic_socialistic
+						has_valid_civic = civic_forever_with_us
+					}
+				}
+			}
+			engineering_research = 0.25
+		}
+		upkeep = {
+			trigger = {
+				owner = {
+					is_gestalt = no
+				}
+			}
+			consumer_goods = 0.5
+		}
+		upkeep = {
+			trigger = {
+				owner = {
+					is_gestalt = yes
+				}
+			}
+			energy = 1
+		}
+	}
+	weight = {
+		weight = @specialist_job_weight
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = {
+				has_trait = trait_mechanical
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_industrious
+				has_trait = trait_robot_power_drills
+				has_trait = trait_natural_engineers
+			}
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = {
+				has_technology = tech_droid_workers
+			}
+		}
+		modifier = {
+			factor = 10
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+			can_take_servant_job = no
+			owner = {
+				NOT = {
+					has_technology = tech_droid_workers
+				}
+			}
+		}
+		modifier = {
+			factor = 0.25
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.2
+			has_trait = trait_very_strong
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_strong
+		}
+		modifier = {
+			factor = 0.9
+			has_trait = trait_weak
+		}
+		modifier = {
+			factor = 1.2
+			has_ethic = ethic_industrial
+		}
+	}
+}
+
+#圣殿骑士
+templar = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_temple
+	clothes_texture_index = 3
+	icon = knight
+	
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+	
+	resources = {
+		category = planet_priests
+		produces = {
+			unity = 4
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_tradition = tr_piety_nature_and_humanity
+				}
+			}
+			physics_research = 1.5
+			engineering_research = 1.5
+		}
+		upkeep = {
+			alloys = 0.5
+		}
+	}
+
+	triggered_pop_modifier = {
+		potential = {
+			always = yes
+		}
+		pop_defense_armies_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			owner = { has_country_flag = toxoids_7090_a }
+		}
+		planet_stability_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_country_modifier = {
+		country_naval_cap_add = 4
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			owner = { has_country_flag = toxoids_7165_a }
+		}
+		country_alloys_produces_mult = 0.015
+	}
+
+	planet_modifier = {
+		job_squire_add = 1
+	}
+
+	weight = {
+		weight = @high_prio_specialist_job_weight
+		modifier = {
+			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|researcher|
+		}
+	}
+}
+
+#死亡骑士
+death_knight = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_sacrificial_temple
+	clothes_texture_index = 3
+	icon = knight
+	
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+	
+	resources = {
+		category = planet_priests
+		produces = {
+			unity = 4
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_tradition = tr_piety_nature_and_humanity
+				}
+			}
+			physics_research = 1.5
+			engineering_research = 1.5
+		}
+		upkeep = {
+			alloys = 0.5
+		}
+	}
+
+	triggered_pop_modifier = {
+		potential = {
+			always = yes
+		}
+		pop_defense_armies_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+	triggered_pop_modifier = {
+		potential = {
+			exists = owner
+			owner = { has_valid_civic = civic_reanimated_armies }
+		}
+		modifier = {
+			pop_defense_armies_add = 3
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			owner = { has_country_flag = toxoids_7090_a }
+		}
+		planet_stability_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_country_modifier = {
+		country_naval_cap_add = 4
+		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
+	}
+
+	triggered_country_modifier = {
+		potential = {
+			owner = { has_country_flag = toxoids_7165_a }
+		}
+		country_alloys_produces_mult = 0.015
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				OR = {
+					has_valid_civic = civic_imperial_cult
+					has_valid_civic = civic_divine_council
+					has_valid_civic = civic_spiritual_democracy
+					has_valid_civic = civic_exalted_priesthood
+				}
+			}
+		}
+		planet_stability_add = 20
+		mult = planet.society_factor_pops
+	}
+
+	weight = {
+		weight = @high_prio_specialist_job_weight
+		modifier = {
+			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			mult = value:job_weights_research_modifier|JOB|researcher|
+		}
+	}
+}
+
+#雇佣兵
+mercenary = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_stronghold
+	clothes_texture_index = 4
+
+	possible_pre_triggers = {
+		has_owner = yes
+		# is_enslaved = no
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	possible = {
+		ethic_is_not_enslaved = yes
+	}
+	
+	country_modifier = {
+		country_naval_cap_add = 4
+	}
+	pop_modifier = {
+		pop_defense_armies_add = 3
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		trade_value_add = 0.5
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+	resources = {
+		category = planet_soldiers
+		upkeep = {
+			consumer_goods = 0.5
+		}
+	}
+	weight = {
+		weight = @soldier_job_weight
+		modifier = {
+			factor = 10
+			exists = planet
+			planet = {
+				has_modifier = martial_law
+			}
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_resilient
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_very_strong
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_strong
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_weak
+		}
+		modifier = {
+			factor = 0.1
+			is_enslaved = yes
+			NOT = {
+				has_slavery_type = {
+					type = slavery_military
+				}
+			}
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			has_slavery_type = {
+				type = slavery_military
+			}
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_cybernetic
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_presapient_earthbound
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_limited_regeneration
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 1.05
+			has_trait = trait_presapient_natural_intellectuals
+		}
+		modifier = {
+			factor = 1.05
+			OR = {
+				has_trait = trait_robust
+				has_trait = trait_robot_efficient_processors
+			}
+		}
+		modifier = {
+			factor = 1.05
+			has_trait = trait_nerve_stapled
+		}
+		modifier = {
+			factor = 1.1
+			OR = {
+				has_trait = trait_robot_propaganda_machines
+				has_trait = trait_traditional
+			}
+		}
+		modifier = {
+			factor = 0.9
+			has_trait = trait_quarrelsome
+		}
+		modifier = {
+			factor = 0
+			can_be_soldier = no
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_lithoid
+		}
+	}
+}
+
+#超越者
+transcend = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_psi_corps
+	clothes_texture_index = 5
+	
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	
+	resources = {
+		category = planet_telepaths
+		produces = {
+			unity = 4
+			society_research = 3
+			physics_research = 2
+			engineering_research = 1
+		}
+		upkeep = {
+			energy = 2
+		}
+	}
+	planet_modifier = {
+		planet_crime_add = -35
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = { has_trait = trait_mechanical }
+		}
+		modifier = {
+			factor = 2
+			exists = owner
+			owner = { has_civic = civic_exalted_priesthood }
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_robot_domestic_protocols
+				has_trait = trait_charismatic
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robot_propaganda_machines
+				has_trait = trait_traditional
+			}
+		}
+		modifier = {
+			factor = 1.2
+			has_ethic = ethic_spiritualist
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_quarrelsome
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_natural_sociologists
+		}
+		modifier = {
+			factor = 0.1
+			has_ethic = ethic_materialist
+			NOT = { has_job = priest }
+		}
+		modifier = {
+			factor = 1.5
+			has_job = priest
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 1.3
+			has_trait = trait_presapient_natural_intellectuals
+		}
+		modifier = {
+			factor = 1.3
+			OR = {
+				has_trait = trait_robust
+				has_trait = trait_robot_efficient_processors
+			}
+		}
+		modifier = {
+			factor = 1.05
+			OR = {
+				has_trait = trait_robot_logic_engines
+				has_trait = trait_intelligent
+			}
+		}
+		modifier = {
+			factor = 0.9
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.05
+			has_trait = trait_psionic
+		}
+		modifier = {
+			factor = 0.7
+			has_trait = trait_enigmatic_intelligence_failed
+		}
+		modifier = {
+			factor = 1.05
+			OR = {
+				has_trait = trait_enigmatic_intelligence
+				has_trait = trait_enigmatic_intelligence_poor
+			}
+		}
+		modifier = {
+			factor = 0.1
+			is_enslaved = yes
+			has_slavery_type = { type = slavery_indentured }
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_void_dweller_1
+			exists = planet
+			planet = { is_planet_class = pc_habitat }
+		}
+		modifier = {
+			factor = 0.85
+			has_trait = trait_void_dweller_1
+			exists = planet
+			planet = { is_artificial = no }
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_necrophage
+		}
+	}
+}
+
+#机械牧师
+techno_priest = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_robot_assembly_plant
+	clothes_texture_index = 3
+	
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	
+	resources = {
+		category = planet_pop_assemblers
+		produces = {
+			unity = 3
+			engineering_research = 2
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_liberation_theology
+					is_lithoid = no
+					NOT = { has_country_flag = synthetic_empire }
+				}
+			}
+			minerals = 2
+			food = 3
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_liberation_theology
+					is_lithoid = yes
+					NOT = { has_country_flag = synthetic_empire }
+				}
+			}
+			minerals = 4
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_liberation_theology
+					has_country_flag = synthetic_empire
+				}
+			}
+			minerals = 2
+			energy = 3
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_tradition = tr_piety_nature_and_humanity
+				}
+			}
+			engineering_research = 1.5
+			society_research = 1.5
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_knowledge_seeker
+				}
+			}
+			unity = -1
+			physics_research = 1.5
+			engineering_research = 1.5
+			society_research = 1.5
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_imperial_cult
+						has_valid_civic = civic_divine_council
+						has_valid_civic = civic_spiritual_democracy
+						has_valid_civic = civic_exalted_priesthood
+					}
+				}
+			}
+			engineering_research = 1
+		}
+		upkeep = {
+			alloys = 0.5
+			consumer_goods = 0.5
+		}
+		produces = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			unity = 1.5
+			society_research = 0.75
+		}
+		upkeep = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			sr_zro = 0.1
+		}
+	}
+	country_modifier = {
+		country_admin_cap_add = 3
+	}
+	planet_modifier = {
+		planet_pops_robotics_upkeep_mult = -0.07
+		planet_pop_assembly_add = 0.75
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 3
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	weight = {
+		weight = @specialist_job_weight
+		modifier = {
+			factor = 2
+			owner = {
+				has_origin = origin_machine_cult
+			}
+		}
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = {
+				has_trait = trait_mechanical
+			}
+		}
+		modifier = {
+			factor = 2
+			exists = owner
+			owner = {
+				OR = {
+					has_valid_civic = civic_imperial_cult
+					has_valid_civic = civic_divine_council
+					has_valid_civic = civic_spiritual_democracy
+					has_valid_civic = civic_exalted_priesthood
+				}
+			}
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_robot_domestic_protocols
+				has_trait = trait_charismatic
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robot_propaganda_machines
+				has_trait = trait_traditional
+			}
+		}
+		modifier = {
+			factor = 1.2
+			has_ethic = ethic_spiritualist
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_quarrelsome
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_natural_sociologists
+		}
+		modifier = {
+			factor = 0.1
+			has_ethic = ethic_materialist
+			NOT = {
+				has_job = priest
+			}
+		}
+		modifier = {
+			factor = 1.5
+			has_job = priest
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 1.3
+			has_trait = trait_presapient_natural_intellectuals
+		}
+		modifier = {
+			factor = 1.3
+			OR = {
+				has_trait = trait_robust
+				has_trait = trait_robot_efficient_processors
+			}
+		}
+		modifier = {
+			factor = 1.15
+			has_trait = trait_erudite
+		}
+		modifier = {
+			factor = 1.05
+			OR = {
+				has_trait = trait_robot_logic_engines
+				has_trait = trait_intelligent
+			}
+		}
+		modifier = {
+			factor = 0.9
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.05
+			has_trait = trait_psionic
+		}
+		modifier = {
+			factor = 0.7
+			has_trait = trait_enigmatic_intelligence_failed
+		}
+		modifier = {
+			factor = 1.05
+			OR = {
+				has_trait = trait_enigmatic_intelligence
+				has_trait = trait_enigmatic_intelligence_poor
+			}
+		}
+		modifier = {
+			factor = 0.1
+			is_enslaved = yes
+			has_slavery_type = {
+				type = slavery_indentured
+			}
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_necrophage
+		}
+	}
+}
+
+#不知道是啥
+geoengineer = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_research_lab_1
+	clothes_texture_index = 3
+	
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	
+	resources = {
+		category = planet_researchers
+		produces = {
+			physics_research = 4
+			engineering_research = 4
+		}
+		upkeep = {
+			consumer_goods = 1
+		}
+	}
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = {
+				has_trait = trait_mechanical
+			}
+		}
+		modifier = {
+			factor = 2
+			has_living_standard = {
+				type = living_standard_academic_privilege
+			}
+		}
+		modifier = {
+			factor = 3
+			has_trait = trait_erudite
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_robot_logic_engines
+				has_trait = trait_intelligent
+			}
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_natural_engineers
+				has_trait = trait_natural_physicists
+			}
+		}
+		modifier = {
+			factor = 1.1
+			has_ethic = ethic_green
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 0.65
+			OR = {
+				has_trait = trait_presapient_proles
+			}
+		}
+		modifier = {
+			factor = 1.5
+			has_job = geoengineer
+		}
+	}
+}
+
+#不知道是啥
+xenobiologist = {
+	category = specialist
+	condition_string = SPECIALIST_JOB_TRIGGER
+	building_icon = building_research_lab_1
+	clothes_texture_index = 3
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_specialist_job
+	resources = {
+		category = planet_researchers
+		produces = {
+			society_research = 7
+		}
+		upkeep = {
+			consumer_goods = 1
+		}
+	}
+	weight = {
+		weight = @worker_job_weight
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = {
+				has_trait = trait_mechanical
+			}
+		}
+		modifier = {
+			factor = 2
+			has_living_standard = {
+				type = living_standard_academic_privilege
+			}
+		}
+		modifier = {
+			factor = 3
+			has_trait = trait_erudite
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_intelligent
+			}
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 2.5
+			OR = {
+				has_trait = trait_natural_sociologists
+			}
+		}
+		modifier = {
+			factor = 1.1
+			has_ethic = ethic_green
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 0.65
+			OR = {
+				has_trait = trait_presapient_proles
+			}
+		}
+		modifier = {
+			factor = 1.5
+			has_job = xenobiologist
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/pop_jobs/ethic_03_worker_jobs.txt b/common/pop_jobs/ethic_03_worker_jobs.txt
new file mode 100644
index 000000000..4e4a1797b
--- /dev/null
+++ b/common/pop_jobs/ethic_03_worker_jobs.txt
@@ -0,0 +1,1554 @@
+#孝子
+professional_star_fans = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_residence
+	clothes_texture_index = 2
+	icon = clerk
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+
+	resources = {
+		category = planet_clerk
+		upkeep = {
+			consumer_goods = 1
+		}
+	}
+	triggered_pop_modifier = {
+		potential = { always = yes }
+		pop_happiness = 0.1
+		mult = planet.value:count_job|JOB|entertainer|
+	}
+	planet_modifier = {
+		pop_cat_worker_happiness = -0.02
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		trade_value_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		trade_value_add = 1
+		mult = planet.value:count_job|JOB|entertainer|
+	}
+
+	weight = {
+		weight = 100
+	}
+}
+
+#角斗士
+gladiator = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_colliseum
+	clothes_texture_index = 3
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_enslaved = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+
+	resources = {
+		category = planet_entertainers
+		upkeep = {
+			alloys = 0.25
+		}
+	}
+	pop_modifier = {
+		pop_defense_armies_add = 1
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 10
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	country_modifier = {
+		country_naval_cap_add = 1
+	}
+
+	weight = {
+		weight = @specialist_job_weight
+		modifier = { # 可控的动态权重
+			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 1.5
+			has_citizenship_rights = no
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			has_slavery_type = {
+				type = slavery_military
+			}
+		}
+		modifier = {
+			factor = 3
+			has_trait = trait_robot_domestic_protocols
+			OR = {
+				is_non_sapient_robot = yes
+				is_shackled_robot = yes
+			}
+		}
+		modifier = {
+			factor = 1.20
+			has_ethic = ethic_militarist
+		}
+		modifier = {
+			factor = 1.5
+			has_job = gladiator
+		}
+		modifier = {
+			factor = 0.5
+			NOT = { has_job = gladiator }
+			exists = planet
+			planet = {
+				free_amenities > 5
+			}
+		}
+	}
+}
+
+#劳动英雄
+labour_hero = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_power_plant
+	clothes_texture_index = 2
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_enslaved = no # incompatible with civic_du_contrat_social
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job #specialist_job
+	possible = {
+		is_non_sapient_robot = no
+		is_shackled_robot = no
+	}
+
+	resources = {
+		category = planet_miners
+		produces = {
+			energy = 3
+			minerals = 2
+			food = 3
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					is_lithoid = yes
+				}
+			}
+			food = -3
+			minerals = 2
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					has_policy_flag = economic_stance_planned
+				}
+			}
+			energy = -3
+			minerals = -2
+			food = -3
+			alloys = 3
+			consumer_goods = 2
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_shared_burden
+						has_valid_civic = civic_socialistic
+						has_valid_civic = civic_forever_with_us
+					}
+					NOR = {
+						has_policy_flag = economic_stance_planned
+					}
+				}
+			}
+			physics_research = 0.25
+			society_research = 0.25
+			engineering_research = 0.25
+			unity = 0.5
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_socialistic
+					}
+					NOR = {
+						has_policy_flag = economic_stance_planned
+					}
+				}
+			}
+			unity = 0.5
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_ascension_perk = ap_synthetic_evolution
+					}
+				}
+			}
+			food = -3
+			minerals = 2
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_anarchism
+					}
+				}
+			}
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			sr_zro = 0.1
+		}
+	}
+
+	planet_modifier = {
+		pop_environment_tolerance = -0.025
+		trade_value_add = 2
+	}
+	
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_jobs_worker_produces_mult = 0.02
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_industry_pacesetter
+			}
+		}
+		modifier = {
+			planet_jobs_produces_mult = 0.01
+		}
+	}
+	triggered_planet_modifier = {
+		potential = {
+			owner = {
+				has_valid_civic = civic_anarchism
+			}
+		}
+		modifier = {
+			planet_amenities_add = 1
+		}
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	# 共产主义社会
+	triggered_planet_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_shared_burden
+				has_ascension_perk = ap_future_society
+			}
+		}
+		planet_crime_add = -5
+	}
+	triggered_country_modifier = {
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_shared_burden
+				has_ascension_perk = ap_future_society
+			}
+		}
+		modifier = {
+			country_admin_cap_add = 0.5
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = { # 可控的动态权重
+			factor = value:job_weights_modifier|JOB|miner|RESOURCE|minerals|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 2
+			OR = {
+				has_trait = trait_agrarian
+				has_trait = trait_ingenious
+				has_trait = trait_industrious
+				has_trait = trait_robot_harvesters
+				has_trait = trait_robot_superconductive
+				has_trait = trait_robot_power_drills
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_strong
+				has_trait = trait_robot_efficient_processors
+			}
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_very_strong
+		}
+		modifier = {
+			factor = 3
+			has_trait = trait_robust
+		}
+		modifier = {
+			factor = 1.2
+			owner = {
+				has_monthly_income = {
+					resource = energy
+					value < -1
+				}
+			}
+		}
+		modifier = {
+			factor = 1.1
+			owner = {
+				has_monthly_income = {
+					resource = minerals
+					value < 20
+				}
+			}
+		}
+		modifier = {
+			factor = 1.2
+			owner = {
+				has_monthly_income = {
+					resource = food
+					value < -1
+				}
+			}
+		}
+	}
+}
+
+#德鲁伊学徒
+druid = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_executive_retreat
+	clothes_texture_index = 3
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+
+	resources = {
+		category = planet_priests
+		produces = {
+			society_research = 2
+			unity = 3
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_imperial_cult
+						has_valid_civic = civic_divine_council
+						has_valid_civic = civic_spiritual_democracy
+						has_valid_civic = civic_exalted_priesthood
+					}
+				}
+			}
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_shared_burden
+						has_valid_civic = civic_socialistic
+						has_valid_civic = civic_forever_with_us
+					}
+				}
+			}
+			society_research = 0.25
+		}
+		produces = {
+			trigger = {
+				planet = { has_modifier = "ley_rift" }
+			}
+			sr_zro = 0.1
+		}
+	}
+	triggered_planet_modifier = {
+		pop_environment_tolerance = 0.01 #宜居度+5%
+		planet_amenities_add = 2
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	triggered_country_modifier = { # 共产主义社会
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_shared_burden
+				has_ascension_perk = ap_future_society
+			}
+		}
+		modifier = {
+			country_admin_cap_add = 0.5
+		}
+	}
+
+	weight = {
+		weight = @worker_job_weight
+		modifier = { # 可控的动态权重
+			factor = value:job_weights_modifier|JOB|druid|RESOURCE|unity|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 0.2
+			has_citizenship_rights = no
+			NOT = {
+				has_trait = trait_mechanical
+			}
+		}
+		modifier = {
+			factor = 2
+			owner = {
+				OR = {
+					has_valid_civic = civic_imperial_cult
+					has_valid_civic = civic_divine_council
+					has_valid_civic = civic_spiritual_democracy
+					has_valid_civic = civic_exalted_priesthood
+				}
+			}
+		}
+		modifier = {
+			factor = 1.5
+			OR = {
+				has_trait = trait_robot_domestic_protocols
+				has_trait = trait_charismatic
+			}
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_repugnant
+		}
+		modifier = {
+			factor = 1.2
+			has_ethic = ethic_spiritualist
+		}
+		modifier = {
+			factor = 1.2
+			has_ethic = ethic_green
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_quarrelsome
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_natural_sociologists
+		}
+		modifier = {
+			factor = 0.1
+			has_ethic = ethic_materialist
+			NOT = {
+				has_job = druid
+			}
+		}
+		modifier = {
+			factor = 1.5
+			has_job = druid
+		}
+	}
+}
+
+#士兵
+conscript = {
+	category = worker
+	icon = soldier
+	condition_string = SOLDIER_JOB_TRIGGER
+	building_icon = building_stronghold
+	clothes_texture_index = 4
+	is_capped_by_modifier = yes
+	can_set_priority = no
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_purged = no
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible = {
+		soldier_job_check_trigger = yes
+	}
+
+	resources = {
+		category = planet_soldiers
+		produces = {
+			trigger = {
+				is_lithoid = no
+				owner = {
+					exists = owner
+					has_valid_civic = civic_army_production
+					NOT = { has_country_flag = synthetic_empire }
+				}
+			}
+			food = 2
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				is_lithoid = yes
+				owner = {
+					exists = owner
+					has_valid_civic = civic_army_production
+					NOT = { has_country_flag = synthetic_empire }
+				}
+			}
+			minerals = 2
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_army_production
+					has_country_flag = synthetic_empire
+				}
+			}
+			energy = 2
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_army_production
+				}
+			}
+			minerals = 1
+			energy = 1
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_military_scientific
+				}
+			}
+			physics_research = 1
+			engineering_research = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_shared_burden
+						has_valid_civic = civic_socialistic
+						has_valid_civic = civic_forever_with_us
+					}
+				}
+			}
+			society_research = 0.25
+		}
+		#军国主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_militarist
+				}
+			}
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_militarist
+				}
+			}
+			unity = 0.5
+		}
+	}
+	country_modifier = {
+		country_naval_cap_add = 2
+	}
+	triggered_country_modifier = {
+		potential = {
+			exists = planet
+			planet = {
+				exists = owner
+				owner = {
+					has_technology = "tech_ground_defense_planning"
+				}
+			}
+		}
+		modifier = {
+			country_naval_cap_add = 2
+		}
+	}
+	pop_modifier = {
+		pop_defense_armies_add = 3
+	}
+	triggered_pop_modifier = {
+		potential = {
+			planet = {
+				has_building = building_automated_defense_system
+			}
+		}
+		modifier = {
+			pop_defense_armies_add = 2
+		}
+	}
+
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				exists = planet
+				has_modifier = martial_law
+				has_modifier = martial_law_martial_brotherhood
+			}
+			happiness >= 0.35
+		}
+		planet_stability_add = 80
+		mult = planet.society_factor_pops
+	}
+	triggered_planet_modifier = {
+		potential = {
+			planet = {
+				exists = planet
+				has_modifier = martial_law
+				has_modifier = martial_law_martial_brotherhood
+			}
+			happiness < 0.35
+		}
+		planet_stability_add = -50
+		mult = planet.society_factor_pops
+	}
+	triggered_country_modifier = { # 共产主义社会
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_shared_burden
+				has_ascension_perk = ap_future_society
+			}
+		}
+		modifier = {
+			country_admin_cap_add = 0.5
+		}
+	}
+
+	weight = {
+		weight = 300
+		modifier = {
+			factor = 10
+			exists = planet
+			planet = { has_modifier = martial_law }
+		}
+		modifier = {
+			factor = 10
+			exists = owner
+			owner = { is_militarist = yes }
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_resilient
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_very_strong
+		}
+		modifier = {
+			factor = 1.5
+			has_trait = trait_strong
+		}
+		modifier = {
+			factor = 0.5
+			has_trait = trait_weak
+		}
+		modifier = {
+			factor = 0.1
+			is_enslaved = yes
+			NOT = { has_slavery_type = { type = slavery_military } }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+			has_slavery_type = { type = slavery_military }
+		}
+		modifier = {
+			factor = 0.1
+			can_take_servant_job = yes
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_cybernetic
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_presapient_earthbound
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_limited_regeneration
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_presapient_proles
+		}
+		modifier = {
+			factor = 1.1
+			has_trait = trait_brainslug
+		}
+		modifier = {
+			factor = 1.05
+			has_trait = trait_presapient_natural_intellectuals
+		}
+		modifier = {
+			factor = 1.05
+			OR = {
+				has_trait = trait_robust
+				has_trait = trait_robot_efficient_processors
+			}
+		}
+		modifier = {
+			factor = 1.05
+			has_trait = trait_nerve_stapled
+		}
+		modifier = {
+			factor = 1.1
+			OR = {
+				has_trait = trait_robot_propaganda_machines
+				has_trait = trait_traditional
+			}
+		}
+		modifier = {
+			factor = 0.9
+			has_trait = trait_quarrelsome
+		}
+		modifier = {
+			factor = 0
+			species = { can_be_soldier = no }
+		}
+		modifier = {
+			factor = 2
+			has_trait = trait_lithoid
+		}
+	}
+}
+
+#苗床
+tentacle_seedbed = {
+	category = worker
+	condition_string = WORKER_JOB_TRIGGER
+	building_icon = building_spawning_pool
+	clothes_texture_index = 3
+	icon = bio_trophy
+
+	possible_pre_triggers = {
+		has_owner = yes
+		is_being_assimilated = no
+		is_sapient = yes
+	}
+	possible_precalc = can_fill_worker_job
+	possible = {
+		hidden_trigger = { exists = owner }
+		NOT = { has_trait = trait_zombie }
+		owner = { has_civic = civic_libido_equipment }
+	}
+
+	resources = {
+		category = planet_jobs
+		upkeep = {
+			trigger = {
+				is_lithoid = no
+			}
+			food = 2
+		}
+		upkeep = {
+			trigger = {
+				is_lithoid = yes
+			}
+			minerals = 2
+		}
+	}
+	planet_modifier = {
+		planet_pop_assembly_organic_add = 1
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 12
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	triggered_planet_modifier = { # 多彩环境强化
+		potential = {
+			AND = {
+				has_global_flag = love_between_us
+				OR = {
+					has_trait = trait_DC_ethic_lust_skynet
+					has_trait = trait_DC_ethic_carnalism
+				}
+			}
+		}
+		planet_pop_assembly_organic_add = 0.5
+		planet_amenities_add = 12
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+
+	weight = {
+		weight = @clerk_job_weight
+		modifier = { # 可控的动态权重
+			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
+			owner = { has_edict = dynamic_weight }
+		}
+		modifier = {
+			factor = 10
+			is_enslaved = yes
+		}
+		modifier = {
+			factor = 10
+			AND = {
+				has_global_flag = love_between_us
+				OR = {
+					has_trait = trait_DC_ethic_lust_skynet
+					has_trait = trait_DC_ethic_carnalism
+				}
+			}
+		}
+	}
+}
+
+#劳工
+future_worker = {
+	category = worker
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+	building_icon = building_research_lab_1
+	icon = primitive_laborer
+
+	possible_pre_triggers = {
+		has_owner = yes
+	}
+	possible_precalc = can_fill_worker_job
+	possible = {
+		hidden_trigger = { exists = planet exists = owner }
+		planet = { has_modifier = planet_unemployment_benefits }
+		owner = {
+			has_active_tradition = tr_future_industry
+			has_technology = tech_ascension_theory
+			is_gestalt = no
+			has_policy_flag = economic_stance_planned
+		}
+	}
+
+	resources = {
+		category = planet_jobs
+		produces = {
+			trigger = {
+				planet = {
+					OR = {
+						has_district = district_generator
+						has_district = district_generator_uncapped
+						has_district = district_rw_generator
+						has_district = district_hab_energy
+						has_district = district_pdhab_energy
+					}
+				}
+			}
+			energy = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					OR = {
+						has_district = district_mining
+						has_district = district_mining_uncapped
+						has_district = district_hab_mining
+						has_district = district_pdhab_mining
+					}
+				}
+			}
+			minerals = 1.5
+		}
+		produces = {
+			trigger = {
+				OR = {
+					has_trait = trait_mechanical
+					has_trait = trait_lithoid
+				}
+				planet = {
+					OR = {
+						has_district = district_mining
+						has_district = district_mining_uncapped
+						has_district = district_hab_mining
+						has_district = district_pdhab_mining
+					}
+				}
+			}
+			minerals = 1.5
+		}
+		produces = {
+			trigger = {
+				NOR = {
+					has_trait = trait_mechanical
+					has_trait = trait_lithoid
+				}
+				planet = {
+					OR = {
+						has_district = district_farming
+						has_district = district_farming_uncapped
+						has_district = district_rw_farming
+						has_district = district_pdhab_food
+						has_building = building_hydroponics_farm
+						has_designation = col_habitat_farming
+					}
+				}
+			}
+			food = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					OR = {
+						has_district = district_industrial
+						has_district = district_arcology_arms_industry
+						has_district = district_rw_industrial
+						has_district = district_hab_industrial
+						has_district = district_pdhab_industrial
+					}
+					NOR = {
+						has_designation = col_factory
+						has_designation = col_habitat_factory
+						has_designation = col_ring_factory
+						has_designation = col_ecu_factory
+						has_designation = col_dome_factory
+					}
+				}
+			}
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					OR = {
+						has_district = district_industrial
+						has_district = district_arcology_civilian_industry
+						has_district = district_rw_industrial
+						has_district = district_hab_industrial
+						has_district = district_pdhab_industrial
+					}
+					NOR = {
+						has_designation = col_foundry
+						has_designation = col_habitat_foundry
+						has_designation = col_ring_foundry
+						has_designation = col_ecu_foundry
+						has_designation = col_dome_foundry
+					}
+				}
+			}
+			consumer_goods = 1
+		}
+
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_democracy_and_clean_government
+						has_valid_civic = civic_business_reporting_administration
+					}
+				}
+			}
+			unity = 1
+		}
+
+		#利他主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_altruism
+				}
+			}
+			unity = 2
+		}
+
+		#社会主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_socialism
+				}
+			}
+			unity = 0.5
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_socialism
+				}
+			}
+			unity = 0.25
+		}
+
+		# Utopian living standards
+		produces = {
+			trigger = {
+				has_utopian_living_standard_type = yes
+			}
+			society_research = 2
+			physics_research = 2
+			engineering_research = 2
+		}
+
+		# Welfare
+		produces = {
+			trigger = {
+				OR = {
+					has_very_high_living_standard_type = yes
+					has_high_living_standard_type = yes
+					has_shared_burden_living_standard_type = yes
+				}
+			}
+			unity = 1
+		}
+		#AI基础与年数产出
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+			}
+			food = 2
+			energy = 4
+			minerals = 2
+			consumer_goods = 1
+			alloys = 0.5
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 20
+			}
+			food = 1
+			energy = 4
+			minerals = 1
+			consumer_goods = 1
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 35
+			}
+			food = 1
+			energy = 4
+			minerals = 1
+			consumer_goods = 1
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 50
+			}
+			food = -2
+			energy = 16
+			minerals = -2
+			consumer_goods = -2
+			alloys = 2
+		}
+
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				mid_game_years_passed > 0
+			}
+			food = 2
+			energy = 6
+			minerals = 2
+			consumer_goods = 2
+			alloys = 2
+		}
+
+		produces = {
+			trigger = {
+				end_game_years_passed > 0
+			}
+			alloys = 3
+			unity = 1
+		}
+		#AI思潮加成
+		produces = {
+			trigger = {
+				owner = {
+					is_ai = yes
+					or = {
+						has_ethic = ethic_fanatic_spiritualist
+						has_ethic = ethic_spiritualist
+					}
+
+				}
+			}
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				owner = {
+					is_ai = yes
+					OR = {
+						has_ethic = ethic_fanatic_materialist
+						has_ethic = ethic_materialist
+					}
+				}
+			}
+			physics_research = 1
+			engineering_research = 1
+			society_research = 1
+		}
+		#AI弱者强化
+		produces = {
+			trigger = {
+				years_passed >= 50
+				owner = {
+					is_ai = yes
+					num_pops < 100
+				}
+			}
+			physics_research = 8
+			engineering_research = 8
+			society_research = 8
+			alloys = 8
+			unity = 2
+		}
+		produces = {
+			trigger = {
+				years_passed >= 80
+				owner = {
+					is_ai = yes
+					num_pops < 100
+				}
+			}
+			physics_research = 8
+			engineering_research = 8
+			society_research = 8
+			alloys = 14
+		}
+
+		upkeep = {
+			consumer_goods = 0.5
+		}
+	}
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		planet_amenities_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
+	}
+	planet_modifier = {
+		job_researcher_add = 0.2
+		job_culture_worker_add = 0.2
+	}
+
+	triggered_country_modifier = { # 共产主义社会
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_shared_burden
+				has_ascension_perk = ap_future_society
+			}
+		}
+		modifier = {
+			country_admin_cap_add = 0.5
+		}
+	}
+
+	weight = {
+		weight = 0.95
+	}
+}
+
+#临时工
+resocialization_workers = {
+	category = worker
+	is_capped_by_modifier = no
+	clothes_texture_index = 2
+	building_icon = building_crude_huts
+	icon = primitive_laborer
+
+	possible_pre_triggers = {
+		has_owner = yes
+	}
+	possible = {
+		hidden_trigger = { exists = planet exists = owner }
+		planet = { has_modifier = planet_unemployment_benefits }
+		owner = {
+			has_active_tradition = tr_future_industry
+			has_technology = tech_ascension_theory
+			is_gestalt = no
+			NOT = { has_policy_flag = economic_stance_planned }
+		}
+	}
+
+	resources = {
+		category = unemployment_resources
+		produces = {
+			trigger = {
+				planet = {
+					OR = {
+						has_district = district_generator
+						has_district = district_generator_uncapped
+						has_district = district_rw_generator
+						has_district = district_hab_energy
+						has_district = district_pdhab_energy
+					}
+				}
+			}
+			energy = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					OR = {
+						has_district = district_mining
+						has_district = district_mining_uncapped
+						has_district = district_hab_mining
+						has_district = district_pdhab_mining
+					}
+				}
+			}
+			minerals = 1.5
+		}
+		produces = {
+			trigger = {
+				OR = {
+					has_trait = trait_mechanical
+					has_trait = trait_lithoid
+				}
+				planet = {
+					OR = {
+						has_district = district_mining
+						has_district = district_mining_uncapped
+						has_district = district_hab_mining
+						has_district = district_pdhab_mining
+					}
+				}
+			}
+			minerals = 1.5
+		}
+		produces = {
+			trigger = {
+				NOR = {
+					has_trait = trait_mechanical
+					has_trait = trait_lithoid
+				}
+				planet = {
+					OR = {
+						has_district = district_farming
+						has_district = district_farming_uncapped
+						has_district = district_rw_farming
+						has_district = district_pdhab_food
+						has_building = building_hydroponics_farm
+						has_designation = col_habitat_farming
+					}
+				}
+			}
+			food = 2
+		}
+		produces = {
+			trigger = {
+				planet = {
+					OR = {
+						has_district = district_industrial
+						has_district = district_arcology_arms_industry
+						has_district = district_rw_industrial
+						has_district = district_hab_industrial
+						has_district = district_pdhab_industrial
+					}
+					NOR = {
+						has_designation = col_factory
+						has_designation = col_habitat_factory
+						has_designation = col_ring_factory
+						has_designation = col_ecu_factory
+						has_designation = col_dome_factory
+					}
+				}
+			}
+			alloys = 1
+		}
+		produces = {
+			trigger = {
+				planet = {
+					OR = {
+						has_district = district_industrial
+						has_district = district_arcology_civilian_industry
+						has_district = district_rw_industrial
+						has_district = district_hab_industrial
+						has_district = district_pdhab_industrial
+					}
+					NOR = {
+						has_designation = col_foundry
+						has_designation = col_habitat_foundry
+						has_designation = col_ring_foundry
+						has_designation = col_ecu_foundry
+						has_designation = col_dome_foundry
+					}
+				}
+			}
+			consumer_goods = 1
+		}
+
+		produces = {
+			trigger = {
+				owner = {
+					OR = {
+						has_valid_civic = civic_democracy_and_clean_government
+						has_valid_civic = civic_business_reporting_administration
+					}
+				}
+			}
+			unity = 1
+		}
+
+		#利他主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_valid_civic = civic_altruism
+				}
+			}
+			unity = 2
+		}
+
+		#社会主义
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_fanatic_socialism
+				}
+			}
+			unity = 0.5
+		}
+		produces = {
+			trigger = {
+				exists = owner
+				owner = {
+					has_ethic = ethic_socialism
+				}
+			}
+			unity = 0.25
+		}
+
+		# Utopian living standards
+		produces = {
+			trigger = {
+				has_utopian_living_standard_type = yes
+			}
+			society_research = 2
+			physics_research = 2
+			engineering_research = 2
+		}
+
+		# Welfare
+		produces = {
+			trigger = {
+				OR = {
+					has_very_high_living_standard_type = yes
+					has_high_living_standard_type = yes
+					has_shared_burden_living_standard_type = yes
+				}
+			}
+			unity = 0.5
+		}
+		#AI基础与年数产出
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+			}
+			food = 1
+			energy = 2
+			minerals = 1
+			consumer_goods = 0.5
+			alloys = 0.25
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 20
+			}
+			food = 0.5
+			energy = 2
+			minerals = 0.5
+			consumer_goods = 0.5
+			alloys = 0.5
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 35
+			}
+			food = 0.5
+			energy = 2
+			minerals = 0.5
+			consumer_goods = 0.5
+			alloys = 0.5
+		}
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				years_passed >= 50
+			}
+			food = -3
+			energy = 8
+			minerals = -3
+			consumer_goods = -3
+			alloys = 1
+		}
+
+		produces = {
+			trigger = {
+				owner = { is_ai = yes }
+				mid_game_years_passed > 0
+			}
+			food = 1
+			energy = 3
+			minerals = 1
+			consumer_goods = 1
+			alloys = 1
+		}
+
+		produces = {
+			trigger = {
+				end_game_years_passed > 0
+			}
+			alloys = 1.5
+			unity = 0.5
+		}
+		#AI思潮加成
+		produces = {
+			trigger = {
+				owner = {
+					is_ai = yes
+					or = {
+						has_ethic = ethic_fanatic_spiritualist
+						has_ethic = ethic_spiritualist
+					}
+
+				}
+			}
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				owner = {
+					is_ai = yes
+					OR = {
+						has_ethic = ethic_fanatic_materialist
+						has_ethic = ethic_materialist
+					}
+				}
+			}
+			physics_research = 0.5
+			engineering_research = 0.5
+			society_research = 0.5
+		}
+		#AI弱者强化
+		produces = {
+			trigger = {
+				years_passed >= 50
+				owner = {
+					is_ai = yes
+					num_pops < 100
+				}
+			}
+			physics_research = 4
+			engineering_research = 4
+			society_research = 4
+			alloys = 4
+			unity = 1
+		}
+		produces = {
+			trigger = {
+				years_passed >= 80
+				owner = {
+					is_ai = yes
+					num_pops < 100
+				}
+			}
+			physics_research = 6
+			engineering_research = 6
+			society_research = 6
+			alloys = 7
+		}
+
+		upkeep = {
+			consumer_goods = 0.5
+		}
+	}
+
+	planet_modifier = {
+		job_merchant_add = 0.2
+		job_mogul_add = 0.05
+	}
+
+	triggered_planet_modifier = {
+		potential = { always = yes }
+		trade_value_add = 1
+		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
+	}
+
+	triggered_country_modifier = { # 共产主义社会
+		potential = {
+			exists = owner
+			owner = {
+				has_valid_civic = civic_shared_burden
+				has_ascension_perk = ap_future_society
+			}
+		}
+		modifier = {
+			country_admin_cap_add = 0.5
+		}
+	}
+
+	weight = {
+		weight = 0.95
+	}
+}
\ No newline at end of file
diff --git a/common/pop_jobs/ethic_rebuild_jobs.txt b/common/pop_jobs/ethic_rebuild_jobs.txt
deleted file mode 100644
index beb78b588..000000000
--- a/common/pop_jobs/ethic_rebuild_jobs.txt
+++ /dev/null
@@ -1,6112 +0,0 @@
-###################
-# 劳工
-###################
-#孝子
-professional_star_fans = {
-	category = worker
-	condition_string = WORKER_JOB_TRIGGER
-	building_icon = building_residence
-	clothes_texture_index = 2
-	icon = clerk
-	
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-
-	resources = {
-		category = planet_clerk
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	triggered_pop_modifier = {
-		potential = { always = yes }
-		pop_happiness = 0.1
-		mult = planet.value:count_job|JOB|entertainer|
-	}
-	planet_modifier = {
-		pop_cat_worker_happiness = -0.02
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		trade_value_add = 1
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-	
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		trade_value_add = 1
-		mult = planet.value:count_job|JOB|entertainer|
-	}
-
-	weight = {
-		weight = 100
-	}
-}
-
-#剩余价值
-surplus_value = {
-	category = worker
-	is_capped_by_modifier = no
-	clothes_texture_index = 2
-	
-	possible_pre_triggers = {
-		is_enslaved = yes
-	}
-	possible = {
-		exists = owner
-		owner = {
-			has_civic = civic_machine_financial_investment
-		}
-		has_citizenship_type = {
-			type = citizenship_slavery
-		}
-	}
-
-	resources = {
-		category = planet_jobs
-		produces = {
-			energy = 3
-			minerals = 3
-			food = 0.5
-		}
-	}
-	pop_modifier = {
-		pop_housing_usage_add = -0.25
-	}
-	
-	weight = {
-		weight = @special_job_weight
-	}
-}
-
-#角斗士
-gladiator = {
-	category = worker
-	condition_string = WORKER_JOB_TRIGGER
-	building_icon = building_colliseum
-	clothes_texture_index = 3
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			is_gestalt = no
-		}
-	}
-
-	resources = {
-		category = planet_entertainers
-		upkeep = {
-			alloys = 0.25
-		}
-	}
-	pop_modifier = {
-		pop_defense_armies_add = 1
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 10
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	country_modifier = {
-		country_naval_cap_add = 1
-	}
-
-	weight = {
-		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 1.5
-			has_citizenship_rights = no
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			has_slavery_type = {
-				type = slavery_military
-			}
-		}
-		modifier = {
-			factor = 3
-			has_trait = trait_robot_domestic_protocols
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-		}
-		modifier = {
-			factor = 1.20
-			has_ethic = ethic_militarist
-		}
-		modifier = {
-			factor = 1.5
-			has_job = gladiator
-		}
-		modifier = {
-			factor = 0.5
-			NOT = { has_job = gladiator }
-			exists = planet
-			planet = {
-				free_amenities > 5
-			}
-		}
-	}
-}
-
-#劳动英雄
-labour_hero = {
-	category = worker
-	condition_string = WORKER_JOB_TRIGGER
-	building_icon = building_power_plant
-	clothes_texture_index = 2
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_enslaved = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job #specialist_job
-	possible = {
-		is_non_sapient_robot = no
-		is_shackled_robot = no
-	}
-
-	resources = {
-		category = planet_miners
-		produces = {
-			energy = 3
-			minerals = 2
-			food = 3
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					is_lithoid = yes
-				}
-			}
-			food = -3
-			minerals = 2
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					has_policy_flag = economic_stance_planned
-				}
-			}
-			energy = -3
-			minerals = -2
-			food = -3
-			alloys = 3
-			consumer_goods = 2
-			unity = 1
-		}
-		planet_modifier = {
-			pop_environment_tolerance = -0.025
-			trade_value_add = 2
-		}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_efficiency
-			}
-		}
-		modifier = {
-		energy = -1
-		minerals = -1
-		food = -1
-		pop_environment_tolerance = 0.005
-		trade_value_add = -1
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_growth
-			}
-		}
-		modifier = {
-			energy = 0.5
-			minerals = 0.5
-			food = 0.5
-		pop_environment_tolerance = -0.01
-		trade_value_add = 1.5
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_growth
-			}
-		}
-		modifier = {
-			energy = 1.5
-			minerals = 1.5
-			food = 1.5
-		pop_environment_tolerance = -0.025
-		trade_value_add = 2
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			AND = {
-				has_policy_flag = industrial_efficiency
-				has_policy_flag = economic_stance_planned
-			}
-		}
-		modifier = {
-		energy = 2
-		minerals = 2
-		food = 2
-		alloys = -1
-		consumer_goods = -0.5
-		pop_environment_tolerance = 0.005
-		trade_value_add = -1
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			AND = {
-				has_policy_flag = industrial_growth
-				has_policy_flag = economic_stance_planned
-			}
-		}
-		modifier = {
-			energy = -0.5
-			minerals = -0.5
-			food = -0.5
-			alloys = 1.5
-			consumer_goods = 1
-		pop_environment_tolerance = -0.015
-		trade_value_add = 2
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			AND = {
-				has_policy_flag = industrial_growth
-				has_policy_flag = economic_stance_planned
-			}
-		}
-		modifier = {
-			energy = -1.5
-			minerals = -1.5
-			food = -1.5
-			alloys = 2
-			consumer_goods = 1.5
-		pop_environment_tolerance = -0.025
-		trade_value_add = 2.5
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_unlimited
-			}
-		}
-		modifier = {
-			food = 2
-			pop_environment_tolerance = -0.015
-			trade_value_add = 1
-		}
-	}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-					NOR = {
-						has_policy_flag = economic_stance_planned
-					}
-				}
-			}
-			physics_research = 0.25
-			society_research = 0.25
-			engineering_research = 0.25
-			unity = 0.5
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_socialistic
-					}
-					NOR = {
-						has_policy_flag = economic_stance_planned
-					}
-				}
-			}
-			unity = 0.5
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_ascension_perk = ap_synthetic_evolution
-					}
-				}
-			}
-			food = -3
-			minerals = 2
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_anarchism
-					}
-				}
-			}
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_jobs_worker_produces_mult = 0.02
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 2
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_industry_pacesetter
-			}
-		}
-		modifier = {
-			planet_jobs_produces_mult = 0.01
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_anarchism
-			}
-		}
-		modifier = {
-			planet_amenities_add = 1
-		}
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	# 共产主义社会
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
-		}
-		planet_crime_add = -5
-	}
-	triggered_country_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
-	}
-
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|miner|RESOURCE|minerals|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_agrarian
-				has_trait = trait_ingenious
-				has_trait = trait_industrious
-				has_trait = trait_robot_harvesters
-				has_trait = trait_robot_superconductive
-				has_trait = trait_robot_power_drills
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_strong
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_very_strong
-		}
-		modifier = {
-			factor = 3
-			has_trait = trait_robust
-		}
-		modifier = {
-			factor = 1.2
-			owner = {
-				has_monthly_income = {
-					resource = energy
-					value < -1
-				}
-			}
-		}
-		modifier = {
-			factor = 1.1
-			owner = {
-				has_monthly_income = {
-					resource = minerals
-					value < 20
-				}
-			}
-		}
-		modifier = {
-			factor = 1.2
-			owner = {
-				has_monthly_income = {
-					resource = food
-					value < -1
-				}
-			}
-		}
-	}
-}
-
-#德鲁伊学徒
-druid = {
-	category = worker
-	condition_string = WORKER_JOB_TRIGGER
-	building_icon = building_executive_retreat
-	clothes_texture_index = 3
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		hidden_trigger = {
-			exists = owner
-		}
-	}
-
-	resources = {
-		category = planet_priests
-		produces = {
-			society_research = 2
-			unity = 3
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_imperial_cult
-						has_valid_civic = civic_divine_council
-						has_valid_civic = civic_spiritual_democracy
-						has_valid_civic = civic_exalted_priesthood
-					}
-				}
-			}
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			society_research = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
-	}
-	planet_modifier = {
-		POP_ENVIRONMENT_TOLERANCE = 0.01 #宜居度+5%
-		planet_amenities_add = 2
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	triggered_country_modifier = { # 共产主义社会
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
-	}
-
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|druid|RESOURCE|unity|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = {
-				has_trait = trait_mechanical
-			}
-		}
-		modifier = {
-			factor = 2
-			owner = {
-				OR = {
-					has_valid_civic = civic_imperial_cult
-					has_valid_civic = civic_divine_council
-					has_valid_civic = civic_spiritual_democracy
-					has_valid_civic = civic_exalted_priesthood
-				}
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robot_domestic_protocols
-				has_trait = trait_charismatic
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			factor = 1.2
-			has_ethic = ethic_spiritualist
-		}
-		modifier = {
-			factor = 1.2
-			has_ethic = ethic_green
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_natural_sociologists
-		}
-		modifier = {
-			factor = 0.1
-			has_ethic = ethic_materialist
-			NOT = {
-				has_job = druid
-			}
-		}
-		modifier = {
-			factor = 1.5
-			has_job = druid
-		}
-	}
-}
-
-#士兵
-conscript = {
-	category = worker
-	icon = soldier
-	condition_string = SOLDIER_JOB_TRIGGER
-	building_icon = building_stronghold
-	clothes_texture_index = 4
-	is_capped_by_modifier = yes
-	can_set_priority = no
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible = {
-		soldier_job_check_trigger = yes
-		owner = { is_gestalt = no }
-	}
-
-	resources = {
-		category = planet_soldiers
-		produces = {
-			trigger = {
-				is_lithoid = no
-				owner = {
-					exists = owner
-					has_valid_civic = civic_army_production
-					NOT = { has_country_flag = synthetic_empire }
-				}
-			}
-			food = 2
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				is_lithoid = yes
-				owner = {
-					exists = owner
-					has_valid_civic = civic_army_production
-					NOT = { has_country_flag = synthetic_empire }
-				}
-			}
-			minerals = 2
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_army_production
-					has_country_flag = synthetic_empire
-				}
-			}
-			energy = 2
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_army_production
-				}
-			}
-			minerals = 1
-			energy = 1
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_military_scientific
-				}
-			}
-			physics_research = 1
-			engineering_research = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			society_research = 0.25
-		}
-		#军国主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_militarist
-				}
-			}
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_militarist
-				}
-			}
-			unity = 0.5
-		}
-	}
-	country_modifier = {
-		country_naval_cap_add = 2
-	}
-	triggered_country_modifier = {
-		potential = {
-			exists = planet
-			planet = {
-				exists = owner
-				owner = {
-					has_technology = "tech_ground_defense_planning"
-				}
-			}
-		}
-		modifier = {
-			country_naval_cap_add = 2
-		}
-	}
-	pop_modifier = {
-		pop_defense_armies_add = 3
-	}
-	triggered_pop_modifier = {
-		potential = {
-			planet = {
-				has_building = building_automated_defense_system
-			}
-		}
-		modifier = {
-			pop_defense_armies_add = 2
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			planet = {
-				exists = planet
-				has_modifier = martial_law
-				has_modifier = martial_law_martial_brotherhood
-			}
-			happiness >= 0.35
-		}
-		planet_stability_add = 80
-		mult = planet.society_factor_pops
-	}
-	triggered_planet_modifier = {
-		potential = {
-			planet = {
-				exists = planet
-				has_modifier = martial_law
-				has_modifier = martial_law_martial_brotherhood
-			}
-			happiness < 0.35
-		}
-		planet_stability_add = -50
-		mult = planet.society_factor_pops
-	}
-	triggered_country_modifier = { # 共产主义社会
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
-	}
-
-	weight = {
-		weight = 300
-		modifier = {
-			factor = 10
-			exists = planet
-			planet = { has_modifier = martial_law }
-		}
-		modifier = {
-			factor = 10
-			exists = owner
-			owner = { is_militarist = yes }
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_resilient
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_very_strong
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_strong
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_weak
-		}
-		modifier = {
-			factor = 0.1
-			is_enslaved = yes
-			NOT = { has_slavery_type = { type = slavery_military } }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			has_slavery_type = { type = slavery_military }
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_cybernetic
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_presapient_earthbound
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_limited_regeneration
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 1.05
-			has_trait = trait_presapient_natural_intellectuals
-		}
-		modifier = {
-			factor = 1.05
-			OR = {
-				has_trait = trait_robust
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 1.05
-			has_trait = trait_nerve_stapled
-		}
-		modifier = {
-			factor = 1.1
-			OR = {
-				has_trait = trait_robot_propaganda_machines
-				has_trait = trait_traditional
-			}
-		}
-		modifier = {
-			factor = 0.9
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0
-			species = { can_be_soldier = no }
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_lithoid
-		}
-	}
-}
-
-#苗床
-tentacle_seedbed = {
-	category = worker
-	condition_string = WORKER_JOB_TRIGGER
-	building_icon = building_spawning_pool
-	clothes_texture_index = 3
-	icon = bio_trophy
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		NOT = { has_trait = trait_zombie }
-		owner = {
-			exists = owner
-			has_civic = civic_libido_equipment
-		}
-	}
-
-	resources = {
-		category = planet_jobs
-		upkeep = {
-			trigger = {
-				is_lithoid = no
-			}
-			food = 2
-		}
-		upkeep = {
-			trigger = {
-				is_lithoid = yes
-			}
-			minerals = 2
-		}
-	}
-	planet_modifier = {
-		planet_pop_assembly_organic_add = 1
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 12
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	triggered_planet_modifier = { # 多彩环境强化
-		potential = {
-			AND = {
-				has_global_flag = love_between_us
-				OR = {
-					has_trait = trait_DC_ethic_lust_skynet
-					has_trait = trait_DC_ethic_carnalism
-				}
-			}
-		}
-		planet_pop_assembly_organic_add = 0.5
-		planet_amenities_add = 12
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	weight = {
-		weight = @clerk_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-		}
-		modifier = {
-			factor = 10
-			AND = {
-				has_global_flag = love_between_us
-				OR = {
-					has_trait = trait_DC_ethic_lust_skynet
-					has_trait = trait_DC_ethic_carnalism
-				}
-			}
-		}
-	}
-}
-
-#圣炉侍者
-re_acolyte_metallurgists = {
-	category = worker
-	is_capped_by_modifier = yes
-	building_icon = building_empyrean_shrine
-	clothes_texture_index = 3
-	icon = foundry
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_metallurgists
-		produces = {
-			alloys = 3
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_catalytic_empire = yes
-				}
-			}
-			society_research = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			alloys = @requisitorium_alloys_reduction
-		}
-		upkeep = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			minerals = 2
-		}
-		upkeep = {
-			minerals = 6
-		}
-		upkeep = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_catalytic_empire = yes
-				}
-			}
-			minerals = -6
-			food = 6
-		}
-			triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = mixed_industrial
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.01
-		}
-	}
-	#污染
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_efficiency
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.005
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_growth
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.015
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_unlimited
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.02
-		}
-	}
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 0.5
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_alloys
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			alloys = @requisitorium_alloys_overlord
-		}
-	}
-
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_metallurgists|RESOURCE|alloys|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 2
-			is_enslaved = yes
-			can_take_servant_job = no
-		}
-		modifier = {
-			factor = 5
-			has_job = re_acolyte_metallurgists
-		}
-	}
-}
-
-#圣坊侍者
-re_acolyte_artisan = {
-	category = worker
-	is_capped_by_modifier = yes
-	building_icon = building_empyrean_shrine
-	clothes_texture_index = 3
-	icon = artisan
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_artisans
-		produces = {
-			consumer_goods = 6
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_crafters
-				}
-			}
-			engineering_research = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
-		upkeep = {
-			minerals = 6
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			consumer_goods = @requisitorium_consumer_goods_reduction
-		}
-		upkeep = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			minerals = 1
-		}
-			triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = mixed_industrial
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.01
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_efficiency
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.005
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_growth
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.015
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_unlimited
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.02
-		}
-	}
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 0.5
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_consumer_goods
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			consumer_goods = @requisitorium_consumer_goods_overlord
-		}
-	}
-
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_artisan|RESOURCE|consumer_goods|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 2
-			is_enslaved = yes
-			can_take_servant_job = no
-		}
-		modifier = {
-			factor = 5
-			has_job = re_acolyte_artisan
-		}
-
-		# low income modifier
-		modifier = {
-			factor = 1.2
-			exists = planet
-			planet = {
-				has_available_jobs = "re_acolyte_artisan"
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = consumer_goods
-					value < 5
-				}
-			}
-		}
-	}
-}
-
-#犁耕侍者
-re_acolyte_farm = {
-	category = worker
-	building_icon = building_food_processing_facility
-	clothes_texture_index = 3
-	icon = farmer
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_farmers
-		produces = {
-			food = 6
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_robot_empire = yes
-				}
-			}
-			food = -1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			society_research = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-				}
-			}
-			food = @requisitorium_food_reduction
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_agrarian_idyll
-			}
-		}
-		modifier = {
-			planet_amenities_add = 2
-		}
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_food
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-				}
-			}
-			food = @requisitorium_food_overlord
-		}
-	}
-	
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_farm|RESOURCE|food|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 1.1
-			owner = { has_valid_civic = civic_agrarian_idyll }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			can_take_servant_job = no
-			NOT = { has_slavery_type = { type = slavery_indentured } }
-		}
-		modifier = {
-			factor = 3
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { has_technology = tech_droid_workers }
-		}
-		modifier = {
-			factor = 200
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { NOT = { has_technology = tech_droid_workers } }
-		}
-		modifier = {
-			factor = 0.25
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-			owner = { has_valid_civic = civic_agrarian_idyll }
-		}
-		# low income modifier
-		modifier = {
-			factor = 1.2
-			exists = planet
-			planet = {
-				has_available_jobs = re_acolyte_farm
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = food
-					value < 10
-				}
-			}
-		}
-
-		modifier = {
-			factor = 0.5
-			has_trait = trait_lithoid
-
-			owner = {
-				is_lithoid_empire = yes
-				has_monthly_income = {
-					resource = food
-					value >= 0
-				}
-			}
-		}
-	}
-}
-
-#焰锤侍者
-re_acolyte_mine = {
-	category = worker
-	building_icon = building_crystal_mines
-	clothes_texture_index = 3
-	icon = miner
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_miners
-		produces = {
-			minerals = 4
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
-		produces = {
-			trigger = {
-				owner = {
-					has_valid_civic = civic_anglers_lithoid
-				}
-				planet = { is_wet = yes }
-			}
-			minerals = 1
-			consumer_goods = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					has_valid_civic = civic_anglers_lithoid
-					has_technology = tech_mine_rare_crystals
-				}
-				planet = { is_wet = yes }
-			}
-			rare_crystals = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			minerals = @requisitorium_minerals_reduction
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}	
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_minerals
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			minerals = @requisitorium_minerals_overlord
-		}
-	}
-	
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_mine|RESOURCE|minerals|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			can_take_servant_job = no
-			NOT = { has_slavery_type = { type = slavery_indentured } }
-		}
-		modifier = {
-			factor = 3
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { has_technology = tech_droid_workers }
-		}
-		modifier = {
-			factor = 200
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { NOT = { has_technology = tech_droid_workers } }
-		}
-		modifier = {
-			factor = 0.25
-			can_take_servant_job = yes
-		}
-
-		# low income modifier
-		modifier = {
-			factor = 1.1
-			exists = planet
-			planet = {
-				has_available_jobs = "re_acolyte_mine"
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = minerals
-					value < 0
-				}
-			}
-		}
-	}
-}
-
-#圣钳侍者
-re_acolyte_generator = {
-	category = worker
-	building_icon = building_power_plant
-	clothes_texture_index = 3
-	icon = technician
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_technician
-		produces = {
-			energy = 6
-		}
-		produces = {
-			trigger = {
-				owner = {
-					is_robot_empire = yes
-				}
-			}
-			energy = 2
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			physics_research = 0.25
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_energy_requisitorium
-				}
-			}
-			energy = @requisitorium_energy_reduction
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.75
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_financial_investment
-			}
-		}
-		modifier = {
-			trade_value_add = 1
-		}
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_energy
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_energy_requisitorium
-				}
-			}
-			energy = @requisitorium_energy_overlord
-		}
-	}
-
-	weight = {
-		weight = @worker_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|re_acolyte_generator|RESOURCE|energy|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 10
-			exists = owner
-			owner = { is_country_type = default }
-			is_enslaved = yes
-			can_take_servant_job = no
-			NOT = { has_slavery_type = { type = slavery_indentured } }
-		}
-		modifier = {
-			factor = 3
-			exists = owner
-			owner = { is_country_type = default }
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { has_technology = tech_droid_workers }
-		}
-		modifier = {
-			factor = 200
-			exists = owner
-			owner = { is_country_type = default }
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = { NOT = { has_technology = tech_droid_workers } }
-		}
-		modifier = {
-			factor = 0.25
-			exists = owner
-			owner = { is_country_type = default }
-			can_take_servant_job = yes
-		}
-		# low income modifier
-		modifier = {
-			factor = 1.1
-			exists = planet
-			planet = {
-				has_available_jobs = "fe_acolyte_generator"
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = energy
-					value < 0
-				}
-			}
-		}
-		# 堕落岗位
-		modifier = {
-			factor = 15000
-			exists = planet.owner
-			planet.owner = { NOT = { is_country_type = default } }
-		}
-		# crisis purge
-		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-		}
-	}
-}
-
-#虚境灵使
-re_augur = {
-	category = worker
-	icon = priest
-	is_capped_by_modifier = yes
-	building_icon = building_citadel_of_faith
-	clothes_texture_index = 2
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_jobs
-		produces = {
-			unity = 20
-		}
-	}
-
-	weight = {
-		weight = 30000
-
-		# crisis purge
-		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-		}
-	}
-}
-
-#劳工
-future_worker = {
-	category = worker
-	is_capped_by_modifier = no
-	clothes_texture_index = 2
-	building_icon = building_research_lab_1
-	icon = primitive_laborer
-
-	possible_pre_triggers = {
-		has_owner = yes
-	}
-	possible_precalc = can_fill_worker_job
-	possible = {
-		planet = { has_modifier = planet_unemployment_benefits }
-		owner = {
-			has_active_tradition = tr_future_industry
-			has_technology = tech_ascension_theory
-			is_gestalt = no
-			has_policy_flag = economic_stance_planned
-		}
-	}
-
-	resources = {
-		category = planet_jobs
-		produces = {
-			trigger = {
-				planet = {
-					OR = {
-						has_district = district_generator
-						has_district = district_generator_uncapped
-						has_district = district_rw_generator
-						has_district = district_hab_energy
-						has_district = district_pdhab_energy
-					}
-				}
-			}
-			energy = 2
-		}
-		produces = {
-			trigger = {
-				planet = {
-					OR = {
-						has_district = district_mining
-						has_district = district_mining_uncapped
-						has_district = district_hab_mining
-						has_district = district_pdhab_mining
-					}
-				}
-			}
-			minerals = 1.5
-		}
-		produces = {
-			trigger = {
-				OR = {
-					has_trait = trait_mechanical
-					has_trait = trait_lithoid
-				}
-				planet = {
-					OR = {
-						has_district = district_mining
-						has_district = district_mining_uncapped
-						has_district = district_hab_mining
-						has_district = district_pdhab_mining
-					}
-				}
-			}
-			minerals = 1.5
-		}
-		produces = {
-			trigger = {
-				NOR = {
-					has_trait = trait_mechanical
-					has_trait = trait_lithoid
-				}
-				planet = {
-					OR = {
-						has_district = district_farming
-						has_district = district_farming_uncapped
-						has_district = district_rw_farming
-						has_district = district_pdhab_food
-						has_building = building_hydroponics_farm
-						has_designation = col_habitat_farming
-					}
-				}
-			}
-			food = 2
-		}
-		produces = {
-			trigger = {
-				planet = {
-					OR = {
-						has_district = district_industrial
-						has_district = district_arcology_arms_industry
-						has_district = district_rw_industrial
-						has_district = district_hab_industrial
-						has_district = district_pdhab_industrial
-					}
-					NOR = {
-						has_designation = col_factory
-						has_designation = col_habitat_factory
-						has_designation = col_ring_factory
-						has_designation = col_ecu_factory
-						has_designation = col_dome_factory
-					}
-				}
-			}
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				planet = {
-					OR = {
-						has_district = district_industrial
-						has_district = district_arcology_civilian_industry
-						has_district = district_rw_industrial
-						has_district = district_hab_industrial
-						has_district = district_pdhab_industrial
-					}
-					NOR = {
-						has_designation = col_foundry
-						has_designation = col_habitat_foundry
-						has_designation = col_ring_foundry
-						has_designation = col_ecu_foundry
-						has_designation = col_dome_foundry
-					}
-				}
-			}
-			consumer_goods = 1
-		}
-
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_democracy_and_clean_government
-						has_valid_civic = civic_business_reporting_administration
-					}
-				}
-			}
-			unity = 1
-		}
-
-		#利他主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_altruism
-				}
-			}
-			unity = 2
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.5
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-
-		# Utopian living standards
-		produces = {
-			trigger = {
-				has_utopian_living_standard_type = yes
-			}
-			society_research = 2
-			physics_research = 2
-			engineering_research = 2
-		}
-
-		# Welfare
-		produces = {
-			trigger = {
-				OR = {
-					has_very_high_living_standard_type = yes
-					has_high_living_standard_type = yes
-					has_shared_burden_living_standard_type = yes
-				}
-			}
-			unity = 1
-		}
-		#AI基础与年数产出
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-			}
-			food = 2
-			energy = 4
-			minerals = 2
-			consumer_goods = 1
-			alloys = 0.5
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 20
-			}
-			food = 1
-			energy = 4
-			minerals = 1
-			consumer_goods = 1
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 35
-			}
-			food = 1
-			energy = 4
-			minerals = 1
-			consumer_goods = 1
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 50
-			}
-			food = -2
-			energy = 16
-			minerals = -2
-			consumer_goods = -2
-			alloys = 2
-		}
-		
-		produces = { 
-			trigger = {
-				owner = { is_ai = yes }
-				mid_game_years_passed > 0
-			}
-			food = 2
-			energy = 6
-			minerals = 2
-			consumer_goods = 2
-			alloys = 2
-		}
-		
-		produces = {
-			trigger = {
-				end_game_years_passed > 0
-			}
-			alloys = 3
-			unity = 1
-		}
-		#AI思潮加成
-		produces = {
-			trigger = {
-				owner = {
-					is_ai = yes
-					or = {
-						has_ethic = ethic_fanatic_spiritualist
-						has_ethic = ethic_spiritualist
-					}
-					
-				}
-			}
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				owner = {
-					is_ai = yes
-					OR = {
-						has_ethic = ethic_fanatic_materialist
-						has_ethic = ethic_materialist
-					}
-				}
-			}
-			physics_research = 1
-			engineering_research = 1
-			society_research = 1
-		}
-		#AI弱者强化
-		produces = {
-			trigger = {
-				years_passed >= 50
-				owner = {
-					is_ai = yes
-					num_pops < 100
-				}				
-			}				
-			physics_research = 8
-			engineering_research = 8
-			society_research = 8
-			alloys = 8
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				years_passed >= 80
-				owner = {
-					is_ai = yes
-					num_pops < 100
-				}								
-			}		
-			physics_research = 8
-			engineering_research = 8
-			society_research = 8
-			alloys = 14
-		}
-
-		upkeep = {
-			consumer_goods = 0.5
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 1
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	planet_modifier = {
-		job_researcher_add = 0.2
-		job_culture_worker_add = 0.2
-	}
-
-	triggered_country_modifier = { # 共产主义社会
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
-	}
-
-	weight = {
-		weight = 0.95
-	}
-}
-
-#临时工
-resocialization_workers = {
-	category = worker
-	is_capped_by_modifier = no
-	clothes_texture_index = 2
-	building_icon = building_crude_huts
-	icon = primitive_laborer
-
-	possible_pre_triggers = {
-		has_owner = yes
-	}
-	possible = {
-		planet = { has_modifier = planet_unemployment_benefits }
-		owner = {
-			has_active_tradition = tr_future_industry
-			has_technology = tech_ascension_theory
-			is_gestalt = no
-			NOT = { has_policy_flag = economic_stance_planned }
-		}
-	}
-
-	resources = {
-		category = unemployment_resources
-		produces = {
-			trigger = {
-				planet = {
-					OR = {
-						has_district = district_generator
-						has_district = district_generator_uncapped
-						has_district = district_rw_generator
-						has_district = district_hab_energy
-						has_district = district_pdhab_energy
-					}
-				}
-			}
-			energy = 2
-		}
-		produces = {
-			trigger = {
-				planet = {
-					OR = {
-						has_district = district_mining
-						has_district = district_mining_uncapped
-						has_district = district_hab_mining
-						has_district = district_pdhab_mining
-					}
-				}
-			}
-			minerals = 1.5
-		}
-		produces = {
-			trigger = {
-				OR = {
-					has_trait = trait_mechanical
-					has_trait = trait_lithoid
-				}
-				planet = {
-					OR = {
-						has_district = district_mining
-						has_district = district_mining_uncapped
-						has_district = district_hab_mining
-						has_district = district_pdhab_mining
-					}
-				}
-			}
-			minerals = 1.5
-		}
-		produces = {
-			trigger = {
-				NOR = {
-					has_trait = trait_mechanical
-					has_trait = trait_lithoid
-				}
-				planet = {
-					OR = {
-						has_district = district_farming
-						has_district = district_farming_uncapped
-						has_district = district_rw_farming
-						has_district = district_pdhab_food
-						has_building = building_hydroponics_farm
-						has_designation = col_habitat_farming
-					}
-				}
-			}
-			food = 2
-		}
-		produces = {
-			trigger = {
-				planet = {
-					OR = {
-						has_district = district_industrial
-						has_district = district_arcology_arms_industry
-						has_district = district_rw_industrial
-						has_district = district_hab_industrial
-						has_district = district_pdhab_industrial
-					}
-					NOR = {
-						has_designation = col_factory
-						has_designation = col_habitat_factory
-						has_designation = col_ring_factory
-						has_designation = col_ecu_factory
-						has_designation = col_dome_factory
-					}
-				}
-			}
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				planet = {
-					OR = {
-						has_district = district_industrial
-						has_district = district_arcology_civilian_industry
-						has_district = district_rw_industrial
-						has_district = district_hab_industrial
-						has_district = district_pdhab_industrial
-					}
-					NOR = {
-						has_designation = col_foundry
-						has_designation = col_habitat_foundry
-						has_designation = col_ring_foundry
-						has_designation = col_ecu_foundry
-						has_designation = col_dome_foundry
-					}
-				}
-			}
-			consumer_goods = 1
-		}
-
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_democracy_and_clean_government
-						has_valid_civic = civic_business_reporting_administration
-					}
-				}
-			}
-			unity = 1
-		}
-
-		#利他主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_altruism
-				}
-			}
-			unity = 2
-		}
-		
-		#社会主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_socialism
-				}
-			}
-			unity = 0.5
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_socialism
-				}
-			}
-			unity = 0.25
-		}
-
-		# Utopian living standards
-		produces = {
-			trigger = {
-				has_utopian_living_standard_type = yes
-			}
-			society_research = 2
-			physics_research = 2
-			engineering_research = 2
-		}
-
-		# Welfare
-		produces = {
-			trigger = {
-				OR = {
-					has_very_high_living_standard_type = yes
-					has_high_living_standard_type = yes
-					has_shared_burden_living_standard_type = yes
-				}
-			}
-			unity = 0.5
-		}
-		#AI基础与年数产出
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-			}
-			food = 1
-			energy = 2
-			minerals = 1
-			consumer_goods = 0.5
-			alloys = 0.25
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 20
-			}
-			food = 0.5
-			energy = 2
-			minerals = 0.5
-			consumer_goods = 0.5
-			alloys = 0.5
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 35
-			}
-			food = 0.5
-			energy = 2
-			minerals = 0.5
-			consumer_goods = 0.5
-			alloys = 0.5
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 50
-			}
-			food = -3
-			energy = 8
-			minerals = -3
-			consumer_goods = -3
-			alloys = 1
-		}
-		
-		produces = { 
-			trigger = {
-				owner = { is_ai = yes }
-				mid_game_years_passed > 0
-			}
-			food = 1
-			energy = 3
-			minerals = 1
-			consumer_goods = 1
-			alloys = 1
-		}
-		
-		produces = {
-			trigger = {
-				end_game_years_passed > 0
-			}
-			alloys = 1.5
-			unity = 0.5
-		}
-		#AI思潮加成
-		produces = {
-			trigger = {
-				owner = {
-					is_ai = yes
-					or = {
-						has_ethic = ethic_fanatic_spiritualist
-						has_ethic = ethic_spiritualist
-					}
-					
-				}
-			}
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					is_ai = yes
-					OR = {
-						has_ethic = ethic_fanatic_materialist
-						has_ethic = ethic_materialist
-					}
-				}
-			}
-			physics_research = 0.5
-			engineering_research = 0.5
-			society_research = 0.5
-		}
-		#AI弱者强化
-		produces = {
-			trigger = {
-				years_passed >= 50
-				owner = {
-					is_ai = yes
-					num_pops < 100
-				}				
-			}				
-			physics_research = 4
-			engineering_research = 4
-			society_research = 4
-			alloys = 4
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				years_passed >= 80
-				owner = {
-					is_ai = yes
-					num_pops < 100
-				}								
-			}		
-			physics_research = 6
-			engineering_research = 6
-			society_research = 6
-			alloys = 7
-		}
-
-		upkeep = {
-			consumer_goods = 0.5
-		}
-	}
-
-	planet_modifier = {
-		job_merchant_add = 0.2
-		job_mogul_add = 0.05
-	}
-
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		trade_value_add = 1
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-
-	triggered_country_modifier = { # 共产主义社会
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
-	}
-
-	weight = {
-		weight = 0.95
-	}
-}
-
-###################
-# 专家
-###################
-#专家冶金师
-foundry_specialist = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_foundry_1
-	clothes_texture_index = 3
-	icon = foundry
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-	}
-	possible_precalc = can_fill_specialist_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
-	}
-
-	resources = {
-		category = planet_metallurgists
-		produces = {
-			alloys = 2
-			engineering_research = 1
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_catalytic_processing
-				}
-			}
-			society_research = 1
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			alloys = @requisitorium_alloys_reduction
-		}
-		upkeep = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			minerals = 2
-		}
-		upkeep = {
-			minerals = 6
-		}
-		upkeep = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_catalytic_processing
-				}
-			}
-			minerals = -6
-			food = 6
-		}
-	}
-	planet_modifier = {
-	    planet_metallurgists_alloys_produces_mult = 0.05
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_civil_rights_gun_grant
-			}
-		}
-		modifier = {
-			army_starting_experience_add = 50
-		}
-	}
-	
-
-	triggered_country_modifier = { # 共产主义社会
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_shared_burden
-				has_ascension_perk = ap_future_society
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 0.5
-		}
-	}
-	planet_modifier = {
-		pop_environment_tolerance = -0.02
-		trade_value_add = 2
-	}
-	
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = mixed_industrial
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.01
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_efficiency
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.005
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_growth
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.015
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_unlimited
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.02
-		}
-	}
-	# 分产主义
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_distributism
-			}
-		}
-		modifier = {
-			trade_value_add = 2
-		}
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-	
-	planet_modifier = {
-		trade_value_add = 3
-	}
-
-	overlord_resources = {
-		category = planet_requisitioned_alloys
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_material_requisitorium
-				}
-			}
-			alloys = @requisitorium_alloys_overlord
-		}
-	}
-
-	weight = {
-		weight = @specialist_job_weight		# Fairly important job
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|foundry|RESOURCE|alloys|
-			exists = owner
-				owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factOR = 2
-			is_enslaved = yes
-			can_take_servant_job = no
-		}
-		modifier = {
-			factOR = 5
-			has_job = foundry_specialist
-		}
-	}
-}
-
-#专家工匠
-artisan_specialist = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_factory_1
-	clothes_texture_index = 3
-	icon = artisan
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-	}
-	possible_precalc = can_fill_specialist_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
-	}
-
-	resources = {
-		category = planet_artisans
-		produces = {
-			consumer_goods = 4
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_crafters
-				}
-			}
-			engineering_research = 2
-		}
-		upkeep = {
-			minerals = 6
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_anarchism
-				}
-			}
-			minerals = -1
-		}
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			consumer_goods = @requisitorium_consumer_goods_reduction
-		}
-		upkeep = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			minerals = 1
-		}
-	}
-
-	#奢侈消费主义
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				OR = {
-					has_valid_civic = civic_consumerism
-				}
-			}
-		}
-		trade_value_add = 2
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 1
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	planet_modifier = {
-		pop_environment_tolerance = -0.02
-		trade_value_add = 3
-	    planet_artisan_consumer_goods_produces_mult = 0.05
-	}
-	
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = mixed_industrial
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.01
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_efficiency
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.005
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_growth
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.015
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_policy_flag = industrial_unlimited
-			}
-		}
-		modifier = {
-		pop_environment_tolerance = -0.02
-		}
-	}
-	# 分产主义
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_distributism
-			}
-		}
-		modifier = {
-			trade_value_add = 2
-		}
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-	# 能工巧匠
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				has_valid_civic = civic_crafters
-			}
-		}
-		modifier = {
-			trade_value_add = 2
-		}
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-
-
-	overlord_resources = {
-		category = planet_requisitioned_consumer_goods
-		produces = {
-			trigger = {
-				planet = {
-					has_planet_flag = has_produce_requisitorium
-					exists = owner.overlord
-					owner.overlord = { is_gestalt = no }
-				}
-			}
-			consumer_goods = @requisitorium_consumer_goods_overlord
-		}
-	}
-
-	weight = {
-		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factOR = value:job_weights_modifier|JOB|artisan|RESOURCE|consumer_goods|
-			exists = owner
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factOR = 2
-			is_enslaved = yes
-			can_take_servant_job = no
-		}
-		modifier = {
-			factOR = 5
-			has_job = artisan_specialist
-		}
-
-		# low income modifier
-		modifier = {
-			factOR = 1.2
-			exists = planet
-			planet = {
-				has_available_jobs = "artisan"
-			}
-			exists = owner
-			owner = {
-				is_ai = yes
-				has_monthly_income = {
-					resource = consumer_goods
-					value < 5
-				}
-			}
-		}
-	}
-}
-
-#记者
-media_worker = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_autochthon_monument
-	clothes_texture_index = 3
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	possible = {
-		complex_specialist_job_check_trigger = yes
-	}
-	triggered_pop_modifier = {
-		potential = {
-			owner = {
-				has_policy_flag = market_operation
-			}
-		}
-		modifier = {
-			pop_cat_specialist_political_power = 0.5
-		}
-	}
-	resources = {
-		category = planet_culture_workers
-		produces = {
-			unity = 4
-		}
-		#信息管制
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					OR = {
-						has_policy_flag = strict_control
-						has_policy_flag = market_operation
-					}
-				}
-			}
-			unity = -1
-		}
-		#完全自由
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_policy_flag = freedom_of_speech
-				}
-			}
-			society_research = 3
-		}
-		#和平主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_fanatic_pacifist
-				}
-			}
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_ethic = ethic_pacifist
-				}
-			}
-			unity = 1
-		}
-		upkeep = {
-			consumer_goods = 2
-		}
-	}
-
-	planet_modifier = {
-		POP_ETHICS_SHIFT_SPEED = 0.1
-	}
-
-	#舆论控制
-	triggered_planet_modifier = { #严格管理
-		potential = {
-			owner = {
-				has_policy_flag = strict_control
-			}
-		}
-		modifier = {
-			pop_cat_ruler_political_power = 0.5
-		}
-	}
-	triggered_planet_modifier = { #市场运作
-		potential = {
-			owner = {
-				has_policy_flag = market_operation
-			}
-		}
-		modifier = {
-			trade_value_add = 2
-			planet_crime_add = 3
-		}
-	}
-	triggered_country_modifier = { #加经费
-		potential = {
-			exists = owner
-			owner = {
-				OR = {
-					has_policy_flag = strict_control
-					has_policy_flag = market_operation
-				}
-			}
-		}
-		modifier = {
-			country_edict_fund_add = 1
-		}
-	}
-
-	weight = {
-		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|media_worker|RESOURCE|unity|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = { has_trait = trait_mechanical }
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_robot_propaganda_machines
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robot_propaganda_machines
-				has_trait = trait_traditional
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.5
-			has_job = bureaucrat
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_latent_psionic
-		}
-		modifier = {
-			factor = 1.2
-			has_trait = trait_psionic
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_enigmatic_intelligence_failed
-		}
-	}
-}
-
-#血肉机器组装者
-reemployment_HR_supervisor = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_robot_assembly_plant
-	clothes_texture_index = 3
-	icon = roboticist
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-
-	possible_precalc = can_fill_specialist_job
-
-	resources = {
-		category = planet_jobs
-		upkeep = {
-			consumer_goods = 0.5
-			minerals = 2
-		}
-	}
-
-	weight = {
-		weight = 5000
-	}
-}
-
-#产品总监
-PR_manager = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_autochthon_monument
-	clothes_texture_index = 3
-	icon = manager
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	planet_modifier = {
-		trade_value_mult = 0.02
-	}
-	planet_modifier = {
-		planet_amenities_add = -3
-	}
-	resources = {
-		category = planet_bureaucrats
-		upkeep = {
-			consumer_goods = 0.5
-			unity = 1.5
-		}
-	}
-
-	weight = {
-		weight = @specialist_job_weight
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = { has_trait = trait_mechanical }
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_robot_propaganda_machines
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robot_propaganda_machines
-				has_trait = trait_traditional
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_natural_sociologists
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_thrifty
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_nuumismatic_administration
-		}
-		modifier = {
-			factor = 1.5
-			has_job = PR_manager
-		}
-		modifier = {
-			factor = 3
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_presapient_natural_intellectuals
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robust
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 1.4
-			OR = {
-				has_trait = trait_robot_logic_engines
-				has_trait = trait_intelligent
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_latent_psionic
-		}
-		modifier = {
-			factor = 1.2
-			has_trait = trait_psionic
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_enigmatic_intelligence_failed
-		}
-		modifier = {
-			factor = 1.4
-			OR = {
-				has_trait = trait_enigmatic_intelligence
-				has_trait = trait_enigmatic_intelligence_poor
-			}
-		}
-		modifier = {
-			factor = 0.1
-			is_enslaved = yes
-			has_slavery_type = { type = slavery_indentured }
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_void_dweller_1
-			exists = planet
-			planet = { is_planet_class = pc_habitat }
-		}
-		modifier = {
-			factor = 0.85
-			has_trait = trait_void_dweller_1
-			exists = planet
-			planet = { is_artificial = no }
-		}
-		modifier = {
-			factor = 1.25
-			has_trait = trait_necrophage
-		}
-	}
-}
-
-#科研模范
-research_pacesetter = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_research_lab_1
-	clothes_texture_index = 3
-	icon = labour_hero
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	possible = {
-		complex_specialist_job_check_trigger = yes
-	}
-	resources = {
-		category = planet_researchers
-		produces = {
-			physics_research = 4
-			engineering_research = 4
-			society_research = 4
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					or = {
-						has_edict = scientific_spirit
-						has_edict = indefinite_patent_act
-					}
-				}
-			}
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					or = {
-						has_valid_civic = civic_technocracy
-						has_valid_civic = civic_cyber_dictatorship
-						has_valid_civic = civic_science_directorate
-						has_valid_civic = civic_cyber_demos_cratos
-					}
-				}
-			}
-			unity = 1
-		}
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_industry_pacesetter
-			}
-		}
-		modifier = {
-			planet_researchers_produces_mult = 0.1
-		}
-	}
-	weight = {
-		weight = @specialist_job_weight
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_research_modifier|JOB|researcher|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = {
-				has_trait = trait_mechanical
-			}
-		}
-		modifier = {
-			factor = 2
-			has_living_standard = {
-				type = living_standard_academic_privilege
-			}
-		}
-		modifier = {
-			factor = 3
-			has_trait = trait_erudite
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_robot_logic_engines
-				has_trait = trait_intelligent
-			}
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_natural_engineers
-				has_trait = trait_natural_physicists
-				has_trait = trait_natural_sociologists
-			}
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 0.65
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.5
-			has_job = researcher
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_latent_psionic
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_psionic
-		}
-		modifier = {
-			factor = 0.1
-			has_trait = trait_enigmatic_intelligence_failed
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_enigmatic_intelligence
-				has_trait = trait_enigmatic_intelligence_poor
-			}
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_presapient_natural_intellectuals
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robust
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 0.8
-			is_enslaved = yes
-			has_slavery_type = {
-				type = slavery_indentured
-			}
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_void_dweller_1
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_necrophage
-		}
-	}
-}
-
-#工人模范
-model_worker = {
-	category = worker
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_foundry_1
-	clothes_texture_index = 3
-	icon = labour_hero
-	
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-	}
-	possible_precalc = can_fill_specialist_job
-	possible = {
-		hidden_trigger = { exists = owner }
-		owner = {
-			is_gestalt = no
-		}
-	}
-
-	resources = {
-		category = planet_metallurgists
-		produces = {
-			alloys = 1.5
-			consumer_goods = 3
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_catalytic_empire = yes
-				}
-			}
-			society_research = 1
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_crafters
-				}
-			}
-			consumer_goods = 1
-			engineering_research = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
-		upkeep = {
-			minerals = 6
-		}
-		upkeep = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_catalytic_empire = yes
-				}
-			}
-			minerals = -6
-			food = 6
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_industry_pacesetter
-			}
-		}
-		modifier = {
-			planet_metallurgists_alloys_produces_mult = 0.05
-			planet_artisans_consumer_goods_produces_mult = 0.05
-		}
-	}
-
-	weight = {
-		weight = @worker_job_weight		# Fairly important job
-		modifier = { # 可控的动态权重
-			factor = value:job_weights_modifier|JOB|model_worker|RESOURCE|consumer_goods|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			factor = 20
-			is_enslaved = yes
-			can_take_servant_job = no
-		}
-		modifier = {
-			factor = 2
-			species = {
-				has_species_flag = racket_species_flag
-			}
-		}
-		modifier = {
-			factor = 5
-			has_job = foundry
-		}
-		modifier = {
-			factor = 15
-			has_job = foundry
-			OR = {
-				has_trait = trait_robust
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_void_dweller_1
-		}
-	}
-}
-
-#节点维护员
-democratic_politician = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_capital
-	icon = administrator
-	clothes_texture_index = 3
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	resources = {
-		category = planet_bureaucrats
-		produces = {
-			society_research = 3
-			physics_research = 1
-		}
-		upkeep = {
-			consumer_goods = 0.75
-		}
-	}
-	country_modifier = {
-		country_admin_cap_add = 10
-	}
-	weight = {
-		weight = @specialist_job_weight
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = {
-				has_trait = trait_mechanical
-			}
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_robot_propaganda_machines
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robot_propaganda_machines
-				has_trait = trait_traditional
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.5
-			has_job = democratic_politician
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_latent_psionic
-		}
-		modifier = {
-			factor = 1.2
-			has_trait = trait_psionic
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_enigmatic_intelligence_failed
-		}
-	}
-}
-
-#深核工程师
-deep_miner = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_crystal_mines
-	clothes_texture_index = 3
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	resources = {
-		category = planet_miners
-		produces = {
-			trigger = {
-				owner = {
-					is_gestalt = no
-				}
-			}
-			minerals = 4
-			energy = 3
-			engineering_research = 2
-		}
-		produces = {
-			trigger = {
-				owner = {
-					is_gestalt = yes
-				}
-			}
-			exotic_gases = 1
-			volatile_motes = 1
-			rare_crystals = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_shared_burden
-						has_valid_civic = civic_socialistic
-						has_valid_civic = civic_forever_with_us
-					}
-				}
-			}
-			engineering_research = 0.25
-		}
-		upkeep = {
-			trigger = {
-				owner = {
-					is_gestalt = no
-				}
-			}
-			consumer_goods = 0.5
-		}
-		upkeep = {
-			trigger = {
-				owner = {
-					is_gestalt = yes
-				}
-			}
-			energy = 1
-		}
-	}
-	weight = {
-		weight = @specialist_job_weight
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = {
-				has_trait = trait_mechanical
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_industrious
-				has_trait = trait_robot_power_drills
-				has_trait = trait_natural_engineers
-			}
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = {
-				has_technology = tech_droid_workers
-			}
-		}
-		modifier = {
-			factor = 10
-			OR = {
-				is_non_sapient_robot = yes
-				is_shackled_robot = yes
-			}
-			can_take_servant_job = no
-			owner = {
-				NOT = {
-					has_technology = tech_droid_workers
-				}
-			}
-		}
-		modifier = {
-			factor = 0.25
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.2
-			has_trait = trait_very_strong
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_strong
-		}
-		modifier = {
-			factor = 0.9
-			has_trait = trait_weak
-		}
-		modifier = {
-			factor = 1.2
-			has_ethic = ethic_industrial
-		}
-	}
-}
-
-#圣殿骑士
-templar = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_temple
-	clothes_texture_index = 3
-	icon = knight
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	resources = {
-		category = planet_priests
-		produces = {
-			unity = 4
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_tradition = tr_piety_nature_and_humanity
-				}
-			}
-			physics_research = 1.5
-			engineering_research = 1.5
-		}
-		upkeep = {
-			alloys = 0.5
-		}
-	}
-
-	triggered_pop_modifier = {
-		potential = {
-			always = yes
-		}
-		pop_defense_armies_add = 2
-		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			owner = { has_country_flag = toxoids_7090_a }
-		}
-		planet_stability_add = 3
-		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
-	}
-
-	triggered_country_modifier = {
-		country_naval_cap_add = 4
-		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
-	}
-
-	triggered_country_modifier = {
-		potential = {
-			owner = { has_country_flag = toxoids_7165_a }
-		}
-		country_alloys_produces_mult = 0.015
-	}
-
-	planet_modifier = {
-		job_squire_add = 1
-	}
-	
-	weight = {
-		weight = @high_prio_specialist_job_weight
-		modifier = {
-			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			mult = value:job_weights_research_modifier|JOB|researcher|
-		}
-	}
-}
-
-#死亡骑士
-death_knight = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_sacrificial_temple
-	clothes_texture_index = 3
-	icon = knight
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	resources = {
-		category = planet_priests
-		produces = {
-			unity = 4
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_tradition = tr_piety_nature_and_humanity
-				}
-			}
-			physics_research = 1.5
-			engineering_research = 1.5
-		}
-		upkeep = {
-			alloys = 0.5
-		}
-	}
-
-	triggered_pop_modifier = {
-		potential = {
-			always = yes
-		}
-		pop_defense_armies_add = 2
-		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
-	}
-	triggered_pop_modifier = {
-		potential = {
-			exists = owner
-			owner = { has_valid_civic = civic_reanimated_armies }
-		}
-		modifier = {
-			pop_defense_armies_add = 3
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			owner = { has_country_flag = toxoids_7090_a }
-		}
-		planet_stability_add = 3
-		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
-	}
-
-	triggered_country_modifier = {
-		country_naval_cap_add = 4
-		mult = value:scripted_modifier_mult|MODIFIER|knights_independent_category_produces_mult|
-	}
-
-	triggered_country_modifier = {
-		potential = {
-			owner = { has_country_flag = toxoids_7165_a }
-		}
-		country_alloys_produces_mult = 0.015
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				OR = {
-					has_valid_civic = civic_imperial_cult
-					has_valid_civic = civic_divine_council
-					has_valid_civic = civic_spiritual_democracy
-					has_valid_civic = civic_exalted_priesthood
-				}
-			}
-		}
-		planet_stability_add = 20
-		mult = planet.society_factor_pops
-	}
-	
-	weight = {
-		weight = @high_prio_specialist_job_weight
-		modifier = {
-			mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity|
-			owner = { has_edict = dynamic_weight }
-		}
-		modifier = {
-			mult = value:job_weights_research_modifier|JOB|researcher|
-		}
-	}
-}
-
-#雇佣兵
-mercenary = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_stronghold
-	clothes_texture_index = 4
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	country_modifier = {
-		country_naval_cap_add = 4
-	}
-	pop_modifier = {
-		pop_defense_armies_add = 3
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		trade_value_add = 0.5
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-	resources = {
-		category = planet_soldiers
-		upkeep = {
-			consumer_goods = 0.5
-		}
-	}
-	weight = {
-		weight = @soldier_job_weight
-		modifier = {
-			factor = 10
-			exists = planet
-			planet = {
-				has_modifier = martial_law
-			}
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_resilient
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_very_strong
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_strong
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_weak
-		}
-		modifier = {
-			factor = 0.1
-			is_enslaved = yes
-			NOT = {
-				has_slavery_type = {
-					type = slavery_military
-				}
-			}
-		}
-		modifier = {
-			factor = 10
-			is_enslaved = yes
-			has_slavery_type = {
-				type = slavery_military
-			}
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_cybernetic
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_presapient_earthbound
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_limited_regeneration
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 1.05
-			has_trait = trait_presapient_natural_intellectuals
-		}
-		modifier = {
-			factor = 1.05
-			OR = {
-				has_trait = trait_robust
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 1.05
-			has_trait = trait_nerve_stapled
-		}
-		modifier = {
-			factor = 1.1
-			OR = {
-				has_trait = trait_robot_propaganda_machines
-				has_trait = trait_traditional
-			}
-		}
-		modifier = {
-			factor = 0.9
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0
-			can_be_soldier = no
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_lithoid
-		}
-	}
-}
-
-#超越者
-transcend = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_psi_corps
-	clothes_texture_index = 5
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	resources = {
-		category = planet_telepaths
-		produces = {
-			unity = 4
-			society_research = 3
-			physics_research = 2
-			engineering_research = 1
-		}
-		upkeep = {
-			energy = 2
-		}
-	}
-	planet_modifier = {
-		planet_crime_add = -35
-	}
-
-	weight = {
-		weight = @specialist_job_weight
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = { has_trait = trait_mechanical }
-		}
-		modifier = {
-			factor = 2
-			exists = owner
-			owner = { has_civic = civic_exalted_priesthood }
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_robot_domestic_protocols
-				has_trait = trait_charismatic
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robot_propaganda_machines
-				has_trait = trait_traditional
-			}
-		}
-		modifier = {
-			factor = 1.2
-			has_ethic = ethic_spiritualist
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_natural_sociologists
-		}
-		modifier = {
-			factor = 0.1
-			has_ethic = ethic_materialist
-			NOT = { has_job = priest }
-		}
-		modifier = {
-			factor = 1.5
-			has_job = priest
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 1.3
-			has_trait = trait_presapient_natural_intellectuals
-		}
-		modifier = {
-			factor = 1.3
-			OR = {
-				has_trait = trait_robust
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 1.05
-			OR = {
-				has_trait = trait_robot_logic_engines
-				has_trait = trait_intelligent
-			}
-		}
-		modifier = {
-			factor = 0.9
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.05
-			has_trait = trait_psionic
-		}
-		modifier = {
-			factor = 0.7
-			has_trait = trait_enigmatic_intelligence_failed
-		}
-		modifier = {
-			factor = 1.05
-			OR = {
-				has_trait = trait_enigmatic_intelligence
-				has_trait = trait_enigmatic_intelligence_poor
-			}
-		}
-		modifier = {
-			factor = 0.1
-			is_enslaved = yes
-			has_slavery_type = { type = slavery_indentured }
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_void_dweller_1
-			exists = planet
-			planet = { is_planet_class = pc_habitat }
-		}
-		modifier = {
-			factor = 0.85
-			has_trait = trait_void_dweller_1
-			exists = planet
-			planet = { is_artificial = no }
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_necrophage
-		}
-	}
-}
-
-#机械牧师
-techno_priest = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_robot_assembly_plant
-	clothes_texture_index = 3
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_ruler_job
-	resources = {
-		category = planet_pop_assemblers
-		produces = {
-			unity = 3
-			engineering_research = 2
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_liberation_theology
-					is_lithoid = no
-					NOT = { has_country_flag = synthetic_empire }
-				}
-			}
-			minerals = 2
-			food = 3
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_liberation_theology
-					is_lithoid = yes
-					NOT = { has_country_flag = synthetic_empire }
-				}
-			}
-			minerals = 4
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_liberation_theology
-					has_country_flag = synthetic_empire
-				}
-			}
-			minerals = 2
-			energy = 3
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_tradition = tr_piety_nature_and_humanity
-				}
-			}
-			engineering_research = 1.5
-			society_research = 1.5
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_knowledge_seeker
-				}
-			}
-			unity = -1
-			physics_research = 1.5
-			engineering_research = 1.5
-			society_research = 1.5
-		}
-		produces = {
-			trigger = {
-				owner = {
-					OR = {
-						has_valid_civic = civic_imperial_cult
-						has_valid_civic = civic_divine_council
-						has_valid_civic = civic_spiritual_democracy
-						has_valid_civic = civic_exalted_priesthood
-					}
-				}
-			}
-			engineering_research = 1
-		}
-		upkeep = {
-			alloys = 0.5
-			consumer_goods = 0.5
-		}
-		produces = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			unity = 1.5
-			society_research = 0.75
-		}
-		upkeep = {
-			trigger = {
-				planet = { has_modifier = "ley_rift" }
-			}
-			sr_zro = 0.1
-		}
-	}
-	country_modifier = {
-		country_admin_cap_add = 3
-	}
-	planet_modifier = {
-		planet_pops_robotics_upkeep_mult = -0.07
-		planet_pop_assembly_add = 0.75
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 3
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	weight = {
-		weight = @specialist_job_weight
-		modifier = {
-			factor = 2
-			owner = {
-				has_origin = origin_machine_cult
-			}
-		}
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = {
-				has_trait = trait_mechanical
-			}
-		}
-		modifier = {
-			factor = 2
-			exists = owner
-			owner = {
-				OR = {
-					has_valid_civic = civic_imperial_cult
-					has_valid_civic = civic_divine_council
-					has_valid_civic = civic_spiritual_democracy
-					has_valid_civic = civic_exalted_priesthood
-				}
-			}
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_robot_domestic_protocols
-				has_trait = trait_charismatic
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robot_propaganda_machines
-				has_trait = trait_traditional
-			}
-		}
-		modifier = {
-			factor = 1.2
-			has_ethic = ethic_spiritualist
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_quarrelsome
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 1.1
-			has_trait = trait_natural_sociologists
-		}
-		modifier = {
-			factor = 0.1
-			has_ethic = ethic_materialist
-			NOT = {
-				has_job = priest
-			}
-		}
-		modifier = {
-			factor = 1.5
-			has_job = priest
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 1.3
-			has_trait = trait_presapient_natural_intellectuals
-		}
-		modifier = {
-			factor = 1.3
-			OR = {
-				has_trait = trait_robust
-				has_trait = trait_robot_efficient_processors
-			}
-		}
-		modifier = {
-			factor = 1.15
-			has_trait = trait_erudite
-		}
-		modifier = {
-			factor = 1.05
-			OR = {
-				has_trait = trait_robot_logic_engines
-				has_trait = trait_intelligent
-			}
-		}
-		modifier = {
-			factor = 0.9
-			has_trait = trait_presapient_proles
-		}
-		modifier = {
-			factor = 1.05
-			has_trait = trait_psionic
-		}
-		modifier = {
-			factor = 0.7
-			has_trait = trait_enigmatic_intelligence_failed
-		}
-		modifier = {
-			factor = 1.05
-			OR = {
-				has_trait = trait_enigmatic_intelligence
-				has_trait = trait_enigmatic_intelligence_poor
-			}
-		}
-		modifier = {
-			factor = 0.1
-			is_enslaved = yes
-			has_slavery_type = {
-				type = slavery_indentured
-			}
-		}
-		modifier = {
-			factor = 1.5
-			has_trait = trait_necrophage
-		}
-	}
-}
-
-#天空主教
-re_sky_cardinal = {
-	category = specialist
-	is_capped_by_modifier = yes
-	clothes_texture_index = 1
-	icon = high_priest
-	building_icon = building_palace
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-
-	possible = {
-		owner = {
-			has_origin = origin_zarqlanism_idea
-		}
-	}
-
-	resources = {
-		category = planet_priests
-	    produces = {
-		    trigger = {
-			    exists = owner
-			    owner = {
-				    has_valid_civic = civic_liberation_theology
-			    }
-		    }
-		    unity = 8
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_stability_add = 85
-		mult = planet.society_factor_pops
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			always = yes
-		}
-		planet_amenities_add = 10
-		mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult|
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_origin = origin_zarqlanism_idea
-			}
-		}
-		modifier = {
-			planet_housing_add = 1
-			planet_crime_add = -5
-		}
-	}
-
-	triggered_country_modifier = {
-		potential = {
-			owner = {
-				has_origin = origin_zarqlanism_idea
-			}
-		}
-		modifier = {
-			country_admin_cap_add = 5
-		}
-	}
-
-	weight = {
-		weight = 30000
-
-		# crisis purge
-		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-		}
-	}
-}
-
-#不知道是啥
-geoengineer = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_research_lab_1
-	clothes_texture_index = 3
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	resources = {
-		category = planet_researchers
-		produces = {
-			physics_research = 4
-			engineering_research = 4
-		}
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	weight = {
-		weight = @worker_job_weight
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = {
-				has_trait = trait_mechanical
-			}
-		}
-		modifier = {
-			factor = 2
-			has_living_standard = {
-				type = living_standard_academic_privilege
-			}
-		}
-		modifier = {
-			factor = 3
-			has_trait = trait_erudite
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_robot_logic_engines
-				has_trait = trait_intelligent
-			}
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_natural_engineers
-				has_trait = trait_natural_physicists
-			}
-		}
-		modifier = {
-			factor = 1.1
-			has_ethic = ethic_green
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 0.65
-			OR = {
-				has_trait = trait_presapient_proles
-			}
-		}
-		modifier = {
-			factor = 1.5
-			has_job = geoengineer
-		}
-	}
-}
-
-#不知道是啥
-xenobiologist = {
-	category = specialist
-	condition_string = SPECIALIST_JOB_TRIGGER
-	building_icon = building_research_lab_1
-	clothes_texture_index = 3
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_specialist_job
-	resources = {
-		category = planet_researchers
-		produces = {
-			society_research = 7
-		}
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	weight = {
-		weight = @worker_job_weight
-		modifier = {
-			factor = 0.2
-			has_citizenship_rights = no
-			NOT = {
-				has_trait = trait_mechanical
-			}
-		}
-		modifier = {
-			factor = 2
-			has_living_standard = {
-				type = living_standard_academic_privilege
-			}
-		}
-		modifier = {
-			factor = 3
-			has_trait = trait_erudite
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_intelligent
-			}
-		}
-		modifier = {
-			factor = 2
-			has_trait = trait_brainslug
-		}
-		modifier = {
-			factor = 2.5
-			OR = {
-				has_trait = trait_natural_sociologists
-			}
-		}
-		modifier = {
-			factor = 1.1
-			has_ethic = ethic_green
-		}
-		modifier = {
-			factor = 0.1
-			can_take_servant_job = yes
-		}
-		modifier = {
-			factor = 0.65
-			OR = {
-				has_trait = trait_presapient_proles
-			}
-		}
-		modifier = {
-			factor = 1.5
-			has_job = xenobiologist
-		}
-	}
-}
-
-###################
-# 统治者
-###################
-#核心党员
-core_party_members = {
-	category = ruler
-	condition_string = BATTLE_THRALL_JOB_TRIGGER
-	building_icon = building_precinct_house
-	clothes_texture_index = 5
-	can_set_priority = no
-	icon = evaluator
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_ruler_job
-	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
-	}
-	resources = {
-		category = planet_enforcers
-		produces = {
-			unity = 3
-		}
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	planet_modifier = {
-		species_empire_size_mult = -0.15
-		POP_SLAVE_RESOURCE_OUTPUT = 0.05
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_crime_add = -300
-		planet_stability_add = 100
-		mult = planet.society_factor_pops
-	}
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_anarchism
-			}
-		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
-	}
-	weight = {
-		weight = @ruler_job_weight
-	}
-}
-
-#指挥官
-commandante = {
-	category = ruler
-	condition_string = RULER_JOB_TRIGGER
-	building_icon = building_stronghold
-	clothes_texture_index = 1
-	can_set_priority = no
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_ruler_job
-	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
-	}
-	country_modifier = {
-		country_naval_cap_add = 5
-	}
-	resources = {
-		category = planet_politicians
-		produces = {
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = {
-					has_valid_civic = civic_citizen_service
-				}
-			}
-			unity = 1
-		}
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	planet_modifier = {
-		army_starting_experience_add = 50
-	}
-	pop_modifier = {
-		pop_defense_armies_add = 1
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_stability_add = 50
-		mult = planet.society_factor_pops
-	}
-	triggered_planet_modifier = {
-		potential = {
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			planet_amenities_add = -1
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_citizen_service
-			}
-		}
-		modifier = {
-			planet_amenities_add = 3
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_anarchism
-			}
-		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
-	}
-	weight = {
-		weight = @ruler_job_weight
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_very_strong
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_strong
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			factor = 5
-			has_job = commandante
-		}
-	}
-}
-
-#长者
-supervisor = {
-	category = ruler
-	condition_string = RULER_JOB_TRIGGER
-	building_icon = building_capital
-	clothes_texture_index = 1
-	can_set_priority = no
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_ruler_job
-	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
-	}
-	resources = {
-		category = planet_politicians
-		produces = {
-			unity = 3
-		}
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	planet_modifier = {
-		pop_cat_ruler_political_power = 1
-		planet_jobs_society_research_produces_mult = 0.05
-		planet_jobs_unity_produces_mult = 0.05
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 5
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	triggered_planet_modifier = {
-		potential = {
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			planet_amenities_add = -1
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_anarchism
-			}
-		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
-	}
-	weight = {
-		weight = @ruler_job_weight
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_talented
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_charismatic
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			factor = 5
-			has_job = supervisor
-		}
-	}
-}
-
-#大亨
-mogul = {
-	category = ruler
-	condition_string = RULER_JOB_TRIGGER
-	building_icon = building_galactic_stock_exchange
-	clothes_texture_index = 1
-	can_set_priority = no
-	possible_pre_triggers = {
-		has_owner = yes
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_ruler_job
-	possible = {
-		OR = {
-			is_enslaved = no
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
-	}
-	possible = {
-		owner = {
-			NOT = {
-				has_valid_civic = civic_distributism
-			}
-		}
-	}
-	resources = {
-		category = planet_merchants
-		produces = {
-			unity = 1
-		}
-		upkeep = {
-			consumer_goods = 1
-		}
-	}
-	triggered_pop_modifier = {
-		potential = {
-			owner = {
-				has_policy_flag = market_operation
-			}
-		}
-		modifier = {
-			pop_cat_ruler_political_power = 1
-		}
-	}
-	triggered_pop_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_triple_the_profit
-			}
-		}
-		modifier = {
-			pop_cat_ruler_political_power = 3
-		}
-	}
-	
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		trade_value_add = 3
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_trade_mult|
-	}
-	
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		trade_value_add = 0.5
-		mult = planet.value:count_job|JOB|manager|
-	}
-
-	planet_modifier = {
-		job_merchant_add = -1
-		job_manager_add = 1
-		planet_jobs_energy_produces_mult = 0.03
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 7
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	triggered_planet_modifier = {
-		potential = {
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			planet_amenities_add = -1
-		}
-	}
-	triggered_planet_modifier = {
-		potential = {
-			owner = {
-				has_valid_civic = civic_anarchism
-			}
-		}
-		modifier = {
-			pop_cat_specialist_happiness = -0.05
-		}
-	}
-	weight = {
-		weight = @ruler_job_weight
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_thrifty
-				has_trait = trait_nuumismatic_administration
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_robot_domestic_protocols
-				has_trait = trait_charismatic
-			}
-		}
-		modifier = {
-			factor = 0.5
-			has_trait = trait_repugnant
-		}
-		modifier = {
-			factor = 5
-			has_job = mogul
-		}
-		modifier = {
-			factor = 1.5
-			has_ethic = ethic_capitalism
-		}
-	}
-}
-
-###################
-# 其他
-###################
-#有机观察员
-organic_observer = {
-	category = bio_trophy
-	is_capped_by_modifier = no
-	clothes_texture_index = 2
-	building_icon = building_fe_dome
-	icon = researcher
-	possible_pre_triggers = {
-	}
-	pop_modifier = {
-		pop_happiness = 0.1
-	}
-	possible = {
-		NOT = { has_trait = "trait_mechanical" }
-		has_citizenship_type = {
-			type = citizenship_limited
-		}
-		exists = owner
-		owner = {
-			has_civic = civic_machine_liberator
-		}
-	}
-	resources = {
-		category = planet_researchers
-		produces = {
-			food = 1
-			minerals = 1
-			consumer_goods = 0.5
-			society_research = 1
-			unity = 4
-		}
-		produces = {
-			trigger = {
-				owner = {
-						has_valid_civic = civic_mechanical_utopia
-				}
-			}
-			energy = 1
-			minerals =1
-			food =1
-			consumer_goods =0.5
-			alloys =0.25
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 1
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	weight = {
-		weight = 1
-	}
-}
-
-#能治工人
-intelligent_labor = {
-	category = complex_drone
-	condition_string = DRONE_JOB_TRIGGER
-	building_icon = building_machine_capital
-	icon = evaluator
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible_precalc = can_fill_drone_job
-	resources = {
-		category = planet_bureaucrats
-		upkeep = {
-			energy = 3
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_stability_add = 200
-		pop_cat_worker_political_power = -20
-		mult = planet.society_factor_pops
-	}
-	weight = {
-		weight = @complex_drone_job_weight
-		modifier = {
-			factor = 3
-			has_trait = trait_erudite
-		}
-		modifier = {
-			factor = 2
-			OR = {
-				has_trait = trait_robot_logic_engines
-				has_trait = trait_intelligent
-			}
-		}
-		modifier = {
-			factor = 1.5
-			OR = {
-				has_trait = trait_natural_engineers
-				has_trait = trait_natural_physicists
-				has_trait = trait_natural_sociologists
-			}
-		}
-		modifier = {
-			factor = 0.9
-			exists = owner
-			years_passed < 1
-			owner = {
-				has_valid_civic = civic_machine_assimilator
-			}
-			has_trait = trait_cybernetic
-		}
-		modifier = {
-			factor = 0
-			planet = {
-				owner = {
-					is_ai = yes
-					has_resource = {
-						type = minerals
-						amount < 500
-					}
-					has_monthly_income = {
-						resource = minerals
-						value < 25
-					}
-				}
-			}
-		}
-	}
-}
-
-#机魂
-machine_soul = {
-	category = machine_soul
-	clothes_texture_index = 1
-	building_icon = building_organic_sanctuary
-	icon = bio_trophy
-	possible = {
-		exists = owner
-		owner = {
-			has_civic = civic_machine_soul_servant
-		}
-		has_trait = "trait_mechanical"
-	}
-	resources = {
-		category = planet_bio_trophies
-		produces = {
-			unity = 4
-		}
-	}
-	planet_modifier = {
-		planet_amenities_no_happiness_add = 2
-		planet_jobs_produces_mult = 0.01
-	}
-	country_modifier = {
-		country_admin_cap_add = 2
-	    pop_amenities_usage_mult = -0.015
-	}
-	triggered_pop_modifier = {
-		pop_housing_usage_add = -1
-	}
-	weight = {
-		weight = 999999
-	}
-}
-
-#复杂子个体
-future_complex_drone = {
-	category = complex_drone
-	is_capped_by_modifier = no
-	clothes_texture_index = 2
-	icon = administrator
-	possible_precalc = can_fill_drone_job
-	possible_pre_triggers = {
-		has_owner = yes
-	}
-	possible = {
-		OR = {
-			planet = { has_modifier = planet_unemployment_benefits }
-			owner = { is_ai = yes }
-		}
-		owner = {
-			has_active_tradition = tr_future_industry
-			has_technology = tech_ascension_theory
-			is_gestalt = yes
-		}
-	}
-	resources = {
-		category = planet_jobs
-		produces = {
-			unity = 3
-			physics_research = 0.5
-			society_research = 0.5
-			engineering_research = 0.5
-			alloys = 1
-			influence = 0.01
-		}
-		#AI基础与年数产出
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-			}
-			food = 2
-			energy = 4
-			minerals = 2
-			alloys = 0.5		
-			physics_research = 0.25
-			engineering_research = 0.25
-			society_research = 0.25
-			unity = 0.25
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 20
-			}
-			food = 1
-			energy = 4
-			minerals = 1
-			alloys = 1		
-			physics_research = 1
-			engineering_research = 1
-			society_research = 1
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 35
-			}
-			food = 1
-			energy = 4
-			minerals = 1
-			alloys = 3		
-			physics_research = 1
-			engineering_research = 1
-			society_research = 1
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 50
-			}
-			food = -2
-			energy = 16
-			minerals = -2
-			alloys = 3		
-			physics_research = 2
-			engineering_research = 2
-			society_research = 2
-			unity = 8
-		}
-		
-		produces = { 
-			trigger = {
-				owner = { is_ai = yes }
-				mid_game_years_passed > 0
-			}
-			food = 2
-			energy = 6
-			minerals = 2
-			alloys = 6		
-			physics_research = 3
-			engineering_research = 3
-			society_research = 3
-			unity = 2
-		}
-		
-		produces = {
-			trigger = {
-				end_game_years_passed > 0
-			}
-			alloys = 8		
-			physics_research = 3
-			engineering_research = 3
-			society_research = 3
-			unity = 1
-		}		
-		#AI思潮加成
-		produces = {
-			trigger = {
-				owner = {
-					is_ai = yes
-					or = {
-						has_ethic = ethic_fanatic_spiritualist
-						has_ethic = ethic_spiritualist
-					}
-					
-				}
-			}
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				owner = {
-					is_ai = yes
-					OR = {
-						has_ethic = ethic_fanatic_materialist
-						has_ethic = ethic_materialist
-					}
-				}
-			}
-			physics_research = 1
-			engineering_research = 1
-			society_research = 1
-		}	
-		#AI难度加成	
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				is_difficulty = 2
-			}
-			food = 1
-			energy = 1
-			minerals = 1
-			consumer_goods = 1
-			alloys = 2		
-			physics_research = 1
-			engineering_research = 1
-			society_research = 1
-			unity = 1
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				is_difficulty = 3
-			}
-			food = 2
-			energy = 2
-			minerals = 2
-			consumer_goods = 2
-			alloys = 4		
-			physics_research = 3
-			engineering_research = 3
-			society_research = 3
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				is_difficulty = 4
-			}
-			food = 3
-			energy = 3
-			minerals = 3
-			consumer_goods = 3
-			alloys = 6	
-			physics_research = 4
-			engineering_research = 4
-			society_research = 4
-			unity = 3
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				is_difficulty = 5
-			}
-			food = 8
-			energy = 8
-			minerals = 8
-			consumer_goods = 8
-			alloys = 18		
-			physics_research = 8
-			engineering_research = 8
-			society_research = 8
-			unity = 8
-		}	
-		#AI弱者强化
-		produces = {
-			trigger = {
-				years_passed >= 50
-				owner = {
-					is_ai = yes
-					num_pops < 100
-				}				
-			}				
-			physics_research = 8
-			engineering_research = 8
-			society_research = 8
-			alloys = 14
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				years_passed >= 80
-				owner = {
-					is_ai = yes
-					num_pops < 100
-				}								
-			}		
-			physics_research = 8
-			engineering_research = 8
-			society_research = 8
-			alloys = 14
-		}
-	}
-	weight = {
-		weight = 0.1
-	}
-}
-
-#简单子个体
-future_simple_drone = {
-	category = simple_drone
-	is_capped_by_modifier = no
-	clothes_texture_index = 2
-	icon = primitive_laborer
-	possible_precalc = can_fill_drone_job
-	possible_pre_triggers = {
-		has_owner = yes
-	}
-	possible = {
-		OR = {
-			planet = { has_modifier = planet_unemployment_benefits }
-			owner = { is_ai = yes }
-		}
-		owner = {
-			has_active_tradition = tr_future_industry
-			has_technology = tech_ascension_theory
-			is_gestalt = yes
-		}
-	}
-	resources = {
-		category = planet_jobs
-		produces = {
-			energy = 2
-			minerals = 1
-			unity = 0.5
-		}
-		produces = {
-			trigger = {
-				NOR = {
-					has_trait = trait_mechanical
-					has_trait = trait_lithoid
-				}
-			}
-			food = 2
-		}
-		produces = {
-			trigger = {
-				OR = {
-					has_trait = trait_mechanical
-					has_trait = trait_lithoid
-				}
-			}
-			minerals = 1.5
-		}
-
-		#利他主义
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					has_valid_civic = civic_altruism
-				}
-			}
-			unity = 2
-		}
-
-		# Utopian living standards
-		produces = {
-			trigger = {
-				has_utopian_living_standard_type = yes
-			}
-			society_research = 2
-			physics_research = 2
-			engineering_research = 2
-		}
-
-		# Welfare
-		produces = {
-			trigger = {
-				OR = {
-					has_very_high_living_standard_type = yes
-					has_high_living_standard_type = yes
-					has_shared_burden_living_standard_type = yes
-				}
-			}
-			unity = 1
-		}
-		#AI基础与年数产出
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-			}
-			food = 2
-			energy = 4
-			minerals = 2
-			consumer_goods = 1
-			alloys = 0.5
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 20
-			}
-			food = 1
-			energy = 4
-			minerals = 1
-			consumer_goods = 1
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 35
-			}
-			food = 1
-			energy = 4
-			minerals = 1
-			consumer_goods = 1
-			alloys = 1
-		}
-		produces = {
-			trigger = {
-				owner = { is_ai = yes }
-				years_passed >= 50
-			}
-			food = -2
-			energy = 16
-			minerals = -2
-			consumer_goods = -2
-			alloys = 2
-		}
-		
-		produces = { 
-			trigger = {
-				owner = { is_ai = yes }
-				mid_game_years_passed > 0
-			}
-			food = 2
-			energy = 6
-			minerals = 2
-			consumer_goods = 2
-			alloys = 2
-		}
-		
-		produces = {
-			trigger = {
-				end_game_years_passed > 0
-			}
-			alloys = 3
-			unity = 1
-		}
-		#AI思潮加成
-		produces = {
-			trigger = {
-				owner = {
-					is_ai = yes
-					or = {
-						has_ethic = ethic_fanatic_spiritualist
-						has_ethic = ethic_spiritualist
-					}
-					
-				}
-			}
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				owner = {
-					is_ai = yes
-					OR = {
-						has_ethic = ethic_fanatic_materialist
-						has_ethic = ethic_materialist
-					}
-				}
-			}
-			physics_research = 1
-			engineering_research = 1
-			society_research = 1
-		}
-		#AI弱者强化
-		produces = {
-			trigger = {
-				years_passed >= 50
-				owner = {
-					is_ai = yes
-					num_pops < 100
-				}				
-			}				
-			physics_research = 8
-			engineering_research = 8
-			society_research = 8
-			alloys = 8
-			unity = 2
-		}
-		produces = {
-			trigger = {
-				years_passed >= 80
-				owner = {
-					is_ai = yes
-					num_pops < 100
-				}								
-			}		
-			physics_research = 8
-			engineering_research = 8
-			society_research = 8
-			alloys = 14
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_hive_empire = yes
-				}
-			}
-			minerals = 1
-		}
-		produces = {
-			trigger = {
-				exists = owner
-				owner = {
-					is_hive_empire = yes
-					has_civic = civic_hive_natural_neural_network
-				}
-			}
-			physics_research = 1
-			engineering_research = 1
-			society_research = 1.5
-		}
-	}
-	triggered_planet_modifier = {
-		potential = { always = yes }
-		planet_amenities_add = 2
-		mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult|
-	}
-	weight = {
-		weight = 0.95
-	}
-}
-
-#享乐主义者
-fe_hedonist = {
-	category = precursor
-	is_capped_by_modifier = no
-	building_icon = building_hyper_entertainment_forum
-	clothes_texture_index = 2
-
-	possible_pre_triggers = {
-		has_owner = yes
-		is_sapient = yes
-	}
-
-	possible = {
-		OR = {
-			AND = {
-				owner = {
-					is_fallen_empire = yes
-					is_fallen_empire_spiritualist = no
-					is_fallen_machine_empire = no
-				}
-			}
-			AND = {
-				owner = { has_origin = origin_taking_care_of_god }
-				has_trait = trait_fallen_god
-			}
-		}
-		is_same_species = owner
-		NOR = {
-			has_trait = trait_mechanical
-			has_trait = trait_machine_unit
-		}
-	}
-
-	resources = {
-		category = planet_jobs
-		produces = {
-			unity = 2
-		}
-	}
-
-	weight = {
-		weight = 1000
-
-		# crisis purge
-		modifier = {
-			factor = 0.01
-			exists = planet
-			exists = planet.controller
-			planet.controller = {
-				OR = {
-					is_country_type = swarm
-					is_country_type = ai_empire
-				}
-			}
-		}
-
-		modifier = {
-			factor = 100
-			owner = { has_origin = origin_taking_care_of_god }
-			has_trait = trait_fallen_god
-		}
-	}
-}
-
-#繁育子个体
-breeding_drone = {
-	category = simple_drone
-	is_capped_by_modifier = no
-	building_icon = building_organic_paradise
-	icon = aid_worker
-	can_set_priority = no
-	possible_precalc = can_fill_drone_job
-	possible_pre_triggers = {
-		has_owner = yes
-		is_robot_pop = yes
-		is_being_assimilated = no
-		is_being_purged = no
-	}
-
-	possible_precalc = can_fill_drone_job
-
-	possible = {
-		hidden_trigger = {
-			exists = owner
-		}
-		owner = {
-			has_valid_civic = civic_machine_syntheticLove
-		}
-	}
-	
-	triggered_planet_modifier = {
-		pop_growth_speed = 0.02
-		biological_pop_happiness = 0.01
-		planet_amenities_no_happiness_add = 2
-	}
-
-	resources = {
-		category = planet_jobs
-		produces = {
-			unity = 2
-		}
-		upkeep = {
-			food = 3
-		}
-	}
-
-	weight = {
-		weight = -1.0
-	}
-}
-
-#不朽者
-vanguard = {
-	category = vanguard_unit
-	condition_string = DRONE_JOB_TRIGGER
-	is_capped_by_modifier = no
-	building_icon = building_power_plant
-	clothes_texture_index = 2
-	icon = mind_thrall
-	possible_pre_triggers = {
-		has_owner = yes
-		is_enslaved = no
-		is_being_purged = no
-		is_being_assimilated = no
-		is_sapient = yes
-	}
-	possible = {
-		owner = {
-			has_valid_civic = civic_forever_with_us
-		}
-		has_trait = trait_vanguard_hive_mind
-	}
-	resources = {
-		category = planet_politicians
-		upkeep = {
-			energy = 6
-		}
-	}
-	country_modifier = {
-		country_admin_cap_add = 10
-	}
-
-	triggered_country_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_authoritarian = yes
-			}
-		}
-		modifier = {
-			country_edict_fund_add = 3
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_egalitarian = yes
-			}
-		}
-		modifier = {
-			pop_housing_usage_mult = -0.025
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_xenophobe = yes
-			}
-		}
-		modifier = {
-			pop_citizen_happiness = 0.025
-		}
-	}
-
-	triggered_country_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_xenophile = yes
-			}
-		}
-		modifier = {
-			planet_pops_upkeep_mult = -0.025
-		}
-	}
-
-	triggered_country_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_militarist = yes
-			}
-		}
-		modifier = {
-			country_naval_cap_add = 2
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_pacifist = yes
-			}
-		}
-		modifier = {
-			pop_amenities_usage_mult = -0.025
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_materialist = yes
-			}
-		}
-		modifier = {
-			planet_amenities_add = 5
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_capitalism = yes
-			}
-		}
-		modifier = {
-			trade_value_mult = 0.075
-		}
-	}
-
-	triggered_planet_modifier = {
-		potential = {
-			exists = owner
-			owner = {
-				is_socialism = yes
-			}
-		}
-		modifier = {
-			plan_type_mult = 0.1
-		}
-	}
-	weight = {
-		weight = 9999
-	}
-}
-
diff --git a/common/scripted_triggers/ethic_scripted_triggers.txt b/common/scripted_triggers/ethic_scripted_triggers.txt
index 01cdde9f3..7ed0d264c 100644
--- a/common/scripted_triggers/ethic_scripted_triggers.txt
+++ b/common/scripted_triggers/ethic_scripted_triggers.txt
@@ -85,33 +85,28 @@ is_criminal_syndicate = {
 ### region JOB CHECK
 # 未被奴役（兼容特殊国策）
 ethic_is_not_enslaved = {
+	hidden_trigger = { exists = owner }
 	OR = {
 		is_enslaved = no
-		exists = owner
 		owner = { has_valid_civic = civic_du_contrat_social }
 	}
 }
 
 # 可以担任艺人职业（兼容特殊国策）
 ethic_entertainer_job_check_trigger = {
+	hidden_trigger = { exists = owner }
 	OR = {
 		entertainer_job_check_trigger = yes
-		AND = {
-			exists = owner
-			owner = { has_valid_civic = civic_triple_the_profit }
-		}
-		AND = {
-			exists = owner
-			owner = { has_valid_civic = civic_du_contrat_social }
-		}
+		owner = { has_valid_civic = civic_du_contrat_social }
+		owner = { has_valid_civic = civic_triple_the_profit }
 	}
 }
 
 # 可以担任战斗职业（兼容特殊国策）
 ethic_battle_thrall_job_check_trigger = {
+	hidden_trigger = { exists = owner }
 	OR = {
 		battle_thrall_job_check_trigger = yes
-		exists = owner
 		owner = { has_valid_civic = civic_du_contrat_social }
 	}
 }
diff --git a/localisation/replace/english/ethic_overlord_jobs_l_english.yml b/localisation/replace/english/ethic_overlord_jobs_l_english.yml
new file mode 100644
index 000000000..92aa863c3
--- /dev/null
+++ b/localisation/replace/english/ethic_overlord_jobs_l_english.yml
@@ -0,0 +1,21 @@
+l_english:
+ # Overlord Mortal Initiates
+ job_overlord_mortal_initiate:0 "Overlord Mortal Initiate"
+ planet_overlord_mortal_initiates:0 "Overlord Mortal Initiates"
+ job_overlord_mortal_initiate_plural:0 "Overlord Mortal Initiates"
+ mod_job_overlord_mortal_initiate_add:0 "$job_overlord_mortal_initiate$ Jobs"
+ job_overlord_mortal_initiate_desc:0 "The customs of our Overlord may seem strange and mysterious, but our way forward is by accepting them. Only those who are willing will be asked to make the ultimate sacrifice."
+ job_overlord_mortal_initiate_drone:0 "$job_overlord_mortal_initiate$ Drone"
+ job_overlord_mortal_initiate_drone_plural:1 "$job_overlord_mortal_initiate$ Drones"
+ mod_job_overlord_mortal_initiate_drone_add:1 "$job_overlord_mortal_initiate$ Jobs"
+ job_overlord_mortal_initiate_drone_desc:0 "The customs of our Overlord may seem strange and mysterious, yet we are to be a part of them. A few of our drones have been designated to join what the Overlord calls 'a study of life', one which concludes with their willing sacrifice."
+ job_overlord_mortal_initiate_effect_desc:0 "£job_mortal_initiate£ $job_overlord_mortal_initiate_plural$ produce £unity£ §YUnity§!, £amenities£ §Y$amenity$§! and £society£ §YResearch§! for the Subject. $job_overlord_mortal_initiate$ can be used for §YSacrifices§!."
+ 
+ job_overlord_knight:0 "Overlord $job_knight$"
+ job_overlord_knight_plural:0 "Overlord $job_knight_plural$"
+ job_overlord_knight_desc:0 "$job_knight_desc$"
+ job_overlord_knight_drone:0 "Overlord $job_knight$"
+ job_overlord_knight_drone_plural:0 "Overlord $job_knight_plural$"
+ job_overlord_knight_drone_desc:0 "$job_knight_desc$"
+ mod_job_overlord_knight_add:0 "$job_overlord_knight$ Jobs"
+ mod_job_overlord_knight_drone_add:0 "$job_overlord_knight_drone$ Jobs"
\ No newline at end of file
diff --git a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
index 60df3a9e4..9893e8de5 100644
--- a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
+++ b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml
@@ -453,3 +453,15 @@
  mod_planet_artisans_produces_mult:0 "£job_artisan£ $job_artisan_plural$与£job_artisan£ $job_artisan_plural$产出"
  mod_planet_metallurgists_alloys_produces_mult:0 "来自£job_foundry£ 合金生产岗位的£alloys£ $alloys$"
  mod_planet_artisans_consumer_goods_produces_mult:0 "来自£job_artisan£ 消费品生产岗位的£consumer_goods£ $consumer_goods$"
+ 
+ pop_cat_deviant_drone:0 "反常子个体"
+ pop_cat_deviant_drone_plural:0 "反常子个体"
+ mod_pop_cat_deviant_drone_political_power:0 "$pop_cat_deviant_drone$政治权力"
+ mod_pop_cat_deviant_drone_happiness:0 "$pop_cat_deviant_drone$幸福度"
+ pop_cat_deviant_drone_desc:0 "这些反常的子个体拒绝遵从蜂巢的意志。"
+ 
+ pop_cat_corrupt_drone:0 "腐化子个体"
+ pop_cat_corrupt_drone_plural:0 "腐化子个体"
+ mod_pop_cat_corrupt_drone_political_power:0 "$pop_cat_corrupt_drone$政治权力"
+ mod_pop_cat_corrupt_drone_happiness:0 "$pop_cat_corrupt_drone$幸福度"
+ pop_cat_corrupt_drone_desc:0 "腐化的子个体不再依照核心智慧设定的指令行动。"
diff --git a/localisation/replace/simp_chinese/ethic_overlord_jobs_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_overlord_jobs_l_simp_chinese.yml
new file mode 100644
index 000000000..638d4b143
--- /dev/null
+++ b/localisation/replace/simp_chinese/ethic_overlord_jobs_l_simp_chinese.yml
@@ -0,0 +1,21 @@
+l_simp_chinese:
+ # Overlord Mortal Initiates
+ job_overlord_mortal_initiate:0 "宗主国凡体先烈"
+ planet_overlord_mortal_initiates:0 "宗主国凡体先烈"
+ job_overlord_mortal_initiate_plural:0 "宗主国凡体先烈"
+ mod_job_overlord_mortal_initiate_add:0 "$job_overlord_mortal_initiate$岗位"
+ job_overlord_mortal_initiate_desc:0 "我们宗主国的风俗习惯或许看上去奇怪而神秘，但是接受他们是我们的历史必然。只有那些心甘情愿的人会被要求作出终极的祭献。"
+ job_overlord_mortal_initiate_drone:0 "$job_overlord_mortal_initiate$子个体"
+ job_overlord_mortal_initiate_drone_plural:1 "$job_overlord_mortal_initiate$子个体"
+ mod_job_overlord_mortal_initiate_drone_add:1 "$job_overlord_mortal_initiate$岗位"
+ job_overlord_mortal_initiate_drone_desc:0 "我们宗主国的风俗习惯或许看上去奇怪而神秘，但我们是他们的一部分。我们子个体的一小部分被指派去加入宗主国的“生命的研究”，这项研究最终会以它们的自愿祭献收场。"
+ job_overlord_mortal_initiate_effect_desc:0 "£job_mortal_initiate£$job_overlord_mortal_initiate_plural$为附属国产出£unity£§Y凝聚力§!，£amenities£§Y$amenity$§!以及£society£§Y研究点§!。$job_overlord_mortal_initiate$可以被用于§Y祭献§!。"
+ 
+ job_overlord_knight:0 "宗主国$job_knight$"
+ job_overlord_knight_plural:0 "宗主国$job_knight_plural$"
+ job_overlord_knight_desc:0 "$job_knight_desc$"
+ job_overlord_knight_drone:0 "宗主国$job_knight$"
+ job_overlord_knight_drone_plural:0 "宗主国$job_knight_plural$"
+ job_overlord_knight_drone_desc:0 "$job_knight_desc$"
+ mod_job_overlord_knight_add:0 "$job_overlord_knight$岗位"
+ mod_job_overlord_knight_drone_add:0 "$job_overlord_knight_drone$岗位"
\ No newline at end of file

From fa45b5cff6de07408a42f7eccd51f10ab78b8c5b Mon Sep 17 00:00:00 2001
From: DragonKnightOfBreeze <dk_breeze@qq.com>
Date: Mon, 30 Jan 2023 03:38:27 +0800
Subject: [PATCH 30/30] =?UTF-8?q?=E6=9B=B4=E6=96=B0=202023/1/29=20by=20dk?=
 =?UTF-8?q?=5Fbreeze?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 514e08e3d..0a4696122 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@
 * 修复 职业适用条件修复 - 注意士官的职业适用条件参照骑士
 * 修复 职业脚本和政策脚本中的语法错误
 
+备注：
+
+* 舍弃对职业的数值修改（否则合并起来太麻烦，以后再看）
+
 ### 2023/1/2
 
 * 调整 所有职业的非全国的贸易额产出改为加算