From 397a0896a9ad50872e0cd22a25f1fff9c6e79df0 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Sun, 13 Apr 2025 13:45:49 +0900 Subject: [PATCH] . --- PHI-CL/data-updates.lua | 69 +++++++++++++ PHI-CL/info.json | 4 +- PHI-CL/migrations/migrations.lua | 9 ++ PHI-CL/note.lua | 160 +------------------------------ 4 files changed, 83 insertions(+), 159 deletions(-) diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index c62a371..9a84feb 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -2,6 +2,75 @@ local items = require 'config' local main = require 'main' local file_stage = 2 +if mods['space-exploration'] and settings.startup['PHI-MB'].value and settings.startup['PHI-MB-MACHINE'].value and settings.startup['PHI-MB-MACHINE-TIER'].value > 1 then + data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' + + local se = { + mod = 'space-exploration', + type = 'mining-drill', + name = 'se-core-miner-drill', + ref_name = 'se-core-miner-drill', + min = 2, + max = 3 + } + + for i=2, settings.startup['PHI-MB-MACHINE-TIER'].value do + local miner_name = 'se-core-miner-' .. i + local drill_name = 'se-core-miner-drill-' .. i + + main.EEE(se, i) + data.raw['mining-drill'][drill_name].minable.result = miner_name + data.raw['mining-drill'][drill_name].placeable_by.item = miner_name + + local item = table.deepcopy(data.raw['item']['se-core-miner']) + item.name = 'se-core-miner-' .. i + item.place_result = drill_name + item.order = 'zzzz-core-miner-' .. i + + item.icons = { + { + icon = '__space-exploration-graphics__/graphics/icons/core-miner.png', + tint = items['tint'][i], + icon_size = 64, + } + } + + item.icon = nil + item.icon_size = nil + item.localised_name = {'name.se-core-miner-drill'} + item.localised_description = {'description.se-core-miner-drill'} + data:extend({item}) + + if i > 2 then + data:extend({{ + type = 'recipe', + name = miner_name, + energy_required = 2, + enabled = false, + ingredients = {{name = 'se-core-miner-' .. (i - 1), amount = 1}, {name = 'se-core-miner', amount = 1}}, + result = miner_name, + localised_name = {'name.se-core-miner-drill'}, + localised_description = {'description.se-core-miner-drill'} + }}) + + else + data:extend({{ + type = 'recipe', + name = miner_name, + energy_required = 2, + enabled = false, + ingredients = {{name = 'se-core-miner', amount = 2}}, + result = miner_name, + localised_name = {'name.se-core-miner-drill'}, + localised_description = {'description.se-core-miner-drill'} + }}) + end + + data.raw['mining-drill'][drill_name].fast_replaceable_group = data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group + table.insert(data.raw.technology['se-core-miner'].effects, {type='unlock-recipe', recipe=miner_name}) + end +end + for _, v in pairs(items['item']) do if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then v.category = 'item' diff --git a/PHI-CL/info.json b/PHI-CL/info.json index ca27b59..8599979 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -12,7 +12,9 @@ "base >= 2.0.0", "? space-age >= 2.0.0", "? quality >= 2.0.0", - "? elevated-rails >= 2.0.0" + "? elevated-rails >= 2.0.0", + "? aai-industry >= 0.6.0", + "? space-exploration >= 0.7.0" ], "quality_required": false, "space_travel_required": false, diff --git a/PHI-CL/migrations/migrations.lua b/PHI-CL/migrations/migrations.lua index 7a6f73c..4283f4d 100644 --- a/PHI-CL/migrations/migrations.lua +++ b/PHI-CL/migrations/migrations.lua @@ -135,4 +135,13 @@ for _, force in pairs(game.forces) do recipes['turbo-loader'].reload() end end + + if script.active_mods['space-exploration'] then + if technologies['se-core-miner'].researched then + for i = 2, settings.startup['PHI-MB-MACHINE-TIER'].value do + recipes['se-core-miner-' .. i].enabled = true + recipes['se-core-miner-' .. i].reload() + end + end + end end diff --git a/PHI-CL/note.lua b/PHI-CL/note.lua index 40e1a5a..77ed648 100644 --- a/PHI-CL/note.lua +++ b/PHI-CL/note.lua @@ -245,150 +245,7 @@ item.energy_per_shield = tostring(math.floor(tonumber(string.match(item.energy_per_shield, '[%d%.]+')) * ((32 - (tier - source.min + 1)) / 32))) .. string.match(item.energy_per_shield, '%a+') end -** DATA - 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['yumako'].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['jellynut'].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['bacteria-cultivation'].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['heating-tower'].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['recycling'].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['lithium-processing'].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['promethium-science-pack'].effects = {{type = 'unlock-recipe', recipe = 'promethium-science-pack'}} - data.raw.technology['railgun'].prerequisites = {'military-3', 'utility-science-pack'} - data.raw.technology['railgun'].unit = {count = 1000, time = 60, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'military-science-pack', 1}, {'chemical-science-pack', 1}, {'utility-science-pack', 1}}} - - local resource_autoplace = require('resource-autoplace') - - for k, v in pairs({['fluorine-vent'] = 'b', ['lithium-brine'] = 'a-b-a', ['sulfuric-acid-geyser'] = 'a-b-b'}) do - data.raw.resource[k].autoplace = resource_autoplace.resource_autoplace_settings{ - name = k, - order = v, - control = k:gsub('-', '_'), - base_density = 8.2, - base_spots_per_km2 = 1.8, - random_probability = 1 / 48, - random_spot_size_minimum = 1, - random_spot_size_maximum = 1, - additional_richness = 220000, - has_starting_area_placement = false, - regular_rq_factor_multiplier = 1 - } - end - - for k, v in pairs({['calcite'] = 'b', ['tungsten-ore'] = 'b', ['scrap'] = 'c'}) do - data.raw.resource[k].autoplace = resource_autoplace.resource_autoplace_settings{ - name = k, - order = v, - 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 - } - end - - for _, v in pairs({'calcite', 'fluorine_vent', 'lithium_brine', 'scrap', 'sulfuric_acid_geyser', 'tungsten_ore'}) do - data.raw.planet['nauvis'].map_gen_settings.autoplace_controls[v] = {} - data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.entity.settings[v:gsub('_', '-')] = {} - end - - data.raw.planet['nauvis'].map_gen_settings.autoplace_controls['gleba_enemy_base'] = {} - - local pen = { - ['entity:tungsten-ore:probability'] = 'vulcanus_tungsten_ore_probability', - ['entity:tungsten-ore:richness'] = 'vulcanus_tungsten_ore_richness', - ['entity:calcite:probability'] = 'vulcanus_calcite_probability', - ['entity:calcite:richness'] = 'vulcanus_calcite_richness', - ['entity:sulfuric-acid-geyser:probability'] = 'vulcanus_sulfuric_acid_geyser_probability', - ['entity:sulfuric-acid-geyser:richness'] = 'vulcanus_sulfuric_acid_geyser_richness' - } - - for k, v in pairs(pen) do - data.raw.planet['nauvis'].map_gen_settings.property_expression_names[k] = v - end - - data.raw['unit-spawner']['gleba-spawner'].autoplace = data.raw['unit-spawner']['biter-spawner'].autoplace - data.raw['unit-spawner']['gleba-spawner-small'].autoplace = data.raw['unit-spawner']['spitter-spawner'].autoplace - - for _, v in pairs({'artificial-yumako-soil', 'overgrowth-yumako-soil', 'artificial-jellynut-soil', 'overgrowth-jellynut-soil', 'ice-platform', 'foundation', 'turbo-transport-belt', turbo-underground-belt', 'turbo-splitter', 'big-mining-drill', 'railgun-turret', 'tesla-turret', 'stack-inserter', 'fusion-reactor', 'fusion-generator'}) do - data.raw.item[v].default_import_location = nil - end - - data.raw.gun['teslagun'].default_import_location = nil - data.raw.ammo['tesla-ammo'].default_import_location = nil - -** DATA UPDATE -if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.startup['PHI-MB-MINING-TIER'].value > 1 then - data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' - - local se = { - type = 'mining-drill', - name = 'se-core-miner-drill', - ref_name = 'se-core-miner-drill', - min = 2, - max = 3 - } - - for i=2, settings.startup['PHI-MB-MINING-TIER'].value do - local miner_name = 'se-core-miner-' .. i - local drill_name = 'se-core-miner-drill-' .. i - - main.EEE(se, i) - data.raw['mining-drill'][drill_name].minable.result = miner_name - data.raw['mining-drill'][drill_name].placeable_by.item = miner_name - - local item = table.deepcopy(data.raw['item']['se-core-miner']) - item.name = 'se-core-miner-' .. i - item.place_result = drill_name - item.order = 'zzzz-core-miner-' .. i - - item.icons = { - { - icon = '__space-exploration-graphics__/graphics/icons/core-miner.png', - tint = items['tint'][i], - icon_size = 64, - } - } - - item.icon = nil - item.icon_size = nil - item.localised_name = {'name.se-core-miner-drill'} - item.localised_description = {'description.se-core-miner-drill'} - data:extend({item}) - - if i > 2 then - data:extend({{ - type = 'recipe', - name = miner_name, - energy_required = 2, - enabled = false, - ingredients = {{name='se-core-miner-' .. (i - 1), amount=1}, {name='se-core-miner', amount=1}}, - result = miner_name, - localised_name = {'name.se-core-miner-drill'}, - localised_description = {'description.se-core-miner-drill'} - }}) - - else - data:extend({{ - type = 'recipe', - name = miner_name, - energy_required = 2, - enabled = false, - ingredients = {{name='se-core-miner', amount=2}}, - result = miner_name, - localised_name = {'name.se-core-miner-drill'}, - localised_description = {'description.se-core-miner-drill'} - }}) - end - - data.raw['mining-drill'][drill_name].fast_replaceable_group = data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group - table.insert(data.raw.technology['se-core-miner'].effects, {type='unlock-recipe', recipe=miner_name}) - end -end - -** DATA FINAL FIXES + ** DATA FINAL FIXES data.raw['utility-constants'].default.train_inactivity_wait_condition_default = 60 data.raw['gui-style'].default.machine_slots_scroll_pane.maximal_height = nil @@ -413,16 +270,6 @@ for _, t in pairs(data.raw['tree']) do t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}} end -** MIGRATION -if script.active_mods['space-exploration'] then - if technologies['se-core-miner'].researched then - for i=2, settings.startup['PHI-MB-MACHINE-TIER'].value do - recipes['se-core-miner-' .. i].enabled = true - recipes['se-core-miner-' .. i].reload() - end - end -end - ** SETTING localised_description = {'phi-cl.combine', {'phi-cl.default'}, {'mod-setting-description.PHI-MB-ENERGY-SOLAR-TIER'}}, @@ -430,9 +277,6 @@ localised_description = {'phi-cl.combine', {'phi-cl.default'}, {'mod-setting-des {type = 'electric', decrease = 20, percent = 50}, {type = 'impact', decrease = 20, percent = 50}, {type = 'poison', decrease = 20, percent = 50} - -"? aai-industry >= 0.5.0", "? Krastorio2 >= 1.3.0", -"? space-exploration >= 0.6.0", -"(?) angelsrefining >= 0.12.0", +"(?) angelsrefining >= 0.12.0" ]]