Various further fixes

cwtools · Aug 7, 2019 · fef94de · fef94de
1 parent 8e721be
commit fef94de
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 12 deletions.
diff --git a/config/Stellaris on_actions.csv b/config/Stellaris on_actions.csv
@@ -202,3 +202,6 @@ on_destroy_planet_with_PLANET_KILLER_NEUTRON,this = planet root = planet from =
 on_destroy_planet_with_PLANET_KILLER_GODRAY,this = planet root = planet from = fleet,planet
 on_destroy_planet_with_PLANET_KILLER_NANOBOTS,this = planet root = planet from = fleet,planet
 on_destroy_planet_with_PLANET_DESTRUCTION_COMPONENT_PlaceholderForMore,this = planet root = planet from = fleet,planet
+on_relic_activated,this = country root = country,ship
+on_arch_stage_finished,this = fleet root = fleet from = archaeological_site,fleet
+on_arch_site_finished,this = fleet root = fleet from = archaeological_site,fleet
diff --git a/config/common/all_modifiers_consolidated.cwt b/config/common/all_modifiers_consolidated.cwt
@@ -48,6 +48,8 @@ static_modifier = {
 		icon = filepath
 	}
 	## cardinality = 0..1
+	icon = filepath
+	## cardinality = 0..1
 	important = bool
 	## cardinality = 0..1
 	custom_tooltip = localisation

