This commit is contained in:
2024-11-29 17:08:42 +09:00
parent 70c323790b
commit f412198ab7
3 changed files with 99 additions and 97 deletions

View File

@@ -4,6 +4,7 @@ Date: 2024-11-30
Changes: Changes:
- [SA] Changed some tile logic. - [SA] Changed some tile logic.
- [SA] Changed the no restriction and vanilla set up logic.
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 3.0.41 Version: 3.0.41

View File

@@ -403,51 +403,60 @@ local items = {
['planet-discovery-gleba'] = true, ['planet-discovery-gleba'] = true,
['planet-discovery-fulgora'] = true, ['planet-discovery-fulgora'] = true,
['planet-discovery-aquilo'] = true, ['planet-discovery-aquilo'] = true,
['space-platform'] = true, ['lightning-collector'] = true
['space-platform-thruster'] = true,
['lightning-collector'] = true,
['asteroid-reprocessing'] = true,
['advanced-asteroid-processing'] = true,
['asteroid-productivity'] = true
}, },
['technology_2'] = { ['technology_2'] = {
['calcite-processing'] = true, ['space-platform'] = true,
['tungsten-carbide'] = true, ['space-platform-thruster'] = true,
['tungsten-steel'] = true, ['asteroid-reprocessing'] = true,
['metallurgic-science-pack'] = true, ['advanced-asteroid-processing'] = true,
['yumako'] = true, ['asteroid-productivity'] = true,
['jellynut'] = true, ['calcite-processing'] = true,
['bioflux'] = true, ['tungsten-carbide'] = true,
['artificial-soil'] = true, ['tungsten-steel'] = true,
['overgrowth-soil'] = true, ['metallurgic-science-pack'] = true,
['bacteria-cultivation'] = true, ['yumako'] = true,
['bioflux-processing'] = true, ['jellynut'] = true,
['agricultural-science-pack'] = true, ['bioflux'] = true,
['tree-seeding'] = true, ['artificial-soil'] = true,
['captivity'] = true, ['overgrowth-soil'] = true,
['biter-egg-handling'] = true, ['bacteria-cultivation'] = true,
['carbon-fiber'] = true, ['bioflux-processing'] = true,
['fish-breeding'] = true, ['agricultural-science-pack'] = true,
['holmium-processing'] = true, ['tree-seeding'] = true,
['electromagnetic-plant'] = true, ['captivity'] = true,
['electromagnetic-science-pack'] = true, ['biter-egg-handling'] = true,
['rail-support-foundations'] = true, ['carbon-fiber'] = true,
['lithium-processing'] = true, ['fish-breeding'] = true,
['quantum-processor'] = true, ['holmium-processing'] = true,
['cryogenic-science-pack'] = true, ['electromagnetic-plant'] = true,
['captive-biter-spawner'] = true, ['electromagnetic-science-pack'] = true,
['promethium-science-pack'] = true, ['rail-support-foundations'] = true,
['foundation'] = true, ['lithium-processing'] = true,
['scrap-recycling-productivity'] = true, ['quantum-processor'] = true,
['recycling'] = true, ['cryogenic-science-pack'] = true,
['heating-tower'] = true, ['captive-biter-spawner'] = true,
['agriculture'] = true, ['promethium-science-pack'] = true,
['foundry'] = true, ['foundation'] = true,
['cryogenic-plant'] = true, ['scrap-recycling-productivity'] = true,
['biolab'] = true, ['recycling'] = true,
['biochamber'] = true ['heating-tower'] = true,
['agriculture'] = true,
['foundry'] = true,
['cryogenic-plant'] = true,
['biolab'] = true,
['biochamber'] = true
}, },
['recipe_1'] = { ['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, ['metallic-asteroid-crushing'] = true,
['carbonic-asteroid-crushing'] = true, ['carbonic-asteroid-crushing'] = true,
['oxide-asteroid-crushing'] = true, ['oxide-asteroid-crushing'] = true,
@@ -457,17 +466,8 @@ local items = {
['metallic-asteroid-reprocessing'] = true, ['metallic-asteroid-reprocessing'] = true,
['carbonic-asteroid-reprocessing'] = true, ['carbonic-asteroid-reprocessing'] = true,
['oxide-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-foundation'] = true,
['space-platform-starter-pack'] = true, ['space-platform-starter-pack'] = true,
['lightning-collector'] = true,
['lightning-rod'] = true
},
['recipe_2'] = {
['agricultural-science-pack'] = true, ['agricultural-science-pack'] = true,
['cryogenic-science-pack'] = true, ['cryogenic-science-pack'] = true,
['electromagnetic-science-pack'] = true, ['electromagnetic-science-pack'] = true,

View File

@@ -518,54 +518,7 @@ if settings.startup['PHI-SA'].value then
v.hidden_in_factoriopedia = true v.hidden_in_factoriopedia = true
end 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['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'].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['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}}} --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 settings.startup['PHI-SA-VANILLA'].value then
if mods['space-age'] 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 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_controls[v] = nil
data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.entity.settings[v:gsub('_', '-')] = nil data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.entity.settings[v:gsub('_', '-')] = nil