This commit is contained in:
2024-09-28 14:12:14 +09:00
parent 8a258826ed
commit fd32f587d5
2 changed files with 45 additions and 28 deletions

View File

@@ -217,6 +217,17 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t
end end
if settings.startup['PHI-RS'].value then if settings.startup['PHI-RS'].value then
local other_recipe_name = {
['basic-oil-processing'] = true,
['advanced-oil-processing'] = true,
['light-oil-cracking'] = true,
['heavy-oil-cracking'] = true,
['uranium-processing'] = true,
['kovarex-enrichment-process'] = true,
['nuclear-fuel-reprocessing'] = true,
['coal-liquefaction'] = true
}
local item = table.deepcopy(data.raw.item['electric-furnace']) local item = table.deepcopy(data.raw.item['electric-furnace'])
item.name = 'electric-filter-furnace' item.name = 'electric-filter-furnace'
item.place_result = 'electric-filter-furnace' item.place_result = 'electric-filter-furnace'
@@ -298,8 +309,11 @@ if settings.startup['PHI-RS'].value then
item = table.deepcopy(data.raw.recipe[k]) item = table.deepcopy(data.raw.recipe[k])
item.enabled = false item.enabled = false
item.name = k .. '-s' .. j item.name = k .. '-s' .. j
item.localised_name = {'name.'} .. k
item.localised_description = {'description.'} .. k if other_recipe_name[k] then
item.localised_name = {'phi-cl.combine', {'name.' .. k}, j}
item.localised_description = {'description.' .. k}
end
if item.normal then if item.normal then
item.normal.hide_from_player_crafting = true item.normal.hide_from_player_crafting = true

View File

@@ -674,53 +674,56 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t
'logistic-chest-requester' 'logistic-chest-requester'
} }
for i=1, #chests, 1 do for _, c in pairs(chests) do
local item = table.deepcopy(data.raw['item'][chests[i]]) local item = table.deepcopy(data.raw['item'][c])
local entity local entity
if chests[i] == 'steel-chest' then if c == 'steel-chest' then
entity = table.deepcopy(data.raw['container'][chests[i]]) entity = table.deepcopy(data.raw['container'][c])
else else
entity = table.deepcopy(data.raw['logistic-container'][chests[i]]) entity = table.deepcopy(data.raw['logistic-container'][c])
end end
item.name = 'basic-' .. chests[i] item.name = 'basic-' .. c
item.place_result = 'basic-' .. chests[i] item.place_result = 'basic-' .. c
item.order = 'b[storage]-h[basic-' .. chests[i] .. ']' item.order = 'b[storage]-h[basic-' .. c .. ']'
item.localised_name = {'name.basic-'.. chests[i]} item.localised_name = {'name.basic-'.. c}
item.localised_description = {'description.basic-'.. chests[i]} item.localised_description = {'description.basic-'.. c}
data:extend({item}) data:extend({item})
entity.inventory_type = 'with_filters_and_bar' entity.inventory_type = 'with_filters_and_bar'
entity.inventory_size = 1 entity.inventory_size = 1
entity.max_logistic_slots = 1 entity.max_logistic_slots = 1
entity.name = 'basic-' .. chests[i] entity.name = 'basic-' .. c
entity.minable.result = 'basic-' .. chests[i] entity.minable.result = 'basic-' .. c
entity.localised_name = {'name.basic-'.. chests[i]} entity.localised_name = {'name.basic-'.. c}
entity.localised_description = {'description.basic-'.. chests[i]} entity.localised_description = {'description.basic-'.. c}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
type = 'recipe', type = 'recipe',
name = 'basic-' .. chests[i], name = 'basic-' .. c,
energy_required = 2, energy_required = 2,
enabled = false, enabled = false,
ingredients = {{chests[i], 1}}, ingredients = {{c, 1}},
results = {{name = 'basic-' .. chests[i], amount = 1}}, results = {{name = 'basic-' .. c, amount = 1}},
localised_name = {'name.basic-'.. chests[i]}, localised_name = {'name.basic-'.. c},
localised_description = {'description.basic-'.. chests[i]} localised_description = {'description.basic-'.. c}
}}) }})
end end
table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='basic-steel-chest'}) table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='basic-steel-chest'})
table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider'})
table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage'}) for _, t in pairs({'construction', 'logistic'}) do
table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider'}) for _, r in pairs({'passive-provider', 'storage'}) do
table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage'}) table.insert(data.raw.technology[t .. '-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-' .. r})
table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-active-provider'}) end
table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-buffer'}) end
table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-requester'})
for _, r in pairs({'active-provider', 'buffer', 'requester'}) do
table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-' .. r})
end
end end
for _, v in pairs(items['item']) do for _, v in pairs(items['item']) do