From f412198ab7015a1d90f0a8c5e92176db2a8c9ff8 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Fri, 29 Nov 2024 17:08:42 +0900 Subject: [PATCH] . --- PHI-CL/changelog.txt | 1 + PHI-CL/config.lua | 100 +++++++++++++++++++++---------------------- PHI-CL/data.lua | 95 ++++++++++++++++++++-------------------- 3 files changed, 99 insertions(+), 97 deletions(-) diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 037d007..6df054b 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -4,6 +4,7 @@ Date: 2024-11-30 Changes: - [SA] Changed some tile logic. + - [SA] Changed the no restriction and vanilla set up logic. --------------------------------------------------------------------------------------------------- Version: 3.0.41 diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index f16d7a0..f91a9ff 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -403,51 +403,60 @@ local items = { ['planet-discovery-gleba'] = true, ['planet-discovery-fulgora'] = true, ['planet-discovery-aquilo'] = true, - ['space-platform'] = true, - ['space-platform-thruster'] = true, - ['lightning-collector'] = true, - ['asteroid-reprocessing'] = true, - ['advanced-asteroid-processing'] = true, - ['asteroid-productivity'] = true + ['lightning-collector'] = true }, ['technology_2'] = { - ['calcite-processing'] = true, - ['tungsten-carbide'] = true, - ['tungsten-steel'] = true, - ['metallurgic-science-pack'] = true, - ['yumako'] = true, - ['jellynut'] = true, - ['bioflux'] = true, - ['artificial-soil'] = true, - ['overgrowth-soil'] = true, - ['bacteria-cultivation'] = true, - ['bioflux-processing'] = true, - ['agricultural-science-pack'] = true, - ['tree-seeding'] = true, - ['captivity'] = true, - ['biter-egg-handling'] = true, - ['carbon-fiber'] = true, - ['fish-breeding'] = true, - ['holmium-processing'] = true, - ['electromagnetic-plant'] = true, - ['electromagnetic-science-pack'] = true, - ['rail-support-foundations'] = true, - ['lithium-processing'] = true, - ['quantum-processor'] = true, - ['cryogenic-science-pack'] = true, - ['captive-biter-spawner'] = true, - ['promethium-science-pack'] = true, - ['foundation'] = true, - ['scrap-recycling-productivity'] = true, - ['recycling'] = true, - ['heating-tower'] = true, - ['agriculture'] = true, - ['foundry'] = true, - ['cryogenic-plant'] = true, - ['biolab'] = true, - ['biochamber'] = true + ['space-platform'] = true, + ['space-platform-thruster'] = true, + ['asteroid-reprocessing'] = true, + ['advanced-asteroid-processing'] = true, + ['asteroid-productivity'] = true, + ['calcite-processing'] = true, + ['tungsten-carbide'] = true, + ['tungsten-steel'] = true, + ['metallurgic-science-pack'] = true, + ['yumako'] = true, + ['jellynut'] = true, + ['bioflux'] = true, + ['artificial-soil'] = true, + ['overgrowth-soil'] = true, + ['bacteria-cultivation'] = true, + ['bioflux-processing'] = true, + ['agricultural-science-pack'] = true, + ['tree-seeding'] = true, + ['captivity'] = true, + ['biter-egg-handling'] = true, + ['carbon-fiber'] = true, + ['fish-breeding'] = true, + ['holmium-processing'] = true, + ['electromagnetic-plant'] = true, + ['electromagnetic-science-pack'] = true, + ['rail-support-foundations'] = true, + ['lithium-processing'] = true, + ['quantum-processor'] = true, + ['cryogenic-science-pack'] = true, + ['captive-biter-spawner'] = true, + ['promethium-science-pack'] = true, + ['foundation'] = true, + ['scrap-recycling-productivity'] = true, + ['recycling'] = true, + ['heating-tower'] = true, + ['agriculture'] = true, + ['foundry'] = true, + ['cryogenic-plant'] = true, + ['biolab'] = true, + ['biochamber'] = true }, ['recipe_1'] = { + ['thruster'] = true, + ['thruster-fuel'] = true, + ['thruster-oxidizer'] = true, + ['advanced-thruster-fuel'] = true, + ['advanced-thruster-oxidizer'] = true, + ['lightning-collector'] = true, + ['lightning-rod'] = true + }, + ['recipe_2'] = { ['metallic-asteroid-crushing'] = true, ['carbonic-asteroid-crushing'] = true, ['oxide-asteroid-crushing'] = true, @@ -457,17 +466,8 @@ local items = { ['metallic-asteroid-reprocessing'] = true, ['carbonic-asteroid-reprocessing'] = true, ['oxide-asteroid-reprocessing'] = true, - ['thruster'] = true, - ['thruster-fuel'] = true, - ['thruster-oxidizer'] = true, - ['advanced-thruster-fuel'] = true, - ['advanced-thruster-oxidizer'] = true, ['space-platform-foundation'] = true, ['space-platform-starter-pack'] = true, - ['lightning-collector'] = true, - ['lightning-rod'] = true - }, - ['recipe_2'] = { ['agricultural-science-pack'] = true, ['cryogenic-science-pack'] = true, ['electromagnetic-science-pack'] = true, diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 27b0b0d..48827ea 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -518,54 +518,7 @@ if settings.startup['PHI-SA'].value then v.hidden_in_factoriopedia = true end - data.raw['rocket-silo']['rocket-silo'].launch_to_space_platforms = false - data.raw['rocket-silo']['rocket-silo'].rocket_parts_required = 100 - data.raw['rocket-silo']['rocket-silo'].to_be_inserted_to_rocket_inventory_size = 1 - data.raw['rocket-silo']['rocket-silo'].logistic_trash_inventory_size = 0 - data.raw['rocket-silo-rocket']['rocket-silo-rocket'].inventory_size = 0 - - local item_sounds = require('__base__/prototypes/item_sounds') - - data:extend({ - { - type = 'item', - name = 'satellite', - icon = '__base__/graphics/icons/satellite.png', - subgroup = 'space-related', - order = 'd[rocket-parts]-e[satellite]', - inventory_move_sound = item_sounds.mechanical_inventory_move, - pick_sound = item_sounds.mechanical_inventory_pickup, - drop_sound = item_sounds.mechanical_inventory_move, - stack_size = 1, - weight = 1 * tons, - rocket_launch_products = {{type='item', name='space-science-pack', amount=1000}}, - send_to_orbit_mode = 'automated' - }, - { - type = 'recipe', - name = 'satellite', - energy_required = 5, - enabled = false, - category = 'crafting', - ingredients = - { - {type='item', name='low-density-structure', amount=100}, - {type='item', name='solar-panel', amount=100}, - {type='item', name='accumulator', amount=100}, - {type='item', name='radar', amount=5}, - {type='item', name='processing-unit', amount=100}, - {type='item', name='rocket-fuel', amount=50} - }, - results = {{type='item', name='satellite', amount=1}}, - requester_paste_multiplier = 1 - } - }) - data.raw.technology['rocket-silo'].effects = {{type = 'unlock-recipe', recipe = 'rocket-silo'}, {type = 'unlock-recipe', recipe = 'rocket-part'}, {type = 'unlock-recipe', recipe = 'cargo-landing-pad'}} - data.raw.technology['space-science-pack'].research_trigger = nil - data.raw.technology['space-science-pack'].prerequisites = {'rocket-silo'} - data.raw.technology['space-science-pack'].effects = {{type='unlock-recipe', recipe='satellite'}} - data.raw.technology['space-science-pack'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}}} data.raw.technology['tungsten-carbide'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} data.raw.technology['tungsten-carbide'].research_trigger = nil --data.raw.technology['agriculture'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} @@ -950,6 +903,54 @@ if settings.startup['PHI-SA'].value then if settings.startup['PHI-SA-VANILLA'].value then if mods['space-age'] then + data.raw['rocket-silo']['rocket-silo'].launch_to_space_platforms = false + data.raw['rocket-silo']['rocket-silo'].rocket_parts_required = 100 + data.raw['rocket-silo']['rocket-silo'].to_be_inserted_to_rocket_inventory_size = 1 + data.raw['rocket-silo']['rocket-silo'].logistic_trash_inventory_size = 0 + data.raw['rocket-silo-rocket']['rocket-silo-rocket'].inventory_size = 0 + + local item_sounds = require('__base__/prototypes/item_sounds') + + data:extend({ + { + type = 'item', + name = 'satellite', + icon = '__base__/graphics/icons/satellite.png', + subgroup = 'space-related', + order = 'd[rocket-parts]-e[satellite]', + inventory_move_sound = item_sounds.mechanical_inventory_move, + pick_sound = item_sounds.mechanical_inventory_pickup, + drop_sound = item_sounds.mechanical_inventory_move, + stack_size = 1, + weight = 1 * tons, + rocket_launch_products = {{type='item', name='space-science-pack', amount=1000}}, + send_to_orbit_mode = 'automated' + }, + { + type = 'recipe', + name = 'satellite', + energy_required = 5, + enabled = false, + category = 'crafting', + ingredients = + { + {type='item', name='low-density-structure', amount=100}, + {type='item', name='solar-panel', amount=100}, + {type='item', name='accumulator', amount=100}, + {type='item', name='radar', amount=5}, + {type='item', name='processing-unit', amount=100}, + {type='item', name='rocket-fuel', amount=50} + }, + results = {{type='item', name='satellite', amount=1}}, + requester_paste_multiplier = 1 + } + }) + + data.raw.technology['space-science-pack'].research_trigger = nil + data.raw.technology['space-science-pack'].prerequisites = {'rocket-silo'} + data.raw.technology['space-science-pack'].effects = {{type='unlock-recipe', recipe='satellite'}} + data.raw.technology['space-science-pack'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}}} + for _, v in pairs({'calcite', 'fluorine_vent', 'lithium_brine', 'scrap', 'tungsten_ore'}) do data.raw.planet['nauvis'].map_gen_settings.autoplace_controls[v] = nil data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.entity.settings[v:gsub('_', '-')] = nil