From a13d042b91521fd47a2763c21aeb2bc7717489d1 Mon Sep 17 00:00:00 2001
From: Colin <1604990672@qq.com>
Date: Sun, 16 Oct 2022 23:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9Bscope=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/buildings/ethic_school_buildings.txt          | 2 +-
 common/decisions/ethic_rebuild_special_decisions.txt | 8 +++++---
 common/on_actions/ethic_rebuild_on_actions.txt       | 1 -
 common/pop_jobs/02_specialist_jobs.txt               | 6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/common/buildings/ethic_school_buildings.txt b/common/buildings/ethic_school_buildings.txt
index ce243e3f9..b8d9034ad 100644
--- a/common/buildings/ethic_school_buildings.txt
+++ b/common/buildings/ethic_school_buildings.txt
@@ -20,7 +20,7 @@ building_school_1 = {
 				is_ai = no
 				AND = {
 					is_ai = yes
-					planet = { num_buildings = { type = building_school_1 value < 3 } }
+					from = { num_buildings = { type = building_school_1 value < 3 } }
 				}
 			}
 		}
diff --git a/common/decisions/ethic_rebuild_special_decisions.txt b/common/decisions/ethic_rebuild_special_decisions.txt
index cacbbcde2..2281bd354 100644
--- a/common/decisions/ethic_rebuild_special_decisions.txt
+++ b/common/decisions/ethic_rebuild_special_decisions.txt
@@ -540,9 +540,11 @@ decision_close_illegal_office = {
 
 	potential = {
 		owner = { has_policy_flag = economic_stance_planned }
-		branch_office_owner = {
-			NOT = { is_same_value = root }
-		}
+		planet = {
+			branch_office_owner = {
+				NOT = { is_same_value = root }
+			}
+		}	
 	}
 
 	allow = {
diff --git a/common/on_actions/ethic_rebuild_on_actions.txt b/common/on_actions/ethic_rebuild_on_actions.txt
index 548e4ddab..ae23d606c 100644
--- a/common/on_actions/ethic_rebuild_on_actions.txt
+++ b/common/on_actions/ethic_rebuild_on_actions.txt
@@ -74,7 +74,6 @@ on_yearly_pulse_country = {
 		peoples_emperor.1
 		ethic_conciliatory.2
 		ethic_corpus_event.1
-		ethic_economic.2
 		ethic_civic_yearly.2
 		ethic_civic_yearly.3
 		ethic_equal_gift.1
diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt
index ecc7d5526..87e3a70bb 100644
--- a/common/pop_jobs/02_specialist_jobs.txt
+++ b/common/pop_jobs/02_specialist_jobs.txt
@@ -912,7 +912,8 @@ priest = {
 	}
 	triggered_planet_modifier = { # 民主廉政取消维护费
 		potential = {
-			NOT = { has_valid_civic = civic_democracy_and_clean_government }
+			exists = owner
+			NOT = { owner = { has_valid_civic = civic_democracy_and_clean_government } }
 		}
 		planet_priests_upkeep_mult = 0.01
 	}
@@ -935,7 +936,8 @@ priest = {
 	}
 	triggered_planet_modifier = {
 		potential = {
-			has_valid_civic = civic_liberation_theology
+			exists = owner
+			owner = { has_valid_civic = civic_liberation_theology }
 		}
 		modifier = {
 			planet_amenities_add = 1