From fef94decf4cd369e3ccd913309128404fcc340ca Mon Sep 17 00:00:00 2001 From: Pierre du Plessis Date: Thu, 8 Aug 2019 01:51:06 +0200 Subject: [PATCH] Various further fixes --- config/Stellaris on_actions.csv | 3 ++ config/common/all_modifiers_consolidated.cwt | 2 + config/common/buildings.cwt | 2 +- ...{defines.cwt => defines.old_archived_file} | 2 + .../deposits_and_planetary_features.cwt | 10 ++++ config/common/districts.cwt | 2 +- config/common/edicts.cwt | 13 +++-- config/common/governments.cwt | 3 +- config/common/on_actions.cwt | 51 +++++++++++++++++++ config/effects.cwt | 22 +++++++- 10 files changed, 98 insertions(+), 12 deletions(-) rename config/common/{defines.cwt => defines.old_archived_file} (99%) diff --git a/config/Stellaris on_actions.csv b/config/Stellaris on_actions.csv index dccdbdc4..794ace93 100644 --- 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 \ No newline at end of file diff --git a/config/common/all_modifiers_consolidated.cwt b/config/common/all_modifiers_consolidated.cwt index 13573904..25fcb02b 100644 --- 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 index aaf9ed1e..754d891d 100644 --- 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 b/config/common/defines.old_archived_file similarity index 99% rename from config/common/defines.cwt rename to config/common/defines.old_archived_file index 14805de4..365aba8e 100644 --- a/config/common/defines.cwt +++ b/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 index 890f093b..91f4f80c 100644 --- a/config/common/deposits_and_planetary_features.cwt +++ b/config/common/deposits_and_planetary_features.cwt @@ -105,6 +105,10 @@ 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 index 88e2adc5..b6384f51 100644 --- a/config/common/districts.cwt +++ b/config/common/districts.cwt @@ -54,7 +54,7 @@ district = { } resources = { - category = planet_districts + category = alias_name[economic_template] = alias_match_left[economic_template] } diff --git a/config/common/edicts.cwt b/config/common/edicts.cwt index b88f067e..57ee1116 100644 --- a/config/common/edicts.cwt +++ b/config/common/edicts.cwt @@ -20,17 +20,16 @@ types = { edict = { length = int - subtype[!edict_ambition] = { - resources = { - category = - alias_name[economic_template] = alias_match_left[economic_template] - } - } - subtype[edict_ambition] = { is_ambition = yes } + ## cardinality = 0..1 + resources = { + 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 index 887ef87a..e3f47459 100644 --- 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 index dca343e6..fac32722 100644 --- 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 = } } + ## replace_scope = { this = country root = country } + subtype[on_relic_activated] = { + ## cardinality = 0..1 + events = { + ## cardinality = 0..inf + + } + ## cardinality = 0..1 + random_events = { + ## cardinality = 0..inf + int = 0 + ## cardinality = 0..inf + int = + } + } + ## replace_scope = { this = fleet root = fleet from = archaeological_site } + subtype[on_arch_stage_finished] = { + ## cardinality = 0..1 + events = { + ## cardinality = 0..inf + + } + ## cardinality = 0..1 + random_events = { + ## cardinality = 0..inf + int = 0 + ## cardinality = 0..inf + int = + } + } + ## replace_scope = { this = fleet root = fleet from = archaeological_site } + subtype[on_arch_site_finished] = { + ## cardinality = 0..1 + events = { + ## cardinality = 0..inf + + } + ## cardinality = 0..1 + random_events = { + ## cardinality = 0..inf + int = 0 + ## cardinality = 0..inf + int = + } + } } \ No newline at end of file diff --git a/config/effects.cwt b/config/effects.cwt index 570fc5f1..4c2b0a5a 100644 --- 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 = ## cardinality = 0..1 hyperlane = bool @@ -2869,3 +2884,6 @@ alias[effect:add_relic] = ###Removes the specified relic from the scoped country. remove_relic = alias[effect:remove_relic] = + +###Makes the archaeological site event expire +alias[effect:expire_site_event] =