diff --git a/common/ascension_perks/rg_ascension_perks.txt b/common/ascension_perks/rg_ascension_perks.txt index 15b7fea..81e9950 100644 --- a/common/ascension_perks/rg_ascension_perks.txt +++ b/common/ascension_perks/rg_ascension_perks.txt @@ -11,7 +11,7 @@ rg_ap_nantiematter = { can_research_technology = tech_lgate_activation } NOT = { - has_ascension_perk = rg_nantiematter + has_ascension_perk = rg_ap_nantiematter } } potential = { diff --git a/common/component_templates/RG_combat_computers.txt b/common/component_templates/RG_combat_computers.txt index b41c392..b1021a4 100644 --- a/common/component_templates/RG_combat_computers.txt +++ b/common/component_templates/RG_combat_computers.txt @@ -2,16 +2,27 @@ # BASIC SHIP COMPUTERS # ######################## +@cost1 = 5 +@cost2 = 10 +@cost3 = 15 +@cost4 = 20 + +@power0 = -5 +@power1 = -10 +@power2 = -15 +@power3 = -20 +@power4 = -30 + utility_component_template = { key = "RG_COMBAT_COMPUTER_SWARM_DEFAULT" size = small icon = "GFX_ship_part_computer_default" icon_frame = 1 - power = @power0 + power = -5 resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 } } ship_behavior = "swarm" @@ -40,11 +51,11 @@ utility_component_template = { size = small icon = "GFX_ship_part_computer_default" icon_frame = 1 - power = @power0 + power = -5 resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 } } ship_behavior = "picket" @@ -75,11 +86,11 @@ utility_component_template = { size = small icon = "GFX_ship_part_computer_default" icon_frame = 1 - power = @power0 + power = -5 resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 } } ship_behavior = "line" @@ -108,11 +119,11 @@ utility_component_template = { size = small icon = "GFX_ship_part_computer_default" icon_frame = 1 - power = @power0 + power = -5 resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 } } ship_behavior = "artillery" @@ -141,11 +152,11 @@ utility_component_template = { size = small icon = "GFX_ship_part_computer_default" icon_frame = 1 - power = @power0 + power = -5 resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 } } ship_behavior = "torpedo" diff --git a/common/component_templates/RG_interdictor_parts.txt b/common/component_templates/RG_interdictor_parts.txt index 4f2ec92..07c2ce1 100644 --- a/common/component_templates/RG_interdictor_parts.txt +++ b/common/component_templates/RG_interdictor_parts.txt @@ -371,40 +371,40 @@ utility_component_template = { } utility_component_template = { - key = "RG_Mothership_DARK_MATTER_REACTOR" - size = small - icon = "GFX_ship_part_dark_matter_power_core" - icon_frame = 1 - power = - resources = { - category = ship_components - cost = { - alloys = 296 - sr_dark_matter = 8 - } - upkeep = { - energy = 2.98 - alloys = 0.298 - } - } - prerequisites = { - "tech_dark_matter_power_core" - } - component_set = "power_core" - size_restriction = { - RG_graygoo_mothership - RG_gray_juggernaut - RG_graygoo_capitalship - } - ai_weight = { - weight = 6 - modifier = { - factor = 0 - no_resource_for_component = { - RESOURCE = sr_dark_matter - } - } - } + key = "RG_Mothership_DARK_MATTER_REACTOR" + size = small + icon = "GFX_ship_part_dark_matter_power_core" + icon_frame = 1 + power = 20 + resources = { + category = ship_components + cost = { + alloys = 296 + sr_dark_matter = 8 + } + upkeep = { + energy = 2.98 + alloys = 0.298 + } + } + prerequisites = { + "tech_dark_matter_power_core" + } + component_set = "power_core" + size_restriction = { + RG_graygoo_mothership + RG_gray_juggernaut + RG_graygoo_capitalship + } + ai_weight = { + weight = 6 + modifier = { + factor = 0 + no_resource_for_component = { + RESOURCE = sr_dark_matter + } + } + } } utility_component_template = { @@ -446,7 +446,7 @@ utility_component_template = { category = ship_components cost = { alloys = 80 - nanties = 2 + nanites = 2 } upkeep = { energy = 0.8 @@ -473,7 +473,7 @@ utility_component_template = { size = small icon = "GFX_ship_part_thruster_1" icon_frame = 1 - power = @battleship_power_1 + power = -80 resources = { category = ship_components cost = { @@ -508,7 +508,7 @@ utility_component_template = { size = small icon = "GFX_ship_part_thruster_2" icon_frame = 1 - power = @battleship_power_2 + power = -120 resources = { category = ship_components cost = { @@ -545,7 +545,7 @@ utility_component_template = { size = small icon = "GFX_ship_part_thruster_3" icon_frame = 1 - power = @battleship_power_3 + power = -160 resources = { category = ship_components cost = { @@ -582,7 +582,7 @@ utility_component_template = { size = small icon = "GFX_ship_part_thruster_4" icon_frame = 1 - power = @battleship_power_4 + power = -200 resources = { category = ship_components cost = { @@ -619,7 +619,7 @@ utility_component_template = { size = small icon = "GFX_ship_part_thruster_5" icon_frame = 1 - power = @battleship_power_5 + power = -240 resources = { category = ship_components cost = { @@ -1183,7 +1183,7 @@ utility_component_template = { "tech_cloaking_3" } component_set = "science_cloaking_components" - upgrades_to = "RG_CIENCE_CLOAKING_DARK_MATTER" + upgrades_to = "RG_SCIENCE_CLOAKING_DARK_MATTER" ai_weight = { weight = 15 } diff --git a/common/component_templates/RG_ship_parts.txt b/common/component_templates/RG_ship_parts.txt index 6087020..cd26e99 100644 --- a/common/component_templates/RG_ship_parts.txt +++ b/common/component_templates/RG_ship_parts.txt @@ -1,3 +1,5 @@ +@shipAuraRange = 80 + #混合装甲 utility_component_template = { key = "LARGE_GRAY_MIX_ARMOR" @@ -988,7 +990,7 @@ strike_craft_component_template = { speed = 225 rotation_speed = 0.25 acceleration = 0.6 - size_damage_factor = 1 + # size_damage_factor = 1 shield_damage = 1.2 armor_penetration = 1 weapon_type = instant @@ -1050,7 +1052,7 @@ strike_craft_component_template = { speed = 225 rotation_speed = 0.25 acceleration = 0.6 - size_damage_factor = 1 + # size_damage_factor = 1 shield_damage = 1.2 armor_penetration = 1 weapon_type = instant @@ -1637,7 +1639,7 @@ utility_component_template = { resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 nanites = 4 } } @@ -1661,11 +1663,11 @@ utility_component_template = { icon = "GFX_ship_part_enigmatic_encoder" icon_frame = 1 hidden = yes - power = @cost0 + power = 0 resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 nanites = 4 } } @@ -1693,7 +1695,7 @@ utility_component_template = { resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 nanites = 4 } } @@ -1721,11 +1723,11 @@ utility_component_template = { icon = "GFX_ship_part_instrument_covenant_aux" icon_frame = 1 hidden = yes - power = @cost0 + power = 0 resources = { category = ship_components cost = { - alloys = @cost0 + alloys = 0 nanites = 4 } } @@ -1963,15 +1965,15 @@ utility_component_template = { id = friendly_BAKAHALO priority = 233 } - damage_per_day = { - accuracy = 0.5 - damage = { - min = 48 - max = 96 - } - shield_penetration = 1 - armor_penetration = 1 - } + # damage_per_day = { + # accuracy = 0.5 + # damage = { + # min = 48 + # max = 96 + # } + # shield_penetration = 1 + # armor_penetration = 1 + # } modifier = { ship_shield_mult = -0.1 ship_speed_mult = -0.1 @@ -2036,43 +2038,43 @@ weapon_component_template = { tags = { weapon_type_rg_halo } - friendly_aura = { - name = "RG_ANTIBAKAHALO" - radius = @shipAuraRange - apply_on = ships - stack_info = { - #A ship can only be affected by one aura of a certain id. If multiple auras have the same ID the one with the highest priority will be applied. - id = friendly_BAKAHALO - priority = 233 - } - modifier = { - ship_shield_mult = -0.1 - ship_speed_mult = -0.1 - ship_armor_mult = -0.1 - ship_hull_mult = -0.1 - ship_shield_hardening_add = 1 - ship_armor_hardening_add = 1 - ship_shield_penetration_mult = 1 - ship_armor_penetration_mult = 1 - ship_weapon_range_mult = -0.1 - ship_tracking_add = -10 - ship_engagement_range_mult = -0.1 - ship_disengage_chance_mult = -0.1 - ship_ftl_jumpdrive_range_mult = -0.1 - ship_windup_mult = 0.1 - ship_jumpdrive_cooldown_mult = 0.1 - } - graphics = { - area_effect = { - entity = "circle_area_entity" - dynamic_scale = yes - } - ship_effect = { - entity = "ship_aura_positive_entity" - dynamic_scale = no - } - } - } + # friendly_aura = { + # name = "RG_ANTIBAKAHALO" + # radius = @shipAuraRange + # apply_on = ships + # stack_info = { + # #A ship can only be affected by one aura of a certain id. If multiple auras have the same ID the one with the highest priority will be applied. + # id = friendly_BAKAHALO + # priority = 233 + # } + # modifier = { + # ship_shield_mult = -0.1 + # ship_speed_mult = -0.1 + # ship_armor_mult = -0.1 + # ship_hull_mult = -0.1 + # ship_shield_hardening_add = 1 + # ship_armor_hardening_add = 1 + # ship_shield_penetration_mult = 1 + # ship_armor_penetration_mult = 1 + # ship_weapon_range_mult = -0.1 + # ship_tracking_add = -10 + # ship_engagement_range_mult = -0.1 + # ship_disengage_chance_mult = -0.1 + # ship_ftl_jumpdrive_range_mult = -0.1 + # ship_windup_mult = 0.1 + # ship_jumpdrive_cooldown_mult = 0.1 + # } + # graphics = { + # area_effect = { + # entity = "circle_area_entity" + # dynamic_scale = yes + # } + # ship_effect = { + # entity = "ship_aura_positive_entity" + # dynamic_scale = no + # } + # } + # } hull_damage = 0 shield_penetration = 0 shield_damage = 0 @@ -2122,51 +2124,51 @@ weapon_component_template = { tags = { weapon_type_rg_halo } - hostile_aura = { - name = "RG_BAKAHALO" - radius = @shipAuraRange - apply_on = ships - stack_info = { - id = hostile_BAKAHALO - priority = 233 - } - modifier = { - ship_shield_mult = -0.1 - ship_speed_mult = -0.1 - ship_armor_mult = -0.1 - ship_hull_mult = -0.1 - ship_shield_hardening_add = -1 - ship_armor_hardening_add = -1 - ship_shield_penetration_mult = -1 - ship_armor_penetration_mult = -1 - ship_weapon_range_mult = -0.1 - ship_tracking_add = -10 - ship_engagement_range_mult = -0.1 - ship_disengage_chance_mult = -0.1 - ship_ftl_jumpdrive_range_mult = -0.1 - ship_windup_mult = 1 - ship_jumpdrive_cooldown_mult = 1 - } - damage_per_day = { - accuracy = 0.5 - damage = { - min = 96 - max = 192 - } - shield_penetration = 1 - armor_penetration = 1 - } - graphics = { - area_effect = { - entity = "circle_area_entity" - dynamic_scale = yes - } - ship_effect = { - entity = "ship_aura_negative_entity" - dynamic_scale = no - } - } - } + # hostile_aura = { + # name = "RG_BAKAHALO" + # radius = @shipAuraRange + # apply_on = ships + # stack_info = { + # id = hostile_BAKAHALO + # priority = 233 + # } + # modifier = { + # ship_shield_mult = -0.1 + # ship_speed_mult = -0.1 + # ship_armor_mult = -0.1 + # ship_hull_mult = -0.1 + # ship_shield_hardening_add = -1 + # ship_armor_hardening_add = -1 + # ship_shield_penetration_mult = -1 + # ship_armor_penetration_mult = -1 + # ship_weapon_range_mult = -0.1 + # ship_tracking_add = -10 + # ship_engagement_range_mult = -0.1 + # ship_disengage_chance_mult = -0.1 + # ship_ftl_jumpdrive_range_mult = -0.1 + # ship_windup_mult = 1 + # ship_jumpdrive_cooldown_mult = 1 + # } + # damage_per_day = { + # accuracy = 0.5 + # damage = { + # min = 96 + # max = 192 + # } + # shield_penetration = 1 + # armor_penetration = 1 + # } + # graphics = { + # area_effect = { + # entity = "circle_area_entity" + # dynamic_scale = yes + # } + # ship_effect = { + # entity = "ship_aura_negative_entity" + # dynamic_scale = no + # } + # } + # } hull_damage = 0 shield_penetration = 0 shield_damage = 0 @@ -2198,7 +2200,7 @@ utility_component_template = { category = ship_components cost = { alloys = 300 - nanties = 10 + nanites = 10 } } prerequisites = { "tech_gray_nano_boost_3" } @@ -2230,7 +2232,7 @@ utility_component_template = { category = ship_components cost = { alloys = 100 - nanties = 5 + nanites = 5 } } sensor_range = 15 @@ -2260,7 +2262,7 @@ utility_component_template = { category = ship_components cost = { alloys = 200 - nanties = 10 + nanites = 10 } } prerequisites = { "tech_gray_nano_boost_3" } @@ -2287,7 +2289,7 @@ utility_component_template = { resources = { category = ship_components cost = { - nanties = 12 + nanites = 12 alloys = 120 } upkeep = { @@ -2322,7 +2324,7 @@ utility_component_template = { resources = { category = ship_components cost = { - nanties = 24 + nanites = 24 alloys = 120 } upkeep = { @@ -2355,7 +2357,7 @@ utility_component_template = { resources = { category = ship_components cost = { - nanties = 120 + nanites = 120 alloys = 120 } upkeep = { @@ -2390,7 +2392,7 @@ utility_component_template = { category = ship_components cost = { alloys = 200 - nanties = 10 + nanites = 10 } } modifier = { diff --git a/common/country_limits/ownership_limits/RG_ownership_limits.txt b/common/country_limits/ownership_limits/RG_ownership_limits.txt new file mode 100644 index 0000000..3a1f44a --- /dev/null +++ b/common/country_limits/ownership_limits/RG_ownership_limits.txt @@ -0,0 +1,23 @@ +# Here you can specify the lists of limits for the number of ships of some types that country can own +# and potentially the lists of limits for the number of building of some type (not implemented yet) + +# Note for overwriting: ownership_limits are extendable/additive. So if you make a second "default" and +# add a single ship_of_size_limit inside it, it will apply both the limits described here, and the one +# that you specified. +# To do a full overwrite, you need to overwrite 00_ownership_limits.txt instead. + +# Example: +# name_of_ownership_limit = { +# ship_of_size_limits = { +# # the list of keys to ship_of_size_limits database +# } +# building_of_type_limit = { +# # not implemented yet +# } +# } + +default = { + ship_of_size_limits = { + RG_gray_juggernaut_ships_limit + } +} diff --git a/common/country_limits/ship_of_size_limits/RG_ship_of_size_limits.txt b/common/country_limits/ship_of_size_limits/RG_ship_of_size_limits.txt new file mode 100644 index 0000000..a98decb --- /dev/null +++ b/common/country_limits/ship_of_size_limits/RG_ship_of_size_limits.txt @@ -0,0 +1,10 @@ +RG_gray_juggernaut_ships_limit = { + ship_types = { + RG_gray_juggernaut + } + base = 2 # 1 * juggernaut's size_multiplier + show = { + is_scope_valid = yes + has_technology = tech_gray_juggernaut_8 + } +} \ No newline at end of file diff --git a/common/districts/rg_station_districts.txt b/common/districts/rg_station_districts.txt index 27ab1c2..fc2e04b 100644 --- a/common/districts/rg_station_districts.txt +++ b/common/districts/rg_station_districts.txt @@ -341,6 +341,7 @@ district_rg_generator = { } produces = { energy = 200 + mult = country.rg_gray_level } } diff --git a/common/global_ship_designs/RG_graygoo_ship_designs.txt b/common/global_ship_designs/RG_graygoo_ship_designs.txt index ffe9554..1d7aa31 100644 --- a/common/global_ship_designs/RG_graygoo_ship_designs.txt +++ b/common/global_ship_designs/RG_graygoo_ship_designs.txt @@ -2333,7 +2333,7 @@ ship_design = { ship_size = RG_graygoo_icebreaker_interdictor is_event_design = yes section = { - template = "RG_icebreaker_interdictor" + template = "RG_icebreaker_interdictor_key" slot = "mid" component = { slot = "PD_01" diff --git a/common/megastructures/RG_oribital_ring.txt b/common/megastructures/RG_oribital_ring.txt index 259b852..05711f3 100644 --- a/common/megastructures/RG_oribital_ring.txt +++ b/common/megastructures/RG_oribital_ring.txt @@ -269,14 +269,23 @@ orbital_ring_restored = { dismantle = yes } } + From = { + create_ship_design = { + design = "RG_ORBITAL_RING_TIER_1_STARBASE_SECTION" + } + add_ship_design = last_created_design + } create_starbase = { - design = "RG_ORBITAL_RING_TIER_1_STARBASE_SECTION" + size = RG_orbital_ring_tier_1 owner = FROM #module = #building = effect = { } } + From = { + remove_ship_design = last_created_design + } } every_system_ambient_object = { limit = { diff --git a/common/relics/RG_relics.txt b/common/relics/RG_relics.txt index e9e8d9a..eb22464 100644 --- a/common/relics/RG_relics.txt +++ b/common/relics/RG_relics.txt @@ -1,5 +1,5 @@ rg_tempest_invocator = { - activation_duration = @triumph_duration + activation_duration = 3600 portrait = "GFX_relic_the_tempest_exsoulcillator" sound = "relic_activation_vultaum_real_perforator" @@ -53,7 +53,7 @@ rg_tempest_invocator = { hidden_effect = { add_modifier = { modifier = "relic_activation_cooldown" - days = @triumph_duration + days = 3600 } set_country_flag = used_tempest_invocator_relic_achievement } @@ -75,7 +75,7 @@ rg_tempest_invocator = { possible = { inline_script = { script = relics/activation_checks - RELIC = r_the_tempest_invocator + RELIC = rg_tempest_invocator } custom_tooltip = { diff --git a/common/script_values/rg_script_values.txt b/common/script_values/rg_script_values.txt index 22a388b..6a44167 100644 --- a/common/script_values/rg_script_values.txt +++ b/common/script_values/rg_script_values.txt @@ -1,7 +1,7 @@ rg_count_maid = { base = 0 complex_trigger_modifier = { - trigger = count_traits + trigger = num_traits trigger_scope = pop parameters = { limit = { diff --git a/common/scripted_effects/!_RG_gray_goo_effects_overwrite.txt b/common/scripted_effects/!_RG_gray_goo_effects_overwrite.txt index f6024be..39771f8 100644 --- a/common/scripted_effects/!_RG_gray_goo_effects_overwrite.txt +++ b/common/scripted_effects/!_RG_gray_goo_effects_overwrite.txt @@ -22,7 +22,7 @@ start_lcluster_chain = { if = { limit = { NOR = { - is_same_value = origin_rg_gray_country + is_same_value = event_target:origin_rg_gray_country has_country_flag = origin_rg_gray_1st } } diff --git a/common/scripted_effects/RG_event_effects.txt b/common/scripted_effects/RG_event_effects.txt index 37037db..b7d3e5e 100644 --- a/common/scripted_effects/RG_event_effects.txt +++ b/common/scripted_effects/RG_event_effects.txt @@ -166,8 +166,11 @@ rg_event_effect_planet2027_spawn_maid_species = { gender = this traits = { trait = trait_machine_unit + trait = trait_robot_domestic_protocols trait = rg_machine_maid_trait - trait = trait_robot_mass_produced + trait = trait_auto_mod_robotic + trait = trait_robot_streamlined_protocols + trait = trait_robot_luxurious } effect = { save_event_target_as = rg_owner_main_maid_species diff --git a/common/scripted_effects/RG_fallen_empire_effects.txt b/common/scripted_effects/RG_fallen_empire_effects.txt index c093473..9825081 100644 --- a/common/scripted_effects/RG_fallen_empire_effects.txt +++ b/common/scripted_effects/RG_fallen_empire_effects.txt @@ -10,7 +10,6 @@ rg_create_fallen_empire_species_effect = { trait = trait_auto_mod_robotic trait = trait_robot_streamlined_protocols trait = trait_robot_luxurious - trait = ramdom_trait } extra_trait_points = 3 allow_negative_traits = no @@ -88,7 +87,7 @@ rg_create_fallen_empire_country_effect = { if = { limit = { NOT = { - exist = event_target:rg_gray_country_leader + exists = event_target:rg_gray_country_leader } } rg_gray_country_leader_init = yes diff --git a/common/scripted_effects/RG_gray_goo_effects.txt b/common/scripted_effects/RG_gray_goo_effects.txt index 26d26d3..be3635a 100644 --- a/common/scripted_effects/RG_gray_goo_effects.txt +++ b/common/scripted_effects/RG_gray_goo_effects.txt @@ -693,9 +693,13 @@ rg_juggernaut_habitat_init = { set_name = "NAME_rg_gray_habitat_base" if = { - OR = { - has_country_flag = gray_official_active - has_country_flag = gray_governor_active #旧版flag + limit = { + event_target:gray_owner = { + OR = { + has_country_flag = gray_official_active + has_country_flag = gray_governor_active #旧版flag + } + } } assign_leader = event_target:gray_governor } diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt index ba5d4c5..a964068 100644 --- a/common/scripted_effects/RG_scripted_effects.txt +++ b/common/scripted_effects/RG_scripted_effects.txt @@ -1992,7 +1992,7 @@ RG_destroy_star_system = { exists = event_target:gray_owner #i.e. not final destruction of all matter is_mobile = yes } - set_mia = yes + set_mia = mia_emergency_ftl } else = { destroy_fleet = this diff --git a/common/scripted_effects/RG_storms_effects.txt b/common/scripted_effects/RG_storms_effects.txt index c3ee4e0..65eb8a0 100644 --- a/common/scripted_effects/RG_storms_effects.txt +++ b/common/scripted_effects/RG_storms_effects.txt @@ -31,9 +31,9 @@ graytempest_storm_apply_aftermath_modifier = { storm_apply_aftermath_modifier = { severity = { modifier = "graytempest_storm_aftermath_modifier_severity_1" - days = @Severity1Duration + days = 1080 chance = { - base = @Severity1BaseChance + base = 33 modifier = { factor = 0 OR = { @@ -49,9 +49,9 @@ graytempest_storm_apply_aftermath_modifier = { severity = { modifier = "graytempest_storm_aftermath_modifier_severity_2" - days = @Severity2Duration + days = 1080 chance = { - base = @Severity2BaseChance + base = 3 modifier = { factor = 0 has_modifier = "graytempest_storm_aftermath_modifier_severity_3" @@ -64,9 +64,9 @@ graytempest_storm_apply_aftermath_modifier = { severity = { modifier = "graytempest_storm_aftermath_modifier_severity_3" - days = @Severity3Duration + days = 1080 chance = { - base = @Severity3BaseChance + base = 33 modifier = { factor = $FactorSev3|1$ } diff --git a/common/scripted_effects/rg_gray_warship_init_effects.txt b/common/scripted_effects/rg_gray_warship_init_effects.txt index 04325a7..ee33eb0 100644 --- a/common/scripted_effects/rg_gray_warship_init_effects.txt +++ b/common/scripted_effects/rg_gray_warship_init_effects.txt @@ -19,7 +19,9 @@ rg_warship_init_mod1 = { prefix = no upgradable = yes effect = { - set_fleet_flag = gray_fleet_ship + PREV = { + set_fleet_flag = gray_fleet_ship + } save_global_event_target_as = gray_warship_ship } } @@ -63,7 +65,9 @@ rg_warship_init_mod2 = { prefix = no upgradable = yes effect = { - set_fleet_flag = gray_fleet_ship + PREV = { + set_fleet_flag = gray_fleet_ship + } save_global_event_target_as = gray_warship_ship } } @@ -108,7 +112,9 @@ rg_warship_init_mod3 = { prefix = no upgradable = yes effect = { - set_fleet_flag = gray_fleet_ship + PREV = { + set_fleet_flag = gray_fleet_ship + } save_global_event_target_as = gray_warship_ship } } @@ -151,7 +157,9 @@ rg_warship_init_mod0 = { prefix = no upgradable = yes effect = { - set_fleet_flag = gray_fleet_ship + PREV = { + set_fleet_flag = gray_fleet_ship + } save_global_event_target_as = gray_warship_ship } } diff --git a/common/scripted_triggers/RG_scripted_triggers_planet_killers.txt b/common/scripted_triggers/RG_scripted_triggers_planet_killers.txt index 87257b5..fd3fe82 100644 --- a/common/scripted_triggers/RG_scripted_triggers_planet_killers.txt +++ b/common/scripted_triggers/RG_scripted_triggers_planet_killers.txt @@ -103,6 +103,127 @@ can_destroy_planet_with_RG_PLANET_KILLER_SP = { } } +can_destroy_planet_with_RG_PLANET_KILLER_CRACKER = { + custom_tooltip = { + fail_text = is_not_a_standard_planet_or_megastructure + is_a_planet_megastructure = yes + } + custom_tooltip = { + fail_text = is_shielded + NOR = { + is_planet_class = pc_shielded + is_planet_class = pc_ringworld_shielded + is_planet_class = pc_habitat_shielded + } + } + custom_tooltip = { + fail_text = fotd_cant_collossus + NOT = { has_planet_flag = fotd_seperatist_planet@from.owner } + exists = from.owner + from.owner = { + NOT = { has_country_flag = fotd_seperatist_country@from.owner } + } + } + OR = { + custom_tooltip = { + text = is_not_hostile_cracker + OR = { + AND = { + exists = space_owner + space_owner = { + OR = { + is_at_war_with = from.owner + is_country_type = swarm + is_country_type = extradimensional + is_country_type = extradimensional_2 + is_country_type = extradimensional_3 + is_country_type = ai_empire + } + } + } + AND = { # colony + exists = owner + owner = { + OR = { + is_at_war_with = from.owner + is_country_type = swarm + is_country_type = extradimensional + is_country_type = extradimensional_2 + is_country_type = extradimensional_3 + is_country_type = ai_empire + } + } + } + } + } + AND = { + # primitive target + custom_tooltip = { + text = cannot_crack_pre_ftl_planet_ownership + exists = space_owner + exists = owner + owner = { + is_primitive = yes + } + space_owner = { + OR = { + is_same_value = from.owner + is_at_war_with = from.owner + is_country_type = swarm + is_country_type = extradimensional + is_country_type = extradimensional_2 + is_country_type = extradimensional_3 + is_country_type = ai_empire + } + } + } + custom_tooltip = { + text = cannot_crack_pre_ftl_planet_interference + # primitive + exists = owner + owner = { + is_primitive = yes + } + from.owner = { + has_policy_flag = interference_aggressive + } + } + } + custom_tooltip = { + text = not_barren_molten_frozen_toxic_test_fire + NOT = { exists = owner } + OR = { + NOT = { exists = space_owner } + AND = { + exists = space_owner + space_owner = { is_same_value = from.owner } + } + } + OR = { + is_planet_class = pc_barren + is_planet_class = pc_barren_cold + is_planet_class = pc_frozen + is_planet_class = pc_molten + is_planet_class = pc_toxic + is_planet_class = pc_desert + is_planet_class = pc_tropical + is_planet_class = pc_arid + is_planet_class = pc_continental + is_planet_class = pc_ocean + is_planet_class = pc_tundra + is_planet_class = pc_arctic + is_planet_class = pc_alpine + is_planet_class = pc_savannah + is_planet_class = pc_gaia + is_planet_class = pc_relic + is_planet_class = pc_nuked + is_planet_class = pc_ringworld_habitable + is_planet_class = pc_habitat + } + } + } +} + can_destroy_planet_with_RG_PLANET_KILLER_SHIELDER = { custom_tooltip = { fail_text = is_not_a_habitable_planet_or_megastructure @@ -135,7 +256,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_SHIELDER = { from.owner = { OR = { has_policy_flag = interference_active - has_policy_flag = interference_full + has_policy_flag = interference_aggressive } } } @@ -256,7 +377,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_GODRAY = { from.owner = { OR = { has_policy_flag = interference_active - has_policy_flag = interference_full + has_policy_flag = interference_aggressive } } } @@ -330,7 +451,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_NANOBOTS = { custom_tooltip = { fail_text = primitives_not_full_interference from.owner = { - has_policy_flag = interference_full + has_policy_flag = interference_aggressive } } } @@ -429,7 +550,7 @@ can_destroy_planet_with_RG_PLANET_KILLER_DELUGE = { custom_tooltip = { fail_text = primitives_not_full_interference from.owner = { - has_policy_flag = interference_full + has_policy_flag = interference_aggressive } } } diff --git a/common/section_templates/RG_starbase_templates.txt b/common/section_templates/RG_starbase_templates.txt index 2be01fc..c0ee02e 100644 --- a/common/section_templates/RG_starbase_templates.txt +++ b/common/section_templates/RG_starbase_templates.txt @@ -164,7 +164,6 @@ ship_section_template = { fits_on_slot = "core" entity = "grey_tempesttw_starbase_starfortress_section_entity" icon = "GFX_ship_part_core_mid" - hidden = yes component_slot = { name = "LARGE_GUN_01" template = "invisible_large_turret" diff --git a/common/ship_sizes/RG_ship_sizes.txt b/common/ship_sizes/RG_ship_sizes.txt index 6e0cc4a..7b7fba9 100644 --- a/common/ship_sizes/RG_ship_sizes.txt +++ b/common/ship_sizes/RG_ship_sizes.txt @@ -257,8 +257,6 @@ RG_gray_juggernaut = { required_component_set = "ship_aura_components" required_component_set = "ship_aura_components" - empire_limit = 1 - components_add_to_cost = no resources = { category = ships @@ -811,8 +809,8 @@ RG_orbital_ring_tier_1 = { required_component_set = "combat_computers" required_component_set = "science_cloaking_components" required_component_set = "ship_aura_components" - build_block_radius = @build_block_orbital_ring - formation_priority = @orbital_ring_formation_priority + build_block_radius = 20 + formation_priority = 1 icon_frame = 7 scales_with_planet = yes graphical_culture = yes diff --git a/common/ship_sizes/z_RG_graygoo_ships.txt b/common/ship_sizes/z_RG_graygoo_ships.txt index d921414..203aa65 100644 --- a/common/ship_sizes/z_RG_graygoo_ships.txt +++ b/common/ship_sizes/z_RG_graygoo_ships.txt @@ -109,8 +109,8 @@ graygoo_factory = { ship_modifier = { ship_shield_hardening_add = 5 ship_armor_hardening_add = 5 - ship_armor_regen_add = 10240 - ship_hull_regen_add = 5120 + ship_armor_regen_add_static = 10240 + ship_hull_regen_add_static = 5120 } max_hitpoints = 2048000 size_multiplier = 32 diff --git a/common/situations/rg_gray_situations.txt b/common/situations/rg_gray_situations.txt index 650ce2a..492a517 100644 --- a/common/situations/rg_gray_situations.txt +++ b/common/situations/rg_gray_situations.txt @@ -31,7 +31,7 @@ situation_rg_gray_mod1 = { situation_rg_gray_mod1_stage_1 = { icon = GFX_situation_stage_1 icon_background = GFX_situation_stage_frame_green - end = 16.5 + end = 17 custom_tooltip = situation_rg_gray_mod1_stage_1_tooltip on_first_enter = { event_target:gray_warship = { @@ -86,7 +86,7 @@ situation_rg_gray_mod1 = { situation_rg_gray_mod1_stage_5 = { icon = GFX_situation_stage_5 icon_background = GFX_situation_stage_frame_green - end = 82.5 + end = 83 custom_tooltip = situation_rg_gray_mod1_stage_5_tooltip on_first_enter = { owner = { @@ -262,7 +262,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_1 = { icon = GFX_situation_stage_1 icon_background = GFX_situation_stage_frame_green - end = 8.4 + end = 8 custom_tooltip = situation_rg_gray_mod2_stage_1_tooltip on_first_enter = { owner = { @@ -275,7 +275,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_2 = { icon = GFX_situation_stage_2 icon_background = GFX_situation_stage_frame_green - end = 16.8 + end = 17 custom_tooltip = situation_rg_gray_mod2_stage_2_tooltip on_first_enter = { owner = { @@ -288,7 +288,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_3 = { icon = GFX_situation_stage_3 icon_background = GFX_situation_stage_frame_green - end = 25.2 + end = 25 custom_tooltip = situation_rg_gray_mod2_stage_3_tooltip on_first_enter = { owner = { @@ -301,7 +301,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_4 = { icon = GFX_situation_stage_4 icon_background = GFX_situation_stage_frame_green - end = 33.6 + end = 34 custom_tooltip = situation_rg_gray_mod2_stage_4_tooltip on_first_enter = { owner = { @@ -327,7 +327,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_6 = { icon = GFX_situation_stage_6 icon_background = GFX_situation_stage_frame_green - end = 50.4 + end = 50 custom_tooltip = situation_rg_gray_mod2_stage_6_tooltip on_first_enter = { owner = { @@ -340,7 +340,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_7 = { icon = GFX_situation_stage_1 icon_background = GFX_situation_stage_frame_green - end = 58.8 + end = 59 custom_tooltip = situation_rg_gray_mod2_stage_7_tooltip on_first_enter = { owner = { @@ -353,7 +353,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_8 = { icon = GFX_situation_stage_2 icon_background = GFX_situation_stage_frame_green - end = 67.2 + end = 67 custom_tooltip = situation_rg_gray_mod2_stage_8_tooltip on_first_enter = { owner = { @@ -366,7 +366,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_9 = { icon = GFX_situation_stage_3 icon_background = GFX_situation_stage_frame_green - end = 75.6 + end = 76 custom_tooltip = situation_rg_gray_mod2_stage_9_tooltip on_first_enter = { owner = { @@ -392,7 +392,7 @@ situation_rg_gray_mod2 = { situation_rg_gray_mod2_stage_11 = { icon = GFX_situation_stage_5 icon_background = GFX_situation_stage_frame_green - end = 92.4 + end = 92 custom_tooltip = situation_rg_gray_mod2_stage_11_tooltip on_first_enter = { owner = { diff --git a/common/special_projects/!_RG_projects_distant_stars.txt b/common/special_projects/!_RG_projects_distant_stars.txt index 6450a80..69f1b93 100644 --- a/common/special_projects/!_RG_projects_distant_stars.txt +++ b/common/special_projects/!_RG_projects_distant_stars.txt @@ -85,7 +85,7 @@ special_project = { event_scope = ship_event requirements = { shipclass_military = 1 - leader = admiral + leader = commander has_trait = RG_leader_trait_admiral_gray } on_start = { diff --git a/common/special_projects/RG_story_special_projects.txt b/common/special_projects/RG_story_special_projects.txt index f2e0edc..851ba86 100644 --- a/common/special_projects/RG_story_special_projects.txt +++ b/common/special_projects/RG_story_special_projects.txt @@ -40,7 +40,7 @@ special_project = { key = "rg_gray_mod2_stage1_project" cost = 2000 #days_to_research = 300 - tech_department = physics_research + tech_department = physics_technology icon = "gfx/interface/icons/situation_log/situation_log_main_quest.dds" picture = GFX_evt_l-gateway event_scope = country_event @@ -80,7 +80,7 @@ special_project = { key = "rg_gray_mod2_stage4_project" cost = 2000 #days_to_research = 300 - tech_department = engineering_research + tech_department = engineering_technology icon = "gfx/interface/icons/situation_log/situation_log_main_quest.dds" picture = GFX_evt_l-gateway event_scope = country_event diff --git a/common/species_classes/rg_species_classes.txt b/common/species_classes/rg_species_classes.txt index 5ce75ca..7935dad 100644 --- a/common/species_classes/rg_species_classes.txt +++ b/common/species_classes/rg_species_classes.txt @@ -20,7 +20,7 @@ GRAY_SPECIES = { playable = { always = no } randomized = no - gender = female + gender = no portraits = { "Gray" @@ -32,7 +32,6 @@ GRAY_SPECIES = { RG_MACHINE = { archetype = MACHINE - playable = no randomized = no # possible = { always = yes } # possible_secondary = { always = no text = SECONDARY_SPECIES_CLASS_INVALID } diff --git a/common/traits/!_RG_gray_goo_traits.txt b/common/traits/!_RG_gray_goo_traits.txt index 5c9d75f..4c69a80 100644 --- a/common/traits/!_RG_gray_goo_traits.txt +++ b/common/traits/!_RG_gray_goo_traits.txt @@ -32,7 +32,6 @@ # initial = no # randomized = no # } - # RG_leader_trait_offical_gray = { # #唯一特质 # cost = 0 @@ -105,7 +104,6 @@ # initial = no # randomized = no # } - RG_leader_trait_governor_gray = { #总督特质 cost = 0 @@ -146,7 +144,9 @@ RG_leader_trait_governor_gray = { starbase_shipyard_build_cost_mult = -0.25 starbase_shipyard_build_speed_mult = -0.3 } - leader_class = { official } + leader_class = { + official + } initial = no randomized = no } @@ -270,7 +270,9 @@ RG_leader_trait_ruler_gray = { country_base_influence_produces_add = 1 mult = trigger:has_skill } - leader_class = { official } + leader_class = { + official + } initial = no randomized = no } @@ -309,7 +311,9 @@ RG_leader_trait_admiral_gray_1 = { army_disengage_chance_mult = 0.3 army_health = 0.15 } - leader_class = { commander } + leader_class = { + commander + } initial = no randomized = no } @@ -348,7 +352,9 @@ RG_leader_trait_admiral_gray_2 = { army_disengage_chance_mult = 0.4 army_health = 0.25 } - leader_class = { commander } + leader_class = { + commander + } initial = no randomized = no } @@ -387,7 +393,9 @@ RG_leader_trait_admiral_gray = { army_disengage_chance_mult = 0.5 army_health = 0.35 } - leader_class = { commander } + leader_class = { + commander + } initial = no randomized = no } @@ -418,7 +426,9 @@ RG_leader_trait_admiral_nanorebuild_gray = { army_health = 0.05 mult = owner.rg_general_skill_combat_daypassed_variable } - leader_class = { commander } + leader_class = { + commander + } initial = no randomized = no } @@ -455,7 +465,9 @@ RG_leader_trait_scientist_gray = { # ship_speed_mult = 0.5 ship_anomaly_generation_chance_mult = -1 } - leader_class = { scientist } + leader_class = { + scientist + } initial = no randomized = no } @@ -486,7 +498,6 @@ RG_leader_trait_scientist_gray = { # initial = no # randomized = no # } - # 与舰长技能合并，弃用 # RG_leader_trait_general_gray_skill = { # destiny_trait = yes @@ -512,7 +523,6 @@ RG_leader_trait_scientist_gray = { # randomized = no # destiny_background_icon = "GFX_leader_background_destiny_1" # } - RG_leader_trait_admiral_fake_dragon = { cost = 0 inline_script = { @@ -532,7 +542,9 @@ RG_leader_trait_admiral_fake_dragon = { ship_hull_mult = 0.2 ship_weapon_damage = 0.2 } - leader_class = { commander } + leader_class = { + commander + } initial = no randomized = no } @@ -573,9 +585,23 @@ RG_leader_trait_admiral_timed_life = { ship_armor_mult = 10 ship_hull_mult = 10 ship_weapon_damage = 10 - custom_tooltip_with_modifiers = rg_timed_life_millennium } - leader_class = { commander } + triggered_desc = { + # Show key if trigger/exclusive_trigger is true. + trigger = { + owner = { + check_variable = { + which = rg_fake_dragon_timedlife_counter + value > 1000 + } + } + } + # Trigger appends additional localization key to existing text. THIS = Leader + text = rg_timed_life_millennium_reborn + } + leader_class = { + commander + } initial = no randomized = no } @@ -617,9 +643,23 @@ RG_leader_trait_admiral_born_tobe_dragon = { ship_armor_mult = 0.01 ship_hull_mult = 0.01 ship_weapon_damage = 0.01 - custom_tooltip_with_modifiers = rg_timed_life_millennium_reborn } - leader_class = { commander } + triggered_desc = { + # Show key if trigger/exclusive_trigger is true. + trigger = { + owner = { + check_variable = { + which = rg_fake_dragon_timedlife_counter + value > 1000 + } + } + } + # Trigger appends additional localization key to existing text. THIS = Leader + text = rg_timed_life_millennium_reborn + } + leader_class = { + commander + } initial = no randomized = no } diff --git a/events/!_RG_gray_goo_event_overwrite.txt b/events/!_RG_gray_goo_event_overwrite.txt index a536c49..6a56ed2 100644 --- a/events/!_RG_gray_goo_event_overwrite.txt +++ b/events/!_RG_gray_goo_event_overwrite.txt @@ -56,6 +56,7 @@ country_event = { limit = { has_planet_flag = main_star } + save_global_event_target_as = rg_main_star save_event_target_as = main_star } create_country = { @@ -79,6 +80,7 @@ country_event = { } } effect = { + save_global_event_target_as = rg_graygoo_country save_event_target_as = graygoo_country create_ship_design = { design = "NAME_RG_armed_transport_ship" diff --git a/events/RG_cluster_events.txt b/events/RG_cluster_events.txt index ad32ea2..c320796 100644 --- a/events/RG_cluster_events.txt +++ b/events/RG_cluster_events.txt @@ -145,7 +145,7 @@ country_event = { root = { random_owned_leader = { limit = { - leader_class = governor + leader_class = official } save_event_target_as = rg_cluster_sector_gov } diff --git a/events/RG_combat_skill_events.txt b/events/RG_combat_skill_events.txt index 0ace858..aae3a5b 100644 --- a/events/RG_combat_skill_events.txt +++ b/events/RG_combat_skill_events.txt @@ -1,5 +1,4 @@ namespace = rg_skill - # fleet_event = { # id = rg_skill.1 # hide_window = yes @@ -139,7 +138,7 @@ ship_event = { limit = { owner = { NOT = { - is_same_value = origin_rg_gray_country + is_same_value = event_target:origin_rg_gray_country } } solar_system = { @@ -158,14 +157,14 @@ ship_event = { else_if = { limit = { owner = { - is_same_value = origin_rg_gray_country + is_same_value = event_target:origin_rg_gray_country NOT = { has_global_flag = l_cluster_opened } } solar_system = { has_star_flag = lcluster - NOT = { + NOT = { any_fleet_in_system = { exists = controller controller = { @@ -180,12 +179,12 @@ ship_event = { else_if = { limit = { owner = { - is_same_value = origin_rg_gray_country # 是小灰起源 + is_same_value = event_target:origin_rg_gray_country # 是小灰起源 has_global_flag = l_cluster_opened # L星门已开启 } solar_system = { # has_star_flag = lcluster - NOT = { + NOT = { any_fleet_in_system = { exists = controller controller = { @@ -382,23 +381,32 @@ planet_event = { remove_planet_flag = checking_tempest_incoming } else = { - #planet - any_ground_combat_attacker = { - #army - exists = leader - leader = { - #leader - has_trait = RG_leader_trait_admiral_nanorebuild_gray - owner = { - #country - save_event_target_as = attacking_general_country + if = { + limit = { + #planet + any_ground_combat_attacker = { + #army + exists = leader + leader = { + #leader + has_trait = RG_leader_trait_admiral_nanorebuild_gray + } + } + + } + from = { + #country + save_event_target_as = attacking_general_country } } - # Do the same check again in X days - country_event = { - id = rg_skill.10 - } # NOTE: Update custom loc for effect when changing days + from = { + # Do the same check again in X days + country_event = { + id = rg_skill.10 + } + # NOTE: Update custom loc for effect when changing days + } } } } @@ -679,13 +687,11 @@ country_event = { # } # } # } - # On destroying enemy ship. country_event = { id = rg_skill.13 hide_window = yes is_triggered_only = yes - trigger = { FromFrom = { is_in_combat = yes @@ -695,11 +701,13 @@ country_event = { has_trait = RG_leader_trait_admiral_nanorebuild_gray } } - immediate = { - FROMFROM = { # Winning ship. + FROMFROM = { + # Winning ship. if = { - limit = { exists = fleet.leader } + limit = { + exists = fleet.leader + } fleet.leader = { if = { limit = { @@ -719,6 +727,7 @@ country_event = { } } } + # This = owner of fleet 1 (winner) # From = owner of fleet 2 (loser) # FromFrom = fleet 1 @@ -751,6 +760,7 @@ country_event = { } } } + # This = owner of fleet 1 (loser) # From = owner of fleet 2 (winner) # FromFrom = fleet 1 diff --git a/events/RG_events.txt b/events/RG_events.txt index 0897154..1d9ebec 100644 --- a/events/RG_events.txt +++ b/events/RG_events.txt @@ -854,7 +854,7 @@ country_event = { has_star_flag = lgate_originating_system } any_system_megastructure = { - is_megastructure_type = l_gate_base + is_megastructure_type = lgate_base } } } @@ -865,10 +865,10 @@ country_event = { has_star_flag = lgate_originating_system } any_system_megastructure = { - is_megastructure_type = l_gate_base + is_megastructure_type = lgate_base } } - save_event_target_as = candidate_gateway + save_global_event_target_as = candidate_gateway } country_event = { id = distar.10905 @@ -989,7 +989,7 @@ country_event = { limit = { is_megastructure_type = lgate_base } - save_event_target_as = candidate_gateway + save_global_event_target_as = candidate_gateway } country_event = { id = distar.10905 @@ -1074,14 +1074,14 @@ country_event = { hidden_effect = { create_fleet = { effect = { - set_owner = event_target:graygoo_country + set_owner = event_target:rg_graygoo_country create_ship = { name = random design = "NAME_Gray_Warship" graphical_culture = "pirate_01" } set_location = { - target = event_target:main_star + target = event_target:rg_main_star distance = 55 angle = 270 } @@ -1127,14 +1127,14 @@ country_event = { hidden_effect = { create_fleet = { effect = { - set_owner = event_target:graygoo_country + set_owner = event_target:rg_graygoo_country create_ship = { name = random design = "NAME_Gray_Warship" graphical_culture = "pirate_01" } set_location = { - target = event_target:main_star + target = event_target:rg_main_star distance = 55 angle = 270 } @@ -1251,14 +1251,14 @@ country_event = { hidden_effect = { create_fleet = { effect = { - set_owner = event_target:graygoo_country + set_owner = event_target:rg_graygoo_country create_ship = { name = random design = "NAME_Gray_Warship" graphical_culture = "pirate_01" } set_location = { - target = event_target:main_star + target = event_target:rg_main_star distance = 55 angle = 270 } @@ -1422,7 +1422,7 @@ country_event = { immediate = { every_owned_fleet = { limit = { - any_ship = { + any_owned_ship = { is_ship_size = graygoo_mothership } } @@ -1718,7 +1718,7 @@ country_event = { any_fleet_in_system = { owner = { NOT = { - is_country = event_target:graygoo_country + is_country = event_target:rg_graygoo_country } } } @@ -1726,7 +1726,7 @@ country_event = { } random_country = { limit = { - is_country = event_target:graygoo_country + is_country = event_target:rg_graygoo_country } country_event = { id = rg_event.405 @@ -1737,7 +1737,7 @@ country_event = { } else_if = { limit = { - event_target:graygoo_country = { + event_target:rg_graygoo_country = { num_fleets < 30 } } @@ -1748,12 +1748,12 @@ country_event = { has_star_flag = lgate_originating_system } any_system_megastructure = { - is_megastructure_type = l_gate_base + is_megastructure_type = lgate_base } } random_system_megastructure = { limit = { - is_megastructure_type = l_gate_base + is_megastructure_type = lgate_base } create_ambient_object = { type = "horror_spawn_object" @@ -1764,7 +1764,7 @@ country_event = { create_fleet = { name = "NAME_Tempest_Fleet" effect = { - set_owner = event_target:graygoo_country + set_owner = event_target:rg_graygoo_country rg_create_graygoo_fleet_random = yes set_formation_scale = 2 set_fleet_stance = aggressive @@ -1819,7 +1819,7 @@ country_event = { any_fleet_in_system = { owner = { NOT = { - is_country = event_target:graygoo_country + is_country = event_target:rg_graygoo_country } } } @@ -1827,7 +1827,7 @@ country_event = { } random_country = { limit = { - is_country = event_target:graygoo_country + is_country = event_target:rg_graygoo_country } country_event = { id = rg_event.405 @@ -1838,7 +1838,7 @@ country_event = { } if = { limit = { - event_target:graygoo_country = { + event_target:rg_graygoo_country = { num_fleets < 60 } } @@ -1849,12 +1849,12 @@ country_event = { has_star_flag = lgate_originating_system } any_system_megastructure = { - is_megastructure_type = l_gate_base + is_megastructure_type = lgate_base } } random_system_megastructure = { limit = { - is_megastructure_type = l_gate_base + is_megastructure_type = lgate_base } create_ambient_object = { type = "horror_spawn_object" @@ -1867,7 +1867,7 @@ country_event = { create_fleet = { name = "NAME_Tempest_Fleet" effect = { - set_owner = event_target:graygoo_country + set_owner = event_target:rg_graygoo_country rg_create_graygoo_fleet_random = yes set_formation_scale = 2 set_fleet_stance = aggressive diff --git a/events/RG_machine_event.txt b/events/RG_machine_event.txt index ba10799..0cf902d 100644 --- a/events/RG_machine_event.txt +++ b/events/RG_machine_event.txt @@ -7,7 +7,7 @@ country_event = { if = { limit = { NOT = { - exist = event_target:rg_maid_species + exists = event_target:rg_maid_species } } create_species = { diff --git a/events/RG_origin_event.txt b/events/RG_origin_event.txt index 3d614dc..a5260ca 100644 --- a/events/RG_origin_event.txt +++ b/events/RG_origin_event.txt @@ -37,7 +37,7 @@ country_event = { if = { limit = { NOT = { - exist = event_target:rg_scion_fe + exists = event_target:rg_scion_fe } } set_country_flag = rg_scion_needs_fe @@ -100,7 +100,7 @@ country_event = { overlord = { add_opinion_modifier = { modifier = opinion_scion - who = rg_scion_fe + who = event_target:rg_scion_fe } } country_event = { id = rg_origin.10 days = 3 } diff --git a/events/RG_story_event.txt b/events/RG_story_event.txt index a207120..be84ab6 100644 --- a/events/RG_story_event.txt +++ b/events/RG_story_event.txt @@ -162,9 +162,11 @@ planet_event = { id = rg_story.6 title = "rg_story.6.title" is_triggered_only = yes - fire_only_once = yes trigger = { NOT = { + any_country = { + has_country_flag = rg_story6_fired + } # has_global_flag = has_wsg_mod } } @@ -178,6 +180,10 @@ planet_event = { has_ship_flag = rg_test_ship } } + prev = { + save_event_target_as = event_target_country + set_country_flag = rg_story6_fired + } delete_fleet = this } } @@ -188,8 +194,10 @@ planet_event = { option = { name = rg_story.6.a hidden_effect = { - country_event = { - id = rg_story.7 + event_target:event_target_country = { + country_event = { + id = rg_story.7 + } } } default_hide_option = yes @@ -647,7 +655,9 @@ country_event = { event_target:rg_fake_dragon_fleet = { leader = { OR = { - exists = NO + NOT = { + exists = leader + } NOR = { has_leader_flag = rg_fake_dragon has_leader_flag = rg_fake_dragon_reborn @@ -701,7 +711,7 @@ country_event = { # 龙噶了把所有卡住的的模拟龙扫描事件中止 country_event = { id = rg_story.22 - hidden_window = yes + hide_window = yes is_triggered_only = yes trigger = { from = { @@ -1026,8 +1036,7 @@ country_event = { } } add_resource = { - resource = nanites - value = -150 + nanites = -150 } random_situation = { limit = { @@ -1120,12 +1129,10 @@ country_event = { } } add_resource = { - resource = alloys - value = -1500 + alloys = -1500 } add_resource = { - resource = energy - value = -1500 + energy = -1500 } rg_create_gray_mod1_testship_2 = yes random_situation = { @@ -1169,12 +1176,10 @@ country_event = { } } add_resource = { - resource = alloys - value = -1500 + alloys = -1500 } add_resource = { - resource = energy - value = -1500 + energy = -1500 } rg_create_gray_mod1_testship_2 = yes random_situation = { @@ -1218,12 +1223,10 @@ country_event = { } } add_resource = { - resource = energy - value = -4000 + alloys = -1500 } add_resource = { - resource = minerals - value = -1500 + energy = -1500 } random_situation = { limit = { @@ -1262,8 +1265,7 @@ country_event = { } } add_resource = { - resource = consumer_goods - value = -3000 + consumer_goods = -3000 } random_situation = { limit = { @@ -1306,12 +1308,10 @@ country_event = { } } add_resource = { - resource = alloys - value = -1500 + alloys = -1500 } add_resource = { - resource = energy - value = -1500 + energy = -1500 } rg_create_gray_mod1_testship_2 = yes random_situation = { @@ -1351,8 +1351,7 @@ country_event = { } } add_resource = { - resource = alloys - value = -3000 + alloys = -3000 } random_situation = { limit = { @@ -1391,8 +1390,7 @@ country_event = { } } add_resource = { - resource = alloys - value = -500 + alloys = -500 } random_situation = { limit = {