This commit is contained in:
2024-11-22 23:21:10 +09:00
parent 810730f257
commit 923100f251
3 changed files with 141 additions and 52 deletions

View File

@@ -376,6 +376,23 @@ local items = {
['promethium-science-pack'] = true, ['promethium-science-pack'] = true,
['space-science-pack'] = true ['space-science-pack'] = true
}, },
['gleba_tile'] = {
['natural-yumako-soil'] = true,
['natural-jellynut-soil'] = true,
['wetland-yumako'] = true,
['wetland-jellynut'] = true,
['lowland-brown-blubber'] = true,
['lowland-olive-blubber'] = true,
['lowland-olive-blubber-2'] = true,
['lowland-olive-blubber-3'] = true,
['lowland-cream-red'] = true,
['lowland-red-vein'] = true,
['lowland-red-vein-2'] = true,
['lowland-red-vein-3'] = true,
['lowland-red-vein-4'] = true,
['lowland-red-vein-dead'] = true,
['lowland-red-infection'] = true
},
['resource'] = { ['resource'] = {
['tungsten-ore'] = true, ['tungsten-ore'] = true,
['calcite'] = true ['calcite'] = true
@@ -429,7 +446,27 @@ local items = {
['biolab'] = true, ['biolab'] = true,
['biochamber'] = true ['biochamber'] = true
}, },
['recipe'] = { ['recipe_1'] = {
['metallic-asteroid-crushing'] = true,
['carbonic-asteroid-crushing'] = true,
['oxide-asteroid-crushing'] = true,
['advanced-metallic-asteroid-crushing'] = true,
['advanced-carbonic-asteroid-crushing'] = true,
['advanced-oxide-asteroid-crushing'] = true,
['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, ['agricultural-science-pack'] = true,
['cryogenic-science-pack'] = true, ['cryogenic-science-pack'] = true,
['electromagnetic-science-pack'] = true, ['electromagnetic-science-pack'] = true,
@@ -470,20 +507,6 @@ local items = {
['cryogenic-plant'] = true, ['cryogenic-plant'] = true,
['electromagnetic-plant'] = true, ['electromagnetic-plant'] = true,
['foundry'] = true, ['foundry'] = true,
['metallic-asteroid-crushing'] = true,
['carbonic-asteroid-crushing'] = true,
['oxide-asteroid-crushing'] = true,
['advanced-metallic-asteroid-crushing'] = true,
['advanced-carbonic-asteroid-crushing'] = true,
['advanced-oxide-asteroid-crushing'] = true,
['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,
['tungsten-carbide'] = true, ['tungsten-carbide'] = true,
['tungsten-plate'] = true, ['tungsten-plate'] = true,
['carbon'] = true, ['carbon'] = true,
@@ -506,8 +529,6 @@ local items = {
['electrolyte'] = true, ['electrolyte'] = true,
['supercapacitor'] = true, ['supercapacitor'] = true,
['superconductor'] = true, ['superconductor'] = true,
['lightning-collector'] = true,
['lightning-rod'] = true,
['molten-iron-from-lava'] = true, ['molten-iron-from-lava'] = true,
['molten-copper-from-lava'] = true, ['molten-copper-from-lava'] = true,
['molten-iron'] = true, ['molten-iron'] = true,
@@ -527,8 +548,6 @@ local items = {
['scrap-recycling'] = true, ['scrap-recycling'] = true,
['foundation'] = true, ['foundation'] = true,
['foundation-o'] = true, ['foundation-o'] = true,
['space-platform-foundation'] = true,
['space-platform-starter-pack'] = true,
['steam-condensation'] = true, ['steam-condensation'] = true,
['ice-melting'] = true ['ice-melting'] = true
} }

View File

@@ -505,17 +505,31 @@ if settings.startup['PHI-SA'].value then
end end
end end
for k, v in pairs(items['space-age']['recipe_1']) do
if data.raw.recipe[k] then
data.raw.recipe[k].hidden = v
data.raw.recipe[k].hidden_in_factoriopedia = v
end
end
data.raw.recipe['promethium-science-pack'].ingredients = {{type='item', name='quantum-processor', amount=1}, {type='item', name='biter-egg', amount=10}}
data.raw['autoplace-control']['vulcanus_coal'] = nil data.raw['autoplace-control']['vulcanus_coal'] = nil
data.raw['autoplace-control']['sulfuric_acid_geyser'] = nil data.raw['autoplace-control']['sulfuric_acid_geyser'] = nil
data.raw['autoplace-control']['gleba_stone'] = nil data.raw['autoplace-control']['gleba_stone'] = nil
data.raw['autoplace-control']['aquilo_crude_oil'] = nil data.raw['autoplace-control']['aquilo_crude_oil'] = nil
data.raw['autoplace-control']['gleba_water'] = nil data.raw['autoplace-control']['gleba_water'].hidden = true
data.raw['autoplace-control']['fulgora_islands'] = nil data.raw['autoplace-control']['fulgora_islands'].hidden = true
data.raw['autoplace-control']['gleba_cliffs'] = nil
data.raw['autoplace-control']['fulgora_cliffs'] = nil
-- 'sulfuric_acid_geyser' --[[
'gleba_water'
'fulgora_islands'
'gleba_cliffs'
'fulgora_cliffs'
'sulfuric_acid_geyser'
]]
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] = {} data.raw.planet['nauvis'].map_gen_settings.autoplace_controls[v] = {}
@@ -525,8 +539,38 @@ if settings.startup['PHI-SA'].value then
data.raw.planet['nauvis'].map_gen_settings.autoplace_controls['gleba_enemy_base'] = {} data.raw.planet['nauvis'].map_gen_settings.autoplace_controls['gleba_enemy_base'] = {}
data.raw.planet['nauvis'].map_gen_settings.autoplace_controls['gleba_plants'] = {} data.raw.planet['nauvis'].map_gen_settings.autoplace_controls['gleba_plants'] = {}
for _, v in pairs({'natural-yumako-soil', 'natural-jellynut-soil', 'wetland-yumako', 'wetland-jellynut', 'lowland-brown-blubber', 'lowland-olive-blubber', 'lowland-olive-blubber-2', 'lowland-olive-blubber-3', 'lowland-cream-red', 'lowland-red-vein', 'lowland-red-vein-2', 'lowland-red-vein-3', 'lowland-red-vein-4', 'lowland-red-vein-dead', 'lowland-red-infection', 'ammoniacal-ocean', 'ammoniacal-ocean-2'}) do local resource_autoplace = require('resource-autoplace')
data.raw.resource['calcite'].autoplace = resource_autoplace.resource_autoplace_settings{
name = 'calcite',
order = 'c',
base_density = 0.9,
base_spots_per_km2 = 1.25,
has_starting_area_placement = false,
random_spot_size_minimum = 2,
random_spot_size_maximum = 4,
regular_rq_factor_multiplier = 1
}
data.raw.resource['tungsten-ore'].autoplace = {
order = 'c',
has_starting_area_placement = false,
probability_expression = 'vulcanus_tungsten_ore_probability',
richness_expression = 'vulcanus_tungsten_ore_richness'
}
for _, v in pairs({'ammoniacal-ocean', 'ammoniacal-ocean-2', 'oil-ocean-shallow', 'oil-ocean-deep', 'lava', 'lava-hot'}) do
data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.tile.settings[v] = {} data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.tile.settings[v] = {}
data.raw.tile[v].autoplace = resource_autoplace.resource_autoplace_settings{
name = v,
order = 'a',
base_density = 8.3,
base_spots_per_km2 = 0.15,
random_probability = 1,
random_spot_size_minimum = 0.3,
random_spot_size_maximum = 1,
has_starting_area_placement = false,
}
end end
data.raw.planet['nauvis'].map_gen_settings.territory_settings = { data.raw.planet['nauvis'].map_gen_settings.territory_settings = {
@@ -540,6 +584,26 @@ if settings.startup['PHI-SA'].value then
data.raw['utility-constants']['default'].main_menu_simulations[v] = nil data.raw['utility-constants']['default'].main_menu_simulations[v] = nil
end end
local gleba_tiles = {}
for _, v in pairs(items['space-age']['gleba_tile']) do
if data.raw.tile[v] then
data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.tile.settings[v] = {}
table.insert(gleba_tiles, v)
end
end
data.raw.tree['cuttlepop'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['sunnycomb'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['slipstack'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['funneltrunk'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['hairyclubnub'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['teflilly'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['lickmaw'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['stingfrond'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['boompuff'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw.tree['water-cane'].autoplace['tile_restriction'] = gleba_land_tiles
data.raw['tips-and-tricks-item']['fulgora-briefing'] = nil data.raw['tips-and-tricks-item']['fulgora-briefing'] = nil
data.raw['tips-and-tricks-item']['lightning-mechanics'] = nil data.raw['tips-and-tricks-item']['lightning-mechanics'] = nil
data.raw['tips-and-tricks-item']['gleba-briefing'] = nil data.raw['tips-and-tricks-item']['gleba-briefing'] = nil
@@ -563,6 +627,14 @@ if settings.startup['PHI-SA'].value then
data.raw['space-connection-distance-traveled-achievement']['shattered-planet-2'] = nil data.raw['space-connection-distance-traveled-achievement']['shattered-planet-2'] = nil
data.raw['space-connection-distance-traveled-achievement']['shattered-planet-3'] = nil data.raw['space-connection-distance-traveled-achievement']['shattered-planet-3'] = nil
data.raw['dont-research-before-researching-achievement']['rush-to-space'] = nil data.raw['dont-research-before-researching-achievement']['rush-to-space'] = nil
for _, v in pairs(items['item']) do
if v.enabled and v.mod and (v.mod == 'space-age' or v.mod == 'quality') then
if (data.raw.technology[v.tech] and data.raw.technology[v.tech].hidden) or (data.raw.recipe[v.name] and data.raw.recipe[v.name].hidden) then
v.enabled = false
end
end
end
end end
if settings.startup['PHI-SA-GENERIC'].value or settings.startup['PHI-SA-VANILLA'].value then if settings.startup['PHI-SA-GENERIC'].value or settings.startup['PHI-SA-VANILLA'].value then
@@ -947,13 +1019,6 @@ if settings.startup['PHI-SA'].value then
data.raw['kill-achievement']['we-need-bigger-guns'] = nil data.raw['kill-achievement']['we-need-bigger-guns'] = nil
data.raw['kill-achievement']['size-doesnt-matter'] = nil data.raw['kill-achievement']['size-doesnt-matter'] = nil
for k, v in pairs(items['space-age']['recipe']) do
if data.raw.recipe[k] then
data.raw.recipe[k].hidden = v
data.raw.recipe[k].hidden_in_factoriopedia = v
end
end
for k, v in pairs(items['space-age']['resource']) do for k, v in pairs(items['space-age']['resource']) do
if data.raw.resource[k] then if data.raw.resource[k] then
data.raw.resource[k].hidden = v data.raw.resource[k].hidden = v
@@ -961,7 +1026,14 @@ if settings.startup['PHI-SA'].value then
end end
end end
for _, v in pairs(items['item']) do for k, v in pairs(items['space-age']['recipe_2']) do
if data.raw.recipe[k] then
data.raw.recipe[k].hidden = v
data.raw.recipe[k].hidden_in_factoriopedia = v
end
end
for _, v in pairs(items['item_2']) do
if v.enabled and v.mod and (v.mod == 'space-age' or v.mod == 'quality') then if v.enabled and v.mod and (v.mod == 'space-age' or v.mod == 'quality') then
if (data.raw.technology[v.tech] and data.raw.technology[v.tech].hidden) or (data.raw.recipe[v.name] and data.raw.recipe[v.name].hidden) then if (data.raw.technology[v.tech] and data.raw.technology[v.tech].hidden) or (data.raw.recipe[v.name] and data.raw.recipe[v.name].hidden) then
v.enabled = false v.enabled = false

View File

@@ -765,8 +765,6 @@ for _, t in pairs(data.raw['tree']) do
t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}} t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}}
end end
** MIGRATION ** MIGRATION
if script.active_mods['space-exploration'] then if script.active_mods['space-exploration'] then
if technologies['se-core-miner'].researched then if technologies['se-core-miner'].researched then