diff --git a/config/common/buildings.cwt b/config/common/buildings.cwt
@@ -47,7 +47,7 @@ building = {
 	## cardinality = 0..1
 	can_be_disabled = bool
 	## cardinality = 0..1
-	can_build = no
+	can_build = bool
 	## cardinality = 0..1
 	base_cap_amount = int
 	## cardinality = 0..1

diff --git a/config/common/defines.cwt → config/common/defines.old_archived_file b/config/common/defines.cwt → config/common/defines.old_archived_file
@@ -1,3 +1,5 @@
+#DO NOT RE-ENABLE THIS WITHOUT UPDATING THE CONTENT! IT IS USELESS AT THE MOMENT!
+
 types = {
  	## type_key_filter = NCamera
 	type[NCamera] = {

diff --git a/config/common/deposits_and_planetary_features.cwt b/config/common/deposits_and_planetary_features.cwt
@@ -105,6 +105,10 @@ deposit = {
 
 		category = <deposit_category>
 	}
+	subtype[!colonisable] = {
+		## cardinality = 0..1
+		category = deposit_cat_rare
+	}
 
 	## cardinality = 0..1
 	potential = {
@@ -117,6 +121,12 @@ deposit = {
 			alias_name[modifier_rule] = alias_match_left[modifier_rule]
 		}
 	}
+	subtype[not_dropped] = {
+	## cardinality = 0..1
+		drop_weight = {
+			weight = 0
+		}
+	}
 
 	subtype[orbital] = {
 		station = shipclass_mining_station

diff --git a/config/common/districts.cwt b/config/common/districts.cwt
@@ -54,7 +54,7 @@ district = {
 	}
 
 	resources = {
-		category = planet_districts
+		category = <economic_category>
 		alias_name[economic_template] = alias_match_left[economic_template]
 	}
 

diff --git a/config/common/edicts.cwt b/config/common/edicts.cwt
@@ -20,17 +20,16 @@ types = {
 edict = {
 	length = int
 
-	subtype[!edict_ambition] = {
-		resources = {
-			category = <economic_category>
-			alias_name[economic_template] = alias_match_left[economic_template]
-		}
-	}
-
 	subtype[edict_ambition] = {
 		is_ambition = yes
 	}
 
+	## cardinality = 0..1
+	resources = {
+		category = <economic_category>
+		alias_name[economic_template] = alias_match_left[economic_template]
+	}
+
 	## cardinality = 0..1
 	## replace_scope = { this = country root = country }
 	modifier = {

diff --git a/config/common/governments.cwt b/config/common/governments.cwt
@@ -25,7 +25,8 @@ types = {
 }
 
 authority = {
-
+	## cardinality = 0..1
+	machine_empire = yes
 	## cardinality = 0..1
 	icon = filepath
 	## cardinality = 0..1

diff --git a/config/common/on_actions.cwt b/config/common/on_actions.cwt
@@ -323,6 +323,12 @@ types = {
         subtype[on_destroy_planet_with_PLANET_KILLER_NANOBOTS] = { }
         ## type_key_filter = on_destroy_planet_with_PLANET_DESTRUCTION_COMPONENT_PlaceholderForMore
         subtype[on_destroy_planet_with_PLANET_DESTRUCTION_COMPONENT_PlaceholderForMore] = { }
+        ## type_key_filter = on_relic_activated
+        subtype[on_relic_activated] = { }
+        ## type_key_filter = on_arch_stage_finished
+        subtype[on_arch_stage_finished] = { }
+        ## type_key_filter = on_arch_site_finished
+        subtype[on_arch_site_finished] = { }
     }
 }
 on_action = {
@@ -2742,4 +2748,49 @@ on_action = {
             int = <event.planet>
         }
     }
+    ## replace_scope = { this = country root = country }
+    subtype[on_relic_activated] = {
+        ## cardinality = 0..1
+        events = {
+            ## cardinality = 0..inf
+            <event.country>
+        }
+        ## cardinality = 0..1
+        random_events = {
+            ## cardinality = 0..inf
+            int = 0
+            ## cardinality = 0..inf
+            int = <event.country>
+        }
+    }
+    ## replace_scope = { this = fleet root = fleet from = archaeological_site }
+    subtype[on_arch_stage_finished] = {
+        ## cardinality = 0..1
+        events = {
+            ## cardinality = 0..inf
+            <event.fleet>
+        }
+        ## cardinality = 0..1
+        random_events = {
+            ## cardinality = 0..inf
+            int = 0
+            ## cardinality = 0..inf
+            int = <event.fleet>
+        }
+    }
+    ## replace_scope = { this = fleet root = fleet from = archaeological_site }
+    subtype[on_arch_site_finished] = {
+        ## cardinality = 0..1
+        events = {
+            ## cardinality = 0..inf
+            <event.fleet>
+        }
+        ## cardinality = 0..1
+        random_events = {
+            ## cardinality = 0..inf
+            int = 0
+            ## cardinality = 0..inf
+            int = <event.fleet>
+        }
+    }
 }
diff --git a/config/effects.cwt b/config/effects.cwt
@@ -369,7 +369,7 @@ alias[effect:destroy_colony] = yes
 #alias[effect:set_ruined] = bool
 
 alias[effect:random_list] = {
-	##cardinality = 0..inf
+	##cardinality = 1..inf
 	int = {
 		##cardinality = 0..inf
 		alias_name[modifier_rule] = alias_match_left[modifier_rule]
@@ -379,7 +379,7 @@ alias[effect:random_list] = {
 }
 
 alias[effect:random_list] = {
-	##cardinality = 0..inf
+	##cardinality = 1..inf
 	float = {
 		##cardinality = 0..inf
 		alias_name[modifier_rule] = alias_match_left[modifier_rule]
@@ -388,6 +388,17 @@ alias[effect:random_list] = {
 	}
 }
 
+###Works like a random list, but the tooltip will only show the option that actually happens.
+alias[effect:locked_random_list] = {
+	##cardinality = 1..inf
+	int = {
+		##cardinality = 0..inf
+		alias_name[modifier_rule] = alias_match_left[modifier_rule]
+		##cardinality = 0..inf
+		alias_name[effect] = alias_match_left[effect]
+	}
+}
+
 alias[effect:random] = {
 	chance = int[1...99]
 	alias_name[effect] = alias_match_left[effect]
@@ -2641,6 +2652,10 @@ alias[effect:spawn_system] = {
 	min_distance = int[0..1000]
 	## cardinality = 0..1
 	max_distance = int[0..1000]
+	## cardinality = 0..1
+	min_jumps = int[0..1000]
+	## cardinality = 0..1
+	max_jumps = int[0..1000]
 	initializer = <solar_system_initializer>
 	## cardinality = 0..1
 	hyperlane = bool
@@ -2869,3 +2884,6 @@ alias[effect:add_relic] = <relic>
 
 ###Removes the specified relic from the scoped country. remove_relic = <relic_key>
 alias[effect:remove_relic] = <relic>
+
+###Makes the archaeological site event expire
+alias[effect:expire_site_event] = <event.fleet>