From 49e58bd317261e1ea603a5d5c39113506db6afc4 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Tue, 12 Nov 2024 15:05:51 +0900 Subject: [PATCH] . --- PHI-CL/data-final-fixes.lua | 3 +-- PHI-CL/data.lua | 53 +++++++++++++++++-------------------- PHI-CL/info.json | 4 +-- PHI-CL/main.lua | 6 ++--- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index 5116d31..c4ac29b 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -1,9 +1,8 @@ local items = require 'config' local main = require 'main' -local file_stage = 3 for _, v in pairs(items['item']) do - if (v.stage <= file_stage) and v.enabled and (v.max >= v.min) then + if v.enabled and (v.max >= v.min) then v.category = 'item' for j=v.min, v.max, 1 do diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 6f67b29..b9531a7 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -427,45 +427,27 @@ if settings.startup['PHI-SA'].value then end if settings.startup['PHI-SA-VANILLA'].value then - for _, v in pairs(items['item']) do - if v.enabled and v.mod and v.mod == 'space-age' then - v.enabled = false - end - end - if mods['space-age'] then - --[[ - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['vulcanus_coal'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['sulfuric_acid_geyser'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['tungsten_ore'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['calcite'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['vulcanus_volcanism'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['gleba_stone'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['gleba_plants'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['gleba_enemy_base'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['gleba_water'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['gleba_cliff'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['scrap'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['fulgora_islands'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['fulgora_cliff'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['lithium_brine'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['fluorine_vent'] = nil - data.raw['map-gen-presets']['default']['default']['basic_settings']['autoplace_controls']['aquilo_crude_oil'] = nil - ]] - for _, v in pairs({'vulcanus', 'gleba', 'fulgora', 'aquilo'}) do - -- data.raw.planet[v] = nil + --[[ + for _, v2 in pairs(data.raw.planet[v].map_gen_settings.autoplace_controls) do + v2.frequency = 0 + v2.size = 0 + v2.richness = 0 + end + ]] + data.raw.planet[v].hidden = true data.raw.planet[v].hidden_in_factoriopedia = true end - for k, v in pairs(data.raw['space-location']) do + for _, v in pairs(data.raw['space-location']) do -- data.raw['space-location'][k] = nil v.hidden = true v.hidden_in_factoriopedia = true end - for k, v in pairs(data.raw['space-connection']) do + for _, v in pairs(data.raw['space-connection']) do -- data.raw['space-connection'][k] = nil v.hidden = true v.hidden_in_factoriopedia = true @@ -659,6 +641,13 @@ if settings.startup['PHI-SA'].value then data.raw.technology['rocket-fuel-productivity'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}} data.raw.technology['rocket-part-productivity'].prerequisites = {'rocket-silo'} data.raw.technology['rocket-part-productivity'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}} + data.raw.technology['artillery'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'military-science-pack', 1}, {'chemical-science-pack', 1}, {'utility-science-pack', 1}} + data.raw.technology['turbo-transport-belt'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}, {'utility-science-pack', 1}} + data.raw.technology['personal-roboport-mk2-equipment'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'utility-science-pack', 1}} + data.raw.technology['energy-shield-mk2-equipment'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'utility-science-pack', 1}} + data.raw.technology['transport-belt-capacity-1'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}, {'utility-science-pack', 1}} + data.raw.technology['transport-belt-capacity-2'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}, {'utility-science-pack', 1}, {'space-science-pack', 1}} + data.raw.technology['spidertron'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}, {'utility-science-pack', 1}} data.raw.recipe['big-mining-drill'].category = nil data.raw.recipe['big-mining-drill'].surface_conditions = nil @@ -794,6 +783,14 @@ if settings.startup['PHI-SA'].value then data.raw['kill-achievement']['size-doesnt-matter'] = nil data.raw['complete-objective-achievement']['work-around-the-clock'] = nil data.raw['complete-objective-achievement']['express-delivery'] = nil + + for _, v in pairs(items['item']) do + if v.enabled and v.mod and v.mod == 'space-age' then + if not data.raw.technology[v.tech] then + v.enabled = false + end + end + end end if mods['quality'] then diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 926d56c..ae4f746 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "3.0.22", + "version": "3.0.24", "factorio_version": "2.0", - "date": "2024-11-11", + "date": "2024-11-12", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index aee9536..a1cb3a9 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -526,11 +526,11 @@ end function main.EEEC(source, tier) local item_name = source.name .. '-' .. tier - if not data.raw[source.type][source.ref_name] then + if not (data.raw[source.type][source.ref_name] and data.raw[source.type][item_name]) then return end - if data.raw[source.type][source.ref_name].crafting_categories then + if data.raw[source.type][source.ref_name].crafting_categories and data.raw[source.type][item_name].crafting_categories then data.raw[source.type][item_name].crafting_categories = {} for i=1, #data.raw[source.type][source.ref_name].crafting_categories do @@ -538,7 +538,7 @@ function main.EEEC(source, tier) end end - if data.raw[source.type][source.ref_name].resource_categories then + if data.raw[source.type][source.ref_name].resource_categories and data.raw[source.type][item_name].resource_categories then data.raw[source.type][item_name].resource_categories = {} for i=1, #data.raw[source.type][source.ref_name].resource_categories do