一些scope相关的bug修复

cocolinfff · Oct 16, 2022 · a13d042 · a13d042
1 parent 6b56974
commit a13d042
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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