diff --git a/common/scripted_effects/RG_gray_leader_init_effects.txt b/common/scripted_effects/RG_gray_leader_init_effects.txt index fe4598a..2862bfb 100644 --- a/common/scripted_effects/RG_gray_leader_init_effects.txt +++ b/common/scripted_effects/RG_gray_leader_init_effects.txt @@ -36,7 +36,7 @@ rg_gray_govener_init = { event_target:rg_gray_country = { create_leader = { class = official - species = GRAY_SPECIES + species = event_target:gray_species_target name = "NAME_Gray" gender = female immortal = yes @@ -155,7 +155,7 @@ rg_gray_commander_init = { event_target:rg_gray_country = { create_leader = { class = commander - species = GRAY_SPECIES + species = event_target:gray_species_target name = "NAME_Gray" immortal = yes event_leader = yes @@ -275,7 +275,7 @@ rg_gray_commander_init = { # event_target:rg_gray_country = { # create_leader = { # class = admiral -# species = GRAY_SPECIES +# species = event_target:gray_species_target # name = "NAME_Gray" # immortal = yes # event_leader = yes @@ -390,7 +390,7 @@ rg_gray_commander_init = { # event_target:rg_gray_country = { # create_leader = { # class = general -# species = GRAY_SPECIES +# species = event_target:gray_species_target # name = "NAME_Gray" # immortal = yes # event_leader = yes @@ -498,7 +498,7 @@ rg_gray_scientist_init = { event_target:rg_gray_country = { create_leader = { class = scientist - species = GRAY_SPECIES + species = event_target:gray_species_target name = "NAME_Gray" immortal = yes event_leader = yes @@ -598,7 +598,7 @@ rg_gray_country_leader_init = { create_leader = { # 只用作看板娘 class = official - species = GRAY_SPECIES + species = event_target:gray_species_target name = "NAME_Gray" gender = female immortal = yes diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt index 9d8d8d0..ab1be0a 100644 --- a/common/scripted_effects/RG_scripted_effects.txt +++ b/common/scripted_effects/RG_scripted_effects.txt @@ -10,7 +10,7 @@ rg_create_gray_species = { if = { limit = { NOT = { - exists = event_target:gray_species + exists = event_target:gray_species_target } } if = { @@ -21,25 +21,25 @@ rg_create_gray_species = { } } create_species = { - name = GRAY_SPECIES - plural = GRAY_SPECIES + name = gray_species + plural = gray_species class = ART portrait = GrayTempest06 namelist = ART1 effect = { - save_global_event_target_as = gray_species + save_global_event_target_as = gray_species_target } } } else = { create_species = { - name = GRAY_SPECIES - plural = GRAY_SPECIES + name = gray_species + plural = gray_species class = ART portrait = @gray_portrait namelist = ART1 effect = { - save_global_event_target_as = gray_species + save_global_event_target_as = gray_species_target } } } diff --git a/common/ship_sizes/RG_ship_sizes.txt b/common/ship_sizes/RG_ship_sizes.txt index ddfc025..022e170 100644 --- a/common/ship_sizes/RG_ship_sizes.txt +++ b/common/ship_sizes/RG_ship_sizes.txt @@ -116,7 +116,7 @@ RG_graygoo_capitalship = { icon = ship_size_military_16 base_buildtime = @titan_build_time can_have_federation_design = yes - enable_default_design = no #if yes, countries will have an auto-generated design at start + enable_default_design = yes #if yes, countries will have an auto-generated design at start enable_3dview_in_ship_browser = yes #if yes, ship design will have a 3d view in the ship browser is_designable = yes default_behavior = colossus @@ -200,6 +200,114 @@ RG_graygoo_capitalship = { empire_limit = 1 } +RG_gray_juggernaut = { + max_speed = 100 + entity = "grey_tempesttw_juggernaut_entity" + acceleration = 0.2 + rotation_speed = 0.15 + collision_radius = @juggernaut_collision_radius + modifier = { + ship_evasion_add = 100 + ship_armor_add = 108000 + ship_shield_add = 108000 + ship_weapon_damage = 2 + starbase_shipyard_capacity_add = 12 + ship_cloaking_detection_add = 5 + } + ship_modifier = { + ship_disengage_chance_reduction = 8 + ships_upkeep_mult = -1 + ship_shield_hardening_add = 2 + ship_armor_hardening_add = 2 + } + max_hitpoints = 108000 + base_buildtime = @juggernaut_build_time + combat_size_multiplier = 5 + size_multiplier = 32 + fleet_slot_size = 32 + section_slots = { + "core" = { + locator = "part1" + } + "behind" = { + locator = "part2" + } + } + num_target_locators = 16 + can_have_federation_design = no + enable_default_design = yes #if yes, countries will have an auto-generated design at start + enable_3dview_in_ship_browser = yes #if yes, ship design will have a 3d view in the ship browser + icon_frame = 7 #probably unused, but mobile starbases are special + icon = ship_size_military_64 + ship_class_icon_frame = 35 + default_behavior = colossus + is_designable = yes + prerequisites = { + "tech_gray_juggernaut_8" + } + class = shipclass_starbase + construction_type = starbase_shipyard + potential_construction = { + OR = { + is_scope_type = starbase + AND = { + is_scope_type = megastructure + OR = { + is_megastructure_type = mega_shipyard_3 + is_megastructure_type = mega_shipyard_restored + } + } + } + } + + possible_construction = { + custom_tooltip = { + fail_text = starbase_citadel_trigger + OR = { + AND = { + is_scope_type = megastructure + OR = { + is_megastructure_type = mega_shipyard_3 + is_megastructure_type = mega_shipyard_restored + } + } + AND = { + is_scope_type = starbase + has_starbase_size >= starbase_citadel + } + } + } + custom_tooltip = { + fail_text = starbase_colossal_yards_trigger + OR = { + AND = { + is_scope_type = megastructure + OR = { + is_megastructure_type = mega_shipyard_3 + is_megastructure_type = mega_shipyard_restored + } + } + AND = { + is_scope_type = starbase + has_starbase_building = colossus_yards + } + } + } + } + required_component_set = "power_core" + required_component_set = "sensor_components" + required_component_set = "combat_computers" + required_component_set = "ftl_components" + required_component_set = "thruster_components" + required_component_set = "science_cloaking_components" + required_component_set = "ship_aura_components" + required_component_set = "ship_aura_components" + required_component_set = "ship_aura_components" + required_component_set = "ship_aura_components" + + empire_limit = 1 +} + RG_armed_constructor_ship = { max_speed = 150 acceleration = 0.1 @@ -571,68 +679,6 @@ RG_graygoo_Buff = { } } -RG_gray_juggernaut = { - max_speed = 100 - entity = "grey_tempesttw_juggernaut_entity" - acceleration = 0.2 - rotation_speed = 0.15 - collision_radius = @juggernaut_collision_radius - modifier = { - ship_evasion_add = 100 - ship_armor_add = 108000 - ship_shield_add = 108000 - ship_weapon_damage = 2 - starbase_shipyard_capacity_add = 12 - ship_cloaking_detection_add = 5 - } - ship_modifier = { - ship_disengage_chance_reduction = 8 - ships_upkeep_mult = -1 - ship_shield_hardening_add = 2 - ship_armor_hardening_add = 2 - } - max_hitpoints = 108000 - base_buildtime = @juggernaut_build_time - combat_size_multiplier = 5 - size_multiplier = 32 - fleet_slot_size = 32 - section_slots = { - "core" = { - locator = "part1" - } - "behind" = { - locator = "part2" - } - } - num_target_locators = 16 - can_have_federation_design = no - enable_default_design = no #if yes, countries will have an auto-generated design at start - enable_3dview_in_ship_browser = yes #if yes, ship design will have a 3d view in the ship browser - icon_frame = 7 #probably unused, but mobile starbases are special - icon = ship_size_military_64 - ship_class_icon_frame = 35 - default_behavior = colossus - is_designable = yes - prerequisites = { - "tech_gray_juggernaut_8" - } - class = shipclass_starbase - construction_type = starbase_shipyard - possible_construction = { - always = no - } - required_component_set = "power_core" - required_component_set = "sensor_components" - required_component_set = "combat_computers" - required_component_set = "ftl_components" - required_component_set = "thruster_components" - required_component_set = "science_cloaking_components" - required_component_set = "ship_aura_components" - required_component_set = "ship_aura_components" - required_component_set = "ship_aura_components" - required_component_set = "ship_aura_components" -} - # Armed Transport RG_armed_transport_ship = { max_speed = 150 diff --git a/common/species_classes/rg_species_classes.txt b/common/species_classes/rg_species_classes.txt index ac42802..62e27ca 100644 --- a/common/species_classes/rg_species_classes.txt +++ b/common/species_classes/rg_species_classes.txt @@ -14,7 +14,7 @@ # possible ethics/government requirements; see common/governments/readme_requirements.txt # gender = yes/no (default: yes) whether the species has a gender # portrait_modding yes/no (default: yes) whether the portrait can be modified with e.g. genemodding or robomodding -GRAY_SPECIES = { +gray_species = { archetype = OTHER playable = { always = no } diff --git a/events/!_RG_gray_goo_events.txt b/events/!_RG_gray_goo_events.txt index b1218b9..023fb27 100644 --- a/events/!_RG_gray_goo_events.txt +++ b/events/!_RG_gray_goo_events.txt @@ -212,11 +212,6 @@ country_event = { room = "ethic_spaceship_room" } is_triggered_only = yes - immediate = { - event_target:gray_governor = { - set_owner = event_target:rg_gray_country - } - } option = { name = graygoo.405.a hidden_effect = { diff --git a/events/RG_story_event.txt b/events/RG_story_event.txt index a7b2ba9..31c8f8a 100644 --- a/events/RG_story_event.txt +++ b/events/RG_story_event.txt @@ -11,7 +11,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -55,7 +55,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -99,7 +99,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -143,7 +143,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -229,7 +229,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -273,7 +273,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -329,7 +329,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -373,7 +373,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -491,7 +491,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -521,7 +521,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = { @@ -612,7 +612,7 @@ country_event = { } diplomatic = yes picture_event_data = { - portrait = event_target:gray_species + portrait = event_target:gray_species_target room = "ethic_spaceship_room" } desc = {