diff --git a/common/component_templates/RG_ship_parts.txt b/common/component_templates/RG_ship_parts.txt index edb2a1b..6087020 100644 --- a/common/component_templates/RG_ship_parts.txt +++ b/common/component_templates/RG_ship_parts.txt @@ -12,8 +12,6 @@ utility_component_template = { ship_armor_regen_add_perc = 0.2 ship_hull_add = 1960 ship_hull_regen_add_perc = 0.2 - ship_shield_add = 980 - ship_shield_regen_add_perc = 0.1 } size_restriction = { RG_graygoo_destroyer @@ -23,6 +21,11 @@ utility_component_template = { RG_graygoo_mothership RG_gray_juggernaut RG_graygoo_capitalship + RG_armed_science_ship + RG_armed_constructor_ship + RG_armed_transport_ship + RG_armed_colony_ship + RG_graygoo_icebreaker_interdictor } prerequisites = { "tech_gray_matter_remix_2" @@ -56,12 +59,10 @@ utility_component_template = { power = 0 power = -180 modifier = { - ship_armor_add = 13840 + ship_armor_add = 7680 ship_armor_regen_add_perc = 0.2 - ship_hull_add = 11960 + ship_hull_add = 3920 ship_hull_regen_add_perc = 0.2 - ship_shield_add = 4560 - ship_shield_regen_add_perc = 0.1 } size_restriction = { RG_graygoo_capitalship @@ -902,13 +903,6 @@ strike_craft_component_template = { alloys = 0.2 } } - size_restriction = { - RG_graygoo_destroyer - RG_graygoo_interdictor - RG_graygoo_mothership - RG_gray_juggernaut - RG_graygoo_capitalship - } prerequisites = { "tech_gray_nano_boost_3" } @@ -969,13 +963,6 @@ strike_craft_component_template = { alloys = 0.2 } } - size_restriction = { - RG_graygoo_destroyer - RG_graygoo_interdictor - RG_graygoo_mothership - RG_gray_juggernaut - RG_graygoo_capitalship - } prerequisites = { "tech_gray_nano_boost_3" } @@ -1039,13 +1026,6 @@ strike_craft_component_template = { alloys = 0.2 } } - size_restriction = { - RG_graygoo_destroyer - RG_graygoo_interdictor - RG_graygoo_mothership - RG_gray_juggernaut - RG_graygoo_capitalship - } prerequisites = { "tech_gray_nano_boost_3" } @@ -1110,13 +1090,6 @@ strike_craft_component_template = { alloys = 0.2 } } - size_restriction = { - RG_graygoo_destroyer - RG_graygoo_interdictor - RG_graygoo_mothership - RG_gray_juggernaut - RG_graygoo_capitalship - } prerequisites = { "tech_gray_nano_boost_3" } @@ -1181,6 +1154,10 @@ utility_component_template = { RG_graygoo_icebreaker_interdictor RG_gray_juggernaut RG_graygoo_capitalship + RG_armed_science_ship + RG_armed_constructor_ship + RG_armed_transport_ship + RG_armed_colony_ship } prerequisites = { "tech_gray_interdictor_4" @@ -2323,6 +2300,13 @@ utility_component_template = { tags = { weapon_type_rg_reactor } + size_restriction = { + RG_graygoo_destroyer + RG_armed_science_ship + RG_armed_constructor_ship + RG_armed_transport_ship + RG_armed_colony_ship + } component_set = "power_core" ai_weight = { weight = 0 @@ -2354,7 +2338,6 @@ utility_component_template = { component_set = "power_core" size_restriction = { RG_graygoo_interdictor - RG_graygoo_destroyer RG_graygoo_Buff RG_graygoo_icebreaker_interdictor } diff --git a/common/global_ship_designs/RG_fallen_empire_ship_designs.txt b/common/global_ship_designs/RG_fallen_empire_ship_designs.txt index f841dee..bc6a7ce 100644 --- a/common/global_ship_designs/RG_fallen_empire_ship_designs.txt +++ b/common/global_ship_designs/RG_fallen_empire_ship_designs.txt @@ -249,6 +249,10 @@ ship_design = { slot = "EXTRA_LARGE_01" template = "GRAY_BEAM_STATIC_X" } + component = { + slot = "EXTRA_LARGE_02" + template = "GRAY_BEAM_STATIC_X" + } component = { slot = "LARGE_GUN_01" template = "LARGE_GRAY_WEAPON_LANCE" @@ -313,6 +317,10 @@ ship_design = { slot = "AUX_UTILITY_2" template = "SHIELD_BOOSTER" } + component = { + slot = "AUX_UTILITY_3" + template = "SHIELD_BOOSTER" + } } required_component="SENSOR_4" required_component="JUMP_DRIVE_1" @@ -337,6 +345,10 @@ ship_design = { slot = "LARGE_GUN_01" template = "LARGE_GRAY_WEAPON_LANCE" } + component = { + slot = "LARGE_GUN_02" + template = "LARGE_GRAY_WEAPON_LANCE" + } component = { slot = "SMALL_GUN_01" template = "SMALL_GRAY_WEAPON_LANCE" @@ -397,6 +409,10 @@ ship_design = { slot = "AUX_UTILITY_1" template = "SHIELD_BOOSTER" } + component = { + slot = "AUX_UTILITY_2" + template = "SHIELD_BOOSTER" + } } required_component="SENSOR_4" required_component="JUMP_DRIVE_1" diff --git a/common/on_actions/RG_on_actions.txt b/common/on_actions/RG_on_actions.txt index a800704..56c0447 100644 --- a/common/on_actions/RG_on_actions.txt +++ b/common/on_actions/RG_on_actions.txt @@ -174,4 +174,4 @@ on_space_battle_lost = { events = { rg_skill.15 } -} +} \ No newline at end of file diff --git a/common/script_values/rg_script_values.txt b/common/script_values/rg_script_values.txt new file mode 100644 index 0000000..22a388b --- /dev/null +++ b/common/script_values/rg_script_values.txt @@ -0,0 +1,14 @@ +rg_count_maid = { + base = 0 + complex_trigger_modifier = { + trigger = count_traits + trigger_scope = pop + parameters = { + limit = { + has_trait = rg_machine_maid_trait + } + } + mode = add + } + # max = 20 +} diff --git a/common/scripted_effects/RG_fallen_empire_effects.txt b/common/scripted_effects/RG_fallen_empire_effects.txt index 14b88ad..c093473 100644 --- a/common/scripted_effects/RG_fallen_empire_effects.txt +++ b/common/scripted_effects/RG_fallen_empire_effects.txt @@ -5,8 +5,11 @@ rg_create_fallen_empire_species_effect = { portrait = "rg_machine_maid" 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 trait = ramdom_trait } extra_trait_points = 3 @@ -75,6 +78,13 @@ rg_create_fallen_empire_country_effect = { add_global_ship_design = "NAME_Gray_Tau" add_global_ship_design = "NAME_Gray_Sigma" add_global_ship_design = "NAME_Gray_FE_Starbase" + set_graphical_culture = fallen_machine_empire_01 + + add_modifier = { + modifier = fe_ship_cost_modifier + days = -1 + } + if = { limit = { NOT = { diff --git a/common/scripted_triggers/!_rg_scripted_trigger_overwrite.txt b/common/scripted_triggers/!_rg_scripted_trigger_overwrite.txt new file mode 100644 index 0000000..e679876 --- /dev/null +++ b/common/scripted_triggers/!_rg_scripted_trigger_overwrite.txt @@ -0,0 +1,8 @@ +has_budding_trait = { + OR = { + has_trait = trait_plantoid_budding + has_trait = trait_lithoid_budding + has_trait = trait_advanced_budding + has_trait = rg_machine_maid_trait + } +} diff --git a/common/section_templates/RG_gray_goo_section.txt b/common/section_templates/RG_gray_goo_section.txt index 954f4d1..4ef7484 100644 --- a/common/section_templates/RG_gray_goo_section.txt +++ b/common/section_templates/RG_gray_goo_section.txt @@ -207,47 +207,47 @@ ship_section_template = { locatorname = "turret_01" } component_slot = { - name = "PD_05" - template = "point_defence_turret" + name = "MEDIUM_GUN_01" + template = "medium_turret" locatorname = "turret_01" } component_slot = { - name = "PD_06" - template = "point_defence_turret" + name = "MEDIUM_GUN_02" + template = "medium_turret" locatorname = "turret_01" } component_slot = { - name = "PD_07" - template = "point_defence_turret" + name = "MEDIUM_GUN_03" + template = "medium_turret" locatorname = "turret_01" } component_slot = { - name = "PD_08" - template = "point_defence_turret" + name = "MEDIUM_GUN_04" + template = "medium_turret" locatorname = "turret_01" } component_slot = { - name = "PD_09" - template = "point_defence_turret" + name = "MEDIUM_GUN_05" + template = "medium_turret" locatorname = "turret_01" } component_slot = { - name = "PD_10" - template = "point_defence_turret" + name = "MEDIUM_GUN_06" + template = "medium_turret" locatorname = "turret_01" } component_slot = { - name = "PD_11" - template = "point_defence_turret" + name = "MEDIUM_GUN_07" + template = "medium_turret" locatorname = "turret_01" } component_slot = { - name = "PD_12" - template = "point_defence_turret" + name = "MEDIUM_GUN_08" + template = "medium_turret" locatorname = "turret_01" } large_utility_slots = 6 - aux_utility_slots = 2 + aux_utility_slots = 3 } #光环7 @@ -268,7 +268,7 @@ ship_section_template = { locatorname = "turret_01" } large_utility_slots = 6 - aux_utility_slots = 2 + aux_utility_slots = 3 } #巨像8 @@ -284,7 +284,7 @@ ship_section_template = { locatorname = "boope" } large_utility_slots = 6 - aux_utility_slots = 2 + aux_utility_slots = 3 } #武库舰9 @@ -733,7 +733,7 @@ ship_section_template = { locatorname = "xl_gun_01" } large_utility_slots = 12 - aux_utility_slots = 2 + aux_utility_slots = 3 } ship_section_template = { diff --git a/common/traits/RG_machine_species_trait.txt b/common/traits/RG_machine_species_trait.txt index a2d3836..dbfafe2 100644 --- a/common/traits/RG_machine_species_trait.txt +++ b/common/traits/RG_machine_species_trait.txt @@ -2,7 +2,7 @@ rg_machine_maid_trait = { cost = { base = 0 } - # custom_tooltip = rg_machine_maid_trait_effect + custom_tooltip = TRAIT_PLANTOID_BUDDING_EFFECT initial = no species_potential_add = { always = no } species_possible_remove = { always = no } diff --git a/events/RG_machine_event.txt b/events/RG_machine_event.txt index 4c7bc63..ba10799 100644 --- a/events/RG_machine_event.txt +++ b/events/RG_machine_event.txt @@ -35,4 +35,60 @@ country_event = { } } } -} \ No newline at end of file +} + +# country_event = { +# id = rg_maid.2 +# hide_window = yes +# is_triggered_only = yes +# immediate = { +# every_playable_country = { +# limit = { +# any_owned_species = { +# has_trait = rg_machine_maid_trait +# } +# } +# triggered_planet_modifier = { +# potential = { +# can_assemble_budding_pop = yes +# } +# planet_pop_assembly_organic_add = @plantoid_budding_rate +# mult = value:budding_multiplier +# } +# } +# capital_scope = { +# while = { +# count = 5 +# create_pop = { +# species = event_target:rg_maid_species +# } +# } +# } +# } +# } + +# planet_event = { #Braiiiins +# id = rg_maid.3 +# is_triggered_only = yes +# hide_window = yes +# +# trigger = { +# fromfrom = { +# is_organic_species = yes +# NOT = { has_trait = trait_zombie } +# } +# owner = { has_valid_civic = civic_permanent_employment } +# has_building = building_posthumous_employment_center +# } +# +# immediate = { +# fromfrom = { +# make_pop_zombie = yes +# } +# } +# after = { +# fromfrom = { +# clear_pop_category = yes #To make sure that the zombie pop does not spawn as a non worker strata +# } +# } +# } \ No newline at end of file