Merge pull request #3 from cocolinfff/master

U313N

common/armies/00_defense_armies.txt

@@ -28,7 +28,7 @@ defense_army = {
 		}
 		produces = {
 			trigger = {
-				NOT = { has_trait = trait_lithoid }
+				NOT = { from = { has_trait = trait_lithoid } }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -39,7 +39,7 @@ defense_army = {
 		}
 		produces = {
 			trigger = {
-				has_trait = trait_lithoid
+				from = { has_trait = trait_lithoid }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -113,7 +113,7 @@ undead_defense_army = {
 		}
 		produces = {
 			trigger = {
-				NOT = { has_trait = trait_lithoid }
+				NOT = { from = { has_trait = trait_lithoid } }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -124,7 +124,7 @@ undead_defense_army = {
 		}
 		produces = {
 			trigger = {
-				has_trait = trait_lithoid
+				from = { has_trait = trait_lithoid }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -172,7 +172,7 @@ robotic_defense_army = {
 		}
 		produces = {
 			trigger = {
-				NOT = { has_trait = trait_lithoid }
+				NOT = { from = { has_trait = trait_lithoid } }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -183,7 +183,7 @@ robotic_defense_army = {
 		}
 		produces = {
 			trigger = {
-				has_trait = trait_lithoid
+				from = { has_trait = trait_lithoid }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -229,7 +229,7 @@ machine_defense = {
 		}
 		produces = {
 			trigger = {
-				NOT = { has_trait = trait_lithoid }
+				NOT = { from = { has_trait = trait_lithoid } }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -240,7 +240,7 @@ machine_defense = {
 		}
 		produces = {
 			trigger = {
-				has_trait = trait_lithoid
+				from = { has_trait = trait_lithoid }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -299,7 +299,7 @@ offspring_defense = {
 		}
 		produces = {
 			trigger = {
-				NOT = { has_trait = trait_lithoid }
+				NOT = { from = { has_trait = trait_lithoid } }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -310,7 +310,7 @@ offspring_defense = {
 		}
 		produces = {
 			trigger = {
-				has_trait = trait_lithoid
+				from = { has_trait = trait_lithoid }
 				exists = owner
 				owner = { has_valid_civic = civic_martial_brotherhood }
 			}
@@ -339,7 +339,7 @@ drone_defense_army = {
 				has_job = patrol_drone
 				has_job = offspring_drone
 			}
-			owner = { has_policy_flag = all_people_are_soldiers_ges }
 		}
+		owner = { has_policy_flag = all_people_are_soldiers_ges }
 	}
 }

common/component_templates/000_ethic_utilities_drives.txt

@@ -0,0 +1,94 @@
+
+@cost1 = 5
+@cost2 = 10
+@cost3 = 15
+@cost4 = 20
+
+@power1 = -10
+@power2 = -15
+@power3 = -20
+@power4 = -30
+
+utility_component_template = {
+	key = "SUBSPACE_DRIVE"
+	size = small
+	icon = "GFX_ship_part_subspace_drive"
+	icon_frame = 1
+
+	power = @power0
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = @cost1
+		}
+	}
+
+	ftl = yes
+	jumpdrive = yes
+	ship_modifier = {
+		ship_ftl_jumpdrive_range_mult = -0.6
+		ship_windup_mult = 35
+	}
+	prerequisites = { "tech_subspace_drive" }
+	ai_weight = {
+		weight = 1
+	}
+	component_set = "ftl_components"
+	upgrades_to = "WARP_DRIVE_1"
+}
+
+utility_component_template = {
+	key = "SUBLIGHT_DRIVE"
+	size = small
+	icon = "GFX_ship_part_wormhole"
+	icon_frame = 1
+
+	power = @power0
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = @cost1
+		}
+	}
+
+	ftl = yes
+	ship_modifier = {
+		ship_windup_mult = 239
+	}
+	prerequisites = { "tech_sublight_drive" }
+	ai_weight = {
+		weight = 0.1
+	}
+
+	class_restriction = { shipclass_military shipclass_transport shipclass_military_special shipclass_starbase }
+	component_set = "ftl_components"
+	upgrades_to = "HYPER_DRIVE_1"
+}
+
+utility_component_template = {
+	key = "SUBLIGHT_DRIVE_CIVILIAN"
+	size = small
+	icon = "GFX_ship_part_wormhole"
+	icon_frame = 1
+
+	power = @power0
+	resources = {
+		category = ship_components
+		cost = {
+			alloys = @cost1
+		}
+	}
+
+	ftl = yes
+	ship_modifier = {
+		ship_windup_mult = 239
+	}
+	prerequisites = { "tech_sublight_drive" }
+	ai_weight = {
+		weight = 0.1
+	}
+
+	size_restriction = { constructor construction_ship_swarm construction_ship_ed construction_ship_ai colonizer sponsored_colonizer lithoid_colonizer colony_ship_swarm colony_ship_ai science alien_racing_ship ghost_ship enigmatic_cache }
+	component_set = "ftl_components"
+	upgrades_to = "HYPER_DRIVE_1_CIVILIAN"
+}

common/component_templates/ethic_warp_drive.txt

@@ -9,34 +9,6 @@
 @power3 = -20
 @power4 = -30
 
-utility_component_template = {
-	key = "SUBSPACE_DRIVE"
-	size = small
-	icon = "GFX_ship_part_subspace_drive"
-	icon_frame = 1
-
-	power = @power0
-	resources = {
-		category = ship_components
-		cost = {
-			alloys = @cost1
-		}
-	}
-
-	ftl = no
-	jumpdrive = yes
-	ship_modifier = {
-		ship_ftl_jumpdrive_range_mult = -0.6
-		ship_jumpdrive_cooldown_mult = 40
-	}
-	prerequisites = { "tech_subspace_drive" }
-	ai_weight = {
-		weight = 1
-	}
-	component_set = "ftl_components"
-	upgrades_to = "WARP_DRIVE_1"
-}
-
 #Warp Drive 1
 utility_component_template = {
 	key = "WARP_DRIVE_1"
@@ -50,11 +22,12 @@ utility_component_template = {
 			alloys = @cost1
 		}
 	}
-	ftl = no
+	ftl = yes
 	jumpdrive = yes
 	ship_modifier = {
 		ship_ftl_jumpdrive_range_mult = -0.5
 		ship_jumpdrive_cooldown_mult = 1.5
+		ship_windup_mult = 23
 	}
 	class_restriction = { shipclass_military shipclass_constructor shipclass_colonizer shipclass_science_ship shipclass_transport shipclass_military_special shipclass_starbase }
 	prerequisites = { "tech_warp_drive_1" }
@@ -79,11 +52,12 @@ utility_component_template = {
 			alloys = @cost2
 		}
 	}
-	ftl = no
+	ftl = yes
 	jumpdrive = yes
 	ship_modifier = {
 		ship_ftl_jumpdrive_range_mult = -0.25
 		ship_jumpdrive_cooldown_mult = 1
+		ship_windup_mult = 10
 	}
 
 	ai_weight = {
@@ -109,11 +83,13 @@ utility_component_template = {
 			alloys = @cost3
 		}
 	}
-	ftl = no
+	ftl = yes
 	jumpdrive = yes
 	ship_modifier = {
 		ship_ftl_jumpdrive_range_mult = -0.25
 		ship_jumpdrive_cooldown_mult = 0.5
+		ship_windup_mult = 2.5
+		ship_windup_mult = 5
 	}
 
 	ai_weight = {

common/decisions/ethic_rebuild_special_decisions.txt

@@ -563,12 +563,11 @@ decision_close_illegal_office = {
 	}
 
 	potential = {
+		has_branch_office = yes
 		owner = { has_policy_flag = economic_stance_planned }
-		planet = {
-			branch_office_owner = {
-				NOT = { is_same_value = root }
-			}
-		}	
+		branch_office_owner = {
+			NOT = { is_same_value = root }
+		}
 	}
 
 	allow = {

common/edicts/00_communists_edicts.txt

@@ -139,7 +139,7 @@ family_planning = {
 	}
 
 	ai_weight = {
-		weight = @EdictMedPrio
+		weight = 0
 	}
 }
 

common/edicts/00_ethic_economic_edicts.txt

@@ -47,12 +47,12 @@ economic_inflaction = {
 	potential = {
 		has_country_flag = ETHIC_MARKET_ECONOMY
 	}
-	possible = {
+	allow = {
 		NOT = { has_edict = economic_deinflaction }
-		any_situation = {
-			limit = { is_situation_type = situation_economic_circle }
-			NOT = { has_situation_flag = economic_crisis }
-		}
+		# any_situation = {
+		# 	limit = { is_situation_type = situation_economic_circle }
+		# 	NOT = { has_situation_flag = economic_crisis }
+		# }
 	}
 
 	ai_weight = {
@@ -97,12 +97,12 @@ economic_deinflaction = {
 	potential = {
 		has_country_flag = ETHIC_MARKET_ECONOMY
 	}
-	possible = {
+	allow = {
 		NOT = { has_edict = economic_inflaction }
-		any_situation = {
-			limit = { is_situation_type = situation_economic_circle }
-			NOT = { has_situation_flag = economic_crisis }
-		}
+		# any_situation = {
+		# 	limit = { is_situation_type = situation_economic_circle }
+		# 	NOT = { has_situation_flag = economic_crisis }
+		# }
 	}
 
 	ai_weight = {
@@ -138,12 +138,6 @@ economic_consumer_coupon = {
 	potential = {
 		has_country_flag = ETHIC_MARKET_ECONOMY
 	}
-	possible = {
-		any_situation = {
-			limit = { is_situation_type = situation_economic_circle }
-			NOT = { has_situation_flag = economic_crisis }
-		}
-	}
 
 	ai_weight = {
 		weight = 0
@@ -174,7 +168,7 @@ explorer_privatization = { # 开拓者私有化协议
 		has_country_flag = ETHIC_MARKET_ECONOMY
 		NOT = { has_ethic = ethic_fanatic_socialism }
 	}
-	possible = {
+	allow = {
 		always = yes
 	}
 
@@ -225,12 +219,6 @@ war_bonds = {
 		is_at_war = yes
 		has_country_flag = ETHIC_MARKET_ECONOMY
 	}
-	possible = {
-		any_situation = {
-			limit = { is_situation_type = situation_economic_circle }
-			NOT = { has_situation_flag = economic_crisis }
-		}
-	}
 
 	ai_weight = {
 		weight = 0
@@ -277,12 +265,6 @@ clean_war_bonds = {
 		has_country_flag = ETHIC_MARKET_ECONOMY
 		check_modifier_value = { which = economic_war_bonds_num value > 0 }
 	}
-	possible = {
-		any_situation = {
-			limit = { is_situation_type = situation_economic_circle }
-			NOT = { has_situation_flag = economic_crisis }
-		}
-	}
 
 	ai_weight = {
 		weight = 0