From 012e626e50c8ac8b21cb01c2d40b493b5783f76b Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 21:12:51 +0200 Subject: [PATCH 1/9] Fix mod name references --- 248k_2/bk_sprites.lua | 6 +- 248k_2/data.lua | 2 +- 248k_2/prototypes/248k_elements.lua | 2 +- 248k_2/prototypes/248k_fluids.lua | 2 +- 248k_2/prototypes/248k_subgroups.lua | 2 +- 248k_2/prototypes/248k_techs.lua | 4 +- 248k_2/prototypes/el_recipes.lua | 90 +++++++++---------- 248k_2/prototypes/electronic/el_aluminum.lua | 2 +- 248k_2/prototypes/electronic/el_ammo.lua | 2 +- .../prototypes/electronic/el_arc_furnace.lua | 2 +- 248k_2/prototypes/electronic/el_burner.lua | 2 +- 248k_2/prototypes/electronic/el_caster.lua | 2 +- 248k_2/prototypes/electronic/el_charger.lua | 2 +- .../prototypes/electronic/el_diesel_train.lua | 2 +- .../electronic/el_energy_crystal.lua | 2 +- 248k_2/prototypes/electronic/el_grower.lua | 2 +- .../electronic/el_ki/el_ki_beacon.lua | 2 +- .../electronic/el_ki/el_ki_core.lua | 2 +- .../prototypes/electronic/el_ki/el_ki_cpu.lua | 2 +- .../electronic/el_ki/el_ki_linker.lua | 4 +- .../electronic/el_ki/el_ki_memory.lua | 2 +- .../electronic/el_ki/fi_ki_circuit.lua | 2 +- .../electronic/el_ki/fu_ki_circuit.lua | 2 +- 248k_2/prototypes/electronic/el_lithium.lua | 2 +- 248k_2/prototypes/electronic/el_materials.lua | 2 +- .../prototypes/electronic/el_pressurizer.lua | 2 +- 248k_2/prototypes/electronic/el_purifier.lua | 2 +- 248k_2/prototypes/electronic/el_solar.lua | 2 +- 248k_2/prototypes/electronic/el_tank.lua | 2 +- .../electronic/el_train_equipment.lua | 2 +- .../prototypes/electronic/el_train_fuel.lua | 2 +- .../electronic/el_water_generator.lua | 2 +- 248k_2/prototypes/fi_recipes.lua | 18 ++-- 248k_2/prototypes/fission/fi_castor.lua | 2 +- .../fission/fi_compound_machine.lua | 2 +- .../fission/fi_compound_material.lua | 2 +- 248k_2/prototypes/fission/fi_crafter.lua | 2 +- 248k_2/prototypes/fission/fi_crushed.lua | 2 +- 248k_2/prototypes/fission/fi_crusher.lua | 2 +- .../prototypes/fission/fi_energy_crystal.lua | 2 +- 248k_2/prototypes/fission/fi_equipment.lua | 2 +- 248k_2/prototypes/fission/fi_fiberer.lua | 2 +- 248k_2/prototypes/fission/fi_fuel.lua | 2 +- 248k_2/prototypes/fission/fi_materials.lua | 2 +- 248k_2/prototypes/fission/fi_miner.lua | 2 +- 248k_2/prototypes/fission/fi_modules.lua | 2 +- 248k_2/prototypes/fission/fi_refinery.lua | 2 +- 248k_2/prototypes/fission/fi_robo.lua | 10 +-- .../prototypes/fission/fi_solid_reactor.lua | 2 +- 248k_2/prototypes/fu_recipes.lua | 38 ++++---- 248k_2/prototypes/fusion/fu_activator.lua | 2 +- 248k_2/prototypes/fusion/fu_boiler.lua | 2 +- 248k_2/prototypes/fusion/fu_burner.lua | 2 +- 248k_2/prototypes/fusion/fu_exchanger.lua | 2 +- 248k_2/prototypes/fusion/fu_fusor.lua | 2 +- 248k_2/prototypes/fusion/fu_ingot.lua | 2 +- 248k_2/prototypes/fusion/fu_lab.lua | 2 +- 248k_2/prototypes/fusion/fu_laser.lua | 2 +- 248k_2/prototypes/fusion/fu_lead.lua | 2 +- 248k_2/prototypes/fusion/fu_magnet.lua | 2 +- 248k_2/prototypes/fusion/fu_materials.lua | 2 +- 248k_2/prototypes/fusion/fu_miner.lua | 14 +-- 248k_2/prototypes/fusion/fu_plasma.lua | 2 +- 248k_2/prototypes/fusion/fu_reactor.lua | 2 +- 248k_2/prototypes/fusion/fu_robo.lua | 2 +- 248k_2/prototypes/fusion/fu_space_probe.lua | 2 +- .../fu_star_engine/fu_star_engine_caster.lua | 2 +- .../fu_star_engine/fu_star_engine_cooler.lua | 2 +- .../fu_star_engine_cooler_up.lua | 2 +- .../fu_star_engine/fu_star_engine_core.lua | 2 +- .../fu_star_engine/fu_star_engine_heater.lua | 2 +- .../fu_star_engine_heater_left.lua | 2 +- 248k_2/prototypes/fusion/fu_turbine.lua | 2 +- .../prototypes/gravitation/gr_black_hole.lua | 2 +- 248k_2/prototypes/gravitation/gr_charger.lua | 2 +- 248k_2/prototypes/gravitation/gr_cooker.lua | 2 +- 248k_2/prototypes/gravitation/gr_crafter.lua | 2 +- 248k_2/prototypes/gravitation/gr_lab.lua | 2 +- .../prototypes/gravitation/gr_materials.lua | 2 +- 248k_2/prototypes/gravitation/gr_train.lua | 2 +- .../prototypes/gravitation/gr_white_hole.lua | 2 +- 248k_2/prototypes/grenades.lua | 2 +- 248k_2/prototypes/pipe_covers.lua | 2 +- 248k_2/scripts/electronic/el_burner.lua | 2 +- 248k_2/scripts/ind2/data-final-fixes.lua | 2 +- 248k_2/scripts/informatron/inf_sprites.lua | 6 +- .../scripts/krastorio2/data-final-fixes.lua | 4 +- 248k_2/scripts/legacy_icons.lua | 6 +- 248k_2/scripts/menu_simulation.lua | 8 +- 248k_2/scripts/realisticreactors/overhaul.lua | 14 +-- 248k_2/scripts/science_overhaul.lua | 2 +- 248k_2/scripts/umr/data.lua | 2 +- 92 files changed, 190 insertions(+), 190 deletions(-) diff --git a/248k_2/bk_sprites.lua b/248k_2/bk_sprites.lua index 0a13c3e..60be19c 100644 --- a/248k_2/bk_sprites.lua +++ b/248k_2/bk_sprites.lua @@ -1,5 +1,5 @@ local function sprite(name) - return '__248k__/ressources/booktorio/bk_sprite_'..name + return '__248k_2__/ressources/booktorio/bk_sprite_'..name end data:extend( @@ -31,7 +31,7 @@ data:extend( { type = "sprite", name = "bk_sprite_4", - filename = '__248k__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png', + filename = '__248k_2__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png', width = 512*2, height = 512*2, scale = 0.4 @@ -39,7 +39,7 @@ data:extend( { type = "sprite", name = "bk_sprite_5", - filename = '__248k__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png', + filename = '__248k_2__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png', width = 512, height = 512, scale = 0.7 diff --git a/248k_2/data.lua b/248k_2/data.lua index 4beb1e6..de58d7d 100644 --- a/248k_2/data.lua +++ b/248k_2/data.lua @@ -122,7 +122,7 @@ data:extend({ { type = "sprite", name = "sprite_248kmainbutton", - filename = "__248k__/ressources/groups/gr_group_icon.png", + filename = "__248k_2__/ressources/groups/gr_group_icon.png", priority = "extra-high", width = 64, height = 64, diff --git a/248k_2/prototypes/248k_elements.lua b/248k_2/prototypes/248k_elements.lua index f72ec30..c3997d0 100644 --- a/248k_2/prototypes/248k_elements.lua +++ b/248k_2/prototypes/248k_elements.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/elements/'..name + return '__248k_2__/ressources/elements/'..name end data:extend({ diff --git a/248k_2/prototypes/248k_fluids.lua b/248k_2/prototypes/248k_fluids.lua index 16d8259..9301d38 100644 --- a/248k_2/prototypes/248k_fluids.lua +++ b/248k_2/prototypes/248k_fluids.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fluids/'..name + return '__248k_2__/ressources/fluids/'..name end local function burner_power() diff --git a/248k_2/prototypes/248k_subgroups.lua b/248k_2/prototypes/248k_subgroups.lua index 8d7ef23..4dd6c07 100644 --- a/248k_2/prototypes/248k_subgroups.lua +++ b/248k_2/prototypes/248k_subgroups.lua @@ -1,5 +1,5 @@ local function sprite(name) - return '__248k__/ressources/groups/'..name + return '__248k_2__/ressources/groups/'..name end data:extend({ diff --git a/248k_2/prototypes/248k_techs.lua b/248k_2/prototypes/248k_techs.lua index adba950..f55bc27 100644 --- a/248k_2/prototypes/248k_techs.lua +++ b/248k_2/prototypes/248k_techs.lua @@ -1,6 +1,6 @@ --local functions local function sprite(name) - return '__248k__/ressources/techs/'..name + return '__248k_2__/ressources/techs/'..name end --techs data:extend({ @@ -385,7 +385,7 @@ data:extend({ { name = 'el_kerosene_tech', type = 'technology', - icon = '__248k__/ressources/techs/el_kerosene_tech.png', + icon = '__248k_2__/ressources/techs/el_kerosene_tech.png', icon_size = 128, prerequisites = {'el_ALK_tech'}, effects = { diff --git a/248k_2/prototypes/el_recipes.lua b/248k_2/prototypes/el_recipes.lua index fc62ed6..e278586 100644 --- a/248k_2/prototypes/el_recipes.lua +++ b/248k_2/prototypes/el_recipes.lua @@ -1,5 +1,5 @@ local function sprite(name) - return '__248k__/ressources/'..name + return '__248k_2__/ressources/'..name end --settings check @@ -178,10 +178,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_kerosene.png" + icon = "__248k_2__/ressources/fluids/el_kerosene.png" }, { - icon = "__248k__/ressources/icons/overlay_2.png" + icon = "__248k_2__/ressources/icons/overlay_2.png" } } }, @@ -515,10 +515,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" + icon = "__248k_2__/ressources/fluids/el_ki_memory_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_1.png" + icon = "__248k_2__/ressources/icons/overlay_1.png" } } }, @@ -541,10 +541,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" + icon = "__248k_2__/ressources/fluids/el_ki_memory_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_2.png" + icon = "__248k_2__/ressources/icons/overlay_2.png" } } }, @@ -567,10 +567,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" + icon = "__248k_2__/ressources/fluids/el_ki_memory_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_3.png" + icon = "__248k_2__/ressources/icons/overlay_3.png" } } }, @@ -592,10 +592,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" + icon = "__248k_2__/ressources/fluids/el_ki_memory_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_4.png" + icon = "__248k_2__/ressources/icons/overlay_4.png" } } }, @@ -617,10 +617,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" + icon = "__248k_2__/ressources/fluids/fu_ki_circuit_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_1.png" + icon = "__248k_2__/ressources/icons/overlay_1.png" } } }, @@ -642,10 +642,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" + icon = "__248k_2__/ressources/fluids/fu_ki_circuit_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_2.png" + icon = "__248k_2__/ressources/icons/overlay_2.png" } } }, @@ -666,10 +666,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" + icon = "__248k_2__/ressources/fluids/fu_ki_circuit_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_3.png" + icon = "__248k_2__/ressources/icons/overlay_3.png" } } }, @@ -690,10 +690,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" + icon = "__248k_2__/ressources/fluids/fu_ki_circuit_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_4.png" + icon = "__248k_2__/ressources/icons/overlay_4.png" } } }, @@ -715,10 +715,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" + icon = "__248k_2__/ressources/fluids/fi_ki_circuit_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_1.png" + icon = "__248k_2__/ressources/icons/overlay_1.png" } } }, @@ -740,10 +740,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" + icon = "__248k_2__/ressources/fluids/fi_ki_circuit_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_2.png" + icon = "__248k_2__/ressources/icons/overlay_2.png" } } }, @@ -764,10 +764,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" + icon = "__248k_2__/ressources/fluids/fi_ki_circuit_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_3.png" + icon = "__248k_2__/ressources/icons/overlay_3.png" } } }, @@ -787,10 +787,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" + icon = "__248k_2__/ressources/fluids/fi_ki_circuit_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_4.png" + icon = "__248k_2__/ressources/icons/overlay_4.png" } } }, @@ -832,10 +832,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" + icon = "__248k_2__/ressources/fluids/el_ki_cpu_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_1.png" + icon = "__248k_2__/ressources/icons/overlay_1.png" } } }, @@ -858,10 +858,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" + icon = "__248k_2__/ressources/fluids/el_ki_cpu_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_2.png" + icon = "__248k_2__/ressources/icons/overlay_2.png" } } }, @@ -884,10 +884,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" + icon = "__248k_2__/ressources/fluids/el_ki_cpu_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_3.png" + icon = "__248k_2__/ressources/icons/overlay_3.png" } } }, @@ -909,10 +909,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" + icon = "__248k_2__/ressources/fluids/el_ki_cpu_fluid.png" }, { - icon = "__248k__/ressources/icons/overlay_4.png" + icon = "__248k_2__/ressources/icons/overlay_4.png" } } }, @@ -1046,10 +1046,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_dirty_water.png" + icon = "__248k_2__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_stone.png" + icon = "__248k_2__/ressources/icons/overlay_stone.png" } } }, @@ -1073,10 +1073,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_dirty_water.png" + icon = "__248k_2__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_stone.png" + icon = "__248k_2__/ressources/icons/overlay_stone.png" } } @@ -1101,10 +1101,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_dirty_water.png" + icon = "__248k_2__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_iron.png" + icon = "__248k_2__/ressources/icons/overlay_iron.png" } } @@ -1129,10 +1129,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_dirty_water.png" + icon = "__248k_2__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_copper.png" + icon = "__248k_2__/ressources/icons/overlay_copper.png" } } }, @@ -1428,10 +1428,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_kerosene.png" + icon = "__248k_2__/ressources/fluids/el_kerosene.png" }, { - icon = "__248k__/ressources/icons/overlay_1.png" + icon = "__248k_2__/ressources/icons/overlay_1.png" } } }, diff --git a/248k_2/prototypes/electronic/el_aluminum.lua b/248k_2/prototypes/electronic/el_aluminum.lua index f3502d6..6405eb8 100644 --- a/248k_2/prototypes/electronic/el_aluminum.lua +++ b/248k_2/prototypes/electronic/el_aluminum.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_aluminum/el_aluminum_'..name + return '__248k_2__/ressources/electronic/el_aluminum/el_aluminum_'..name end --ore data:extend({ diff --git a/248k_2/prototypes/electronic/el_ammo.lua b/248k_2/prototypes/electronic/el_ammo.lua index 2d9bd0e..4475a7b 100644 --- a/248k_2/prototypes/electronic/el_ammo.lua +++ b/248k_2/prototypes/electronic/el_ammo.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_ammo/el_ammo_'..name + return '__248k_2__/ressources/electronic/el_ammo/el_ammo_'..name end --item diff --git a/248k_2/prototypes/electronic/el_arc_furnace.lua b/248k_2/prototypes/electronic/el_arc_furnace.lua index b9d5751..8dc9d0d 100644 --- a/248k_2/prototypes/electronic/el_arc_furnace.lua +++ b/248k_2/prototypes/electronic/el_arc_furnace.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_arc_furnace/el_arc_furnace_'..name + return '__248k_2__/ressources/electronic/el_arc_furnace/el_arc_furnace_'..name end --item diff --git a/248k_2/prototypes/electronic/el_burner.lua b/248k_2/prototypes/electronic/el_burner.lua index a295280..1beb225 100644 --- a/248k_2/prototypes/electronic/el_burner.lua +++ b/248k_2/prototypes/electronic/el_burner.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_burner/el_burner_'..name + return '__248k_2__/ressources/electronic/el_burner/el_burner_'..name end local function burner_output() diff --git a/248k_2/prototypes/electronic/el_caster.lua b/248k_2/prototypes/electronic/el_caster.lua index 28d809c..d4c3fd1 100644 --- a/248k_2/prototypes/electronic/el_caster.lua +++ b/248k_2/prototypes/electronic/el_caster.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_caster/el_caster_'..name + return '__248k_2__/ressources/electronic/el_caster/el_caster_'..name end --item diff --git a/248k_2/prototypes/electronic/el_charger.lua b/248k_2/prototypes/electronic/el_charger.lua index 9ce31b8..a7852e2 100644 --- a/248k_2/prototypes/electronic/el_charger.lua +++ b/248k_2/prototypes/electronic/el_charger.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_charger/el_charger_'..name + return '__248k_2__/ressources/electronic/el_charger/el_charger_'..name end --item diff --git a/248k_2/prototypes/electronic/el_diesel_train.lua b/248k_2/prototypes/electronic/el_diesel_train.lua index 3f965fb..07da8e6 100644 --- a/248k_2/prototypes/electronic/el_diesel_train.lua +++ b/248k_2/prototypes/electronic/el_diesel_train.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_diesel_train/el_diesel_train_'..name + return '__248k_2__/ressources/electronic/el_diesel_train/el_diesel_train_'..name end --item diff --git a/248k_2/prototypes/electronic/el_energy_crystal.lua b/248k_2/prototypes/electronic/el_energy_crystal.lua index 6ce7e20..6993ed4 100644 --- a/248k_2/prototypes/electronic/el_energy_crystal.lua +++ b/248k_2/prototypes/electronic/el_energy_crystal.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_energy_crystal/el_energy_crystal_'..name + return '__248k_2__/ressources/electronic/el_energy_crystal/el_energy_crystal_'..name end throw_projectile = diff --git a/248k_2/prototypes/electronic/el_grower.lua b/248k_2/prototypes/electronic/el_grower.lua index 18654bd..90b1500 100644 --- a/248k_2/prototypes/electronic/el_grower.lua +++ b/248k_2/prototypes/electronic/el_grower.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_grower/el_grower_'..name + return '__248k_2__/ressources/electronic/el_grower/el_grower_'..name end --item diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua b/248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua index 6789d6a..fdd91f4 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_ki/el_ki_beacon/el_ki_beacon_'..name + return '__248k_2__/ressources/electronic/el_ki/el_ki_beacon/el_ki_beacon_'..name end local function config_blueprintable(name,int) diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_core.lua b/248k_2/prototypes/electronic/el_ki/el_ki_core.lua index 56e9e1b..cb7c09a 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_core.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_core.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_ki/el_ki_core/el_ki_core_'..name + return '__248k_2__/ressources/electronic/el_ki/el_ki_core/el_ki_core_'..name end local function core_input(core_number) diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua b/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua index 4a7d350..5d99436 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_ki/el_ki_cpu/el_ki_cpu_'..name + return '__248k_2__/ressources/electronic/el_ki/el_ki_cpu/el_ki_cpu_'..name end --item diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_linker.lua b/248k_2/prototypes/electronic/el_ki/el_ki_linker.lua index d9e5b3d..0ddf957 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_linker.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_linker.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_ki/el_ki_linker/el_ki_'..name + return '__248k_2__/ressources/electronic/el_ki/el_ki_linker/el_ki_'..name end data:extend({ @@ -56,7 +56,7 @@ data:extend({ { type = "sprite", name = "el_ki_not_operable_icon", - filename = "__248k__/ressources/electronic/el_ki/el_ki_linker/el_ki_not_operable_icon.png", + filename = "__248k_2__/ressources/electronic/el_ki/el_ki_linker/el_ki_not_operable_icon.png", width = 64, height = 64, scale = 1 diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua b/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua index 1942428..5e12763 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_ki/el_ki_memory/el_ki_memory_'..name + return '__248k_2__/ressources/electronic/el_ki/el_ki_memory/el_ki_memory_'..name end --item diff --git a/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua b/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua index 8171c0a..81efbef 100644 --- a/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua +++ b/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_ki/fi_ki_circuit/fi_ki_circuit_'..name + return '__248k_2__/ressources/electronic/el_ki/fi_ki_circuit/fi_ki_circuit_'..name end --item diff --git a/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua b/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua index d10b525..59120eb 100644 --- a/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua +++ b/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_ki/fu_ki_circuit/fu_ki_circuit_'..name + return '__248k_2__/ressources/electronic/el_ki/fu_ki_circuit/fu_ki_circuit_'..name end --item diff --git a/248k_2/prototypes/electronic/el_lithium.lua b/248k_2/prototypes/electronic/el_lithium.lua index 37765c3..64592a6 100644 --- a/248k_2/prototypes/electronic/el_lithium.lua +++ b/248k_2/prototypes/electronic/el_lithium.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_lithium/el_lithium_'..name + return '__248k_2__/ressources/electronic/el_lithium/el_lithium_'..name end --ore data:extend({ diff --git a/248k_2/prototypes/electronic/el_materials.lua b/248k_2/prototypes/electronic/el_materials.lua index 493a2f3..1a72a42 100644 --- a/248k_2/prototypes/electronic/el_materials.lua +++ b/248k_2/prototypes/electronic/el_materials.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_materials/el_materials_'..name + return '__248k_2__/ressources/electronic/el_materials/el_materials_'..name end --item diff --git a/248k_2/prototypes/electronic/el_pressurizer.lua b/248k_2/prototypes/electronic/el_pressurizer.lua index 37e5708..b11bf97 100644 --- a/248k_2/prototypes/electronic/el_pressurizer.lua +++ b/248k_2/prototypes/electronic/el_pressurizer.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_pressurizer/el_pressurizer_'..name + return '__248k_2__/ressources/electronic/el_pressurizer/el_pressurizer_'..name end --item diff --git a/248k_2/prototypes/electronic/el_purifier.lua b/248k_2/prototypes/electronic/el_purifier.lua index c8b848c..472e9a2 100644 --- a/248k_2/prototypes/electronic/el_purifier.lua +++ b/248k_2/prototypes/electronic/el_purifier.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_purifier/el_purifier_'..name + return '__248k_2__/ressources/electronic/el_purifier/el_purifier_'..name end --item diff --git a/248k_2/prototypes/electronic/el_solar.lua b/248k_2/prototypes/electronic/el_solar.lua index 279386c..b71f7da 100644 --- a/248k_2/prototypes/electronic/el_solar.lua +++ b/248k_2/prototypes/electronic/el_solar.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_solar/el_solar_'..name + return '__248k_2__/ressources/electronic/el_solar/el_solar_'..name end local function solar_output() diff --git a/248k_2/prototypes/electronic/el_tank.lua b/248k_2/prototypes/electronic/el_tank.lua index 023df3e..a7e7359 100644 --- a/248k_2/prototypes/electronic/el_tank.lua +++ b/248k_2/prototypes/electronic/el_tank.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_tank/el_tank_'..name + return '__248k_2__/ressources/electronic/el_tank/el_tank_'..name end local tank_color = {r=1.7,g=1.7,b=1.7} diff --git a/248k_2/prototypes/electronic/el_train_equipment.lua b/248k_2/prototypes/electronic/el_train_equipment.lua index 5100bef..c410d62 100644 --- a/248k_2/prototypes/electronic/el_train_equipment.lua +++ b/248k_2/prototypes/electronic/el_train_equipment.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_train_equipment/el_train_equipment_'..name + return '__248k_2__/ressources/electronic/el_train_equipment/el_train_equipment_'..name end --item diff --git a/248k_2/prototypes/electronic/el_train_fuel.lua b/248k_2/prototypes/electronic/el_train_fuel.lua index fe0bef2..7d206a9 100644 --- a/248k_2/prototypes/electronic/el_train_fuel.lua +++ b/248k_2/prototypes/electronic/el_train_fuel.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_train_fuel/el_train_fuel_'..name + return '__248k_2__/ressources/electronic/el_train_fuel/el_train_fuel_'..name end --item diff --git a/248k_2/prototypes/electronic/el_water_generator.lua b/248k_2/prototypes/electronic/el_water_generator.lua index 46b1d53..6df2577 100644 --- a/248k_2/prototypes/electronic/el_water_generator.lua +++ b/248k_2/prototypes/electronic/el_water_generator.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/electronic/el_water_generator/el_water_generator_'..name + return '__248k_2__/ressources/electronic/el_water_generator/el_water_generator_'..name end local function water_output() diff --git a/248k_2/prototypes/fi_recipes.lua b/248k_2/prototypes/fi_recipes.lua index 1fee9bf..0b60ab8 100644 --- a/248k_2/prototypes/fi_recipes.lua +++ b/248k_2/prototypes/fi_recipes.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/'..name + return '__248k_2__/ressources/'..name end data:extend({ @@ -856,10 +856,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fi_dirty_water.png" + icon = "__248k_2__/ressources/fluids/fi_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_stone.png" + icon = "__248k_2__/ressources/icons/overlay_stone.png" } }, subgroup = 'fi_item_subgroup_f', @@ -887,10 +887,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fi_dirty_water.png" + icon = "__248k_2__/ressources/fluids/fi_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_iron.png" + icon = "__248k_2__/ressources/icons/overlay_iron.png" } }, subgroup = 'fi_item_subgroup_f', @@ -918,10 +918,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fi_dirty_water.png" + icon = "__248k_2__/ressources/fluids/fi_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_copper.png" + icon = "__248k_2__/ressources/icons/overlay_copper.png" } }, subgroup = 'fi_item_subgroup_f', @@ -950,10 +950,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/fi_dirty_water.png" + icon = "__248k_2__/ressources/fluids/fi_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_uranium.png" + icon = "__248k_2__/ressources/icons/overlay_uranium.png" } }, subgroup = 'fi_item_subgroup_f', diff --git a/248k_2/prototypes/fission/fi_castor.lua b/248k_2/prototypes/fission/fi_castor.lua index c1ce159..592b69d 100644 --- a/248k_2/prototypes/fission/fi_castor.lua +++ b/248k_2/prototypes/fission/fi_castor.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_castor/fi_castor_'..name + return '__248k_2__/ressources/fission/fi_castor/fi_castor_'..name end --item diff --git a/248k_2/prototypes/fission/fi_compound_machine.lua b/248k_2/prototypes/fission/fi_compound_machine.lua index b1ade83..d6ad533 100644 --- a/248k_2/prototypes/fission/fi_compound_machine.lua +++ b/248k_2/prototypes/fission/fi_compound_machine.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_compound_machine/fi_compound_machine_'..name + return '__248k_2__/ressources/fission/fi_compound_machine/fi_compound_machine_'..name end --item diff --git a/248k_2/prototypes/fission/fi_compound_material.lua b/248k_2/prototypes/fission/fi_compound_material.lua index 8afe2a5..4752f65 100644 --- a/248k_2/prototypes/fission/fi_compound_material.lua +++ b/248k_2/prototypes/fission/fi_compound_material.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_compound_material/fi_compound_material_'..name + return '__248k_2__/ressources/fission/fi_compound_material/fi_compound_material_'..name end --item diff --git a/248k_2/prototypes/fission/fi_crafter.lua b/248k_2/prototypes/fission/fi_crafter.lua index f40720d..56f9d92 100644 --- a/248k_2/prototypes/fission/fi_crafter.lua +++ b/248k_2/prototypes/fission/fi_crafter.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_crafter/fi_crafter_'..name + return '__248k_2__/ressources/fission/fi_crafter/fi_crafter_'..name end --item diff --git a/248k_2/prototypes/fission/fi_crushed.lua b/248k_2/prototypes/fission/fi_crushed.lua index 888644e..b7bc0f1 100644 --- a/248k_2/prototypes/fission/fi_crushed.lua +++ b/248k_2/prototypes/fission/fi_crushed.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_crushed/fi_crushed_'..name + return '__248k_2__/ressources/fission/fi_crushed/fi_crushed_'..name end --item diff --git a/248k_2/prototypes/fission/fi_crusher.lua b/248k_2/prototypes/fission/fi_crusher.lua index 9ebbd38..1ea824a 100644 --- a/248k_2/prototypes/fission/fi_crusher.lua +++ b/248k_2/prototypes/fission/fi_crusher.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_crusher/fi_crusher_'..name + return '__248k_2__/ressources/fission/fi_crusher/fi_crusher_'..name end --item diff --git a/248k_2/prototypes/fission/fi_energy_crystal.lua b/248k_2/prototypes/fission/fi_energy_crystal.lua index caee42e..7ecb6cc 100644 --- a/248k_2/prototypes/fission/fi_energy_crystal.lua +++ b/248k_2/prototypes/fission/fi_energy_crystal.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_energy_crystal/fi_energy_crystal_'..name + return '__248k_2__/ressources/fission/fi_energy_crystal/fi_energy_crystal_'..name end --item diff --git a/248k_2/prototypes/fission/fi_equipment.lua b/248k_2/prototypes/fission/fi_equipment.lua index 260afec..5630b24 100644 --- a/248k_2/prototypes/fission/fi_equipment.lua +++ b/248k_2/prototypes/fission/fi_equipment.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_equipment/fi_equipment_'..name + return '__248k_2__/ressources/fission/fi_equipment/fi_equipment_'..name end --item diff --git a/248k_2/prototypes/fission/fi_fiberer.lua b/248k_2/prototypes/fission/fi_fiberer.lua index 2f4c9e1..ced2b55 100644 --- a/248k_2/prototypes/fission/fi_fiberer.lua +++ b/248k_2/prototypes/fission/fi_fiberer.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_fiberer/fi_fiberer_'..name + return '__248k_2__/ressources/fission/fi_fiberer/fi_fiberer_'..name end --item diff --git a/248k_2/prototypes/fission/fi_fuel.lua b/248k_2/prototypes/fission/fi_fuel.lua index 26dfb0e..110aa2e 100644 --- a/248k_2/prototypes/fission/fi_fuel.lua +++ b/248k_2/prototypes/fission/fi_fuel.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_fuel/fi_fuel_'..name + return '__248k_2__/ressources/fission/fi_fuel/fi_fuel_'..name end --item diff --git a/248k_2/prototypes/fission/fi_materials.lua b/248k_2/prototypes/fission/fi_materials.lua index bc8538c..d4b6a13 100644 --- a/248k_2/prototypes/fission/fi_materials.lua +++ b/248k_2/prototypes/fission/fi_materials.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_materials/fi_materials_'..name + return '__248k_2__/ressources/fission/fi_materials/fi_materials_'..name end --item diff --git a/248k_2/prototypes/fission/fi_miner.lua b/248k_2/prototypes/fission/fi_miner.lua index 21dd6d5..57af415 100644 --- a/248k_2/prototypes/fission/fi_miner.lua +++ b/248k_2/prototypes/fission/fi_miner.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_miner/fi_miner_'..name + return '__248k_2__/ressources/fission/fi_miner/fi_miner_'..name end --item diff --git a/248k_2/prototypes/fission/fi_modules.lua b/248k_2/prototypes/fission/fi_modules.lua index e250620..5aa8187 100644 --- a/248k_2/prototypes/fission/fi_modules.lua +++ b/248k_2/prototypes/fission/fi_modules.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_modules/fi_modules_'..name + return '__248k_2__/ressources/fission/fi_modules/fi_modules_'..name end local limitation_list = { diff --git a/248k_2/prototypes/fission/fi_refinery.lua b/248k_2/prototypes/fission/fi_refinery.lua index f456e3f..4279076 100644 --- a/248k_2/prototypes/fission/fi_refinery.lua +++ b/248k_2/prototypes/fission/fi_refinery.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_refinery/fi_refinery_'..name + return '__248k_2__/ressources/fission/fi_refinery/fi_refinery_'..name end --item diff --git a/248k_2/prototypes/fission/fi_robo.lua b/248k_2/prototypes/fission/fi_robo.lua index 0985c02..fb7c6cc 100644 --- a/248k_2/prototypes/fission/fi_robo.lua +++ b/248k_2/prototypes/fission/fi_robo.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_robo/fi_robo_'..name + return '__248k_2__/ressources/fission/fi_robo/fi_robo_'..name end --item @@ -138,7 +138,7 @@ data:extend({ }, circuit_connector_sprites = { led_red = { - filename = "__248k__/ressources/64x64_empty.png", + filename = "__248k_2__/ressources/64x64_empty.png", width = 64, height = 64, shift = {0, 0}, @@ -146,7 +146,7 @@ data:extend({ size = 1 }, led_green = { - filename = "__248k__/ressources/64x64_empty.png", + filename = "__248k_2__/ressources/64x64_empty.png", width = 64, height = 64, shift = {0, 0}, @@ -154,7 +154,7 @@ data:extend({ size = 1 }, led_blue = { - filename = "__248k__/ressources/64x64_empty.png", + filename = "__248k_2__/ressources/64x64_empty.png", width = 64, height = 64, shift = {0, 0}, @@ -162,7 +162,7 @@ data:extend({ size = 1 }, led_light = { - filename = "__248k__/ressources/64x64_empty.png", + filename = "__248k_2__/ressources/64x64_empty.png", width = 64, height = 64, shift = {0, 0}, diff --git a/248k_2/prototypes/fission/fi_solid_reactor.lua b/248k_2/prototypes/fission/fi_solid_reactor.lua index 0f435d9..b8c2c17 100644 --- a/248k_2/prototypes/fission/fi_solid_reactor.lua +++ b/248k_2/prototypes/fission/fi_solid_reactor.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_'..name + return '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_'..name end --item diff --git a/248k_2/prototypes/fu_recipes.lua b/248k_2/prototypes/fu_recipes.lua index 2b0331b..247f0d5 100644 --- a/248k_2/prototypes/fu_recipes.lua +++ b/248k_2/prototypes/fu_recipes.lua @@ -177,10 +177,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/elements/fu_hydrogen.png" + icon = "__248k_2__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k__/ressources/icons/overlay_1.png" + icon = "__248k_2__/ressources/icons/overlay_1.png" } }, subgroup = 'fu_item_subgroup_e', @@ -205,10 +205,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/elements/fu_hydrogen.png" + icon = "__248k_2__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k__/ressources/icons/overlay_2.png" + icon = "__248k_2__/ressources/icons/overlay_2.png" } }, subgroup = 'fu_item_subgroup_e', @@ -233,10 +233,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/elements/fu_hydrogen.png" + icon = "__248k_2__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k__/ressources/icons/overlay_3.png" + icon = "__248k_2__/ressources/icons/overlay_3.png" } }, subgroup = 'fu_item_subgroup_e', @@ -260,10 +260,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/elements/fu_hydrogen.png" + icon = "__248k_2__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k__/ressources/icons/overlay_4.png" + icon = "__248k_2__/ressources/icons/overlay_4.png" } }, subgroup = 'fu_item_subgroup_e', @@ -1597,7 +1597,7 @@ data:extend({ name = 'fu_burn_oxygen_recipe', type = 'recipe', category = 'fu_burner_category', - icon = '__248k__/ressources/elements/fu_oxygen.png', + icon = '__248k_2__/ressources/elements/fu_oxygen.png', icon_size = 64, enabled = true, hidden = true, @@ -1779,10 +1779,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/elements/fu_hydrogen.png" + icon = "__248k_2__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k__/ressources/icons/overlay_1.png" + icon = "__248k_2__/ressources/icons/overlay_1.png" } }, subgroup = 'fu_item_subgroup_e', @@ -1809,10 +1809,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/elements/fu_hydrogen.png" + icon = "__248k_2__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k__/ressources/icons/overlay_2.png" + icon = "__248k_2__/ressources/icons/overlay_2.png" } }, subgroup = 'fu_item_subgroup_e', @@ -1839,10 +1839,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/elements/fu_hydrogen.png" + icon = "__248k_2__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k__/ressources/icons/overlay_3.png" + icon = "__248k_2__/ressources/icons/overlay_3.png" } }, subgroup = 'fu_item_subgroup_e', @@ -1866,10 +1866,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/elements/fu_hydrogen.png" + icon = "__248k_2__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k__/ressources/icons/overlay_4.png" + icon = "__248k_2__/ressources/icons/overlay_4.png" } }, subgroup = 'fu_item_subgroup_e', @@ -2100,10 +2100,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k__/ressources/fluids/el_dirty_water.png" + icon = "__248k_2__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k__/ressources/icons/overlay_slag.png" + icon = "__248k_2__/ressources/icons/overlay_slag.png" } }, }, diff --git a/248k_2/prototypes/fusion/fu_activator.lua b/248k_2/prototypes/fusion/fu_activator.lua index 0888e1c..51e3b00 100644 --- a/248k_2/prototypes/fusion/fu_activator.lua +++ b/248k_2/prototypes/fusion/fu_activator.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_activator/fu_activator_'..name + return '__248k_2__/ressources/fusion/fu_activator/fu_activator_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_boiler.lua b/248k_2/prototypes/fusion/fu_boiler.lua index 2fe74f4..c637631 100644 --- a/248k_2/prototypes/fusion/fu_boiler.lua +++ b/248k_2/prototypes/fusion/fu_boiler.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_boiler/fu_boiler_'..name + return '__248k_2__/ressources/fusion/fu_boiler/fu_boiler_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_burner.lua b/248k_2/prototypes/fusion/fu_burner.lua index 827c92e..3c28a72 100644 --- a/248k_2/prototypes/fusion/fu_burner.lua +++ b/248k_2/prototypes/fusion/fu_burner.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_burner/fu_burner_'..name + return '__248k_2__/ressources/fusion/fu_burner/fu_burner_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_exchanger.lua b/248k_2/prototypes/fusion/fu_exchanger.lua index be49bb3..114dda6 100644 --- a/248k_2/prototypes/fusion/fu_exchanger.lua +++ b/248k_2/prototypes/fusion/fu_exchanger.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_exchanger/fu_exchanger_'..name + return '__248k_2__/ressources/fusion/fu_exchanger/fu_exchanger_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_fusor.lua b/248k_2/prototypes/fusion/fu_fusor.lua index a71f82d..7809fc8 100644 --- a/248k_2/prototypes/fusion/fu_fusor.lua +++ b/248k_2/prototypes/fusion/fu_fusor.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_fusor/fu_fusor_'..name + return '__248k_2__/ressources/fusion/fu_fusor/fu_fusor_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_ingot.lua b/248k_2/prototypes/fusion/fu_ingot.lua index 287f1f5..d8fc26f 100644 --- a/248k_2/prototypes/fusion/fu_ingot.lua +++ b/248k_2/prototypes/fusion/fu_ingot.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_ingot/fu_ingot_'..name + return '__248k_2__/ressources/fusion/fu_ingot/fu_ingot_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_lab.lua b/248k_2/prototypes/fusion/fu_lab.lua index 9782bc0..214e32a 100644 --- a/248k_2/prototypes/fusion/fu_lab.lua +++ b/248k_2/prototypes/fusion/fu_lab.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_lab/fu_lab_'..name..".png" + return '__248k_2__/ressources/fusion/fu_lab/fu_lab_'..name..".png" end --item diff --git a/248k_2/prototypes/fusion/fu_laser.lua b/248k_2/prototypes/fusion/fu_laser.lua index 99b12ce..4adcf87 100644 --- a/248k_2/prototypes/fusion/fu_laser.lua +++ b/248k_2/prototypes/fusion/fu_laser.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_laser/fu_laser_'..name + return '__248k_2__/ressources/fusion/fu_laser/fu_laser_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_lead.lua b/248k_2/prototypes/fusion/fu_lead.lua index 36e8b58..91fb527 100644 --- a/248k_2/prototypes/fusion/fu_lead.lua +++ b/248k_2/prototypes/fusion/fu_lead.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_lead/fu_lead_'..name + return '__248k_2__/ressources/fusion/fu_lead/fu_lead_'..name end --ore data:extend({ diff --git a/248k_2/prototypes/fusion/fu_magnet.lua b/248k_2/prototypes/fusion/fu_magnet.lua index b7187a1..5931568 100644 --- a/248k_2/prototypes/fusion/fu_magnet.lua +++ b/248k_2/prototypes/fusion/fu_magnet.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_magnet/fu_magnet_'..name + return '__248k_2__/ressources/fusion/fu_magnet/fu_magnet_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_materials.lua b/248k_2/prototypes/fusion/fu_materials.lua index 71ef2f0..773ff7a 100644 --- a/248k_2/prototypes/fusion/fu_materials.lua +++ b/248k_2/prototypes/fusion/fu_materials.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_materials/fu_materials_'..name + return '__248k_2__/ressources/fusion/fu_materials/fu_materials_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_miner.lua b/248k_2/prototypes/fusion/fu_miner.lua index 51521e1..d2430cc 100644 --- a/248k_2/prototypes/fusion/fu_miner.lua +++ b/248k_2/prototypes/fusion/fu_miner.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_miner/fu_miner_'..name + return '__248k_2__/ressources/fusion/fu_miner/fu_miner_'..name end --item @@ -117,7 +117,7 @@ miner2.icons = { icon = miner2.icon }, { - icon = "__248k__/ressources/icons/fi_upgrade.png" + icon = "__248k_2__/ressources/icons/fi_upgrade.png" } } miner2.icon = nil @@ -132,7 +132,7 @@ miner3.icons = { icon = miner3.icon }, { - icon = "__248k__/ressources/icons/fu_upgrade.png" + icon = "__248k_2__/ressources/icons/fu_upgrade.png" } } miner3.icon = nil @@ -148,7 +148,7 @@ miner4.icons = { icon = miner4.icon }, { - icon = "__248k__/ressources/icons/gr_upgrade.png" + icon = "__248k_2__/ressources/icons/gr_upgrade.png" } } miner4.icon = nil @@ -164,7 +164,7 @@ miner2_item.icons = { icon = miner2_item.icon }, { - icon = "__248k__/ressources/icons/fi_upgrade.png" + icon = "__248k_2__/ressources/icons/fi_upgrade.png" } } miner2_item.icon = nil @@ -177,7 +177,7 @@ miner3_item.icons = { icon = miner3_item.icon }, { - icon = "__248k__/ressources/icons/fu_upgrade.png" + icon = "__248k_2__/ressources/icons/fu_upgrade.png" } } miner3_item.icon = nil @@ -192,7 +192,7 @@ miner4_item.icons = { icon = miner4_item.icon }, { - icon = "__248k__/ressources/icons/gr_upgrade.png" + icon = "__248k_2__/ressources/icons/gr_upgrade.png" } } miner4_item.icon = nil diff --git a/248k_2/prototypes/fusion/fu_plasma.lua b/248k_2/prototypes/fusion/fu_plasma.lua index 7474dd9..c44f60c 100644 --- a/248k_2/prototypes/fusion/fu_plasma.lua +++ b/248k_2/prototypes/fusion/fu_plasma.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_plasma/fu_plasma_'..name + return '__248k_2__/ressources/fusion/fu_plasma/fu_plasma_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_reactor.lua b/248k_2/prototypes/fusion/fu_reactor.lua index 1974a72..f00a6f4 100644 --- a/248k_2/prototypes/fusion/fu_reactor.lua +++ b/248k_2/prototypes/fusion/fu_reactor.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_reactor/fu_reactor_'..name + return '__248k_2__/ressources/fusion/fu_reactor/fu_reactor_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_robo.lua b/248k_2/prototypes/fusion/fu_robo.lua index 5f90f37..9858317 100644 --- a/248k_2/prototypes/fusion/fu_robo.lua +++ b/248k_2/prototypes/fusion/fu_robo.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_robo/fu_robo_'..name + return '__248k_2__/ressources/fusion/fu_robo/fu_robo_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_space_probe.lua b/248k_2/prototypes/fusion/fu_space_probe.lua index b1fc87e..7182b80 100644 --- a/248k_2/prototypes/fusion/fu_space_probe.lua +++ b/248k_2/prototypes/fusion/fu_space_probe.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_space_probe/fu_space_probe_'..name + return '__248k_2__/ressources/fusion/fu_space_probe/fu_space_probe_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua index 9333753..9c7bada 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_caster/fu_star_engine_caster_'..name + return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_caster/fu_star_engine_caster_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua index ef1e6d0..4bad7bc 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_'..name + return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua index 223a08e..70740f1 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_'..name + return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua index 521bf4a..5457bb2 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_'..name + return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua index fd2c04d..71ce05d 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_'..name + return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua index bd0a5e2..f88c104 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_'..name + return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_'..name end --item diff --git a/248k_2/prototypes/fusion/fu_turbine.lua b/248k_2/prototypes/fusion/fu_turbine.lua index 7b4afe3..22b9664 100644 --- a/248k_2/prototypes/fusion/fu_turbine.lua +++ b/248k_2/prototypes/fusion/fu_turbine.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/fusion/fu_turbine/fu_turbine_'..name + return '__248k_2__/ressources/fusion/fu_turbine/fu_turbine_'..name end --item diff --git a/248k_2/prototypes/gravitation/gr_black_hole.lua b/248k_2/prototypes/gravitation/gr_black_hole.lua index 41060cd..98352a0 100644 --- a/248k_2/prototypes/gravitation/gr_black_hole.lua +++ b/248k_2/prototypes/gravitation/gr_black_hole.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/gravitation/gr_black_hole/gr_black_hole_'..name + return '__248k_2__/ressources/gravitation/gr_black_hole/gr_black_hole_'..name end --item diff --git a/248k_2/prototypes/gravitation/gr_charger.lua b/248k_2/prototypes/gravitation/gr_charger.lua index 02267f3..14536ab 100644 --- a/248k_2/prototypes/gravitation/gr_charger.lua +++ b/248k_2/prototypes/gravitation/gr_charger.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/gravitation/gr_charger/gr_charger_'..name + return '__248k_2__/ressources/gravitation/gr_charger/gr_charger_'..name end --item diff --git a/248k_2/prototypes/gravitation/gr_cooker.lua b/248k_2/prototypes/gravitation/gr_cooker.lua index 1e7d3b0..7a3814e 100644 --- a/248k_2/prototypes/gravitation/gr_cooker.lua +++ b/248k_2/prototypes/gravitation/gr_cooker.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/gravitation/gr_cooker/gr_cooker_'..name + return '__248k_2__/ressources/gravitation/gr_cooker/gr_cooker_'..name end --item diff --git a/248k_2/prototypes/gravitation/gr_crafter.lua b/248k_2/prototypes/gravitation/gr_crafter.lua index 948b483..95b18f2 100644 --- a/248k_2/prototypes/gravitation/gr_crafter.lua +++ b/248k_2/prototypes/gravitation/gr_crafter.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/gravitation/gr_crafter/gr_crafter_'..name + return '__248k_2__/ressources/gravitation/gr_crafter/gr_crafter_'..name end --item diff --git a/248k_2/prototypes/gravitation/gr_lab.lua b/248k_2/prototypes/gravitation/gr_lab.lua index 49a131f..7672d50 100644 --- a/248k_2/prototypes/gravitation/gr_lab.lua +++ b/248k_2/prototypes/gravitation/gr_lab.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/gravitation/gr_lab/gr_lab_'..name + return '__248k_2__/ressources/gravitation/gr_lab/gr_lab_'..name end --item diff --git a/248k_2/prototypes/gravitation/gr_materials.lua b/248k_2/prototypes/gravitation/gr_materials.lua index 3dd143b..2debb39 100644 --- a/248k_2/prototypes/gravitation/gr_materials.lua +++ b/248k_2/prototypes/gravitation/gr_materials.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/gravitation/gr_materials/gr_materials_'..name + return '__248k_2__/ressources/gravitation/gr_materials/gr_materials_'..name end --item diff --git a/248k_2/prototypes/gravitation/gr_train.lua b/248k_2/prototypes/gravitation/gr_train.lua index b56debd..b13335b 100644 --- a/248k_2/prototypes/gravitation/gr_train.lua +++ b/248k_2/prototypes/gravitation/gr_train.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/gravitation/gr_magnet_train/gr_magnet_train_'..name + return '__248k_2__/ressources/gravitation/gr_magnet_train/gr_magnet_train_'..name end --item diff --git a/248k_2/prototypes/gravitation/gr_white_hole.lua b/248k_2/prototypes/gravitation/gr_white_hole.lua index df30d24..539f8d3 100644 --- a/248k_2/prototypes/gravitation/gr_white_hole.lua +++ b/248k_2/prototypes/gravitation/gr_white_hole.lua @@ -4,7 +4,7 @@ local function config(name) end local function sprite(name) - return '__248k__/ressources/gravitation/gr_white_hole/gr_white_hole_'..name + return '__248k_2__/ressources/gravitation/gr_white_hole/gr_white_hole_'..name end --item diff --git a/248k_2/prototypes/grenades.lua b/248k_2/prototypes/grenades.lua index 5d1c87d..f8a2330 100644 --- a/248k_2/prototypes/grenades.lua +++ b/248k_2/prototypes/grenades.lua @@ -1,5 +1,5 @@ local function sprite(name) - return '__248k__/ressources/grenade/'..name + return '__248k_2__/ressources/grenade/'..name end local el_explosion = table.deepcopy(data.raw['explosion']['grenade-explosion']) diff --git a/248k_2/prototypes/pipe_covers.lua b/248k_2/prototypes/pipe_covers.lua index 28b12dc..2fdc308 100644 --- a/248k_2/prototypes/pipe_covers.lua +++ b/248k_2/prototypes/pipe_covers.lua @@ -1,5 +1,5 @@ local function sprite(name) - return "__248k__/ressources/pipe_covers/"..name..".png" + return "__248k_2__/ressources/pipe_covers/"..name..".png" end empty_sprite = { diff --git a/248k_2/scripts/electronic/el_burner.lua b/248k_2/scripts/electronic/el_burner.lua index 868341e..0d828e9 100644 --- a/248k_2/scripts/electronic/el_burner.lua +++ b/248k_2/scripts/electronic/el_burner.lua @@ -4,7 +4,7 @@ function make_burner_recipe(item) name = 'fu_burn_oxygen_recipe', type = 'recipe', category = 'fu_burner_category', - icon = '__248k__/ressources/elements/fu_oxygen.png', + icon = '__248k_2__/ressources/elements/fu_oxygen.png', icon_size = 64, enabled = true, hidden = true, diff --git a/248k_2/scripts/ind2/data-final-fixes.lua b/248k_2/scripts/ind2/data-final-fixes.lua index f3b65b9..a3a860a 100644 --- a/248k_2/scripts/ind2/data-final-fixes.lua +++ b/248k_2/scripts/ind2/data-final-fixes.lua @@ -1,5 +1,5 @@ local function sprite(name) - return '__248k__/ressources/techs/'..name + return '__248k_2__/ressources/techs/'..name end data.raw["assembling-machine"]["oil-refinery"].fixed_recipe = nil diff --git a/248k_2/scripts/informatron/inf_sprites.lua b/248k_2/scripts/informatron/inf_sprites.lua index 1ed2fa1..0557bc6 100644 --- a/248k_2/scripts/informatron/inf_sprites.lua +++ b/248k_2/scripts/informatron/inf_sprites.lua @@ -1,12 +1,12 @@ local function sprite(name) - return '__248k__/ressources/booktorio/bk_sprite_'..name + return '__248k_2__/ressources/booktorio/bk_sprite_'..name end -- style_name, filename, width, height -- style_name MUST be a completely unique name informatron_make_image("inf_248k_image_1", sprite('1.png'), 1245, 1122) informatron_make_image("inf_248k_image_2", sprite('2.png'), 1044, 826) informatron_make_image("inf_248k_image_3", sprite('3.png'), 988, 696) -informatron_make_image("inf_248k_image_4", '__248k__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png', 512*2, 512*2) -informatron_make_image("inf_248k_image_5", '__248k__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png', 512, 512) +informatron_make_image("inf_248k_image_4", '__248k_2__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png', 512*2, 512*2) +informatron_make_image("inf_248k_image_5", '__248k_2__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png', 512, 512) informatron_make_image("inf_248k_image_6", sprite('6.png'), 1080, 1080) informatron_make_image("inf_248k_image_7", sprite('7.png'), 1292, 627) diff --git a/248k_2/scripts/krastorio2/data-final-fixes.lua b/248k_2/scripts/krastorio2/data-final-fixes.lua index 905de9d..6a8890a 100644 --- a/248k_2/scripts/krastorio2/data-final-fixes.lua +++ b/248k_2/scripts/krastorio2/data-final-fixes.lua @@ -308,7 +308,7 @@ data:extend({ type = 'recipe', enabled = 'false', category = 'el_special_fluid', - icon = '__248k__/ressources/fluids/el_pressurized_water.png', + icon = '__248k_2__/ressources/fluids/el_pressurized_water.png', icon_size = 64, main_product = 'el_pressurized_water', ingredients = { @@ -408,4 +408,4 @@ table.insert(data.raw.lab['biusart-lab'].inputs, 'fu_space_probe_science_item') table.insert(data.raw.lab['biusart-lab'].inputs, 'fi_ki_science') table.insert(data.raw.lab['biusart-lab'].inputs, 'fu_ki_science') -data.raw.tool["fu_space_probe_science_item"].icon = "__248k__/ressources/fusion/fu_space_probe/fu_space_probe_science_item_krastorio.png" +data.raw.tool["fu_space_probe_science_item"].icon = "__248k_2__/ressources/fusion/fu_space_probe/fu_space_probe_science_item_krastorio.png" diff --git a/248k_2/scripts/legacy_icons.lua b/248k_2/scripts/legacy_icons.lua index 08c1a72..9adc1b7 100644 --- a/248k_2/scripts/legacy_icons.lua +++ b/248k_2/scripts/legacy_icons.lua @@ -1,5 +1,5 @@ if settings.startup['legacy_icons'].value then - data.raw.item["fi_materials_gold"].icon = "__248k__/ressources/legacy_icons/fi_materials_gold.png" - data.raw.item["fi_materials_titan"].icon = "__248k__/ressources/legacy_icons/fi_materials_titan.png" - data.raw.item["fi_materials_neodym"].icon = "__248k__/ressources/legacy_icons/fi_materials_neodym.png" + data.raw.item["fi_materials_gold"].icon = "__248k_2__/ressources/legacy_icons/fi_materials_gold.png" + data.raw.item["fi_materials_titan"].icon = "__248k_2__/ressources/legacy_icons/fi_materials_titan.png" + data.raw.item["fi_materials_neodym"].icon = "__248k_2__/ressources/legacy_icons/fi_materials_neodym.png" end \ No newline at end of file diff --git a/248k_2/scripts/menu_simulation.lua b/248k_2/scripts/menu_simulation.lua index 144a500..791838d 100644 --- a/248k_2/scripts/menu_simulation.lua +++ b/248k_2/scripts/menu_simulation.lua @@ -26,7 +26,7 @@ main_menu_simulations.spider_ponds = nil data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_1 = { checkboard = false, - save = "__248k__/ressources/menu_simulation/248k_menu_1.zip", + save = "__248k_2__/ressources/menu_simulation/248k_menu_1.zip", length = 60*25, init = [[ local logo = game.surfaces.nauvis.find_entities_filtered{name = "factorio-logo-22tiles", limit = 1}[1] @@ -40,7 +40,7 @@ data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_1 = data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_2 = { checkboard = false, - save = "__248k__/ressources/menu_simulation/248k_menu_2.zip", + save = "__248k_2__/ressources/menu_simulation/248k_menu_2.zip", length = 60*25, init = [[ local logo = game.surfaces.nauvis.find_entities_filtered{name = "factorio-logo-11tiles", limit = 1}[1] @@ -53,7 +53,7 @@ data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_2 = data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_3 = { checkboard = false, - save = "__248k__/ressources/menu_simulation/248k_menu_3.zip", + save = "__248k_2__/ressources/menu_simulation/248k_menu_3.zip", length = 60*25, init = [[ local logo = game.surfaces.nauvis.find_entities_filtered{name = "factorio-logo-16tiles", limit = 1}[1] @@ -67,7 +67,7 @@ data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_3 = data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_6 = { checkboard = false, - save = "__248k__/ressources/menu_simulation/248k_menu_6.zip", + save = "__248k_2__/ressources/menu_simulation/248k_menu_6.zip", length = 60*25, init = [[ local logo = game.surfaces.nauvis.find_entities_filtered{name = "crash-site-spaceship", limit = 1}[1] diff --git a/248k_2/scripts/realisticreactors/overhaul.lua b/248k_2/scripts/realisticreactors/overhaul.lua index d359781..da77de7 100644 --- a/248k_2/scripts/realisticreactors/overhaul.lua +++ b/248k_2/scripts/realisticreactors/overhaul.lua @@ -245,7 +245,7 @@ data:extend({ { name = 'fi_test_fuel', type = 'item', - icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_test_item.png', + icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_test_item.png', icon_size = 64, stack_size = 20, subgroup = 'fi_item_subgroup_b', @@ -258,7 +258,7 @@ data:extend({ { name = 'fi_test_used_fuel', type = 'item', - icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_test_used_item.png', + icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_test_used_item.png', icon_size = 64, stack_size = 100, subgroup = 'fi_item_subgroup_b', @@ -267,7 +267,7 @@ data:extend({ { name = 'fi_tech_fuel', type = 'item', - icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_tech_item.png', + icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_tech_item.png', icon_size = 64, stack_size = 100, subgroup = 'fi_item_subgroup_b', @@ -319,7 +319,7 @@ data:extend({ { name = 'fi_solid_reactor_tech', type = 'technology', - icon = '__248k__/ressources/techs/fi_solid_reactor_tech.png', + icon = '__248k_2__/ressources/techs/fi_solid_reactor_tech.png', icon_size = 128, prerequisites = {'fi_energy_tech','fi_refining_tech'}, effects = { @@ -349,7 +349,7 @@ data:extend({ { name = 'fi_solid_reactor_entity', type = 'assembling-machine', - icon = '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_icon.png', + icon = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_icon.png', icon_size = 64, flags = {"player-creation","placeable-neutral"}, max_health = 300, @@ -369,7 +369,7 @@ data:extend({ }, energy_usage = "1W", animation = { - filename = '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation.png', + filename = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation.png', width = 960, height = 960, shift = {0, 0}, @@ -378,7 +378,7 @@ data:extend({ working_visualisations = { { animation = { - filename = '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation_2.png', + filename = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation_2.png', width = 960, height = 960, shift = {0, 0}, diff --git a/248k_2/scripts/science_overhaul.lua b/248k_2/scripts/science_overhaul.lua index afc7ce1..7a8eaf8 100644 --- a/248k_2/scripts/science_overhaul.lua +++ b/248k_2/scripts/science_overhaul.lua @@ -3,7 +3,7 @@ --=================================================================================================================== local function sprite(name) - return '__248k__/ressources/science/'..name..'.png' + return '__248k_2__/ressources/science/'..name..'.png' end local function retexture_science(table_in) diff --git a/248k_2/scripts/umr/data.lua b/248k_2/scripts/umr/data.lua index df3486d..80578c2 100644 --- a/248k_2/scripts/umr/data.lua +++ b/248k_2/scripts/umr/data.lua @@ -2,7 +2,7 @@ data:extend({ { name = 'fu_fusor_tech', type = 'technology', - icon = '__248k__/ressources/techs/fu_fusor_tech.png', + icon = '__248k_2__/ressources/techs/fu_fusor_tech.png', icon_size = 128, prerequisites = { 'fu_magnet_tech','fu_basic_elements_tech' From 4f0867edbeb57fc674fa7534324405c8d5d3109e Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 21:14:26 +0200 Subject: [PATCH 2/9] Fix hidden flag --- 248k_2/prototypes/electronic/el_ki/el_ki_linker.lua | 3 ++- 248k_2/scripts/clean_up.lua | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_linker.lua b/248k_2/prototypes/electronic/el_ki/el_ki_linker.lua index 0ddf957..fef56a8 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_linker.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_linker.lua @@ -43,7 +43,8 @@ data:extend({ stack_size = 1, icon_size = 64, icon = sprite('selection_tool.png'), - flags = {"hidden","mod-openable","only-in-cursor"}, + flags = {"mod-openable","only-in-cursor"}, + hidden = true, selection_color = {r=0.79, g=0.4, b=0, a=0.5 }, selection_mode = {"any-entity"}, selection_cursor_box_type = "entity", diff --git a/248k_2/scripts/clean_up.lua b/248k_2/scripts/clean_up.lua index f7d5f03..f6c5b57 100644 --- a/248k_2/scripts/clean_up.lua +++ b/248k_2/scripts/clean_up.lua @@ -17,11 +17,11 @@ local clean_up_list = { local function clean_up(clean_up_list) for i,v in ipairs(clean_up_list) do if data.raw.item[v] then - data.raw.item[v].flags = { "hidden" } + data.raw.item[v].hidden = true end if data.raw["item-with-tags"][v] then - data.raw["item-with-tags"][v].flags = { "hidden" } + data.raw["item-with-tags"][v].hidden = true end end end From d649ec5cc563474dced99a63b6a1fe64b884dd1a Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 21:16:06 +0200 Subject: [PATCH 3/9] Convert enabled property from string to boolean --- 248k_2/prototypes/el_recipes.lua | 152 ++++++------ 248k_2/prototypes/fi_recipes.lua | 206 ++++++++-------- 248k_2/prototypes/fu_recipes.lua | 220 +++++++++--------- 248k_2/prototypes/gr_recipes.lua | 100 ++++---- .../gr_make_white_hole_recipes.lua | 6 +- 248k_2/scripts/ind2/data-final-fixes.lua | 12 +- .../scripts/krastorio2/data-final-fixes.lua | 24 +- 248k_2/scripts/krastorio2/overhaul.lua | 8 +- 248k_2/scripts/realisticreactors/overhaul.lua | 6 +- 248k_2/scripts/umr/data.lua | 4 +- 10 files changed, 369 insertions(+), 369 deletions(-) diff --git a/248k_2/prototypes/el_recipes.lua b/248k_2/prototypes/el_recipes.lua index e278586..22074be 100644 --- a/248k_2/prototypes/el_recipes.lua +++ b/248k_2/prototypes/el_recipes.lua @@ -11,7 +11,7 @@ data:extend({ { name = 'el_solar_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'el_aluminum_item',30}, {'concrete',20}, @@ -29,7 +29,7 @@ data:extend({ { name = 'el_lithium_basic_battery_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', subgroup = 'el_item_subgroup_b', ingredients = { @@ -46,7 +46,7 @@ data:extend({ { name = 'el_lithium_battery_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'el_lithium_item',4}, @@ -61,7 +61,7 @@ data:extend({ { name = 'el_burner_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'iron-gear-wheel',40}, @@ -76,7 +76,7 @@ data:extend({ { name = 'el_burner_kerosene_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'el_burner_item',1}, @@ -91,7 +91,7 @@ data:extend({ { name = 'el_water_generator_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'iron-gear-wheel',60}, @@ -109,7 +109,7 @@ data:extend({ { name = 'el_pressurizer_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'iron-gear-wheel',20}, @@ -125,7 +125,7 @@ data:extend({ { name = 'el_water_pressure_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_special_fluid', icon = sprite('fluids/el_pressurized_water.png'), icon_size = 64, @@ -144,7 +144,7 @@ data:extend({ { name = 'el_diesel_train_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'locomotive',1}, @@ -161,7 +161,7 @@ data:extend({ { name = 'el_kerosene_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'oil-processing', main_product = 'el_kerosene', ingredients = { @@ -188,7 +188,7 @@ data:extend({ { name = 'el_tank_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'storage-tank', 4}, @@ -203,7 +203,7 @@ data:extend({ { name = 'el_desulfurized_kerosene_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'el_desulfurized_kerosene', ingredients = { @@ -220,7 +220,7 @@ data:extend({ { name = 'el_usage_acidic_water_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', subgroup = 'el_item_subgroup_e', main_product = 'sulfuric-acid', @@ -239,7 +239,7 @@ data:extend({ { name = 'el_train_fuel_diesel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', subgroup = 'el_item_subgroup_d', main_product = 'el_train_fuel_diesel_item', @@ -256,7 +256,7 @@ data:extend({ { name = 'el_train_equipment_generator_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', subgroup = 'el_item_subgroup_d', ingredients = { @@ -274,7 +274,7 @@ data:extend({ { name = 'el_train_equipment_accelerator_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', subgroup = 'el_item_subgroup_d', ingredients = { @@ -292,7 +292,7 @@ data:extend({ { name = 'el_grow_energy_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_grower_category', ingredients = { {type="item", name="el_energy_crystal_item", amount=1}, @@ -309,7 +309,7 @@ data:extend({ { name = 'el_train_fuel_diesel_energized_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="el_train_fuel_diesel_item", amount=4}, @@ -325,7 +325,7 @@ data:extend({ { name = 'el_ki_beacon_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=20}, @@ -341,7 +341,7 @@ data:extend({ { name = 'fi_ki_beacon_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=20}, @@ -358,7 +358,7 @@ data:extend({ { name = 'fu_ki_beacon_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="fu_materials_KFK", amount=20}, @@ -376,7 +376,7 @@ data:extend({ { name = 'el_ki_core_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=100}, @@ -399,7 +399,7 @@ data:extend({ { name = 'fi_ki_core_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="fi_crafter_item", amount=10}, @@ -420,7 +420,7 @@ data:extend({ { name = 'fu_ki_core_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="fu_materials_KFK", amount=100}, @@ -445,7 +445,7 @@ data:extend({ { name = 'el_ki_memory_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=40}, @@ -462,7 +462,7 @@ data:extend({ { name = 'fi_ki_circuit_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="fi_materials_neodym", amount=20}, @@ -479,7 +479,7 @@ data:extend({ { name = 'fu_ki_circuit_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="fu_materials_KFK", amount=40}, @@ -499,7 +499,7 @@ data:extend({ { name = 'el_ki_memory_fluid_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_memory_category', main_product = 'el_ki_memory_fluid', ingredients = { @@ -525,7 +525,7 @@ data:extend({ { name = 'el_ki_memory_fluid_recipe_1', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_memory_category', main_product = 'el_ki_memory_fluid', ingredients = { @@ -551,7 +551,7 @@ data:extend({ { name = 'el_ki_memory_fluid_recipe_2', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_memory_category', main_product = 'el_ki_memory_fluid', ingredients = { @@ -577,7 +577,7 @@ data:extend({ { name = 'el_ki_memory_fluid_recipe_3', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_memory_category', main_product = 'el_ki_memory_fluid', ingredients = { @@ -602,7 +602,7 @@ data:extend({ { name = 'fu_ki_circuit_fluid_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { @@ -627,7 +627,7 @@ data:extend({ { name = 'fu_ki_circuit_fluid_recipe_1', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { @@ -652,7 +652,7 @@ data:extend({ { name = 'fu_ki_circuit_fluid_recipe_2', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { @@ -676,7 +676,7 @@ data:extend({ { name = 'fu_ki_circuit_fluid_recipe_3', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { @@ -700,7 +700,7 @@ data:extend({ { name = 'fi_ki_circuit_fluid_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_ki_circuit_category', main_product = 'fi_ki_circuit_fluid', ingredients = { @@ -725,7 +725,7 @@ data:extend({ { name = 'fi_ki_circuit_fluid_recipe_1', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_ki_circuit_category', main_product = 'fi_ki_circuit_fluid', ingredients = { @@ -750,7 +750,7 @@ data:extend({ { name = 'fi_ki_circuit_fluid_recipe_2', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_ki_circuit_category', main_product = 'fi_ki_circuit_fluid', ingredients = { @@ -774,7 +774,7 @@ data:extend({ { name = 'fi_ki_circuit_fluid_recipe_3', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_ki_circuit_category', main_product = 'fi_ki_circuit_fluid', ingredients = { @@ -798,7 +798,7 @@ data:extend({ { name = 'el_ki_cpu_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=40}, @@ -816,7 +816,7 @@ data:extend({ { name = 'el_ki_cpu_fluid_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_cpu_category', main_product = 'el_ki_cpu_fluid', ingredients = { @@ -842,7 +842,7 @@ data:extend({ { name = 'el_ki_cpu_fluid_recipe_1', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_cpu_category', main_product = 'el_ki_cpu_fluid', ingredients = { @@ -868,7 +868,7 @@ data:extend({ { name = 'el_ki_cpu_fluid_recipe_2', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_cpu_category', main_product = 'el_ki_cpu_fluid', ingredients = { @@ -894,7 +894,7 @@ data:extend({ { name = 'el_ki_cpu_fluid_recipe_3', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_cpu_category', main_product = 'el_ki_cpu_fluid', ingredients = { @@ -921,7 +921,7 @@ data:extend({ { name = 'el_ki_cpu_memory_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_ki_core_category', icon = sprite('fluids/el_pressurized_water.png'), icon_size = 64, @@ -936,7 +936,7 @@ data:extend({ { name = 'fi_ki_cpu_memory_circuit_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_ki_core_category', ingredients = { {type="fluid", name="el_ki_cpu_fluid", amount=550*3}, @@ -952,7 +952,7 @@ data:extend({ { name = 'fu_ki_cpu_memory_circuit_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ki_core_category', ingredients = { {type="fluid", name="el_ki_cpu_fluid", amount=550*3}, @@ -969,7 +969,7 @@ data:extend({ { name = 'el_arc_furnace_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'iron-gear-wheel',40}, @@ -983,7 +983,7 @@ data:extend({ { name = 'el_caster_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'iron-gear-wheel',40}, @@ -997,7 +997,7 @@ data:extend({ { name = 'el_purifier_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'iron-gear-wheel',40}, @@ -1011,7 +1011,7 @@ data:extend({ { name = 'el_grower_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'iron-gear-wheel',40}, @@ -1027,7 +1027,7 @@ data:extend({ { name = 'el_purify_stone_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'el_dirty_water', ingredients = { @@ -1056,7 +1056,7 @@ data:extend({ { name = 'el_purify_stone_2_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'el_dirty_water', ingredients = { @@ -1084,7 +1084,7 @@ data:extend({ { name = 'el_purify_iron_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'el_dirty_water', ingredients = { @@ -1112,7 +1112,7 @@ data:extend({ { name = 'el_purify_copper_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'el_dirty_water', ingredients = { @@ -1139,7 +1139,7 @@ data:extend({ { name = 'el_purify_stone_acidic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'el_energy_crystal_item', ingredients = { @@ -1160,7 +1160,7 @@ data:extend({ { name = 'el_purify_uranium_acidic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'el_energy_crystal_item', ingredients = { @@ -1183,7 +1183,7 @@ data:extend({ { name = 'el_aluminum_item_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'smelting', ingredients = { {'el_aluminum_ore_item',2}, @@ -1197,7 +1197,7 @@ data:extend({ { name = 'el_lithium_ore_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'el_lithium_item', ingredients = { @@ -1213,7 +1213,7 @@ data:extend({ { name = 'el_arc_pure_iron_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="el_materials_pure_iron", amount=1}, @@ -1228,7 +1228,7 @@ data:extend({ { name = 'el_cast_pure_iron_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="el_arc_pure_iron", amount=100}, @@ -1244,7 +1244,7 @@ data:extend({ { name = 'el_cast_pure_steel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="el_arc_pure_iron", amount=500}, @@ -1260,7 +1260,7 @@ data:extend({ { name = 'el_arc_pure_copper_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="el_materials_pure_copper", amount=1}, @@ -1275,7 +1275,7 @@ data:extend({ { name = 'el_cast_pure_copper_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="el_arc_pure_copper", amount=100}, @@ -1291,7 +1291,7 @@ data:extend({ { name = 'el_arc_pure_aluminum_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="el_materials_pure_aluminum", amount=1}, @@ -1306,7 +1306,7 @@ data:extend({ { name = 'el_cast_pure_aluminum_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="el_arc_pure_aluminum", amount=100}, @@ -1322,7 +1322,7 @@ data:extend({ { name = 'el_ceramic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', ingredients = { {type="fluid", name="steam", amount=30}, @@ -1337,7 +1337,7 @@ data:extend({ { name = 'el_ceramic_1_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="stone", amount=4}, @@ -1353,7 +1353,7 @@ data:extend({ { name = 'el_ALK_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="el_materials_ceramic", amount=2}, {type="item", name="el_aluminum_item", amount=6}, @@ -1367,7 +1367,7 @@ data:extend({ { name = 'el_dirty_water_vent_recipe', type = 'recipe', - enabled = 'false', + enabled = false, subgroup = 'el_item_subgroup_a', category = 'crafting-with-fluid', ingredients = { @@ -1382,7 +1382,7 @@ data:extend({ { name = 'el_dirty_water_vent_2_recipe', type = 'recipe', - enabled = 'false', + enabled = false, subgroup = 'el_item_subgroup_a', category = 'el_purifier_category', ingredients = { @@ -1397,7 +1397,7 @@ data:extend({ { name = 'el_dirty_water_landfill_recipe', type = 'recipe', - enabled = 'false', + enabled = false, subgroup = 'el_item_subgroup_a', category = 'crafting-with-fluid', ingredients = { @@ -1412,7 +1412,7 @@ data:extend({ { name = 'el_kerosene_basic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'oil-processing', main_product = 'el_kerosene', ingredients = { @@ -1438,7 +1438,7 @@ data:extend({ { name = 'el_charger_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'iron-gear-wheel',40}, @@ -1452,7 +1452,7 @@ data:extend({ { name = 'el_charge_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_charger_category', ingredients = { {type='item', name='el_energy_crystal_item', amount=1}, @@ -1465,7 +1465,7 @@ data:extend({ { name = 'el_grenade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'el_grenade', ingredients = { diff --git a/248k_2/prototypes/fi_recipes.lua b/248k_2/prototypes/fi_recipes.lua index 0b60ab8..0ba915b 100644 --- a/248k_2/prototypes/fi_recipes.lua +++ b/248k_2/prototypes/fi_recipes.lua @@ -12,7 +12,7 @@ data:extend({ { name = 'fi_crafter_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'concrete',30}, {'fi_materials_GFK',20}, @@ -27,7 +27,7 @@ data:extend({ { name = 'fi_castor_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'concrete',50}, {'fi_materials_GFK',40}, @@ -41,7 +41,7 @@ data:extend({ { name = 'fi_crusher_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'concrete',60}, {'el_materials_ALK',20}, @@ -57,7 +57,7 @@ data:extend({ { name = 'fi_miner_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'concrete',100}, {'fi_compound_material_item',60}, @@ -73,7 +73,7 @@ data:extend({ { name = 'fi_basic_fuel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'uranium-235',1}, {'uranium-238',19}, @@ -86,7 +86,7 @@ data:extend({ { name = 'fi_basic_thorium_fuel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_thorium232_item',10}, {'uranium-238',10}, @@ -99,7 +99,7 @@ data:extend({ { name = 'fi_advanced_fuel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_plutonium239_item',1}, {'uranium-238',19}, @@ -112,7 +112,7 @@ data:extend({ { name = 'fi_advanced_thorium_fuel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_uranium233_item',4}, {'uranium-238',16}, @@ -125,7 +125,7 @@ data:extend({ { name = 'fi_pure_fuel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'uranium-235',1}, {'fi_plutonium239_item',1}, @@ -139,7 +139,7 @@ data:extend({ { name = 'fi_solid_reactor_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'steel-plate',450}, {'concrete',400}, @@ -156,7 +156,7 @@ data:extend({ { name = 'fi_compound_material_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'el_aluminum_item',15}, {'steel-plate',10}, @@ -169,7 +169,7 @@ data:extend({ { name = 'fi_low-density-structure_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crafting_category', subgroup = 'fi_item_subgroup_b', ingredients = { @@ -188,7 +188,7 @@ data:extend({ { name = 'fi_plutonium239_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'centrifuging', main_product = 'fi_plutonium239_item', ingredients = { @@ -206,7 +206,7 @@ data:extend({ { name = 'fi_thorium232_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fi_thorium232_item', ingredients = { @@ -224,7 +224,7 @@ data:extend({ { name = 'fi_uranium233_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'centrifuging', main_product = 'fi_uranium233_item', ingredients = { @@ -242,7 +242,7 @@ data:extend({ { name = 'fi_atomic_bomb_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'explosive-rocket',10}, {'fi_plutonium239_item',10}, @@ -256,7 +256,7 @@ data:extend({ { name = 'fi_advanced_fuel_recycle_recipe', type = 'recipe', - enabled = 'false', + enabled = false, main_product = 'uranium-238', category = 'centrifuging', ingredients = { @@ -277,7 +277,7 @@ data:extend({ { name = 'fi_advanced_thorium_fuel_recycle_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'centrifuging', main_product = 'uranium-238', ingredients = { @@ -298,7 +298,7 @@ data:extend({ { name = 'fi_pure_fuel_recycle_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'centrifuging', main_product = 'uranium-238', ingredients = { @@ -320,7 +320,7 @@ data:extend({ { name = 'fi_equipment_player_reactor_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_solid_reactor_item',1}, {'fi_pure_fuel_item',1}, @@ -332,7 +332,7 @@ data:extend({ { name = 'fi_equipment_player_shield_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_energy_crystal_item',20}, {'low-density-structure',10}, @@ -346,7 +346,7 @@ data:extend({ { name = 'fi_train_equipment_generator_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_solid_reactor_item',1}, {'low-density-structure',10}, @@ -361,7 +361,7 @@ data:extend({ { name = 'fi_energy_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_grower_category', ingredients = { {type="item", name="el_energy_crystal_item", amount=1}, @@ -375,7 +375,7 @@ data:extend({ { name = 'fi_catalyst_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'centrifuging', ingredients = { {'el_train_fuel_diesel_energized_item',1}, @@ -388,7 +388,7 @@ data:extend({ { name = 'fi_base_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', ingredients = { {type="fluid", name="fi_crystal_fluid", amount=100}, @@ -401,7 +401,7 @@ data:extend({ { name = 'fi_crushed_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'el_energy_crystal_item',1}, @@ -414,7 +414,7 @@ data:extend({ { name = 'fi_crystal_fluid_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'fi_crystal_fluid', ingredients = { @@ -430,7 +430,7 @@ data:extend({ { name = 'fi_fuel_train_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_energy_crystal_charged_item',1}, {'el_train_fuel_diesel_item',4}, @@ -443,7 +443,7 @@ data:extend({ { name = 'fi_crushed_lithium_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'el_lithium_item',1}, @@ -456,7 +456,7 @@ data:extend({ { name = 'fi_crushed_iron_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'iron-plate',1}, @@ -469,7 +469,7 @@ data:extend({ { name = 'fi_crushed_copper_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'copper-plate',1}, @@ -482,7 +482,7 @@ data:extend({ { name = 'fi_crushed_aluminum_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'el_aluminum_item',1}, @@ -495,7 +495,7 @@ data:extend({ { name = 'fi_crushed_coal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'coal',1}, @@ -508,7 +508,7 @@ data:extend({ { name = 'fi_crushed_stone_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'stone',1}, @@ -521,7 +521,7 @@ data:extend({ { name = 'fi_crushed_uranium_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'uranium-238',1}, @@ -535,7 +535,7 @@ data:extend({ { name = 'fi_materials_industrial_steel_blend_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_crushed_coal_item',3}, {'fi_crushed_iron_item',4}, @@ -548,7 +548,7 @@ data:extend({ { name = 'fi_materials_industrial_steel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'smelting', ingredients = { {'fi_industrial_steel_blend_item',4}, @@ -561,7 +561,7 @@ data:extend({ { name = 'fi_materials_steel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'smelting', ingredients = { {'fi_industrial_steel_blend_item',1}, @@ -577,7 +577,7 @@ data:extend({ { name = 'fi_robo_port_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_robo_charger_item',1}, {'fi_materials_GFK',40}, @@ -591,7 +591,7 @@ data:extend({ { name = 'fi_robo_charger_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'roboport',1}, {'el_materials_ALK',60}, @@ -606,7 +606,7 @@ data:extend({ { name = 'fi_modules_base_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'low-density-structure',2}, {'advanced-circuit',6}, @@ -618,7 +618,7 @@ data:extend({ { name = 'fi_modules_core_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_modules_base_item',1}, {'fi_materials_GFK',1}, @@ -630,7 +630,7 @@ data:extend({ { name = 'fi_modules_productivity_1_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_modules_core_item',1}, {'productivity-module',2}, @@ -643,7 +643,7 @@ data:extend({ { name = 'fi_modules_productivity_2_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_modules_productivity_1_item',4}, {'fi_modules_core_item',1}, @@ -657,7 +657,7 @@ data:extend({ { name = 'fi_modules_productivity_3_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_modules_productivity_2_item',4}, {'fi_modules_core_item',1}, @@ -671,7 +671,7 @@ data:extend({ { name = 'fi_modules_productivity_4_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_modules_productivity_3_item',6}, {'fi_modules_core_item',1}, @@ -684,7 +684,7 @@ data:extend({ { name = 'fi_modules_productivity_5_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_modules_productivity_4_item',6}, {'fi_modules_core_item',1}, @@ -697,7 +697,7 @@ data:extend({ { name = 'fi_modules_productivity_6_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_modules_productivity_5_item',6}, {'fi_modules_core_item',1}, @@ -710,7 +710,7 @@ data:extend({ { name = 'fi_fiberer_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'concrete',60}, @@ -726,7 +726,7 @@ data:extend({ { name = 'fi_natural_fiber_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_fiberer_category', main_product = 'fi_materials_natural_fiber', ingredients = { @@ -742,7 +742,7 @@ data:extend({ { name = 'fi_glass_fiber_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_fiberer_category', main_product = 'fi_materials_glass_fiber', ingredients = { @@ -758,7 +758,7 @@ data:extend({ { name = 'fi_arc_glass_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="stone", amount=3}, @@ -773,7 +773,7 @@ data:extend({ { name = 'fi_cast_glass_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="fi_arc_glass", amount=100}, @@ -788,7 +788,7 @@ data:extend({ { name = 'fi_crushed_glass_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'fi_materials_glass',1}, @@ -801,7 +801,7 @@ data:extend({ { name = 'fi_flourite_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fi_materials_flourite', ingredients = { @@ -817,7 +817,7 @@ data:extend({ { name = 'fi_strong_acid_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'fi_strong_acid', ingredients = { @@ -836,7 +836,7 @@ data:extend({ { name = 'fi_purify_stone_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'fi_dirty_water', ingredients = { @@ -868,7 +868,7 @@ data:extend({ { name = 'fi_purify_iron_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'fi_thorium232_item', ingredients = { @@ -899,7 +899,7 @@ data:extend({ { name = 'fi_purify_copper_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'uranium-238', ingredients = { @@ -930,7 +930,7 @@ data:extend({ { name = 'fi_purify_uranium_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_purifier_category', main_product = 'fi_dirty_water', ingredients = { @@ -964,7 +964,7 @@ data:extend({ { name = 'fi_arc_pure_gold_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="fi_materials_pure_gold", amount=1}, @@ -979,7 +979,7 @@ data:extend({ { name = 'fi_cast_gold_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="fi_arc_gold", amount=100}, @@ -994,7 +994,7 @@ data:extend({ { name = 'fi_arc_pure_titan_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="fi_materials_pure_titan", amount=1}, @@ -1009,7 +1009,7 @@ data:extend({ { name = 'fi_cast_titan_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="fi_arc_titan", amount=100}, @@ -1024,7 +1024,7 @@ data:extend({ { name = 'fi_arc_pure_neodym_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="fi_materials_pure_neodym", amount=1}, @@ -1039,7 +1039,7 @@ data:extend({ { name = 'fi_cast_neodym_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="fi_arc_neodym", amount=100}, @@ -1054,7 +1054,7 @@ data:extend({ { name = 'fi_compound_machine_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'concrete',60}, {'el_materials_ALK',60}, @@ -1069,7 +1069,7 @@ data:extend({ { name = 'fi_NFK_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_compound_machine_category', ingredients = { {type="fluid", name="petroleum-gas", amount=10}, @@ -1086,7 +1086,7 @@ data:extend({ { name = 'fi_GFK_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_compound_machine_category', ingredients = { {type="fluid", name="petroleum-gas", amount=10}, @@ -1103,7 +1103,7 @@ data:extend({ { name = 'fi_pure_neodym_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fi_materials_pure_neodym', ingredients = { @@ -1121,7 +1121,7 @@ data:extend({ { name = 'fi_pure_gold_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fi_materials_pure_gold', ingredients = { @@ -1139,7 +1139,7 @@ data:extend({ { name = 'fi_pure_titan_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fi_materials_pure_titan', ingredients = { @@ -1157,7 +1157,7 @@ data:extend({ { name = 'fi_decay_waste_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_castor_category', icon = sprite('fission/fi_materials/fi_materials_waste.png'), icon_size = 64, @@ -1173,7 +1173,7 @@ data:extend({ { name = 'fi_empty_solution_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fi_materials_empty_solution', ingredients = { @@ -1190,7 +1190,7 @@ data:extend({ { name = 'fi_solution_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'fi_materials_solution', ingredients = { @@ -1213,7 +1213,7 @@ data:extend({ { name = 'fi_rich_powder_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'centrifuging', main_product = 'fi_materials_rich_powder', ingredients = { @@ -1233,7 +1233,7 @@ data:extend({ { name = 'fi_extract_rich_powder_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'fi_dirty_water', ingredients = { @@ -1251,7 +1251,7 @@ data:extend({ { name = 'fi_refinery_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="oil-refinery", amount=1}, @@ -1268,7 +1268,7 @@ data:extend({ { name = 'fi_refinery_basic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_refining', icon = sprite('icons/fi_refining_basic.png'), icon_size = 64, @@ -1290,7 +1290,7 @@ data:extend({ { name = 'fi_refinery_coal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_refining', icon = sprite('icons/fi_refining_coal.png'), icon_size = 64, @@ -1313,7 +1313,7 @@ data:extend({ { name = 'fi_refinery_sulfur_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_refining', icon = sprite('icons/fi_refining_sulfur.png'), icon_size = 64, @@ -1336,7 +1336,7 @@ data:extend({ { name = 'fi_crack_sulfur_gas_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'sulfur', ingredients = { @@ -1355,7 +1355,7 @@ data:extend({ { name = 'fi_crack_acid_gas_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'el_acidic_water', ingredients = { @@ -1374,7 +1374,7 @@ data:extend({ { name = 'fi_refinery_kerosene_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_refining', icon = sprite('icons/fi_cracking_kerosene.png'), icon_size = 64, @@ -1394,7 +1394,7 @@ data:extend({ { name = 'fi_refinery_kerosene_coal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_refining', icon = sprite('icons/fi_cracking_kerosene_coal.png'), icon_size = 64, @@ -1415,7 +1415,7 @@ data:extend({ { name = 'fi_charge_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_charger_category', ingredients = { {type='item', name='fi_energy_crystal_item', amount=1}, @@ -1428,7 +1428,7 @@ data:extend({ { name = 'fi_ceramic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', ingredients = { {type="fluid", name="steam", amount=45}, @@ -1444,7 +1444,7 @@ data:extend({ { name = 'fi_grenade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fi_grenade', ingredients = { @@ -1460,7 +1460,7 @@ data:extend({ { name = 'fi_solid_1_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'solid-fuel', icon = sprite('icons/fi_solid_2.png'), @@ -1479,7 +1479,7 @@ data:extend({ { name = 'fi_solid_2_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'solid-fuel', icon = sprite('icons/fi_solid_1.png'), @@ -1498,7 +1498,7 @@ data:extend({ { name = 'fi_rocket_fuel_2_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'rocket-fuel', icon = sprite('icons/fi_rocket_1.png'), @@ -1518,7 +1518,7 @@ data:extend({ { name = 'fi_rocket_fuel_1_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'rocket-fuel', icon = sprite('icons/fi_rocket_2.png'), @@ -1538,7 +1538,7 @@ data:extend({ { name = 'fi_rocket_fuel_1_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', main_product = 'rocket-fuel', icon = sprite('icons/fi_rocket_2.png'), @@ -1558,7 +1558,7 @@ data:extend({ { name = 'fi_rich_solution_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fi_materials_rich_solution', ingredients = { @@ -1575,7 +1575,7 @@ data:extend({ { name = 'fi_rich_solution_unpack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fi_dirty_water', ingredients = { @@ -1592,7 +1592,7 @@ data:extend({ { name = 'fi_dirty_solution_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fi_materials_dirty_solution', ingredients = { @@ -1609,7 +1609,7 @@ data:extend({ { name = 'fi_dirty_solution_unpack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'el_dirty_water', ingredients = { @@ -1628,7 +1628,7 @@ data:extend({ { name = 'fi_upgrade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fi_materials_upgrade', ingredients = { @@ -1646,7 +1646,7 @@ data:extend({ { name = 'fi_miner_upgrade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fu_miner_item_2', ingredients = { @@ -1663,7 +1663,7 @@ data:extend({ { name = 'fu_upgrade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fu_materials_upgrade', ingredients = { @@ -1681,7 +1681,7 @@ data:extend({ { name = 'fu_miner_upgrade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fu_miner_item_3', ingredients = { @@ -1698,7 +1698,7 @@ data:extend({ { name = 'gr_upgrade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'gr_materials_upgrade', ingredients = { @@ -1716,7 +1716,7 @@ data:extend({ { name = 'gr_miner_upgrade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fu_miner_item_4', ingredients = { diff --git a/248k_2/prototypes/fu_recipes.lua b/248k_2/prototypes/fu_recipes.lua index 247f0d5..59d896a 100644 --- a/248k_2/prototypes/fu_recipes.lua +++ b/248k_2/prototypes/fu_recipes.lua @@ -3,7 +3,7 @@ data:extend({ { name = 'fu_fusor_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'low-density-structure',100}, {'fu_materials_TIM',100}, @@ -22,7 +22,7 @@ data:extend({ { name = 'fu_stelar_reactor_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fu_materials_magnet',100}, {'fu_materials_TIM',200}, @@ -40,7 +40,7 @@ data:extend({ { name = 'fu_tokamak_reactor_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fu_materials_magnet',200}, {'fu_materials_TIM',400}, @@ -60,7 +60,7 @@ data:extend({ { name = 'fu_boiler_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'heat-exchanger',4}, {'fu_materials_TIM',20}, @@ -77,7 +77,7 @@ data:extend({ { name = 'fu_burner_recipe', type = 'recipe', - enabled = 'false', + enabled = false, hidden = false, ingredients = { {'el_burner_item',1}, @@ -93,7 +93,7 @@ data:extend({ name = 'fu_fusion_card_1_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_protium", amount=100}, @@ -107,7 +107,7 @@ data:extend({ name = 'fu_fusion_card_2_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_deuterium", amount=100}, @@ -121,7 +121,7 @@ data:extend({ name = 'fu_fusion_card_4_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_deuterium", amount=100}, {type="fluid", name="fu_tritium", amount=100}, @@ -135,7 +135,7 @@ data:extend({ name = 'fu_fusion_card_5_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_deuterium", amount=100}, }, @@ -148,7 +148,7 @@ data:extend({ name = 'fu_fusion_card_7_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_protium", amount=20000}, }, @@ -163,7 +163,7 @@ data:extend({ type = 'recipe', category = 'fu_boiler_crafting_category', main_product = 'fu_hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="water", amount=150}, }, @@ -191,7 +191,7 @@ data:extend({ type = 'recipe', category = 'fu_boiler_crafting_category', main_product = 'fu_hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="water", amount=300}, }, @@ -219,7 +219,7 @@ data:extend({ type = 'recipe', category = 'fu_boiler_crafting_category', main_product = 'fu_hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="water", amount=650}, }, @@ -247,7 +247,7 @@ data:extend({ type = 'recipe', category = 'fu_boiler_crafting_category', main_product = 'fu_hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="water", amount=1100}, }, @@ -274,7 +274,7 @@ data:extend({ type = 'recipe', category = 'oil-processing', main_product = 'fu_protium', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_hydrogen", amount=100000}, }, @@ -290,7 +290,7 @@ data:extend({ name = 'fu_lithium_6_recipe', type = 'recipe', category = 'chemistry', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_crushed_lithium_item", amount=1}, }, @@ -306,7 +306,7 @@ data:extend({ name = 'fu_lead_ore_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="stone", amount=10}, {type="fluid", name="sulfuric-acid", amount=20}, @@ -319,7 +319,7 @@ data:extend({ { name = 'fu_lead_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_caster_category', ingredients = { {type="fluid", name="fu_arc_pure_lead", amount=100}, @@ -335,7 +335,7 @@ data:extend({ name = 'fu_lead_crushed_recipe', type = 'recipe', category = 'fi_crushing', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_lead_item", amount=1}, }, @@ -347,7 +347,7 @@ data:extend({ name = 'fu_lead_molten_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_crushed_lead_item", amount=1}, }, @@ -363,7 +363,7 @@ data:extend({ name = 'fu_stelerator_1_recipe', type = 'recipe', category = 'fu_stelar_reactor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_cold", amount=1000}, {type="fluid", name="fu_protium", amount=20}, @@ -378,7 +378,7 @@ data:extend({ name = 'fu_stelerator_2_recipe', type = 'recipe', category = 'fu_stelar_reactor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_cold", amount=1000}, {type="fluid", name="fu_deuterium", amount=1}, @@ -394,7 +394,7 @@ data:extend({ name = 'fu_stelerator_3_recipe', type = 'recipe', category = 'fu_stelar_reactor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_cold", amount=1000}, {type="fluid", name="fu_protium", amount=15}, @@ -411,7 +411,7 @@ data:extend({ type = 'recipe', category = 'fu_stelar_reactor_crafting_category', main_product = 'fu_materials_charged_container', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_cold", amount=300}, {type="fluid", name="fu_deuterium", amount=1}, @@ -433,7 +433,7 @@ data:extend({ type = 'recipe', category = 'fu_stelar_reactor_crafting_category', main_product = 'fu_materials_charged_container', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_cold", amount=300}, {type="fluid", name="fu_protium", amount=15}, @@ -456,7 +456,7 @@ data:extend({ name = 'fu_tokamak_1_recipe', type = 'recipe', category = 'fu_tokamak_reactor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_cold", amount=110000}, {type="fluid", name="fu_deuterium", amount=200}, @@ -471,7 +471,7 @@ data:extend({ name = 'fu_tokamak_2_recipe', type = 'recipe', category = 'fu_tokamak_reactor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_cold", amount=180000}, {type="fluid", name="fu_deuterium", amount=100}, @@ -487,7 +487,7 @@ data:extend({ { name = 'fu_exchanger_item_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="heat-exchanger", amount=10}, {type="item", name="fu_materials_KFK", amount=40}, @@ -505,7 +505,7 @@ data:extend({ type = 'recipe', category = 'fu_exchanger_crafting_category', main_product = 'steam', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_hot", amount=50}, {type="fluid", name="water", amount=1000}, @@ -525,7 +525,7 @@ data:extend({ type = 'recipe', category = 'fu_exchanger_crafting_category', main_product = 'steam', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_hot", amount=100}, {type="fluid", name="water", amount=1000}, @@ -545,7 +545,7 @@ data:extend({ type = 'recipe', category = 'fu_exchanger_crafting_category', main_product = 'fu_lead_fluid_cold', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_hot", amount=100}, {type="fluid", name="water", amount=1000}, @@ -562,7 +562,7 @@ data:extend({ { name = 'fu_turbine_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="steam-turbine", amount=5}, {type="item", name="fu_materials_KFK", amount=40}, @@ -580,7 +580,7 @@ data:extend({ type = 'recipe', category = 'fu_exchanger_crafting_category', main_product = 'fu_hot_steam', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_hot", amount=100}, {type="fluid", name="water", amount=100}, @@ -599,7 +599,7 @@ data:extend({ { name = 'fu_robo_logistic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="logistic-robot", amount=2}, {type="item", name="fu_tech_sign_item", amount=2}, @@ -615,7 +615,7 @@ data:extend({ { name = 'fu_robo_construction_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="construction-robot", amount=2}, {type="item", name="fu_tech_sign_item", amount=2}, @@ -632,7 +632,7 @@ data:extend({ { name = 'fu_activator_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_crafter_item", amount=2}, {type="item", name="fu_tech_sign_item", amount=100}, @@ -649,7 +649,7 @@ data:extend({ type = 'recipe', category = 'fu_activator_crafting_category', main_product = 'fu_deuterium', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_protium", amount=10}, {type="fluid", name="fu_neutron_fluid", amount=1}, @@ -667,7 +667,7 @@ data:extend({ type = 'recipe', category = 'fu_activator_crafting_category', main_product = 'fu_tritium', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_deuterium", amount=10}, {type="fluid", name="fu_neutron_fluid", amount=1}, @@ -684,7 +684,7 @@ data:extend({ { name = 'fu_star_engine_cooler_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'low-density-structure',200}, {'fu_materials_KFK',200}, @@ -702,7 +702,7 @@ data:extend({ { name = 'fu_star_engine_cooler_up_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'low-density-structure',200}, {'fu_materials_KFK',200}, @@ -720,7 +720,7 @@ data:extend({ { name = 'fu_star_engine_heater_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'low-density-structure',200}, {'fu_materials_KFK',200}, @@ -738,7 +738,7 @@ data:extend({ { name = 'fu_star_engine_heater_left_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'low-density-structure',200}, {'fu_materials_KFK',200}, @@ -756,7 +756,7 @@ data:extend({ { name = 'fu_star_engine_core_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'low-density-structure',1000}, {'fu_materials_KFK',200}, @@ -779,7 +779,7 @@ data:extend({ name = 'fu_star_engine_heater_1_recipe', type = 'recipe', category = 'fu_star_engine_heater_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_a', ingredients = { {type="fluid", name="fu_protium", amount=13000}, @@ -795,7 +795,7 @@ data:extend({ name = 'fu_star_engine_core_1_recipe', type = 'recipe', category = 'fu_star_engine_core_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_b', ingredients = { {type="fluid", name="fu_protium_heated", amount=13000*2}, @@ -810,7 +810,7 @@ data:extend({ name = 'fu_star_engine_core_2_recipe', type = 'recipe', category = 'fu_star_engine_core_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_b', ingredients = { {type="fluid", name="fu_protium_heated", amount=29000}, @@ -825,7 +825,7 @@ data:extend({ name = 'fu_star_engine_core_3_recipe', type = 'recipe', category = 'fu_star_engine_core_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_b', ingredients = { {type="fluid", name="fu_protium_heated", amount=16000}, @@ -840,7 +840,7 @@ data:extend({ name = 'fu_star_engine_core_4_recipe', type = 'recipe', category = 'fu_star_engine_core_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_b', ingredients = { {type="fluid", name="fu_protium_heated", amount=3000}, @@ -855,7 +855,7 @@ data:extend({ name = 'fu_star_engine_core_5_recipe', type = 'recipe', category = 'fu_star_engine_core_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_b', ingredients = { {type="fluid", name="fu_protium_heated", amount=92000}, @@ -870,7 +870,7 @@ data:extend({ name = 'fu_star_engine_core_6_recipe', type = 'recipe', category = 'fu_star_engine_core_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_b', ingredients = { {type="fluid", name="fu_protium_heated", amount=92000}, @@ -886,7 +886,7 @@ data:extend({ name = 'fu_star_engine_cooler_1_recipe', type = 'recipe', category = 'fu_star_engine_cooler_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_c', ingredients = { {type="fluid", name="fu_iron_heated", amount=500}, @@ -901,7 +901,7 @@ data:extend({ name = 'fu_star_engine_cooler_2_recipe', type = 'recipe', category = 'fu_star_engine_cooler_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_c', ingredients = { {type="fluid", name="fu_copper_heated", amount=500}, @@ -916,7 +916,7 @@ data:extend({ name = 'fu_star_engine_cooler_3_recipe', type = 'recipe', category = 'fu_star_engine_cooler_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_c', ingredients = { {type="fluid", name="fu_sulfur_heated", amount=500}, @@ -931,7 +931,7 @@ data:extend({ name = 'fu_star_engine_cooler_4_recipe', type = 'recipe', category = 'fu_star_engine_cooler_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_c', ingredients = { {type="fluid", name="fu_lithium_7_heated", amount=500}, @@ -946,7 +946,7 @@ data:extend({ name = 'fu_star_engine_cooler_5_recipe', type = 'recipe', category = 'fu_star_engine_cooler_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_c', ingredients = { {type="fluid", name="fu_uranium_235_heated", amount=500}, @@ -961,7 +961,7 @@ data:extend({ name = 'fu_star_engine_cooler_6_recipe', type = 'recipe', category = 'fu_star_engine_cooler_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_c', ingredients = { {type="fluid", name="fu_uranium_238_heated", amount=500}, @@ -977,7 +977,7 @@ data:extend({ name = 'fu_star_engine_caster_1_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_d', ingredients = { {type="fluid", name="fu_iron", amount=500}, @@ -992,7 +992,7 @@ data:extend({ name = 'fu_star_engine_caster_2_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_d', ingredients = { {type="fluid", name="fu_copper", amount=500}, @@ -1007,7 +1007,7 @@ data:extend({ name = 'fu_star_engine_caster_3_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_d', ingredients = { {type="fluid", name="fu_sulfur", amount=500}, @@ -1022,7 +1022,7 @@ data:extend({ name = 'fu_star_engine_caster_4_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_d', ingredients = { {type="fluid", name="fu_lithium_7", amount=500}, @@ -1037,7 +1037,7 @@ data:extend({ name = 'fu_star_engine_caster_5_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_d', ingredients = { {type="fluid", name="fu_uranium_235", amount=500}, @@ -1052,7 +1052,7 @@ data:extend({ name = 'fu_star_engine_caster_6_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_d', ingredients = { {type="fluid", name="fu_uranium_238", amount=500}, @@ -1068,7 +1068,7 @@ data:extend({ name = 'fu_space_probe_sputnik_recipe', type = 'recipe', category = 'advanced-crafting', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="rocket-control-unit", amount=10}, {type="item", name="fu_materials_KFK", amount=20}, @@ -1088,7 +1088,7 @@ data:extend({ name = 'fu_space_probe_probe_recipe', type = 'recipe', category = 'advanced-crafting', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="rocket-control-unit", amount=10}, {type="item", name="fu_materials_energy_crystal", amount=20}, @@ -1107,7 +1107,7 @@ data:extend({ name = 'fu_space_probe_deep_probe_recipe', type = 'recipe', category = 'advanced-crafting', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_space_probe_data_card_3_item", amount=5}, {type="item", name="fu_space_probe_probe_item", amount=1}, @@ -1127,7 +1127,7 @@ data:extend({ name = 'fu_space_probe_data_card_2_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_space_probe_data_card_1_item", amount=1}, {type="fluid", name="el_ki_cpu_fluid", amount=1000}, @@ -1144,7 +1144,7 @@ data:extend({ name = 'fu_space_probe_ore_recipe', type = 'recipe', category = 'el_purifier_category', - enabled = 'false', + enabled = false, main_product = 'fu_space_probe_down_matter_item', ingredients = { {type="item", name="fu_space_probe_ore_item", amount=10}, @@ -1163,7 +1163,7 @@ data:extend({ name = 'fu_space_probe_science_recipe', type = 'recipe', category = 'crafting', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_space_probe_up_matter_item", amount=1}, {type="item", name="fu_space_probe_down_matter_item", amount=1}, @@ -1179,7 +1179,7 @@ data:extend({ name = 'fu_space_probe_science_recipe_1', type = 'recipe', category = 'crafting', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_space_probe_up_matter_item", amount=1}, {type="item", name="fu_space_probe_down_matter_item", amount=1}, @@ -1196,7 +1196,7 @@ data:extend({ name = 'fu_crystal_from_fluid_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_item_subgroup_a-b', ingredients = { {type="fluid", name="petroleum-gas", amount=400}, @@ -1211,7 +1211,7 @@ data:extend({ { name = 'fu_laser_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'concrete',100}, {'fu_materials_TIM',60}, @@ -1229,7 +1229,7 @@ data:extend({ name = 'fu_laser_crystal_recipe', type = 'recipe', category = 'fu_laser_category', - enabled = 'false', + enabled = false, main_product = 'fu_materials_energy_crystal', subgroup = 'fu_item_subgroup_a-b', ingredients = { @@ -1248,7 +1248,7 @@ data:extend({ name = 'fu_refined_crystal_recipe', type = 'recipe', category = 'el_grower_category', - enabled = 'false', + enabled = false, subgroup = 'fu_item_subgroup_a-b', ingredients = { {type="fluid", name="fi_crystal_fluid", amount=100}, @@ -1264,7 +1264,7 @@ data:extend({ { name = 'fu_plasma_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'concrete',100}, {'fu_materials_TIM',60}, @@ -1281,7 +1281,7 @@ data:extend({ { name = 'fu_magnet_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'concrete',100}, {'fu_materials_TIM',60}, @@ -1298,7 +1298,7 @@ data:extend({ { name = 'fu_magnet_1_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_magnet_category', main_product = 'fu_materials_magnet', ingredients = { @@ -1316,7 +1316,7 @@ data:extend({ { name = 'fu_KFK_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_compound_machine_category', ingredients = { {type="fluid", name="petroleum-gas", amount=20}, @@ -1333,7 +1333,7 @@ data:extend({ { name = 'fu_TIM_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_compound_machine_category', ingredients = { {type="fluid", name="fu_metal_foam", amount=20}, @@ -1349,7 +1349,7 @@ data:extend({ { name = 'fu_metal_foam_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', ingredients = { {type="fluid", name="steam", amount=100}, @@ -1365,7 +1365,7 @@ data:extend({ { name = 'fu_carbon_fiber_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_fiberer_category', ingredients = { {type="item", name="fi_crushed_coal_item", amount=6}, @@ -1383,7 +1383,7 @@ data:extend({ { name = 'fu_laser_card_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_laser_category', main_product = 'fu_materials_laser_card', ingredients = { @@ -1399,7 +1399,7 @@ data:extend({ { name = 'fu_plasma_card_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_plasma_category', main_product = 'fu_materials_plasma_card', ingredients = { @@ -1416,7 +1416,7 @@ data:extend({ { name = 'fu_magnet_card_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_magnet_category', main_product = 'fu_materials_magnet_card', ingredients = { @@ -1434,7 +1434,7 @@ data:extend({ { name = 'fu_pure_ore_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'fu_materials_pure_lead', ingredients = { @@ -1453,7 +1453,7 @@ data:extend({ { name = 'fu_arc_pure_lead_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="fu_materials_pure_lead", amount=1}, @@ -1468,7 +1468,7 @@ data:extend({ { name = 'fu_tech_sign_recipe', type = 'recipe', - enabled = 'false', + enabled = false, main_product = 'fu_tech_sign_item', ingredients = { {type="item", name="fu_materials_laser_card", amount=1}, @@ -1486,7 +1486,7 @@ data:extend({ name = 'fu_heat_lead_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_hot", amount=100}, }, @@ -1499,7 +1499,7 @@ data:extend({ { name = 'fu_empty_container_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_materials_magnet", amount=2}, {type="item", name="fu_materials_KFK", amount=6}, @@ -1517,7 +1517,7 @@ data:extend({ type = 'recipe', category = 'crafting-with-fluid', main_product = 'fu_neutron_fluid', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_materials_charged_container", amount=1}, }, @@ -1533,7 +1533,7 @@ data:extend({ type = 'recipe', category = 'crafting-with-fluid', main_product = 'fu_neutron_fluid', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_advanced_thorium_fuel_item", amount=1}, }, @@ -1549,7 +1549,7 @@ data:extend({ type = 'recipe', category = 'crafting-with-fluid', main_product = 'fu_neutron_fluid', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_basic_fuel_item", amount=1}, }, @@ -1565,7 +1565,7 @@ data:extend({ type = 'recipe', category = 'crafting-with-fluid', main_product = 'fu_neutron_fluid', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_basic_thorium_fuel_item", amount=1}, }, @@ -1581,7 +1581,7 @@ data:extend({ type = 'recipe', category = 'crafting-with-fluid', main_product = 'fu_neutron_fluid', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_advanced_fuel_item", amount=1}, }, @@ -1748,7 +1748,7 @@ data:extend({ { name = 'fu_charge_crystal_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_charger_category', ingredients = { {type='item', name='fu_materials_energy_crystal', amount=1}, @@ -1763,7 +1763,7 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'fu_hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_materials_gold", amount=1}, {type="fluid", name="water", amount=150}, @@ -1793,7 +1793,7 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'fu_hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_materials_gold", amount=1}, {type="fluid", name="water", amount=300}, @@ -1823,7 +1823,7 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'fu_hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_materials_gold", amount=1}, {type="fluid", name="water", amount=650}, @@ -1853,7 +1853,7 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'fu_hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="water", amount=1100}, }, @@ -1878,7 +1878,7 @@ data:extend({ { name = 'fu_grenade_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fu_grenade', ingredients = { @@ -1894,7 +1894,7 @@ data:extend({ { name = 'fu_lab_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fu_lab_item', ingredients = { @@ -1914,7 +1914,7 @@ data:extend({ { name = 'fu_ingot_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fu_ingot_item', ingredients = { @@ -1934,7 +1934,7 @@ data:extend({ { name = 'fu_gold_ingot_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ingot_category', main_product = 'fu_materials_gold_ingot', ingredients = { @@ -1953,7 +1953,7 @@ data:extend({ { name = 'fu_gold_plate_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fi_materials_gold', ingredients = { @@ -1971,7 +1971,7 @@ data:extend({ { name = 'fu_neodym_ingot_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ingot_category', main_product = 'fu_materials_neodym_ingot', ingredients = { @@ -1990,7 +1990,7 @@ data:extend({ { name = 'fu_neodym_plate_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fi_materials_neodym', ingredients = { @@ -2008,7 +2008,7 @@ data:extend({ { name = 'fu_titan_ingot_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ingot_category', main_product = 'fu_materials_titan_ingot', ingredients = { @@ -2027,7 +2027,7 @@ data:extend({ { name = 'fu_titan_plate_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fi_materials_titan', ingredients = { @@ -2045,7 +2045,7 @@ data:extend({ { name = 'fu_lead_ingot_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_ingot_category', main_product = 'fu_materials_lead_ingot', ingredients = { @@ -2064,7 +2064,7 @@ data:extend({ { name = 'fu_lead_plate_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', main_product = 'fu_lead_item', ingredients = { @@ -2082,7 +2082,7 @@ data:extend({ { name = 'fu_treat_slag_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'el_dirty_water', ingredients = { diff --git a/248k_2/prototypes/gr_recipes.lua b/248k_2/prototypes/gr_recipes.lua index fdab89d..e0bd139 100644 --- a/248k_2/prototypes/gr_recipes.lua +++ b/248k_2/prototypes/gr_recipes.lua @@ -3,7 +3,7 @@ data:extend({ { name = 'gr_crafter_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fi_crafter_item',2}, {'fu_materials_KFK',100}, @@ -18,7 +18,7 @@ data:extend({ { name = 'gr_materials_fusion_cell_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crafting_category', ingredients = { {'fu_space_probe_up_matter_item',1}, @@ -32,7 +32,7 @@ data:extend({ { name = 'gr_materials_stack_down_item_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fu_space_probe_down_matter_item',2}, {'low-density-structure',10}, @@ -45,7 +45,7 @@ data:extend({ { name = 'gr_materials_stack_up_item_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fu_space_probe_up_matter_item',2}, {'low-density-structure',10}, @@ -59,7 +59,7 @@ data:extend({ name = 'gr_wheel_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_e', ingredients = { {type="fluid", name="fu_iron", amount=500}, @@ -74,7 +74,7 @@ data:extend({ name = 'gr_steel_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_e', ingredients = { {type="fluid", name="fu_iron", amount=500}, @@ -89,7 +89,7 @@ data:extend({ { name = 'gr_magnet_train_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="gr_materials_fusion_cell_item", amount=4}, {type="item", name="fu_materials_KFK", amount=100}, @@ -106,7 +106,7 @@ data:extend({ { name = 'gr_magnet_wagon_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="gr_materials_fusion_cell_item", amount=2}, {type="item", name="fu_materials_KFK", amount=100}, @@ -123,7 +123,7 @@ data:extend({ { name = 'gr_magnet_tanker_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="gr_materials_fusion_cell_item", amount=2}, {type="item", name="fu_materials_KFK", amount=100}, @@ -140,7 +140,7 @@ data:extend({ { name = 'gr_magnet_train_pre_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_materials_KFK", amount=100}, {type="item", name="fu_materials_TIM", amount=100}, @@ -157,7 +157,7 @@ data:extend({ { name = 'gr_magnet_wagon_pre_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_materials_KFK", amount=100}, {type="item", name="fu_materials_TIM", amount=100}, @@ -174,7 +174,7 @@ data:extend({ { name = 'gr_magnet_tanker_pre_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fu_materials_KFK", amount=100}, {type="item", name="fu_materials_TIM", amount=100}, @@ -193,7 +193,7 @@ data:extend({ name = 'gr_kovarex_recipe', type = 'recipe', category = 'centrifuging', - enabled = 'false', + enabled = false, main_product = 'fu_space_probe_up_matter_item', ingredients = { {type="item", name="fu_space_probe_down_matter_item", amount=10} @@ -210,7 +210,7 @@ data:extend({ name = 'gr_kovarex_2_recipe', type = 'recipe', category = 'centrifuging', - enabled = 'false', + enabled = false, main_product = 'fu_space_probe_down_matter_item', ingredients = { {type="item", name="fu_space_probe_up_matter_item", amount=10} @@ -227,7 +227,7 @@ data:extend({ { name = 'gr_charger_recipe', type = 'recipe', - enabled = 'false', + enabled = false, main_product = 'gr_charger_item', ingredients = { {'low-density-structure',100}, @@ -248,7 +248,7 @@ data:extend({ name = 'gr_stabilizer_recipe', type = 'recipe', category = 'gr_charger_category', - enabled = 'false', + enabled = false, main_product = 'gr_materials_stabilizer_item', ingredients = { {'gr_materials_crushed_exotic_item',1}, @@ -265,7 +265,7 @@ data:extend({ { name = 'gr_crushed_exotic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_crushing', ingredients = { {'fu_space_probe_ore_item',1}, @@ -278,7 +278,7 @@ data:extend({ { name = 'gr_black_hole_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fu_star_engine_core_item',1}, {'fu_star_engine_heater_left_item',1}, @@ -296,7 +296,7 @@ data:extend({ { name = 'gr_white_hole_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fu_star_engine_core_item',1}, {'fu_star_engine_heater_left_item',1}, @@ -314,7 +314,7 @@ data:extend({ { name = 'gr_lab_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'gr_materials_stack_up_item',10}, {'gr_materials_stack_down_item',10}, @@ -332,7 +332,7 @@ data:extend({ { name = 'gr_red_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'automation-science-pack',100}, @@ -346,7 +346,7 @@ data:extend({ { name = 'gr_red_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_red_data_item',36}, @@ -361,7 +361,7 @@ data:extend({ { name = 'gr_green_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'logistic-science-pack',100}, @@ -375,7 +375,7 @@ data:extend({ { name = 'gr_green_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_green_data_item',72}, @@ -391,7 +391,7 @@ data:extend({ { name = 'gr_blue_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'chemical-science-pack',100}, @@ -405,7 +405,7 @@ data:extend({ { name = 'gr_blue_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_blue_data_item',155}, @@ -421,7 +421,7 @@ data:extend({ { name = 'gr_purple_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'production-science-pack',100}, @@ -435,7 +435,7 @@ data:extend({ { name = 'gr_purple_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_purple_data_item',310}, @@ -451,7 +451,7 @@ data:extend({ { name = 'gr_yellow_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'utility-science-pack',100}, @@ -465,7 +465,7 @@ data:extend({ { name = 'gr_yellow_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_yellow_data_item',620}, @@ -482,7 +482,7 @@ data:extend({ { name = 'gr_grey_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'space-science-pack',100}, @@ -496,7 +496,7 @@ data:extend({ { name = 'gr_grey_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_grey_data_item',1240}, @@ -512,7 +512,7 @@ data:extend({ { name = 'gr_white_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'fu_space_probe_science_item',100}, @@ -526,7 +526,7 @@ data:extend({ { name = 'gr_white_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_white_data_item',2480}, @@ -547,7 +547,7 @@ data:extend({ { name = 'gr_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_crushed_exotic_item',1}, @@ -563,7 +563,7 @@ data:extend({ { name = 'gr_stacked_data_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_fusor_crafting_category', ingredients = { {'gr_materials_data_item',3}, @@ -579,7 +579,7 @@ data:extend({ { name = 'gr_red_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'gr_charger_category', ingredients = { {'automation-science-pack',100}, @@ -593,7 +593,7 @@ data:extend({ { name = 'gr_green_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'gr_charger_category', ingredients = { {'logistic-science-pack',100}, @@ -607,7 +607,7 @@ data:extend({ { name = 'gr_blue_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'gr_charger_category', ingredients = { {'chemical-science-pack',100}, @@ -621,7 +621,7 @@ data:extend({ { name = 'gr_purple_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'gr_charger_category', ingredients = { {'production-science-pack',100}, @@ -635,7 +635,7 @@ data:extend({ { name = 'gr_yellow_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'gr_charger_category', ingredients = { {'utility-science-pack',100}, @@ -649,7 +649,7 @@ data:extend({ { name = 'gr_grey_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'gr_charger_category', ingredients = { {'space-science-pack',100}, @@ -663,7 +663,7 @@ data:extend({ { name = 'gr_white_pack_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'gr_charger_category', ingredients = { {'fu_space_probe_science_item',100}, @@ -677,7 +677,7 @@ data:extend({ { name = 'gr_materials_charge_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'fu_space_probe_science_item',100}, {'low-density-structure',40}, @@ -691,7 +691,7 @@ data:extend({ { name = 'gr_materials_charge_remote_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {'gr_materials_fusion_cell_item',1} }, @@ -703,7 +703,7 @@ data:extend({ { name = 'gr_circuit_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', main_product = 'gr_materials_circuit', ingredients = { @@ -722,7 +722,7 @@ data:extend({ { name = 'gr_gold_wire_recipe', type = 'recipe', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_materials_gold", amount=1}, }, @@ -735,7 +735,7 @@ data:extend({ { name = 'gr_pcb_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'chemistry', ingredients = { {type="fluid", name="petroleum-gas", amount=30}, @@ -754,7 +754,7 @@ data:extend({ { name = 'gr_magnet_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_magnet_category', main_product = 'gr_materials_magnet', ingredients = { @@ -773,7 +773,7 @@ data:extend({ { name = 'gr_plasma_cube_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fu_plasma_category', main_product = 'gr_materials_plasma_cube', ingredients = { diff --git a/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua b/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua index 1c31a06..abd946f 100644 --- a/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua +++ b/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua @@ -2,9 +2,9 @@ function gr_make_white_hole_recipe(item) local blank = { name = 'blank', type = 'recipe', - enabled = 'true', - hidden = 'true', - allow_as_intermediate = 'false', + enabled = true, + hidden = true, + allow_as_intermediate = false, category = 'gr_white_hole_category', ingredients = { {'blank',1} diff --git a/248k_2/scripts/ind2/data-final-fixes.lua b/248k_2/scripts/ind2/data-final-fixes.lua index a3a860a..62cb217 100644 --- a/248k_2/scripts/ind2/data-final-fixes.lua +++ b/248k_2/scripts/ind2/data-final-fixes.lua @@ -29,7 +29,7 @@ data:extend({ name = 'gr_stainless_steel_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_e', ingredients = { {type="fluid", name="fu_iron", amount=500}, @@ -44,7 +44,7 @@ data:extend({ name = 'gr_invar_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_e', ingredients = { {type="fluid", name="fu_iron", amount=500}, @@ -59,7 +59,7 @@ data:extend({ name = 'gr_nickel_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_e', ingredients = { {type="fluid", name="fu_iron", amount=500}, @@ -74,7 +74,7 @@ data:extend({ name = 'gr_chrome_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_e', ingredients = { {type="fluid", name="fu_iron", amount=500}, @@ -89,7 +89,7 @@ data:extend({ name = 'gr_gold_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_e', ingredients = { {type="fluid", name="fu_iron", amount=500}, @@ -104,7 +104,7 @@ data:extend({ name = 'gr_tellerium_recipe', type = 'recipe', category = 'crafting-with-fluid', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_e', ingredients = { {type="fluid", name="fu_iron", amount=500}, diff --git a/248k_2/scripts/krastorio2/data-final-fixes.lua b/248k_2/scripts/krastorio2/data-final-fixes.lua index 6a8890a..337dac8 100644 --- a/248k_2/scripts/krastorio2/data-final-fixes.lua +++ b/248k_2/scripts/krastorio2/data-final-fixes.lua @@ -23,7 +23,7 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_materials_gold", amount=1}, {type="fluid", name="water", amount=150}, @@ -44,7 +44,7 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_materials_gold", amount=1}, {type="fluid", name="water", amount=300}, @@ -65,7 +65,7 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="fi_materials_gold", amount=1}, {type="fluid", name="water", amount=650}, @@ -86,7 +86,7 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'hydrogen', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="water", amount=1100}, }, @@ -197,7 +197,7 @@ data:extend({ type = 'recipe', category = 'fu_exchanger_crafting_category', main_product = 'steam', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_hot", amount=50}, {type="fluid", name="water", amount=1000/2}, @@ -217,7 +217,7 @@ data:extend({ type = 'recipe', category = 'fu_exchanger_crafting_category', main_product = 'steam', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lead_fluid_hot", amount=100}, {type="fluid", name="water", amount=1000/4}, @@ -236,7 +236,7 @@ data:extend({ name = 'fu_star_engine_cooler_7_recipe', type = 'recipe', category = 'fu_star_engine_cooler_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_c', ingredients = { {type="fluid", name="fu_iron_heated", amount=500}, @@ -252,7 +252,7 @@ data:extend({ type = 'recipe', category = 'chemistry', main_product = 'fu_deuterium', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="heavy-water", amount=10}, }, @@ -268,7 +268,7 @@ data:extend({ type = 'recipe', category = 'chemistry', main_product = 'fu_tritium', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="tritium", amount=1}, }, @@ -282,7 +282,7 @@ data:extend({ { name = 'fu_ki_core_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=100}, @@ -306,7 +306,7 @@ data:extend({ { name = 'el_water_pressure_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_special_fluid', icon = '__248k_2__/ressources/fluids/el_pressurized_water.png', icon_size = 64, @@ -324,7 +324,7 @@ data:extend({ { name = 'el_ceramic_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting-with-fluid', ingredients = { {type="fluid", name="steam", amount=10}, diff --git a/248k_2/scripts/krastorio2/overhaul.lua b/248k_2/scripts/krastorio2/overhaul.lua index 9ca3068..2f34a86 100644 --- a/248k_2/scripts/krastorio2/overhaul.lua +++ b/248k_2/scripts/krastorio2/overhaul.lua @@ -441,7 +441,7 @@ data:extend({ { name = 'fi_arc_glass_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'el_arc_furnace_category', ingredients = { {type="item", name="glass", amount=3}, @@ -460,7 +460,7 @@ data:extend({ type = 'recipe', category = 'chemistry', main_product = 'fu_tritium', - enabled = 'false', + enabled = false, ingredients = { {type="item", name="tritium", amount=1}, }, @@ -476,7 +476,7 @@ data:extend({ type = 'recipe', category = 'chemistry', main_product = 'fu_deuterium', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="heavy-water", amount=10}, {type="item", name="improved-pollution-filter", amount=1}, @@ -492,7 +492,7 @@ data:extend({ name = 'fu_star_engine_cooler_7_recipe', type = 'recipe', category = 'fu_star_engine_cooler_crafting_category', - enabled = 'false', + enabled = false, subgroup = 'fu_star_engine_subgroup_c', ingredients = { {type="fluid", name="fu_iron_heated", amount=500}, diff --git a/248k_2/scripts/realisticreactors/overhaul.lua b/248k_2/scripts/realisticreactors/overhaul.lua index da77de7..75d19c2 100644 --- a/248k_2/scripts/realisticreactors/overhaul.lua +++ b/248k_2/scripts/realisticreactors/overhaul.lua @@ -276,7 +276,7 @@ data:extend({ { name = 'fi_test_fuel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'uranium-238',2}, @@ -290,7 +290,7 @@ data:extend({ { name = 'fi_tech_fuel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'crafting', ingredients = { {'fi_test_used_fuel', 1}, @@ -305,7 +305,7 @@ data:extend({ { name = 'fi_use_tech_fuel_recipe', type = 'recipe', - enabled = 'false', + enabled = false, category = 'fi_test_fuel_crafting_category', ingredients = { {'fi_test_fuel', 1} diff --git a/248k_2/scripts/umr/data.lua b/248k_2/scripts/umr/data.lua index 80578c2..c871c11 100644 --- a/248k_2/scripts/umr/data.lua +++ b/248k_2/scripts/umr/data.lua @@ -60,7 +60,7 @@ data:extend({ name = 'fu_fusion_card_3_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_helium_3", amount=100}, @@ -74,7 +74,7 @@ data:extend({ name = 'fu_fusion_card_6_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', - enabled = 'false', + enabled = false, ingredients = { {type="fluid", name="fu_deuterium", amount=100}, {type="fluid", name="fu_helium_3", amount=100}, From 13febea43457d83b900db38224aa939e7daae19f Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 21:20:11 +0200 Subject: [PATCH 4/9] Fix results/ingredients --- 248k_2/prototypes/el_recipes.lua | 174 +++---- 248k_2/prototypes/fi_recipes.lua | 435 ++++++++---------- 248k_2/prototypes/fu_recipes.lua | 358 +++++--------- 248k_2/prototypes/fusion/fu_space_probe.lua | 6 +- 248k_2/prototypes/gr_recipes.lua | 311 ++++++------- 248k_2/scripts/SE/data-final-fixes.lua | 30 +- 248k_2/scripts/electronic/el_burner.lua | 12 +- .../gr_make_white_hole_recipes.lua | 42 +- 248k_2/scripts/ind2/data-final-fixes.lua | 6 - .../scripts/krastorio2/data-final-fixes.lua | 44 +- 248k_2/scripts/krastorio2/overhaul.lua | 151 +++--- 248k_2/scripts/overhaul.lua | 82 ++-- 248k_2/scripts/realisticreactors/overhaul.lua | 52 +-- 248k_2/scripts/umr/data.lua | 6 +- 14 files changed, 680 insertions(+), 1029 deletions(-) diff --git a/248k_2/prototypes/el_recipes.lua b/248k_2/prototypes/el_recipes.lua index 22074be..345f1bc 100644 --- a/248k_2/prototypes/el_recipes.lua +++ b/248k_2/prototypes/el_recipes.lua @@ -13,13 +13,12 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'el_aluminum_item',30}, - {'concrete',20}, - {'electronic-circuit',40}, - {'copper-plate',20}, + {type="item", name="el_aluminum_item", amount=30}, + {type="item", name="concrete", amount=20}, + {type="item", name="electronic-circuit", amount=40}, + {type="item", name="copper-plate", amount=20}, }, - result = 'el_solar_item', - result_count = 2, + results = {{type="item", name='el_solar_item', amount=2}}, energy_required = 4, order = 'a-a-2', }, @@ -33,12 +32,11 @@ data:extend({ category = 'crafting', subgroup = 'el_item_subgroup_b', ingredients = { - {'el_lithium_item',4}, - {'iron-plate',4}, - {'copper-plate',4}, + {type="item", name="el_lithium_item", amount=4}, + {type="item", name="iron-plate", amount=4}, + {type="item", name="copper-plate", amount=4}, }, - result = 'battery', - result_count = 12, + results = {{type="item", name='battery', amount=12}}, energy_required = 20, order = 'b-a', }, @@ -49,12 +47,11 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'el_lithium_item',4}, - {'iron-plate',4}, - {'steel-plate',4}, + {type="item", name="el_lithium_item", amount=4}, + {type="item", name="iron-plate", amount=4}, + {type="item", name="steel-plate", amount=4}, }, - result = 'el_lithium_battery', - result_count = 2, + results = {{type="item", name='el_lithium_battery', amount=2}}, energy_required = 10, }, --el_burner @@ -64,13 +61,12 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'iron-gear-wheel',40}, - {'steel-plate',15}, - {'el_materials_ALK',10}, - {'electronic-circuit',10} + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="steel-plate", amount=15}, + {type="item", name="el_materials_ALK", amount=10}, + {type="item", name="electronic-circuit", amount=10} }, - result = 'el_burner_item', - result_count = 1, + results = {{type="item", name='el_burner_item', amount=1}}, energy_required = 4, }, { @@ -79,12 +75,11 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'el_burner_item',1}, - {'pipe',20}, - {'electronic-circuit',20}, + {type="item", name="el_burner_item", amount=1}, + {type="item", name="pipe", amount=20}, + {type="item", name="electronic-circuit", amount=20}, }, - result = 'el_burner_kerosene_item', - result_count = 1, + results = {{type="item", name='el_burner_kerosene_item', amount=1}}, energy_required = 4, }, --el_water_generator @@ -94,15 +89,14 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'iron-gear-wheel',60}, - {'engine-unit',15}, - {'el_materials_ALK',20}, - {'electronic-circuit',20}, - {'pipe',30}, - {'copper-cable',20}, + {type="item", name="iron-gear-wheel", amount=60}, + {type="item", name="engine-unit", amount=15}, + {type="item", name="el_materials_ALK", amount=20}, + {type="item", name="electronic-circuit", amount=20}, + {type="item", name="pipe", amount=30}, + {type="item", name="copper-cable", amount=20}, }, - result = 'el_water_generator_item', - result_count = 2, + results = {{type="item", name='el_water_generator_item', amount=2}}, energy_required = 4, }, --el_pressurizer @@ -112,13 +106,12 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'iron-gear-wheel',20}, - {'pipe',15}, - {'el_materials_ALK',10}, - {'electronic-circuit',10} + {type="item", name="iron-gear-wheel", amount=20}, + {type="item", name="pipe", amount=15}, + {type="item", name="el_materials_ALK", amount=10}, + {type="item", name="electronic-circuit", amount=10} }, - result = 'el_pressurizer_item', - result_count = 1, + results = {{type="item", name='el_pressurizer_item', amount=1}}, energy_required = 4, }, --el_water_pressure @@ -147,14 +140,13 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'locomotive',1}, - {'engine-unit',15}, - {'iron-gear-wheel',40}, - {'advanced-circuit',15}, - {'el_materials_ALK',25}, + {type="item", name="locomotive", amount=1}, + {type="item", name="engine-unit", amount=15}, + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="advanced-circuit", amount=15}, + {type="item", name="el_materials_ALK", amount=25}, }, - result = 'el_diesel_train_item', - result_count = 1, + results = {{type="item", name='el_diesel_train_item', amount=1}}, energy_required = 20, }, --el_kerosene @@ -173,7 +165,6 @@ data:extend({ {type="fluid", name="light-oil", amount=90}, {type="fluid", name="water", amount=70}, }, - result_count = 1, energy_required = 5, icon_size = 64, icons = { @@ -191,12 +182,11 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'storage-tank', 4}, - {'steel-plate', 50}, - {'el_aluminum_item', 150}, + {type="item", name="storage-tank", amount=4}, + {type="item", name="steel-plate", amount=50}, + {type="item", name="el_aluminum_item", amount=150}, }, - result = 'el_tank_item', - result_count = 1, + results = {{type="item", name='el_tank_item', amount=1}}, energy_required = 4, }, --el_desulfurized_kerosene @@ -213,7 +203,6 @@ data:extend({ {type="fluid", name="el_desulfurized_kerosene", amount=80}, {type="fluid", name="el_acidic_water", amount=120}, }, - result_count = 1, energy_required = 4, }, --el_usage_acidic_water @@ -232,7 +221,6 @@ data:extend({ {type="fluid", name="sulfuric-acid", amount=100}, --{type="item", name="sulfur", amount=6}, }, - result_count = 1, energy_required = 4, }, --el_train_fuel_diesel @@ -249,7 +237,6 @@ data:extend({ results = { {type="item", name="el_train_fuel_diesel_item", amount=1}, }, - result_count = 1, energy_required = 10, }, --el_generator_equip @@ -267,7 +254,6 @@ data:extend({ results = { {type="item", name="el_train_equipment_generator_item", amount=1}, }, - result_count = 1, energy_required = 25, }, --el_accelerator_equip @@ -285,7 +271,6 @@ data:extend({ results = { {type="item", name="el_train_equipment_accelerator_item", amount=1}, }, - result_count = 1, energy_required = 25, }, --el_energy_crystal @@ -301,7 +286,6 @@ data:extend({ results = { {type="item", name="el_energy_crystal_item", amount=2}, }, - result_count = 1, energy_required = 10, always_show_made_in = true }, @@ -318,7 +302,6 @@ data:extend({ results = { {type="item", name="el_train_fuel_diesel_energized_item", amount=4}, }, - result_count = 1, energy_required = 5, }, --el_ki_beacon @@ -335,7 +318,6 @@ data:extend({ results = { {type="item", name="el_ki_beacon_item", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -352,7 +334,6 @@ data:extend({ results = { {type="item", name="fi_ki_beacon_item", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -369,7 +350,6 @@ data:extend({ results = { {type="item", name="fu_ki_beacon_item", amount=1}, }, - result_count = 1, energy_required = 6, }, --el_ki_core @@ -393,7 +373,6 @@ data:extend({ results = { {type="item", name="el_ki_core_item", amount=1}, }, - result_count = 1, energy_required = 60, }, { @@ -414,7 +393,6 @@ data:extend({ results = { {type="item", name="fi_ki_core_item", amount=1}, }, - result_count = 1, energy_required = 60, }, { @@ -438,7 +416,6 @@ data:extend({ results = { {type="item", name="fu_ki_core_item", amount=1}, }, - result_count = 1, energy_required = 60, }, --el_ki_memory_entity @@ -456,7 +433,6 @@ data:extend({ results = { {type="item", name="el_ki_memory_item", amount=1}, }, - result_count = 1, energy_required = 30, }, { @@ -473,7 +449,6 @@ data:extend({ results = { {type="item", name="fi_ki_circuit_item", amount=1}, }, - result_count = 1, energy_required = 30, }, { @@ -492,7 +467,6 @@ data:extend({ results = { {type="item", name="fu_ki_circuit_item", amount=1}, }, - result_count = 1, energy_required = 30, }, --el_ki_memory_fluid @@ -809,8 +783,7 @@ data:extend({ results = { {type="item", name="el_ki_cpu_item", amount=1}, }, - result_count = 1, - energy_required = 30, + energy_required = 30, }, --el_ki_cpu_fluid { @@ -972,12 +945,11 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'iron-gear-wheel',40}, - {'steel-plate',25}, - {'stone-furnace',2} + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="steel-plate", amount=25}, + {type="item", name="stone-furnace", amount=2} }, - result = 'el_arc_furnace_item', - result_count = 1, + results = {{type="item", name='el_arc_furnace_item', amount=1}}, energy_required = 4, }, { @@ -986,12 +958,11 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'iron-gear-wheel',40}, - {'steel-plate',25}, - {'electronic-circuit',20} + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="steel-plate", amount=25}, + {type="item", name="electronic-circuit", amount=20} }, - result = 'el_caster_item', - result_count = 1, + results = {{type="item", name='el_caster_item', amount=1}}, energy_required = 4, }, { @@ -1000,12 +971,11 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'iron-gear-wheel',40}, - {'steel-plate',15}, - {'electronic-circuit',10} + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="steel-plate", amount=15}, + {type="item", name="electronic-circuit", amount=10} }, - result = 'el_purifier_item', - result_count = 1, + results = {{type="item", name='el_purifier_item', amount=1}}, energy_required = 4, }, { @@ -1014,13 +984,12 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'iron-gear-wheel',40}, - {'steel-plate',15}, - {'el_materials_ALK',15}, - {'electronic-circuit',10} + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="steel-plate", amount=15}, + {type="item", name="el_materials_ALK", amount=15}, + {type="item", name="electronic-circuit", amount=10} }, - result = 'el_grower_item', - result_count = 1, + results = {{type="item", name='el_grower_item', amount=1}}, energy_required = 4, }, @@ -1186,10 +1155,9 @@ data:extend({ enabled = false, category = 'smelting', ingredients = { - {'el_aluminum_ore_item',2}, + {type="item", name="el_aluminum_ore_item", amount=2}, }, - result = 'el_aluminum_item', - result_count = 4, + results = {{type="item", name='el_aluminum_item', amount=4}}, energy_required = 2, always_show_made_in = true, order = 'a-c', @@ -1423,7 +1391,6 @@ data:extend({ {type="fluid", name="el_kerosene", amount=140}, {type="fluid", name="water", amount=90}, }, - result_count = 1, energy_required = 5, icon_size = 64, icons = { @@ -1441,12 +1408,11 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'iron-gear-wheel',40}, - {'steel-plate',25}, - {'stone-furnace',2} + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="steel-plate", amount=25}, + {type="item", name="stone-furnace", amount=2} }, - result = 'el_charger_item', - result_count = 1, + results = {{type="item", name='el_charger_item', amount=1}}, energy_required = 4, }, { @@ -1457,8 +1423,7 @@ data:extend({ ingredients = { {type='item', name='el_energy_crystal_item', amount=1}, }, - result = 'el_energy_crystal_charged_item', - result_count = 1, + results = {{type="item", name='el_energy_crystal_charged_item', amount=1}}, energy_required = 2, always_show_made_in = true, }, @@ -1475,7 +1440,6 @@ data:extend({ results = { {type="item", name="el_grenade", amount=1}, }, - result_count = 1, energy_required = 4, }, diff --git a/248k_2/prototypes/fi_recipes.lua b/248k_2/prototypes/fi_recipes.lua index 0ba915b..ff918cf 100644 --- a/248k_2/prototypes/fi_recipes.lua +++ b/248k_2/prototypes/fi_recipes.lua @@ -14,14 +14,13 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'concrete',30}, - {'fi_materials_GFK',20}, - {'iron-gear-wheel',20}, - {'electronic-circuit',15}, - {'el_energy_crystal_item',4}, + {type="item", name="concrete", amount=30}, + {type="item", name="fi_materials_GFK", amount=20}, + {type="item", name="iron-gear-wheel", amount=20}, + {type="item", name="electronic-circuit", amount=15}, + {type="item", name="el_energy_crystal_item", amount=4}, }, - result = 'fi_crafter_item', - result_count = 1, + results = {{type="item", name='fi_crafter_item', amount=1}}, energy_required = 4, }, { @@ -29,12 +28,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'concrete',50}, - {'fi_materials_GFK',40}, - {'el_tank_item',1} + {type="item", name="concrete", amount=50}, + {type="item", name="fi_materials_GFK", amount=40}, + {type="item", name="el_tank_item", amount=1} }, - result = 'fi_castor_item', - result_count = 1, + results = {{type="item", name='fi_castor_item', amount=1}}, energy_required = 4, }, --crusher @@ -43,14 +41,13 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'concrete',60}, - {'el_materials_ALK',20}, - {'iron-gear-wheel',40}, - {'engine-unit',15}, - {'el_energy_crystal_item',10}, + {type="item", name="concrete", amount=60}, + {type="item", name="el_materials_ALK", amount=20}, + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="engine-unit", amount=15}, + {type="item", name="el_energy_crystal_item", amount=10}, }, - result = 'fi_crusher_item', - result_count = 1, + results = {{type="item", name='fi_crusher_item', amount=1}}, energy_required = 4, }, --miner @@ -59,14 +56,13 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'concrete',100}, - {'fi_compound_material_item',60}, - {'iron-gear-wheel',40}, - {'electric-mining-drill',8}, - {'engine-unit',10}, + {type="item", name="concrete", amount=100}, + {type="item", name="fi_compound_material_item", amount=60}, + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="electric-mining-drill", amount=8}, + {type="item", name="engine-unit", amount=10}, }, - result = 'fi_miner_item', - result_count = 1, + results = {{type="item", name='fi_miner_item', amount=1}}, energy_required = 4, }, --fuels @@ -75,12 +71,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'uranium-235',1}, - {'uranium-238',19}, - {'el_materials_ALK',10}, + {type="item", name="uranium-235", amount=1}, + {type="item", name="uranium-238", amount=19}, + {type="item", name="el_materials_ALK", amount=10}, }, - result = 'fi_basic_fuel_item', - result_count = 8, + results = {{type="item", name='fi_basic_fuel_item', amount=8}}, energy_required = 20, }, { @@ -88,12 +83,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_thorium232_item',10}, - {'uranium-238',10}, - {'el_materials_ALK',10}, + {type="item", name="fi_thorium232_item", amount=10}, + {type="item", name="uranium-238", amount=10}, + {type="item", name="el_materials_ALK", amount=10}, }, - result = 'fi_basic_thorium_fuel_item', - result_count = 8, + results = {{type="item", name='fi_basic_thorium_fuel_item', amount=8}}, energy_required = 20, }, { @@ -101,12 +95,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_plutonium239_item',1}, - {'uranium-238',19}, - {'el_materials_ALK',10}, + {type="item", name="fi_plutonium239_item", amount=1}, + {type="item", name="uranium-238", amount=19}, + {type="item", name="el_materials_ALK", amount=10}, }, - result = 'fi_advanced_fuel_item', - result_count = 2, + results = {{type="item", name='fi_advanced_fuel_item', amount=2}}, energy_required = 20, }, { @@ -114,12 +107,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_uranium233_item',4}, - {'uranium-238',16}, - {'el_materials_ALK',10}, + {type="item", name="fi_uranium233_item", amount=4}, + {type="item", name="uranium-238", amount=16}, + {type="item", name="el_materials_ALK", amount=10}, }, - result = 'fi_advanced_thorium_fuel_item', - result_count = 2, + results = {{type="item", name='fi_advanced_thorium_fuel_item', amount=2}}, energy_required = 20, }, { @@ -127,12 +119,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'uranium-235',1}, - {'fi_plutonium239_item',1}, - {'el_materials_ALK',10}, + {type="item", name="uranium-235", amount=1}, + {type="item", name="fi_plutonium239_item", amount=1}, + {type="item", name="el_materials_ALK", amount=10}, }, - result = 'fi_pure_fuel_item', - result_count = 1, + results = {{type="item", name='fi_pure_fuel_item', amount=1}}, energy_required = 20, }, --reactor @@ -141,15 +132,14 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'steel-plate',450}, - {'concrete',400}, - {'fi_materials_GFK',300}, - {'fi_materials_NFK',300}, - {'fi_energy_crystal_item',40}, - {'advanced-circuit',500}, + {type="item", name="steel-plate", amount=450}, + {type="item", name="concrete", amount=400}, + {type="item", name="fi_materials_GFK", amount=300}, + {type="item", name="fi_materials_NFK", amount=300}, + {type="item", name="fi_energy_crystal_item", amount=40}, + {type="item", name="advanced-circuit", amount=500}, }, - result = 'fi_solid_reactor_item', - result_count = 1, + results = {{type="item", name='fi_solid_reactor_item', amount=1}}, energy_required = 20, }, --material @@ -158,12 +148,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'el_aluminum_item',15}, - {'steel-plate',10}, - {'iron-plate',20}, + {type="item", name="el_aluminum_item", amount=15}, + {type="item", name="steel-plate", amount=10}, + {type="item", name="iron-plate", amount=20}, }, - result = 'fi_compound_material_item', - result_count = 2, + results = {{type="item", name='fi_compound_material_item', amount=2}}, energy_required = 4, }, { @@ -173,12 +162,11 @@ data:extend({ category = 'fi_crafting_category', subgroup = 'fi_item_subgroup_b', ingredients = { - {'fi_materials_glass_fiber',3}, - {'el_materials_ALK',3}, - {'copper-plate',30}, + {type="item", name="fi_materials_glass_fiber", amount=3}, + {type="item", name="el_materials_ALK", amount=3}, + {type="item", name="copper-plate", amount=30}, }, - result = 'low-density-structure', - result_count = 4, + results = {{type="item", name='low-density-structure', amount=4}}, energy_required = 20, order = 'b-b', always_show_made_in = true, @@ -192,15 +180,14 @@ data:extend({ category = 'centrifuging', main_product = 'fi_plutonium239_item', ingredients = { - {'fi_used_basic_fuel_item',6}, + {type="item", name="fi_used_basic_fuel_item", amount=6}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {'fi_plutonium239_item',1}, - {'fi_materials_waste',1}, + {type="item", name="fi_plutonium239_item", amount=1}, + {type="item", name="fi_materials_waste", amount=1}, {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, - result_count = 1, energy_required = 20, }, { @@ -210,15 +197,14 @@ data:extend({ category = 'crafting-with-fluid', main_product = 'fi_thorium232_item', ingredients = { - {'stone',80}, - {'el_energy_crystal_item',2}, + {type="item", name="stone", amount=80}, + {type="item", name="el_energy_crystal_item", amount=2}, {type="fluid", name="sulfuric-acid", amount=140}, }, results = { - {'fi_thorium232_item',2}, - {'uranium-238',3} + {type="item", name="fi_thorium232_item", amount=2}, + {type="item", name="uranium-238", amount=3} }, - result_count = 1, energy_required = 40, }, { @@ -228,15 +214,14 @@ data:extend({ category = 'centrifuging', main_product = 'fi_uranium233_item', ingredients = { - {'fi_used_basic_thorium_fuel_item',6}, + {type="item", name="fi_used_basic_thorium_fuel_item", amount=6}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {'fi_uranium233_item',1}, - {'fi_materials_waste',1}, + {type="item", name="fi_uranium233_item", amount=1}, + {type="item", name="fi_materials_waste", amount=1}, {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, - result_count = 1, energy_required = 20, }, { @@ -244,12 +229,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'explosive-rocket',10}, - {'fi_plutonium239_item',10}, - {'rocket-control-unit',10} + {type="item", name="explosive-rocket", amount=10}, + {type="item", name="fi_plutonium239_item", amount=10}, + {type="item", name="rocket-control-unit", amount=10} }, - result = 'atomic-bomb', - result_count = 1, + results = {{type="item", name='atomic-bomb', amount=1}}, energy_required = 20, }, --wideraufbereitung @@ -260,15 +244,14 @@ data:extend({ main_product = 'uranium-238', category = 'centrifuging', ingredients = { - {'fi_used_advanced_fuel_item',4}, + {type="item", name="fi_used_advanced_fuel_item", amount=4}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {'uranium-238',1}, - {'fi_materials_waste',1}, + {type="item", name="uranium-238", amount=1}, + {type="item", name="fi_materials_waste", amount=1}, {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, - result_count = 3, energy_required = 20, subgroup = 'fi_item_subgroup_a', order = 'a-d', @@ -281,15 +264,14 @@ data:extend({ category = 'centrifuging', main_product = 'uranium-238', ingredients = { - {'fi_used_advanced_thorium_fuel_item',4}, + {type="item", name="fi_used_advanced_thorium_fuel_item", amount=4}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {'uranium-238',1}, - {'fi_materials_waste',1}, + {type="item", name="uranium-238", amount=1}, + {type="item", name="fi_materials_waste", amount=1}, {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, - result_count = 3, energy_required = 20, subgroup = 'fi_item_subgroup_a', order = 'a-e', @@ -302,15 +284,14 @@ data:extend({ category = 'centrifuging', main_product = 'uranium-238', ingredients = { - {'fi_used_pure_fuel_item',4}, + {type="item", name="fi_used_pure_fuel_item", amount=4}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {'uranium-238',1}, - {'fi_materials_waste',1}, + {type="item", name="uranium-238", amount=1}, + {type="item", name="fi_materials_waste", amount=1}, {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, - result_count = 3, energy_required = 20, subgroup = 'fi_item_subgroup_a', order = 'a-f', @@ -322,11 +303,10 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_solid_reactor_item',1}, - {'fi_pure_fuel_item',1}, + {type="item", name="fi_solid_reactor_item", amount=1}, + {type="item", name="fi_pure_fuel_item", amount=1}, }, - result = 'fi_equipment_player_reactor_item', - result_count = 6, + results = {{type="item", name='fi_equipment_player_reactor_item', amount=6}}, energy_required = 20, }, { @@ -334,13 +314,12 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_energy_crystal_item',20}, - {'low-density-structure',10}, - {'processing-unit',10}, - {'energy-shield-mk2-equipment',5} + {type="item", name="fi_energy_crystal_item", amount=20}, + {type="item", name="low-density-structure", amount=10}, + {type="item", name="processing-unit", amount=10}, + {type="item", name="energy-shield-mk2-equipment", amount=5} }, - result = 'fi_equipment_player_shield_item', - result_count = 1, + results = {{type="item", name='fi_equipment_player_shield_item', amount=1}}, energy_required = 20, }, { @@ -348,13 +327,12 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_solid_reactor_item',1}, - {'low-density-structure',10}, - {'iron-gear-wheel',20}, - {'fi_pure_fuel_item',1}, + {type="item", name="fi_solid_reactor_item", amount=1}, + {type="item", name="low-density-structure", amount=10}, + {type="item", name="iron-gear-wheel", amount=20}, + {type="item", name="fi_pure_fuel_item", amount=1}, }, - result = 'fi_train_equipment_generator_item', - result_count = 6, + results = {{type="item", name='fi_train_equipment_generator_item', amount=6}}, energy_required = 20, }, --crystals @@ -367,8 +345,7 @@ data:extend({ {type="item", name="el_energy_crystal_item", amount=1}, {type="fluid", name="fi_crystal_fluid", amount=50}, }, - result = 'fi_energy_crystal_item', - result_count = 2, + results = {{type="item", name='fi_energy_crystal_item', amount=2}}, energy_required = 4, always_show_made_in = true, }, @@ -378,10 +355,9 @@ data:extend({ enabled = false, category = 'centrifuging', ingredients = { - {'el_train_fuel_diesel_energized_item',1}, + {type="item", name="el_train_fuel_diesel_energized_item", amount=1}, }, - result = 'fi_catalyst_crystal_item', - result_count = 2, + results = {{type="item", name='fi_catalyst_crystal_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -394,8 +370,7 @@ data:extend({ {type="fluid", name="fi_crystal_fluid", amount=100}, {type="item", name="fi_catalyst_crystal_item", amount=1}, }, - result = 'fi_base_crystal_item', - result_count = 2, + results = {{type="item", name='fi_base_crystal_item', amount=2}}, energy_required = 6, }, { @@ -404,10 +379,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'el_energy_crystal_item',1}, + {type="item", name="el_energy_crystal_item", amount=1}, }, - result = 'fi_crushed_crystal_item', - result_count = 2, + results = {{type="item", name='fi_crushed_crystal_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -432,11 +406,10 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_energy_crystal_charged_item',1}, - {'el_train_fuel_diesel_item',4}, + {type="item", name="fi_energy_crystal_charged_item", amount=1}, + {type="item", name="el_train_fuel_diesel_item", amount=4}, }, - result = 'fi_fuel_train_crystal_item', - result_count = 4, + results = {{type="item", name='fi_fuel_train_crystal_item', amount=4}}, energy_required = 5, }, --crushed @@ -446,10 +419,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'el_lithium_item',1}, + {type="item", name="el_lithium_item", amount=1}, }, - result = 'fi_crushed_lithium_item', - result_count = 2, + results = {{type="item", name='fi_crushed_lithium_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -459,10 +431,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'iron-plate',1}, + {type="item", name="iron-plate", amount=1}, }, - result = 'fi_crushed_iron_item', - result_count = 2, + results = {{type="item", name='fi_crushed_iron_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -472,10 +443,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'copper-plate',1}, + {type="item", name="copper-plate", amount=1}, }, - result = 'fi_crushed_copper_item', - result_count = 2, + results = {{type="item", name='fi_crushed_copper_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -485,10 +455,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'el_aluminum_item',1}, + {type="item", name="el_aluminum_item", amount=1}, }, - result = 'fi_crushed_aluminum_item', - result_count = 2, + results = {{type="item", name='fi_crushed_aluminum_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -498,10 +467,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'coal',1}, + {type="item", name="coal", amount=1}, }, - result = 'fi_crushed_coal_item', - result_count = 2, + results = {{type="item", name='fi_crushed_coal_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -511,10 +479,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'stone',1}, + {type="item", name="stone", amount=1}, }, - result = 'fi_crushed_stone_item', - result_count = 2, + results = {{type="item", name='fi_crushed_stone_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -524,10 +491,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'uranium-238',1}, + {type="item", name="uranium-238", amount=1}, }, - result = 'fi_crushed_uranium_item', - result_count = 2, + results = {{type="item", name='fi_crushed_uranium_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -537,12 +503,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_crushed_coal_item',3}, - {'fi_crushed_iron_item',4}, - {'fi_crushed_aluminum_item',1}, + {type="item", name="fi_crushed_coal_item", amount=3}, + {type="item", name="fi_crushed_iron_item", amount=4}, + {type="item", name="fi_crushed_aluminum_item", amount=1}, }, - result = 'fi_industrial_steel_blend_item', - result_count = 2, + results = {{type="item", name='fi_industrial_steel_blend_item', amount=2}}, energy_required = 4, }, { @@ -551,10 +516,9 @@ data:extend({ enabled = false, category = 'smelting', ingredients = { - {'fi_industrial_steel_blend_item',4}, + {type="item", name="fi_industrial_steel_blend_item", amount=4}, }, - result = 'fi_industrial_steel_item', - result_count = 2, + results = {{type="item", name='fi_industrial_steel_item', amount=2}}, energy_required = 2, always_show_made_in = true, }, @@ -564,10 +528,9 @@ data:extend({ enabled = false, category = 'smelting', ingredients = { - {'fi_industrial_steel_blend_item',1}, + {type="item", name="fi_industrial_steel_blend_item", amount=1}, }, - result = 'steel-plate', - result_count = 4, + results = {{type="item", name='steel-plate', amount=4}}, energy_required = 6, subgroup = 'fi_item_subgroup_b', order = 'b-a', @@ -579,13 +542,12 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_robo_charger_item',1}, - {'fi_materials_GFK',40}, - {'fi_materials_titan',10}, - {'fi_materials_NFK',20}, + {type="item", name="fi_robo_charger_item", amount=1}, + {type="item", name="fi_materials_GFK", amount=40}, + {type="item", name="fi_materials_titan", amount=10}, + {type="item", name="fi_materials_NFK", amount=20}, }, - result = 'fi_robo_port_item', - result_count = 1, + results = {{type="item", name='fi_robo_port_item', amount=1}}, energy_required = 6, }, { @@ -593,13 +555,12 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'roboport',1}, - {'el_materials_ALK',60}, - {'fi_energy_crystal_item',25}, - {'el_energy_crystal_item',25}, + {type="item", name="roboport", amount=1}, + {type="item", name="el_materials_ALK", amount=60}, + {type="item", name="fi_energy_crystal_item", amount=25}, + {type="item", name="el_energy_crystal_item", amount=25}, }, - result = 'fi_robo_charger_item', - result_count = 1, + results = {{type="item", name='fi_robo_charger_item', amount=1}}, energy_required = 6, }, --modules @@ -608,11 +569,10 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'low-density-structure',2}, - {'advanced-circuit',6}, + {type="item", name="low-density-structure", amount=2}, + {type="item", name="advanced-circuit", amount=6}, }, - result = 'fi_modules_base_item', - result_count = 1, + results = {{type="item", name='fi_modules_base_item', amount=1}}, energy_required = 6, }, { @@ -620,11 +580,10 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_modules_base_item',1}, - {'fi_materials_GFK',1}, + {type="item", name="fi_modules_base_item", amount=1}, + {type="item", name="fi_materials_GFK", amount=1}, }, - result = 'fi_modules_core_item', - result_count = 1, + results = {{type="item", name='fi_modules_core_item', amount=1}}, energy_required = 6, }, { @@ -632,12 +591,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_modules_core_item',1}, - {'productivity-module',2}, - {'advanced-circuit',6}, + {type="item", name="fi_modules_core_item", amount=1}, + {type="item", name="productivity-module", amount=2}, + {type="item", name="advanced-circuit", amount=6}, }, - result = 'fi_modules_productivity_1_item', - result_count = 1, + results = {{type="item", name='fi_modules_productivity_1_item', amount=1}}, energy_required = 6, }, { @@ -645,13 +603,12 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_modules_productivity_1_item',4}, - {'fi_modules_core_item',1}, - {'productivity-module-2',2}, - {'processing-unit',6}, + {type="item", name="fi_modules_productivity_1_item", amount=4}, + {type="item", name="fi_modules_core_item", amount=1}, + {type="item", name="productivity-module-2", amount=2}, + {type="item", name="processing-unit", amount=6}, }, - result = 'fi_modules_productivity_2_item', - result_count = 1, + results = {{type="item", name='fi_modules_productivity_2_item', amount=1}}, energy_required = 6, }, { @@ -659,13 +616,12 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_modules_productivity_2_item',4}, - {'fi_modules_core_item',1}, - {'productivity-module-3',2}, - {'fu_tech_sign_item',40}, + {type="item", name="fi_modules_productivity_2_item", amount=4}, + {type="item", name="fi_modules_core_item", amount=1}, + {type="item", name="productivity-module-3", amount=2}, + {type="item", name="fu_tech_sign_item", amount=40}, }, - result = 'fi_modules_productivity_3_item', - result_count = 1, + results = {{type="item", name='fi_modules_productivity_3_item', amount=1}}, energy_required = 6, }, { @@ -673,12 +629,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_modules_productivity_3_item',6}, - {'fi_modules_core_item',1}, - {'gr_materials_stack_up_item',4}, + {type="item", name="fi_modules_productivity_3_item", amount=6}, + {type="item", name="fi_modules_core_item", amount=1}, + {type="item", name="gr_materials_stack_up_item", amount=4}, }, - result = 'fi_modules_productivity_4_item', - result_count = 1, + results = {{type="item", name='fi_modules_productivity_4_item', amount=1}}, energy_required = 6, }, { @@ -686,12 +641,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_modules_productivity_4_item',6}, - {'fi_modules_core_item',1}, - {'gr_materials_stack_down_item',4}, + {type="item", name="fi_modules_productivity_4_item", amount=6}, + {type="item", name="fi_modules_core_item", amount=1}, + {type="item", name="gr_materials_stack_down_item", amount=4}, }, - result = 'fi_modules_productivity_5_item', - result_count = 1, + results = {{type="item", name='fi_modules_productivity_5_item', amount=1}}, energy_required = 6, }, { @@ -699,12 +653,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_modules_productivity_5_item',6}, - {'fi_modules_core_item',1}, - {'gr_materials_fusion_cell_item',4}, + {type="item", name="fi_modules_productivity_5_item", amount=6}, + {type="item", name="fi_modules_core_item", amount=1}, + {type="item", name="gr_materials_fusion_cell_item", amount=4}, }, - result = 'fi_modules_productivity_6_item', - result_count = 1, + results = {{type="item", name='fi_modules_productivity_6_item', amount=1}}, energy_required = 6, }, { @@ -713,14 +666,13 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'concrete',60}, - {'el_materials_ALK',20}, - {'iron-gear-wheel',40}, - {'engine-unit',15}, - {'el_energy_crystal_item',10}, + {type="item", name="concrete", amount=60}, + {type="item", name="el_materials_ALK", amount=20}, + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="engine-unit", amount=15}, + {type="item", name="el_energy_crystal_item", amount=10}, }, - result = 'fi_fiberer_item', - result_count = 1, + results = {{type="item", name='fi_fiberer_item', amount=1}}, energy_required = 4, }, { @@ -791,10 +743,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'fi_materials_glass',1}, + {type="item", name="fi_materials_glass", amount=1}, }, - result = 'fi_crushed_glass_item', - result_count = 2, + results = {{type="item", name='fi_crushed_glass_item', amount=2}}, energy_required = 1, always_show_made_in = true, }, @@ -1056,14 +1007,13 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'concrete',60}, - {'el_materials_ALK',60}, - {'iron-gear-wheel',40}, - {'engine-unit',15}, - {'el_energy_crystal_item',20}, + {type="item", name="concrete", amount=60}, + {type="item", name="el_materials_ALK", amount=60}, + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="engine-unit", amount=15}, + {type="item", name="el_energy_crystal_item", amount=20}, }, - result = 'fi_compound_machine_item', - result_count = 1, + results = {{type="item", name='fi_compound_machine_item', amount=1}}, energy_required = 4, }, { @@ -1255,9 +1205,9 @@ data:extend({ category = 'crafting', ingredients = { {type="item", name="oil-refinery", amount=1}, - {'concrete',60}, - {'el_materials_ALK',20}, - {'engine-unit',15}, + {type="item", name="concrete", amount=60}, + {type="item", name="el_materials_ALK", amount=20}, + {type="item", name="engine-unit", amount=15}, }, results = { {type="item", name="fi_refinery_item", amount=1} @@ -1420,8 +1370,7 @@ data:extend({ ingredients = { {type='item', name='fi_energy_crystal_item', amount=1}, }, - result = 'fi_energy_crystal_charged_item', - result_count = 1, + results = {{type="item", name='fi_energy_crystal_charged_item', amount=1}}, energy_required = 10, always_show_made_in = true, }, @@ -1454,7 +1403,6 @@ data:extend({ results = { {type="item", name="fi_grenade", amount=1}, }, - result_count = 1, energy_required = 4, }, { @@ -1471,7 +1419,6 @@ data:extend({ results = { {type="item", name="solid-fuel", amount=1}, }, - result_count = 1, energy_required = 2, subgroup = 'fluid-recipes', order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-a', @@ -1490,7 +1437,6 @@ data:extend({ results = { {type="item", name="solid-fuel", amount=1}, }, - result_count = 1, energy_required = 2, subgroup = 'fluid-recipes', order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-b', @@ -1510,7 +1456,6 @@ data:extend({ results = { {type="item", name="rocket-fuel", amount=1}, }, - result_count = 1, energy_required = 30, subgroup = 'fluid-recipes', order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-c', @@ -1530,7 +1475,6 @@ data:extend({ results = { {type="item", name="rocket-fuel", amount=1}, }, - result_count = 1, energy_required = 30, subgroup = 'fluid-recipes', order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-d', @@ -1550,7 +1494,6 @@ data:extend({ results = { {type="item", name="rocket-fuel", amount=1}, }, - result_count = 1, energy_required = 30, subgroup = 'fluid-recipes', order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-d', @@ -1568,7 +1511,6 @@ data:extend({ results = { {type="item", name="fi_materials_rich_solution", amount=1}, }, - result_count = 1, energy_required = 0.2, always_show_made_in = true, }, @@ -1585,7 +1527,6 @@ data:extend({ {type="fluid", name="fi_dirty_water", amount=1000}, {type="item", name="fi_materials_empty_solution", amount=1}, }, - result_count = 1, energy_required = 0.2, always_show_made_in = true, }, @@ -1602,7 +1543,6 @@ data:extend({ results = { {type="item", name="fi_materials_dirty_solution", amount=1}, }, - result_count = 1, energy_required = 0.2, always_show_made_in = true, }, @@ -1619,7 +1559,6 @@ data:extend({ {type="fluid", name="el_dirty_water", amount=1000}, {type="item", name="fi_materials_empty_solution", amount=1}, }, - result_count = 1, energy_required = 0.2, always_show_made_in = true, subgroup = 'fi_item_subgroup_f', @@ -1639,7 +1578,6 @@ data:extend({ results = { {type="item", name="fi_materials_upgrade", amount=2}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -1656,7 +1594,6 @@ data:extend({ results = { {type="item", name="fu_miner_item_2", amount=1}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -1674,7 +1611,6 @@ data:extend({ results = { {type="item", name="fu_materials_upgrade", amount=2}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -1691,7 +1627,6 @@ data:extend({ results = { {type="item", name="fu_miner_item_3", amount=1}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -1709,7 +1644,6 @@ data:extend({ results = { {type="item", name="gr_materials_upgrade", amount=2}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -1726,7 +1660,6 @@ data:extend({ results = { {type="item", name="fu_miner_item_4", amount=1}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, diff --git a/248k_2/prototypes/fu_recipes.lua b/248k_2/prototypes/fu_recipes.lua index 59d896a..e2ffa58 100644 --- a/248k_2/prototypes/fu_recipes.lua +++ b/248k_2/prototypes/fu_recipes.lua @@ -5,17 +5,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'low-density-structure',100}, - {'fu_materials_TIM',100}, - {'fu_materials_KFK',100}, - {'fu_materials_magnet',20}, - {'fi_energy_crystal_item',100}, - {'concrete',500}, - {'lab',10}, - {'processing-unit',500} + {type="item", name="low-density-structure", amount=100}, + {type="item", name="fu_materials_TIM", amount=100}, + {type="item", name="fu_materials_KFK", amount=100}, + {type="item", name="fu_materials_magnet", amount=20}, + {type="item", name="fi_energy_crystal_item", amount=100}, + {type="item", name="concrete", amount=500}, + {type="item", name="lab", amount=10}, + {type="item", name="processing-unit", amount=500} }, - result = 'fu_fusor_item', - result_count = 1, + results = {{type="item", name='fu_fusor_item', amount=1}}, energy_required = 6, }, --reactor @@ -24,17 +23,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fu_materials_magnet',100}, - {'fu_materials_TIM',200}, - {'fu_materials_KFK',200}, - {'concrete',500}, - {'fu_materials_energy_crystal',100}, - {'pump',80}, - {'processing-unit',500}, - {'fu_tech_sign_item',100}, + {type="item", name="fu_materials_magnet", amount=100}, + {type="item", name="fu_materials_TIM", amount=200}, + {type="item", name="fu_materials_KFK", amount=200}, + {type="item", name="concrete", amount=500}, + {type="item", name="fu_materials_energy_crystal", amount=100}, + {type="item", name="pump", amount=80}, + {type="item", name="processing-unit", amount=500}, + {type="item", name="fu_tech_sign_item", amount=100}, }, - result = 'fu_stelar_reactor_item', - result_count = 1, + results = {{type="item", name='fu_stelar_reactor_item', amount=1}}, energy_required = 60, }, { @@ -42,17 +40,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fu_materials_magnet',200}, - {'fu_materials_TIM',400}, - {'fu_materials_KFK',400}, - {'concrete',500}, - {'fu_materials_energy_crystal',200}, - {'pump',80}, - {'processing-unit',500}, - {'fu_tech_sign_item',2000}, + {type="item", name="fu_materials_magnet", amount=200}, + {type="item", name="fu_materials_TIM", amount=400}, + {type="item", name="fu_materials_KFK", amount=400}, + {type="item", name="concrete", amount=500}, + {type="item", name="fu_materials_energy_crystal", amount=200}, + {type="item", name="pump", amount=80}, + {type="item", name="processing-unit", amount=500}, + {type="item", name="fu_tech_sign_item", amount=2000}, }, - result = 'fu_tokamak_reactor_item', - result_count = 1, + results = {{type="item", name='fu_tokamak_reactor_item', amount=1}}, energy_required = 60, }, @@ -62,15 +59,14 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'heat-exchanger',4}, - {'fu_materials_TIM',20}, - {'fu_materials_KFK',20}, - {'fi_materials_GFK',20}, - {'concrete',100}, - {'heat-pipe',20} + {type="item", name="heat-exchanger", amount=4}, + {type="item", name="fu_materials_TIM", amount=20}, + {type="item", name="fu_materials_KFK", amount=20}, + {type="item", name="fi_materials_GFK", amount=20}, + {type="item", name="concrete", amount=100}, + {type="item", name="heat-pipe", amount=20} }, - result = 'fu_boiler_item', - result_count = 1, + results = {{type="item", name='fu_boiler_item', amount=1}}, energy_required = 2, }, --burner @@ -80,12 +76,11 @@ data:extend({ enabled = false, hidden = false, ingredients = { - {'el_burner_item',1}, - {'pipe',20}, - {'electronic-circuit',20} + {type="item", name="el_burner_item", amount=1}, + {type="item", name="pipe", amount=20}, + {type="item", name="electronic-circuit", amount=20} }, - result = 'fu_burner_item', - result_count = 1, + results = {{type="item", name='fu_burner_item', amount=1}}, energy_required = 2, }, --tech sign @@ -98,8 +93,7 @@ data:extend({ {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_protium", amount=100}, }, - result = 'fu_materials_fusion_card', - result_count = 10, + results = {{type="item", name='fu_materials_fusion_card', amount=10}}, energy_required = 100, always_show_made_in = true, }, @@ -112,8 +106,7 @@ data:extend({ {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_deuterium", amount=100}, }, - result = 'fu_materials_fusion_card', - result_count = 100, + results = {{type="item", name='fu_materials_fusion_card', amount=100}}, energy_required = 100, always_show_made_in = true, }, @@ -126,8 +119,7 @@ data:extend({ {type="fluid", name="fu_deuterium", amount=100}, {type="fluid", name="fu_tritium", amount=100}, }, - result = 'fu_materials_fusion_card', - result_count = 500, + results = {{type="item", name='fu_materials_fusion_card', amount=500}}, energy_required = 100, always_show_made_in = true, }, @@ -139,8 +131,7 @@ data:extend({ ingredients = { {type="fluid", name="fu_deuterium", amount=100}, }, - result = 'fu_materials_fusion_card', - result_count = 50, + results = {{type="item", name='fu_materials_fusion_card', amount=50}}, energy_required = 100, always_show_made_in = true, }, @@ -152,8 +143,7 @@ data:extend({ ingredients = { {type="fluid", name="fu_protium", amount=20000}, }, - result = 'fu_materials_fusion_card', - result_count = 1, + results = {{type="item", name='fu_materials_fusion_card', amount=1}}, energy_required = 100, always_show_made_in = true, }, @@ -171,7 +161,6 @@ data:extend({ {type="fluid", name="fu_hydrogen", amount=100}, {type="fluid", name="fu_oxygen", amount=50} }, - result_count = 1, energy_required = 1, always_show_made_in = true, icon_size = 64, @@ -199,7 +188,6 @@ data:extend({ {type="fluid", name="fu_hydrogen", amount=200}, {type="fluid", name="fu_oxygen", amount=100} }, - result_count = 1, energy_required = 1, always_show_made_in = true, icon_size = 64, @@ -227,7 +215,6 @@ data:extend({ {type="fluid", name="fu_hydrogen", amount=500}, {type="fluid", name="fu_oxygen", amount=150}, }, - result_count = 1, energy_required = 1, always_show_made_in = true, icon_size = 64, @@ -254,7 +241,6 @@ data:extend({ results = { {type="fluid", name="fu_hydrogen", amount=1000}, }, - result_count = 1, energy_required = 1, always_show_made_in = true, icon_size = 64, @@ -297,7 +283,6 @@ data:extend({ results = { {type="fluid", name="fu_lithium_6", amount=5}, }, - result_count = 1, energy_required = 1, always_show_made_in = true, }, @@ -311,8 +296,7 @@ data:extend({ {type="item", name="stone", amount=10}, {type="fluid", name="sulfuric-acid", amount=20}, }, - result = 'fu_lead_ore_item', - result_count = 4, + results = {{type="item", name='fu_lead_ore_item', amount=4}}, energy_required = 2, }, --lead ore @@ -339,8 +323,7 @@ data:extend({ ingredients = { {type="item", name="fu_lead_item", amount=1}, }, - result = 'fu_crushed_lead_item', - result_count = 2, + results = {{type="item", name='fu_crushed_lead_item', amount=2}}, energy_required = 2, }, { @@ -354,7 +337,6 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_cold", amount=100}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -371,7 +353,6 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=1000}, }, - result_count = 1, energy_required = 1, }, { @@ -387,7 +368,6 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=1000}, }, - result_count = 1, energy_required = 1, }, { @@ -403,7 +383,6 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=1000}, }, - result_count = 1, energy_required = 1, }, { @@ -422,7 +401,6 @@ data:extend({ {type="fluid", name="fu_lead_fluid_hot", amount=300}, {type="item", name="fu_materials_charged_container", amount=6}, }, - result_count = 1, energy_required = 1, always_show_made_in = true, subgroup = 'fu_item_subgroup_e', @@ -444,7 +422,6 @@ data:extend({ {type="fluid", name="fu_lead_fluid_hot", amount=300}, {type="item", name="fu_materials_charged_container", amount=6}, }, - result_count = 1, energy_required = 1, always_show_made_in = true, subgroup = 'fu_item_subgroup_e', @@ -464,7 +441,6 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=110000}, }, - result_count = 1, energy_required = 100, }, { @@ -480,7 +456,6 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=180000}, }, - result_count = 1, energy_required = 100, }, --exchanger @@ -497,7 +472,6 @@ data:extend({ results = { {type="item", name="fu_exchanger_item", amount=1}, }, - result_count = 1, energy_required = 10, }, { @@ -514,7 +488,6 @@ data:extend({ {type="fluid", name="fu_lead_fluid_cold", amount=50}, {type="fluid", name="steam", amount=1000, temperature=500}, }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'b-a', @@ -534,7 +507,6 @@ data:extend({ {type="fluid", name="fu_lead_fluid_cold", amount=100}, {type="fluid", name="steam", amount=1000, temperature=1000}, }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'b-a', @@ -553,7 +525,6 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_cold", amount=100}, }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'b-a', @@ -572,7 +543,6 @@ data:extend({ results = { {type="item", name="fu_turbine_item", amount=1}, }, - result_count = 1, energy_required = 10, }, { @@ -589,7 +559,6 @@ data:extend({ {type="fluid", name="fu_lead_fluid_cold", amount=100}, {type="fluid", name="fu_hot_steam", amount=100, temperature=1500}, }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'b-a', @@ -608,8 +577,7 @@ data:extend({ {type="item", name="el_lithium_battery", amount=10}, {type="item", name="flying-robot-frame", amount=4}, }, - result = 'fu_robo_logistic_item', - result_count = 1, + results = {{type="item", name='fu_robo_logistic_item', amount=1}}, energy_required = 10, }, { @@ -624,8 +592,7 @@ data:extend({ {type="item", name="el_lithium_battery", amount=10}, {type="item", name="flying-robot-frame", amount=4}, }, - result = 'fu_robo_construction_item', - result_count = 1, + results = {{type="item", name='fu_robo_construction_item', amount=1}}, energy_required = 10, }, --fu activator @@ -640,8 +607,7 @@ data:extend({ {type="item", name="fu_materials_KFK", amount=40}, {type="item", name="fu_materials_TIM", amount=60}, }, - result = 'fu_activator_item', - result_count = 1, + results = {{type="item", name='fu_activator_item', amount=1}}, energy_required = 10, }, { @@ -658,7 +624,6 @@ data:extend({ {type="fluid", name="fu_protium", amount=9}, {type="fluid", name="fu_deuterium", amount=1}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -676,7 +641,6 @@ data:extend({ {type="fluid", name="fu_deuterium", amount=9}, {type="fluid", name="fu_tritium", amount=1}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -686,17 +650,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'low-density-structure',200}, - {'fu_materials_KFK',200}, - {'fu_materials_TIM',200}, - {'heat-pipe',200}, - {'concrete',500}, - {'fu_materials_magnet',100}, - {'fu_materials_energy_crystal',100}, - {'fu_tech_sign_item',1000}, + {type="item", name="low-density-structure", amount=200}, + {type="item", name="fu_materials_KFK", amount=200}, + {type="item", name="fu_materials_TIM", amount=200}, + {type="item", name="heat-pipe", amount=200}, + {type="item", name="concrete", amount=500}, + {type="item", name="fu_materials_magnet", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=100}, + {type="item", name="fu_tech_sign_item", amount=1000}, }, - result = 'fu_star_engine_cooler_item', - result_count = 1, + results = {{type="item", name='fu_star_engine_cooler_item', amount=1}}, energy_required = 60, }, { @@ -704,17 +667,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'low-density-structure',200}, - {'fu_materials_KFK',200}, - {'fu_materials_TIM',200}, - {'heat-pipe',200}, - {'concrete',500}, - {'fu_materials_magnet',100}, - {'fu_materials_energy_crystal',100}, - {'fu_tech_sign_item',1000}, + {type="item", name="low-density-structure", amount=200}, + {type="item", name="fu_materials_KFK", amount=200}, + {type="item", name="fu_materials_TIM", amount=200}, + {type="item", name="heat-pipe", amount=200}, + {type="item", name="concrete", amount=500}, + {type="item", name="fu_materials_magnet", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=100}, + {type="item", name="fu_tech_sign_item", amount=1000}, }, - result = 'fu_star_engine_cooler_up_item', - result_count = 1, + results = {{type="item", name='fu_star_engine_cooler_up_item', amount=1}}, energy_required = 60, }, { @@ -722,17 +684,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'low-density-structure',200}, - {'fu_materials_KFK',200}, - {'fu_materials_TIM',200}, - {'heat-pipe',200}, - {'concrete',500}, - {'fu_materials_magnet',100}, - {'fu_materials_energy_crystal',100}, - {'fu_tech_sign_item',1000}, + {type="item", name="low-density-structure", amount=200}, + {type="item", name="fu_materials_KFK", amount=200}, + {type="item", name="fu_materials_TIM", amount=200}, + {type="item", name="heat-pipe", amount=200}, + {type="item", name="concrete", amount=500}, + {type="item", name="fu_materials_magnet", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=100}, + {type="item", name="fu_tech_sign_item", amount=1000}, }, - result = 'fu_star_engine_heater_item', - result_count = 1, + results = {{type="item", name='fu_star_engine_heater_item', amount=1}}, energy_required = 60, }, { @@ -740,17 +701,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'low-density-structure',200}, - {'fu_materials_KFK',200}, - {'fu_materials_TIM',200}, - {'heat-pipe',200}, - {'concrete',500}, - {'fu_materials_magnet',100}, - {'fu_materials_energy_crystal',100}, - {'fu_tech_sign_item',1000}, + {type="item", name="low-density-structure", amount=200}, + {type="item", name="fu_materials_KFK", amount=200}, + {type="item", name="fu_materials_TIM", amount=200}, + {type="item", name="heat-pipe", amount=200}, + {type="item", name="concrete", amount=500}, + {type="item", name="fu_materials_magnet", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=100}, + {type="item", name="fu_tech_sign_item", amount=1000}, }, - result = 'fu_star_engine_heater_left_item', - result_count = 1, + results = {{type="item", name='fu_star_engine_heater_left_item', amount=1}}, energy_required = 60, }, { @@ -758,19 +718,18 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'low-density-structure',1000}, - {'fu_materials_KFK',200}, - {'fu_materials_TIM',200}, - {'concrete',2000}, - {'fu_materials_magnet',200}, - {'fu_materials_energy_crystal',200}, - {'processing-unit',3000}, - {'electronic-circuit',3000}, - {'advanced-circuit',3000}, - {'fu_tech_sign_item',1000}, + {type="item", name="low-density-structure", amount=1000}, + {type="item", name="fu_materials_KFK", amount=200}, + {type="item", name="fu_materials_TIM", amount=200}, + {type="item", name="concrete", amount=2000}, + {type="item", name="fu_materials_magnet", amount=200}, + {type="item", name="fu_materials_energy_crystal", amount=200}, + {type="item", name="processing-unit", amount=3000}, + {type="item", name="electronic-circuit", amount=3000}, + {type="item", name="advanced-circuit", amount=3000}, + {type="item", name="fu_tech_sign_item", amount=1000}, }, - result = 'fu_star_engine_core_item', - result_count = 1, + results = {{type="item", name='fu_star_engine_core_item', amount=1}}, energy_required = 200, }, --star fusion @@ -787,7 +746,6 @@ data:extend({ results = { {type="fluid", name="fu_protium_heated", amount=13000}, }, - result_count = 1, energy_required = 1, }, --core @@ -803,7 +761,6 @@ data:extend({ results = { {type="fluid", name="fu_iron_heated", amount=500*2}, }, - result_count = 1, energy_required = 1, }, { @@ -818,7 +775,6 @@ data:extend({ results = { {type="fluid", name="fu_copper_heated", amount=500*2}, }, - result_count = 1, energy_required = 1, }, { @@ -833,7 +789,6 @@ data:extend({ results = { {type="fluid", name="fu_sulfur_heated", amount=500*2}, }, - result_count = 1, energy_required = 1, }, { @@ -848,7 +803,6 @@ data:extend({ results = { {type="fluid", name="fu_lithium_7_heated", amount=500*2}, }, - result_count = 1, energy_required = 1, }, { @@ -863,7 +817,6 @@ data:extend({ results = { {type="fluid", name="fu_uranium_235_heated", amount=500*2}, }, - result_count = 1, energy_required = 1, }, { @@ -878,7 +831,6 @@ data:extend({ results = { {type="fluid", name="fu_uranium_238_heated", amount=500*2}, }, - result_count = 1, energy_required = 1, }, --cooler @@ -894,7 +846,6 @@ data:extend({ results = { {type="fluid", name="fu_iron", amount=500}, }, - result_count = 1, energy_required = 1, }, { @@ -909,7 +860,6 @@ data:extend({ results = { {type="fluid", name="fu_copper", amount=500}, }, - result_count = 1, energy_required = 1, }, { @@ -924,7 +874,6 @@ data:extend({ results = { {type="fluid", name="fu_sulfur", amount=500}, }, - result_count = 1, energy_required = 1, }, { @@ -939,7 +888,6 @@ data:extend({ results = { {type="fluid", name="fu_lithium_7", amount=500}, }, - result_count = 1, energy_required = 1, }, { @@ -954,7 +902,6 @@ data:extend({ results = { {type="fluid", name="fu_uranium_235", amount=500}, }, - result_count = 1, energy_required = 1, }, { @@ -969,7 +916,6 @@ data:extend({ results = { {type="fluid", name="fu_uranium_238", amount=500}, }, - result_count = 1, energy_required = 1, }, --caster @@ -985,7 +931,6 @@ data:extend({ results = { {type="item", name="iron-plate", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -1000,7 +945,6 @@ data:extend({ results = { {type="item", name="copper-plate", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -1015,7 +959,6 @@ data:extend({ results = { {type="item", name="sulfur", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -1030,7 +973,6 @@ data:extend({ results = { {type="item", name="el_lithium_item", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -1045,7 +987,6 @@ data:extend({ results = { {type="item", name="uranium-235", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -1060,7 +1001,6 @@ data:extend({ results = { {type="item", name="uranium-238", amount=500}, }, - result_count = 1, energy_required = 6, }, --space probes @@ -1080,7 +1020,6 @@ data:extend({ results = { {type="item", name="fu_space_probe_sputnik_item", amount=1}, }, - result_count = 1, energy_required = 20, always_show_made_in = true, }, @@ -1099,7 +1038,6 @@ data:extend({ results = { {type="item", name="fu_space_probe_probe_item", amount=1}, }, - result_count = 1, energy_required = 20, always_show_made_in = true, }, @@ -1118,7 +1056,6 @@ data:extend({ results = { {type="item", name="fu_space_probe_deep_probe_item", amount=1}, }, - result_count = 1, energy_required = 20, always_show_made_in = true, }, @@ -1135,7 +1072,6 @@ data:extend({ results = { {type="item", name="fu_space_probe_data_card_2_item", amount=1}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -1154,7 +1090,6 @@ data:extend({ {type="item", name="fu_space_probe_down_matter_item", amount=1}, {type="item", name="fu_space_probe_up_matter_item", amount=1}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -1172,7 +1107,6 @@ data:extend({ results = { {type="item", name="fu_space_probe_science_item", amount=200}, }, - result_count = 1, energy_required = 3, }, { @@ -1188,7 +1122,6 @@ data:extend({ results = { {type="item", name="fu_space_probe_science_item_1", amount=200}, }, - result_count = 1, energy_required = 3, }, --crystals @@ -1205,7 +1138,6 @@ data:extend({ results = { {type="item", name="fi_energy_crystal_item", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -1213,16 +1145,15 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'concrete',100}, - {'fu_materials_TIM',60}, - {'fu_materials_KFK',60}, - {'fi_materials_GFK',60}, - {'iron-gear-wheel',40}, - {'laser-turret',2}, - {'fi_energy_crystal_item',100}, + {type="item", name="concrete", amount=100}, + {type="item", name="fu_materials_TIM", amount=60}, + {type="item", name="fu_materials_KFK", amount=60}, + {type="item", name="fi_materials_GFK", amount=60}, + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="laser-turret", amount=2}, + {type="item", name="fi_energy_crystal_item", amount=100}, }, - result = 'fu_laser_item', - result_count = 1, + results = {{type="item", name='fu_laser_item', amount=1}}, energy_required = 4, }, { @@ -1240,7 +1171,6 @@ data:extend({ {type="item", name="fu_materials_energy_crystal", amount=1}, {type="fluid", name="fu_lead_fluid_hot", amount=10} }, - result_count = 1, energy_required = 3, always_show_made_in = true, }, @@ -1257,7 +1187,6 @@ data:extend({ results = { {type="item", name="fu_materials_refined_crystal", amount=1} }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -1266,16 +1195,15 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'concrete',100}, - {'fu_materials_TIM',60}, - {'fu_materials_KFK',60}, - {'fi_materials_GFK',60}, - {'iron-gear-wheel',40}, - {'fi_materials_neodym',60}, - {'electric-furnace',10}, + {type="item", name="concrete", amount=100}, + {type="item", name="fu_materials_TIM", amount=60}, + {type="item", name="fu_materials_KFK", amount=60}, + {type="item", name="fi_materials_GFK", amount=60}, + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="fi_materials_neodym", amount=60}, + {type="item", name="electric-furnace", amount=10}, }, - result = 'fu_plasma_item', - result_count = 1, + results = {{type="item", name='fu_plasma_item', amount=1}}, energy_required = 4, }, { @@ -1283,16 +1211,15 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'concrete',100}, - {'fu_materials_TIM',60}, - {'fu_materials_KFK',60}, - {'fi_materials_GFK',60}, - {'iron-gear-wheel',40}, - {'electric-engine-unit',20}, - {'fi_materials_neodym',200}, + {type="item", name="concrete", amount=100}, + {type="item", name="fu_materials_TIM", amount=60}, + {type="item", name="fu_materials_KFK", amount=60}, + {type="item", name="fi_materials_GFK", amount=60}, + {type="item", name="iron-gear-wheel", amount=40}, + {type="item", name="electric-engine-unit", amount=20}, + {type="item", name="fi_materials_neodym", amount=200}, }, - result = 'fu_magnet_item', - result_count = 1, + results = {{type="item", name='fu_magnet_item', amount=1}}, energy_required = 4, }, { @@ -1493,7 +1420,6 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_cold", amount=100}, }, - result_count = 1, energy_required = 6, }, { @@ -1509,7 +1435,6 @@ data:extend({ results = { {type="item", name="fu_materials_empty_container", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -1525,7 +1450,6 @@ data:extend({ {type="item", name="fu_materials_empty_container", amount=1}, {type="fluid", name="fu_neutron_fluid", amount=2}, }, - result_count = 1, energy_required = 1, }, { @@ -1541,7 +1465,6 @@ data:extend({ {type="item", name="fi_used_advanced_thorium_fuel_item", amount=1}, {type="fluid", name="fu_neutron_fluid", amount=30}, }, - result_count = 1, energy_required = 4, }, { @@ -1557,7 +1480,6 @@ data:extend({ {type="item", name="fi_used_basic_fuel_item", amount=1}, {type="fluid", name="fu_neutron_fluid", amount=30}, }, - result_count = 1, energy_required = 4, }, { @@ -1573,7 +1495,6 @@ data:extend({ {type="item", name="fi_used_basic_thorium_fuel_item", amount=1}, {type="fluid", name="fu_neutron_fluid", amount=18}, }, - result_count = 1, energy_required = 4, }, { @@ -1589,7 +1510,6 @@ data:extend({ {type="item", name="fi_used_advanced_fuel_item", amount=1}, {type="fluid", name="fu_neutron_fluid", amount=34}, }, - result_count = 1, energy_required = 4, }, --Burner recipe @@ -1605,7 +1525,6 @@ data:extend({ {type="fluid", name="fu_oxygen", amount=60}, }, results = {}, - result_count = 1, energy_required = 1, always_show_made_in = true, subgroup = 'fu_item_subgroup_f', @@ -1622,7 +1541,6 @@ data:extend({ results = { {type="fluid", name="water", amount=100}, }, - result_count = 1, energy_required = 1, always_show_made_in = true, subgroup = 'fu_item_subgroup_f', @@ -1638,7 +1556,6 @@ data:extend({ {type="fluid", name="water", amount=100}, }, results = {}, - result_count = 1, energy_required = 1, always_show_made_in = true, subgroup = 'fu_item_subgroup_f', @@ -1654,7 +1571,6 @@ data:extend({ results = { {type="fluid", name="water", amount=100}, }, - result_count = 1, energy_required = 1, always_show_made_in = true, subgroup = 'fu_item_subgroup_f', @@ -1673,7 +1589,6 @@ data:extend({ results = { {type="item", name="fu_miner_item", amount=1}, }, - result_count = 20, energy_required = 10, always_show_made_in = true, subgroup = 'fi_item_subgroup_c', @@ -1687,7 +1602,6 @@ data:extend({ results = { {type="item", name="fu_materials_stone", amount=1}, }, - result_count = 1, energy_required = 1.5, always_show_made_in = true, subgroup = 'fi_item_subgroup_a', @@ -1708,7 +1622,6 @@ data:extend({ {type="item", name="fu_materials_stone", amount=1, probability=0.25}, {type="fluid", name="el_dirty_water", amount=10}, }, - result_count = 1, energy_required = 0.5, always_show_made_in = true, subgroup = 'fi_item_subgroup_a', @@ -1724,7 +1637,6 @@ data:extend({ results = { {type="item", name="stone", amount=4}, }, - result_count = 1, energy_required = 0.5, always_show_made_in = true, subgroup = 'fi_item_subgroup_a', @@ -1741,7 +1653,6 @@ data:extend({ results = { {type="item", name="fu_miner_fuel_item", amount=1}, }, - result_count = 1, energy_required = 6, subgroup = 'fi_item_subgroup_b', }, @@ -1753,8 +1664,7 @@ data:extend({ ingredients = { {type='item', name='fu_materials_energy_crystal', amount=1}, }, - result = 'fu_materials_energy_charged_crystal', - result_count = 1, + results = {{type="item", name='fu_materials_energy_charged_crystal', amount=1}}, energy_required = 30, always_show_made_in = true, }, @@ -1773,7 +1683,6 @@ data:extend({ {type="fluid", name="fu_oxygen", amount=50}, {type="item", name="fi_materials_gold", amount=1, probability=0.25}, }, - result_count = 1, energy_required = 5, always_show_made_in = true, icon_size = 64, @@ -1803,7 +1712,6 @@ data:extend({ {type="fluid", name="fu_oxygen", amount=100}, {type="item", name="fi_materials_gold", amount=1, probability=0.55}, }, - result_count = 1, energy_required = 5, always_show_made_in = true, icon_size = 64, @@ -1833,7 +1741,6 @@ data:extend({ {type="fluid", name="fu_oxygen", amount=150}, {type="item", name="fi_materials_gold", amount=1, probability=0.85}, }, - result_count = 1, energy_required = 5, always_show_made_in = true, icon_size = 64, @@ -1860,7 +1767,6 @@ data:extend({ results = { {type="fluid", name="fu_hydrogen", amount=1000}, }, - result_count = 1, energy_required = 5, always_show_made_in = true, icon_size = 64, @@ -1888,7 +1794,6 @@ data:extend({ results = { {type="item", name="fu_grenade", amount=1}, }, - result_count = 1, energy_required = 4, }, { @@ -1908,7 +1813,6 @@ data:extend({ results = { {type="item", name="fu_lab_item", amount=1}, }, - result_count = 1, energy_required = 10, }, { @@ -1918,17 +1822,16 @@ data:extend({ category = 'crafting', main_product = 'fu_ingot_item', ingredients = { - {'concrete',50}, - {'fu_materials_TIM',40}, - {'fu_materials_KFK',40}, - {'fi_materials_GFK',40}, - {'iron-gear-wheel',20}, - {'electric-furnace',2}, + {type="item", name="concrete", amount=50}, + {type="item", name="fu_materials_TIM", amount=40}, + {type="item", name="fu_materials_KFK", amount=40}, + {type="item", name="fi_materials_GFK", amount=40}, + {type="item", name="iron-gear-wheel", amount=20}, + {type="item", name="electric-furnace", amount=2}, }, results = { {type="item", name="fu_ingot_item", amount=1}, }, - result_count = 1, energy_required = 5, }, { @@ -1944,7 +1847,6 @@ data:extend({ {type="item", name="fu_materials_gold_ingot", amount=1}, {type="item", name="fu_materials_slag", amount=1, probability=0.25}, }, - result_count = 1, energy_required = 0.2*6, subgroup = 'fu_item_subgroup_a', order = 'a-a-a', @@ -1962,7 +1864,6 @@ data:extend({ results = { {type="item", name="fi_materials_gold", amount=2}, }, - result_count = 1, energy_required = 0.2, subgroup = 'fu_item_subgroup_a', order = 'a-a-b', @@ -1981,7 +1882,6 @@ data:extend({ {type="item", name="fu_materials_neodym_ingot", amount=1}, {type="item", name="fu_materials_slag", amount=1, probability=0.25}, }, - result_count = 1, energy_required = 0.2*6, subgroup = 'fu_item_subgroup_a', order = 'a-a-a', @@ -1999,7 +1899,6 @@ data:extend({ results = { {type="item", name="fi_materials_neodym", amount=2}, }, - result_count = 1, energy_required = 0.2, subgroup = 'fu_item_subgroup_a', order = 'a-a-b', @@ -2018,7 +1917,6 @@ data:extend({ {type="item", name="fu_materials_titan_ingot", amount=1}, {type="item", name="fu_materials_slag", amount=1, probability=0.25}, }, - result_count = 1, energy_required = 0.2*6, subgroup = 'fu_item_subgroup_a', order = 'a-a-a', @@ -2036,7 +1934,6 @@ data:extend({ results = { {type="item", name="fi_materials_titan", amount=2}, }, - result_count = 1, energy_required = 0.2, subgroup = 'fu_item_subgroup_a', order = 'a-a-b', @@ -2055,7 +1952,6 @@ data:extend({ {type="item", name="fu_materials_lead_ingot", amount=1}, {type="item", name="fu_materials_slag", amount=1, probability=0.25}, }, - result_count = 1, energy_required = 0.2*6, subgroup = 'fu_item_subgroup_a', order = 'a-a-a', @@ -2073,7 +1969,6 @@ data:extend({ results = { {type="item", name="fu_lead_item", amount=2}, }, - result_count = 1, energy_required = 0.2, subgroup = 'fu_item_subgroup_a', order = 'a-a-b', @@ -2092,7 +1987,6 @@ data:extend({ results = { {type="fluid", name="el_dirty_water", amount=25}, }, - result_count = 1, energy_required = 0.2, always_show_made_in = true, subgroup = 'fu_item_subgroup_f', diff --git a/248k_2/prototypes/fusion/fu_space_probe.lua b/248k_2/prototypes/fusion/fu_space_probe.lua index 7182b80..b0a305a 100644 --- a/248k_2/prototypes/fusion/fu_space_probe.lua +++ b/248k_2/prototypes/fusion/fu_space_probe.lua @@ -17,7 +17,7 @@ data:extend({ icon_size = 64, stack_size = 1, subgroup = 'fu_item_subgroup_d', - rocket_launch_product = {'fu_space_probe_data_card_1_item',10}, + rocket_launch_products = {{type="item", name="fu_space_probe_data_card_1_item", amount=10}}, order = 'd-a', }, { @@ -27,7 +27,7 @@ data:extend({ icon_size = 64, stack_size = 1, subgroup = 'fu_item_subgroup_d', - rocket_launch_product = {'fu_space_probe_data_card_3_item',10}, + rocket_launch_products = {{type="item", name="fu_space_probe_data_card_3_item", amount=10}}, order = 'd-b', }, { @@ -37,7 +37,7 @@ data:extend({ icon_size = 64, stack_size = 1, subgroup = 'fu_item_subgroup_d', - rocket_launch_product = {'fu_space_probe_ore_item',100}, + rocket_launch_products = {{type="item", name="fu_space_probe_ore_item", amount=100}}, order = 'd-c', }, --data cards diff --git a/248k_2/prototypes/gr_recipes.lua b/248k_2/prototypes/gr_recipes.lua index e0bd139..f34e3f7 100644 --- a/248k_2/prototypes/gr_recipes.lua +++ b/248k_2/prototypes/gr_recipes.lua @@ -5,14 +5,13 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fi_crafter_item',2}, - {'fu_materials_KFK',100}, - {'fu_materials_magnet',10}, - {'gr_materials_fusion_cell_item',1}, - {'gr_materials_circuit',10} + {type="item", name="fi_crafter_item", amount=2}, + {type="item", name="fu_materials_KFK", amount=100}, + {type="item", name="fu_materials_magnet", amount=10}, + {type="item", name="gr_materials_fusion_cell_item", amount=1}, + {type="item", name="gr_materials_circuit", amount=10} }, - result = 'gr_crafter_item', - result_count = 1, + results = {{type="item", name='gr_crafter_item', amount=1}}, energy_required = 6, }, { @@ -21,12 +20,11 @@ data:extend({ enabled = false, category = 'fi_crafting_category', ingredients = { - {'fu_space_probe_up_matter_item',1}, - {'fu_tech_sign_item',40}, - {'fusion-reactor-equipment',1} + {type="item", name="fu_space_probe_up_matter_item", amount=1}, + {type="item", name="fu_tech_sign_item", amount=40}, + {type="item", name="fusion-reactor-equipment", amount=1} }, - result = 'gr_materials_fusion_cell_item', - result_count = 1, + results = {{type="item", name='gr_materials_fusion_cell_item', amount=1}}, energy_required = 35, }, { @@ -34,12 +32,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fu_space_probe_down_matter_item',2}, - {'low-density-structure',10}, - {'fu_space_probe_data_card_3_item',1}, + {type="item", name="fu_space_probe_down_matter_item", amount=2}, + {type="item", name="low-density-structure", amount=10}, + {type="item", name="fu_space_probe_data_card_3_item", amount=1}, }, - result = 'gr_materials_stack_down_item', - result_count = 1, + results = {{type="item", name='gr_materials_stack_down_item', amount=1}}, energy_required = 10, }, { @@ -47,12 +44,11 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fu_space_probe_up_matter_item',2}, - {'low-density-structure',10}, - {'fu_space_probe_data_card_3_item',1}, + {type="item", name="fu_space_probe_up_matter_item", amount=2}, + {type="item", name="low-density-structure", amount=10}, + {type="item", name="fu_space_probe_data_card_3_item", amount=1}, }, - result = 'gr_materials_stack_up_item', - result_count = 1, + results = {{type="item", name='gr_materials_stack_up_item', amount=1}}, energy_required = 10, }, { @@ -67,7 +63,6 @@ data:extend({ results = { {type="item", name="iron-gear-wheel", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -82,7 +77,6 @@ data:extend({ results = { {type="item", name="steel-plate", amount=500}, }, - result_count = 1, energy_required = 6, }, --train @@ -100,7 +94,6 @@ data:extend({ results = { {type="item", name="gr_magnet_train_item", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -117,7 +110,6 @@ data:extend({ results = { {type="item", name="gr_magnet_wagon_item", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -134,7 +126,6 @@ data:extend({ results = { {type="item", name="gr_magnet_tanker_item", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -151,7 +142,6 @@ data:extend({ results = { {type="item", name="gr_magnet_train_pre_item", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -168,7 +158,6 @@ data:extend({ results = { {type="item", name="gr_magnet_wagon_pre_item", amount=1}, }, - result_count = 1, energy_required = 6, }, { @@ -185,7 +174,6 @@ data:extend({ results = { {type="item", name="gr_magnet_tanker_pre_item", amount=1}, }, - result_count = 1, energy_required = 6, }, --kovarex for matter @@ -202,7 +190,6 @@ data:extend({ {type="item", name="fu_space_probe_down_matter_item", amount=9}, {type="item", name="fu_space_probe_up_matter_item", amount=1} }, - result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -219,7 +206,6 @@ data:extend({ {type="item", name="fu_space_probe_up_matter_item", amount=9}, {type="item", name="fu_space_probe_down_matter_item", amount=1} }, - result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -230,18 +216,17 @@ data:extend({ enabled = false, main_product = 'gr_charger_item', ingredients = { - {'low-density-structure',100}, - {'fu_materials_KFK',100}, - {'gr_materials_magnet',100}, - {'fu_tech_sign_item',1000}, - {'concrete',500}, - {'lab',10}, - {'gr_materials_circuit',100} + {type="item", name="low-density-structure", amount=100}, + {type="item", name="fu_materials_KFK", amount=100}, + {type="item", name="gr_materials_magnet", amount=100}, + {type="item", name="fu_tech_sign_item", amount=1000}, + {type="item", name="concrete", amount=500}, + {type="item", name="lab", amount=10}, + {type="item", name="gr_materials_circuit", amount=100} }, results = { {type="item", name="gr_charger_item", amount=1} }, - result_count = 1, energy_required = 5 }, { @@ -251,14 +236,13 @@ data:extend({ enabled = false, main_product = 'gr_materials_stabilizer_item', ingredients = { - {'gr_materials_crushed_exotic_item',1}, - {'fu_materials_energy_crystal',10}, - {'fu_tech_sign_item',10}, + {type="item", name="gr_materials_crushed_exotic_item", amount=1}, + {type="item", name="fu_materials_energy_crystal", amount=10}, + {type="item", name="fu_tech_sign_item", amount=10}, }, results = { {type="item", name="gr_materials_stabilizer_item", amount=4} }, - result_count = 1, energy_required = 4, always_show_made_in = true }, @@ -268,10 +252,9 @@ data:extend({ enabled = false, category = 'fi_crushing', ingredients = { - {'fu_space_probe_ore_item',1}, + {type="item", name="fu_space_probe_ore_item", amount=1}, }, - result = 'gr_materials_crushed_exotic_item', - result_count = 2, + results = {{type="item", name='gr_materials_crushed_exotic_item', amount=2}}, energy_required = 2, always_show_made_in = true }, @@ -280,17 +263,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fu_star_engine_core_item',1}, - {'fu_star_engine_heater_left_item',1}, - {'fu_star_engine_heater_item',1}, - {'fu_star_engine_cooler_up_item',1}, - {'fu_star_engine_cooler_item',1}, - {'gr_materials_stack_up_item',40}, - {'gr_materials_stack_down_item',40}, - {'gr_materials_magnet',100}, + {type="item", name="fu_star_engine_core_item", amount=1}, + {type="item", name="fu_star_engine_heater_left_item", amount=1}, + {type="item", name="fu_star_engine_heater_item", amount=1}, + {type="item", name="fu_star_engine_cooler_up_item", amount=1}, + {type="item", name="fu_star_engine_cooler_item", amount=1}, + {type="item", name="gr_materials_stack_up_item", amount=40}, + {type="item", name="gr_materials_stack_down_item", amount=40}, + {type="item", name="gr_materials_magnet", amount=100}, }, - result = 'gr_black_hole_item', - result_count = 1, + results = {{type="item", name='gr_black_hole_item', amount=1}}, energy_required = 200, }, { @@ -298,17 +280,16 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fu_star_engine_core_item',1}, - {'fu_star_engine_heater_left_item',1}, - {'fu_star_engine_heater_item',1}, - {'fu_star_engine_cooler_up_item',1}, - {'fu_star_engine_cooler_item',1}, - {'gr_materials_stack_up_item',40}, - {'gr_materials_stack_down_item',40}, - {'gr_materials_magnet',100}, + {type="item", name="fu_star_engine_core_item", amount=1}, + {type="item", name="fu_star_engine_heater_left_item", amount=1}, + {type="item", name="fu_star_engine_heater_item", amount=1}, + {type="item", name="fu_star_engine_cooler_up_item", amount=1}, + {type="item", name="fu_star_engine_cooler_item", amount=1}, + {type="item", name="gr_materials_stack_up_item", amount=40}, + {type="item", name="gr_materials_stack_down_item", amount=40}, + {type="item", name="gr_materials_magnet", amount=100}, }, - result = 'gr_white_hole_item', - result_count = 1, + results = {{type="item", name='gr_white_hole_item', amount=1}}, energy_required = 200, }, { @@ -316,15 +297,14 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'gr_materials_stack_up_item',10}, - {'gr_materials_stack_down_item',10}, - {'lab',40}, - {'fu_materials_KFK',100}, - {'fu_materials_TIM',100}, - {'gr_materials_magnet',100}, + {type="item", name="gr_materials_stack_up_item", amount=10}, + {type="item", name="gr_materials_stack_down_item", amount=10}, + {type="item", name="lab", amount=40}, + {type="item", name="fu_materials_KFK", amount=100}, + {type="item", name="fu_materials_TIM", amount=100}, + {type="item", name="gr_materials_magnet", amount=100}, }, - result = 'gr_lab_item', - result_count = 1, + results = {{type="item", name='gr_lab_item', amount=1}}, energy_required = 20, }, --endgame @@ -335,11 +315,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'automation-science-pack',100}, - {'gr_materials_data_item',1} + {type="item", name="automation-science-pack", amount=100}, + {type="item", name="gr_materials_data_item", amount=1} }, - result = 'gr_materials_red_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_red_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -349,10 +328,9 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_red_data_item',36}, + {type="item", name="gr_materials_red_data_item", amount=36}, }, - result = 'gr_materials_red_item', - result_count = 1, + results = {{type="item", name='gr_materials_red_item', amount=1}}, energy_required = 100, always_show_made_in = true }, @@ -364,11 +342,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'logistic-science-pack',100}, - {'gr_materials_data_item',1} + {type="item", name="logistic-science-pack", amount=100}, + {type="item", name="gr_materials_data_item", amount=1} }, - result = 'gr_materials_green_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_green_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -378,11 +355,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_green_data_item',72}, - {'gr_materials_red_item',2} + {type="item", name="gr_materials_green_data_item", amount=72}, + {type="item", name="gr_materials_red_item", amount=2} }, - result = 'gr_materials_green_item', - result_count = 1, + results = {{type="item", name='gr_materials_green_item', amount=1}}, energy_required = 100, always_show_made_in = true }, @@ -394,11 +370,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'chemical-science-pack',100}, - {'gr_materials_data_item',1} + {type="item", name="chemical-science-pack", amount=100}, + {type="item", name="gr_materials_data_item", amount=1} }, - result = 'gr_materials_blue_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_blue_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -408,11 +383,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_blue_data_item',155}, - {'gr_materials_green_item',2} + {type="item", name="gr_materials_blue_data_item", amount=155}, + {type="item", name="gr_materials_green_item", amount=2} }, - result = 'gr_materials_blue_item', - result_count = 1, + results = {{type="item", name='gr_materials_blue_item', amount=1}}, energy_required = 100, always_show_made_in = true }, @@ -424,11 +398,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'production-science-pack',100}, - {'gr_materials_data_item',1} + {type="item", name="production-science-pack", amount=100}, + {type="item", name="gr_materials_data_item", amount=1} }, - result = 'gr_materials_purple_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_purple_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -438,11 +411,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_purple_data_item',310}, - {'gr_materials_blue_item',2} + {type="item", name="gr_materials_purple_data_item", amount=310}, + {type="item", name="gr_materials_blue_item", amount=2} }, - result = 'gr_materials_purple_item', - result_count = 1, + results = {{type="item", name='gr_materials_purple_item', amount=1}}, energy_required = 100, always_show_made_in = true }, @@ -454,11 +426,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'utility-science-pack',100}, - {'gr_materials_data_item',1} + {type="item", name="utility-science-pack", amount=100}, + {type="item", name="gr_materials_data_item", amount=1} }, - result = 'gr_materials_yellow_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_yellow_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -468,11 +439,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_yellow_data_item',620}, - {'gr_materials_purple_item',2} + {type="item", name="gr_materials_yellow_data_item", amount=620}, + {type="item", name="gr_materials_purple_item", amount=2} }, - result = 'gr_materials_yellow_item', - result_count = 1, + results = {{type="item", name='gr_materials_yellow_item', amount=1}}, energy_required = 100, always_show_made_in = true }, @@ -485,11 +455,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'space-science-pack',100}, - {'gr_materials_data_item',1} + {type="item", name="space-science-pack", amount=100}, + {type="item", name="gr_materials_data_item", amount=1} }, - result = 'gr_materials_grey_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_grey_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -499,11 +468,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_grey_data_item',1240}, - {'gr_materials_yellow_item',2} + {type="item", name="gr_materials_grey_data_item", amount=1240}, + {type="item", name="gr_materials_yellow_item", amount=2} }, - result = 'gr_materials_grey_item', - result_count = 1, + results = {{type="item", name='gr_materials_grey_item', amount=1}}, energy_required = 100, always_show_made_in = true }, @@ -515,11 +483,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'fu_space_probe_science_item',100}, - {'gr_materials_data_item',1} + {type="item", name="fu_space_probe_science_item", amount=100}, + {type="item", name="gr_materials_data_item", amount=1} }, - result = 'gr_materials_white_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_white_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -529,11 +496,10 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_white_data_item',2480}, - {'gr_materials_grey_item',2} + {type="item", name="gr_materials_white_data_item", amount=2480}, + {type="item", name="gr_materials_grey_item", amount=2} }, - result = 'gr_materials_white_item', - result_count = 1, + results = {{type="item", name='gr_materials_white_item', amount=1}}, energy_required = 100, always_show_made_in = true }, @@ -550,13 +516,12 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_crushed_exotic_item',1}, - {'gr_materials_stabilizer_item',1}, - {'gr_materials_circuit',20}, - {'fi_modules_base_item',10} + {type="item", name="gr_materials_crushed_exotic_item", amount=1}, + {type="item", name="gr_materials_stabilizer_item", amount=1}, + {type="item", name="gr_materials_circuit", amount=20}, + {type="item", name="fi_modules_base_item", amount=10} }, - result = 'gr_materials_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -566,12 +531,11 @@ data:extend({ enabled = false, category = 'fu_fusor_crafting_category', ingredients = { - {'gr_materials_data_item',3}, - {'gr_materials_stack_up_item',1}, - {'gr_materials_stack_down_item',1} + {type="item", name="gr_materials_data_item", amount=3}, + {type="item", name="gr_materials_stack_up_item", amount=1}, + {type="item", name="gr_materials_stack_down_item", amount=1} }, - result = 'gr_materials_stacked_data_item', - result_count = 1, + results = {{type="item", name='gr_materials_stacked_data_item', amount=1}}, energy_required = 10, always_show_made_in = true }, @@ -582,11 +546,10 @@ data:extend({ enabled = false, category = 'gr_charger_category', ingredients = { - {'automation-science-pack',100}, - {'gr_materials_stacked_data_item',1} + {type="item", name="automation-science-pack", amount=100}, + {type="item", name="gr_materials_stacked_data_item", amount=1} }, - result = 'gr_materials_red_pack_item', - result_count = 100, + results = {{type="item", name='gr_materials_red_pack_item', amount=100}}, energy_required = 10, always_show_made_in = true }, @@ -596,11 +559,10 @@ data:extend({ enabled = false, category = 'gr_charger_category', ingredients = { - {'logistic-science-pack',100}, - {'gr_materials_stacked_data_item',1} + {type="item", name="logistic-science-pack", amount=100}, + {type="item", name="gr_materials_stacked_data_item", amount=1} }, - result = 'gr_materials_green_pack_item', - result_count = 100, + results = {{type="item", name='gr_materials_green_pack_item', amount=100}}, energy_required = 10, always_show_made_in = true }, @@ -610,11 +572,10 @@ data:extend({ enabled = false, category = 'gr_charger_category', ingredients = { - {'chemical-science-pack',100}, - {'gr_materials_stacked_data_item',1} + {type="item", name="chemical-science-pack", amount=100}, + {type="item", name="gr_materials_stacked_data_item", amount=1} }, - result = 'gr_materials_blue_pack_item', - result_count = 100, + results = {{type="item", name='gr_materials_blue_pack_item', amount=100}}, energy_required = 10, always_show_made_in = true }, @@ -624,11 +585,10 @@ data:extend({ enabled = false, category = 'gr_charger_category', ingredients = { - {'production-science-pack',100}, - {'gr_materials_stacked_data_item',1} + {type="item", name="production-science-pack", amount=100}, + {type="item", name="gr_materials_stacked_data_item", amount=1} }, - result = 'gr_materials_purple_pack_item', - result_count = 100, + results = {{type="item", name='gr_materials_purple_pack_item', amount=100}}, energy_required = 10, always_show_made_in = true }, @@ -638,11 +598,10 @@ data:extend({ enabled = false, category = 'gr_charger_category', ingredients = { - {'utility-science-pack',100}, - {'gr_materials_stacked_data_item',1} + {type="item", name="utility-science-pack", amount=100}, + {type="item", name="gr_materials_stacked_data_item", amount=1} }, - result = 'gr_materials_yellow_pack_item', - result_count = 100, + results = {{type="item", name='gr_materials_yellow_pack_item', amount=100}}, energy_required = 10, always_show_made_in = true }, @@ -652,11 +611,10 @@ data:extend({ enabled = false, category = 'gr_charger_category', ingredients = { - {'space-science-pack',100}, - {'gr_materials_stacked_data_item',1} + {type="item", name="space-science-pack", amount=100}, + {type="item", name="gr_materials_stacked_data_item", amount=1} }, - result = 'gr_materials_grey_pack_item', - result_count = 100, + results = {{type="item", name='gr_materials_grey_pack_item', amount=100}}, energy_required = 10, always_show_made_in = true }, @@ -666,11 +624,10 @@ data:extend({ enabled = false, category = 'gr_charger_category', ingredients = { - {'fu_space_probe_science_item',100}, - {'gr_materials_stacked_data_item',1} + {type="item", name="fu_space_probe_science_item", amount=100}, + {type="item", name="gr_materials_stacked_data_item", amount=1} }, - result = 'gr_materials_white_pack_item', - result_count = 100, + results = {{type="item", name='gr_materials_white_pack_item', amount=100}}, energy_required = 10, always_show_made_in = true }, @@ -679,13 +636,12 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'fu_space_probe_science_item',100}, - {'low-density-structure',40}, - {'gr_materials_fusion_cell_item',10}, - {'discharge-defense-equipment',10} + {type="item", name="fu_space_probe_science_item", amount=100}, + {type="item", name="low-density-structure", amount=40}, + {type="item", name="gr_materials_fusion_cell_item", amount=10}, + {type="item", name="discharge-defense-equipment", amount=10} }, - result = 'gr_materials_charge_item', - result_count = 1, + results = {{type="item", name='gr_materials_charge_item', amount=1}}, energy_required = 10, }, { @@ -693,10 +649,9 @@ data:extend({ type = 'recipe', enabled = false, ingredients = { - {'gr_materials_fusion_cell_item',1} + {type="item", name="gr_materials_fusion_cell_item", amount=1} }, - result = 'gr_materials_charge_remote', - result_count = 1, + results = {{type="item", name='gr_materials_charge_remote', amount=1}}, energy_required = 10, }, diff --git a/248k_2/scripts/SE/data-final-fixes.lua b/248k_2/scripts/SE/data-final-fixes.lua index e44f41a..b66a50f 100644 --- a/248k_2/scripts/SE/data-final-fixes.lua +++ b/248k_2/scripts/SE/data-final-fixes.lua @@ -7,25 +7,25 @@ table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-deep-space-science-pack-1 table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-material-science-pack-2") table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-rocket-science-pack") --se-energy-science-pack-1 -table.insert(data.raw.technology["fu_energy_tech"].unit.ingredients, {"se-energy-science-pack-1", 1}) -table.insert(data.raw.technology["fu_reactor_tech"].unit.ingredients, {"se-energy-science-pack-1", 1}) -table.insert(data.raw.technology["fu_tokamak_tech"].unit.ingredients, {"se-energy-science-pack-2", 1}) -table.insert(data.raw.technology["fu_star_engine_tech"].unit.ingredients, {"se-energy-science-pack-3", 1}) +table.insert(data.raw.technology["fu_energy_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1}) +table.insert(data.raw.technology["fu_reactor_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1}) +table.insert(data.raw.technology["fu_tokamak_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-2", amount=1}) +table.insert(data.raw.technology["fu_star_engine_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-3", amount=1}) --se-energy-material-pack-1 -table.insert(data.raw.technology["fu_star_engine_copper_tech"].unit.ingredients, {"se-material-science-pack-1", 1}) -table.insert(data.raw.technology["fu_star_engine_iron_tech"].unit.ingredients, {"se-material-science-pack-1", 1}) -table.insert(data.raw.technology["fu_star_engine_sulfur_tech"].unit.ingredients, {"se-material-science-pack-1", 1}) +table.insert(data.raw.technology["fu_star_engine_copper_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1}) +table.insert(data.raw.technology["fu_star_engine_iron_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1}) +table.insert(data.raw.technology["fu_star_engine_sulfur_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1}) --ki -table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"se-deep-space-science-pack-2", 1}) -table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"se-deep-space-science-pack-4", 1}) -table.insert(data.raw.technology["el_ki_sup_2_tech"].unit.ingredients, {"se-energy-science-pack-1", 1}) -table.insert(data.raw.technology["el_ki_sup_3_tech"].unit.ingredients, {"se-energy-science-pack-2", 1}) -table.insert(data.raw.technology["el_ki_sup_4_tech"].unit.ingredients, {"se-energy-science-pack-3", 1}) +table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-2", amount=1}) +table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-4", amount=1}) +table.insert(data.raw.technology["el_ki_sup_2_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1}) +table.insert(data.raw.technology["el_ki_sup_3_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-2", amount=1}) +table.insert(data.raw.technology["el_ki_sup_4_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-3", amount=1}) --modules -table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {"se-deep-space-science-pack-2", 1}) -table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {"se-deep-space-science-pack-3", 1}) -table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {"se-deep-space-science-pack-4", 1}) +table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-2", amount=1}) +table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-3", amount=1}) +table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-4", amount=1}) data.raw.technology["gr_stage_tech"].prerequisites = { diff --git a/248k_2/scripts/electronic/el_burner.lua b/248k_2/scripts/electronic/el_burner.lua index 0d828e9..02abde4 100644 --- a/248k_2/scripts/electronic/el_burner.lua +++ b/248k_2/scripts/electronic/el_burner.lua @@ -1,7 +1,7 @@ function make_burner_recipe(item) if string.find(item, "dummy") then return end -- fix for ElectricTrains crash local blank = { - name = 'fu_burn_oxygen_recipe', + name = "fu_burn_"..item.."_recipe", type = 'recipe', category = 'fu_burner_category', icon = '__248k_2__/ressources/elements/fu_oxygen.png', @@ -9,23 +9,17 @@ function make_burner_recipe(item) enabled = true, hidden = true, ingredients = { - {type="item", name="blank", amount=1}, + {type="item", name=item, amount=1}, }, results = {}, - result_count = 1, energy_required = 0.1, always_show_made_in = true, subgroup = 'fu_item_subgroup_f', } - blank["name"] = "fu_burn_"..item.."_recipe" - blank["ingredients"] = { - {item,1} - } - if data.raw.item[item].icon then + if data.raw.item[item].icon then blank["icon"] = data.raw.item[item].icon blank["icon_size"] = data.raw.item[item].icon_size end - --table.insert(data.raw.recipe, base) data:extend({blank}) end diff --git a/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua b/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua index abd946f..bf80a0a 100644 --- a/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua +++ b/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua @@ -1,36 +1,28 @@ function gr_make_white_hole_recipe(item) - local blank = { - name = 'blank', - type = 'recipe', - enabled = true, - hidden = true, - allow_as_intermediate = false, - category = 'gr_white_hole_category', - ingredients = { - {'blank',1} - }, - result = 'blank', - result_count = 2, - energy_required = 10, - } - blank["name"] = "gr_white_hole_cycle_"..item.."_recipe" - blank["ingredients"] = { - {item,1} - } - blank["result"] = item - - --table.insert(data.raw.recipe, base) - data:extend({blank}) + data:extend({ + { + name = "gr_white_hole_cycle_" .. item .. "_recipe", + type = 'recipe', + enabled = true, + hidden = true, + allow_as_intermediate = false, + category = 'gr_white_hole_category', + ingredients = { + { type = "item", name = item, amount = 1 } + }, + results = { { type = "item", name = item, amount = 2 } }, + energy_required = 10, + } + }) end function gr_white_hole_recipe_generator() local items = data.raw.item - for i,v in pairs(items) do + for i, v in pairs(items) do if tonumber(data.raw.item[i].stack_size) > 1 then gr_make_white_hole_recipe(data.raw.item[i].name) end end end - -gr_white_hole_recipe_generator() \ No newline at end of file +gr_white_hole_recipe_generator() diff --git a/248k_2/scripts/ind2/data-final-fixes.lua b/248k_2/scripts/ind2/data-final-fixes.lua index 62cb217..ea0d98f 100644 --- a/248k_2/scripts/ind2/data-final-fixes.lua +++ b/248k_2/scripts/ind2/data-final-fixes.lua @@ -37,7 +37,6 @@ data:extend({ results = { {type="item", name="stainless-ingot", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -52,7 +51,6 @@ data:extend({ results = { {type="item", name="invar-ingot", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -67,7 +65,6 @@ data:extend({ results = { {type="item", name="cupronickel-ingot", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -82,7 +79,6 @@ data:extend({ results = { {type="item", name="chromium-ingot", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -97,7 +93,6 @@ data:extend({ results = { {type="item", name="gold-ingot", amount=500}, }, - result_count = 1, energy_required = 6, }, { @@ -112,7 +107,6 @@ data:extend({ results = { {type="item", name="tellurium-ingot", amount=500}, }, - result_count = 1, energy_required = 6, }, { diff --git a/248k_2/scripts/krastorio2/data-final-fixes.lua b/248k_2/scripts/krastorio2/data-final-fixes.lua index 337dac8..354616e 100644 --- a/248k_2/scripts/krastorio2/data-final-fixes.lua +++ b/248k_2/scripts/krastorio2/data-final-fixes.lua @@ -11,11 +11,10 @@ data:extend({ always_show_made_in = true, ingredients = { - {"fi_crushed_lithium_item", 10}, + {type="item", name="fi_crushed_lithium_item", amount=10}, {type="fluid", name="mineral-water", amount=100} }, - result = "lithium-chloride", - result_count = 10, + results = {{type="item", name="lithium-chloride", amount=10}}, category = "chemistry" }, { @@ -33,7 +32,6 @@ data:extend({ {type="fluid", name="oxygen", amount=50}, {type="item", name="fi_materials_gold", amount=1, probability=0.25}, }, - result_count = 1, energy_required = 5, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -54,7 +52,6 @@ data:extend({ {type="fluid", name="oxygen", amount=100}, {type="item", name="fi_materials_gold", amount=1, probability=0.55}, }, - result_count = 1, energy_required = 5, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -75,7 +72,6 @@ data:extend({ {type="fluid", name="oxygen", amount=150}, {type="item", name="fi_materials_gold", amount=1, probability=0.85}, }, - result_count = 1, energy_required = 5, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -93,7 +89,6 @@ data:extend({ results = { {type="fluid", name="hydrogen", amount=1000}, }, - result_count = 1, energy_required = 5, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -111,7 +106,6 @@ data:extend({ results = { {type="fluid", name="hydrogen", amount=1000, temperature=40}, }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -130,7 +124,6 @@ data:extend({ {type="fluid", name="hydrogen", amount=100, temperature=40}, {type="fluid", name="oxygen", amount=50, temperature=40} }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -149,7 +142,6 @@ data:extend({ {type="fluid", name="hydrogen", amount=200, temperature=40}, {type="fluid", name="oxygen", amount=100, temperature=40} }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -168,7 +160,6 @@ data:extend({ {type="fluid", name="hydrogen", amount=500, temperature=40}, {type="fluid", name="oxygen", amount=150, temperature=40}, }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -188,7 +179,6 @@ data:extend({ {type="fluid", name="fu_deuterium", amount=10}, {type="fluid", name="fu_tritium", amount=1} }, - result_count = '0.5', energy_required = 100, always_show_made_in = true, }, @@ -206,7 +196,6 @@ data:extend({ {type="fluid", name="fu_lead_fluid_cold", amount=50}, {type="fluid", name="steam", amount=1000/2, temperature=415}, }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'b-a', @@ -226,7 +215,6 @@ data:extend({ {type="fluid", name="fu_lead_fluid_cold", amount=100}, {type="fluid", name="steam", amount=1000/4, temperature=975}, }, - result_count = 1, energy_required = 1, subgroup = 'fu_item_subgroup_e', order = 'b-a', @@ -244,7 +232,6 @@ data:extend({ results = { {type="fluid", name="matter", amount=500}, }, - result_count = 1, energy_required = 1, }, { @@ -259,7 +246,6 @@ data:extend({ results = { {type="fluid", name="fu_deuterium", amount=4}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -275,7 +261,6 @@ data:extend({ results = { {type="fluid", name="fu_tritium", amount=10}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -295,12 +280,10 @@ data:extend({ {type="item", name="fu_exchanger_item", amount=10}, {type="item", name="fu_tech_sign_item", amount=100}, {type="item", name="fu_boiler_item", amount=10}, - --{type="item", name="fu_burner_item", amount=10}, }, results = { {type="item", name="fu_ki_core_item", amount=1}, }, - result_count = 1, energy_required = 60, }, { @@ -363,34 +346,11 @@ data.raw.recipe["fi_crack_acid_gas_recipe"].ingredients = { --techs table.insert(data.raw.technology["kr-lithium-processing"].effects, {type ="unlock-recipe", recipe ="fi_lithium_to_k2"}) ---table.insert(data.raw.technology["kr-matter-processing"].effects, {type ="unlock-recipe", recipe ="fu_star_engine_cooler_7_recipe"}) if (not mods["RealisticFusionPower"]) then table.insert(data.raw.technology["kr-fusion-energy"].effects, {type ="unlock-recipe", recipe ="fu_activator_4_recipe"}) table.insert(data.raw.technology["kr-fusion-energy"].effects, {type ="unlock-recipe", recipe ="fu_activator_3_recipe"}) end ---[[ -table.insert(data.raw.technology["gr_stage_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_train_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_train_plus_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_star_engine_1_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_star_engine_2_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_crafter_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_materials_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_compact_fusion_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_charger_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_kovarex_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["gr_black_hole_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) -table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {"fu_space_probe_science_item", 1}) - -table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"fi_ki_science", 1}) -table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"fu_ki_science", 1}) -table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"fi_ki_science", 1}) -table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"fu_ki_science", 1}) ---]] - table.insert(data.raw["generator-equipment"]["fi_train_equipment_generator_item"].categories,"vehicle-equipment") if (config("krastorio_endgame")) then diff --git a/248k_2/scripts/krastorio2/overhaul.lua b/248k_2/scripts/krastorio2/overhaul.lua index 2f34a86..3219bf4 100644 --- a/248k_2/scripts/krastorio2/overhaul.lua +++ b/248k_2/scripts/krastorio2/overhaul.lua @@ -71,14 +71,6 @@ local function remove_tech_card(tech, card) return end - --in data.raw - --[[ - ingredients = { - {'automation-science-pack',1}, - {'logistic-science-pack',1}, - } - ]] - for i,v in ipairs(data.raw.technology[tech].unit.ingredients) do for j,w in ipairs(v) do if w == card then @@ -248,48 +240,46 @@ end --[BUILDINGS] building_table = { - {"kr-electrolysis-plant", "el_materials_ALK", 10}, - {"kr-filtration-plant", "el_materials_ALK", 10}, - --{"kr-electrolysis-plant", "el_materials_ALK", 10}, - --{"kr-electrolysis-plant", "el_materials_ALK", 10}, - {"kr-fluid-burner", "el_materials_ALK", 2}, - {"kr-atmospheric-condensor", "el_materials_ALK", 6}, - {"el_solar_recipe", "solar-panel", 2}, - {"solar-panel", "el_materials_ALK", 6}, - {"kr-advanced-solar-panel", "el_solar_item", 1}, - {"kr-advanced-solar-panel", "fi_materials_GFK", 2}, - {"kr-fuel-refinery", "el_materials_ALK", 4}, - {"kr-gas-power-station", "el_materials_ALK", 10}, + {type="item", name="kr-electrolysis-plant", "el_materials_ALK", amount=10}, + {type="item", name="kr-filtration-plant", "el_materials_ALK", amount=10}, + {type="item", name="kr-fluid-burner", "el_materials_ALK", amount=2}, + {type="item", name="kr-atmospheric-condensor", "el_materials_ALK", amount=6}, + {type="item", name="el_solar_recipe", "solar-panel", amount=2}, + {type="item", name="solar-panel", "el_materials_ALK", amount=6}, + {type="item", name="kr-advanced-solar-panel", "el_solar_item", amount=1}, + {type="item", name="kr-advanced-solar-panel", "fi_materials_GFK", amount=2}, + {type="item", name="kr-fuel-refinery", "el_materials_ALK", amount=4}, + {type="item", name="kr-gas-power-station", "el_materials_ALK", amount=10}, - {"buisart-lab", "fi_materials_NFK", 10}, - {"kr-electric-mining-drill-mk2", "fi_materials_GFK", 6}, - {"kr-research-server", "fi_materials_NFK", 8}, - {"kr-research-server", "fi_materials_GFK", 8}, - {"kr-air-purifier", "fi_materials_NFK", 4}, - {"kr-bio-lab", "fi_materials_NFK", 20}, - {"kr-atmospheric-condensor", "fi_materials_GFK", 4}, - {"kr-fusion-reactor", "fu_tech_sign_item",200}, - {"fu_tokamak_reactor_recipe", "kr-fusion-reactor",1}, - {"kr-advanced-steam-turbine", "fu_materials_KFK", 10}, + {type="item", name="buisart-lab", "fi_materials_NFK", amount=10}, + {type="item", name="kr-electric-mining-drill-mk2", "fi_materials_GFK", amount=6}, + {type="item", name="kr-research-server", "fi_materials_NFK", amount=8}, + {type="item", name="kr-research-server", "fi_materials_GFK", amount=8}, + {type="item", name="kr-air-purifier", "fi_materials_NFK", amount=4}, + {type="item", name="kr-bio-lab", "fi_materials_NFK", amount=20}, + {type="item", name="kr-atmospheric-condensor", "fi_materials_GFK", amount=4}, + {type="item", name="kr-fusion-reactor", "fu_tech_sign_item", amount=200}, + {type="item", name="fu_tokamak_reactor_recipe", "kr-fusion-reactor", amount=1}, + {type="item", name="kr-advanced-steam-turbine", "fu_materials_KFK", amount=10}, --logistics - {"kr-fast-loader", "el_materials_ALK", 4}, - {"kr-express-loader", "fi_materials_GFK", 4}, - {"kr-advanced-transport-belt", "fu_materials_KFK", 1}, - {"kr-advanced-splitter", "fu_materials_KFK", 3}, - {"kr-advanced-loader", "fu_materials_KFK", 4}, - {"kr-advanced-underground-belt", "fu_materials_KFK", 8}, + {type="item", name="kr-fast-loader", "el_materials_ALK", amount=4}, + {type="item", name="kr-express-loader", "fi_materials_GFK", amount=4}, + {type="item", name="kr-advanced-transport-belt", "fu_materials_KFK", amount=1}, + {type="item", name="kr-advanced-splitter", "fu_materials_KFK", amount=3}, + {type="item", name="kr-advanced-loader", "fu_materials_KFK", amount=4}, + {type="item", name="kr-advanced-underground-belt", "fu_materials_KFK", amount=8}, - {"kr-advanced-assembling-machine", "fu_materials_KFK", 6}, - {"kr-advanced-furnace", "fu_materials_KFK", 6}, - {"kr-advanced-chemical-plant", "fu_materials_KFK", 6}, - {"kr-matter-plant", "fu_materials_KFK", 12}, - {"kr-matter-assembler", "fu_materials_KFK", 8}, - {"kr-stabilizer-charging-station", "fu_materials_KFK", 6}, - {"kr-large-roboport", "fi_robo_port_item", 1}, - {"kr-antimatter-reactor", "fu_tokamak_reactor_item", 1}, - {"kr-intergalactic-transceiver", "fu_tokamak_reactor_item", 1}, - {"kr-intergalactic-transceiver", "gr_materials_magnet", 100}, - {"kr-intergalactic-transceiver", "gr_materials_fusion_cell_item", 10}, + {type="item", name="kr-advanced-assembling-machine", "fu_materials_KFK", amount=6}, + {type="item", name="kr-advanced-furnace", "fu_materials_KFK", amount=6}, + {type="item", name="kr-advanced-chemical-plant", "fu_materials_KFK", amount=6}, + {type="item", name="kr-matter-plant", "fu_materials_KFK", amount=12}, + {type="item", name="kr-matter-assembler", "fu_materials_KFK", amount=8}, + {type="item", name="kr-stabilizer-charging-station", "fu_materials_KFK", amount=6}, + {type="item", name="kr-large-roboport", "fi_robo_port_item", amount=1}, + {type="item", name="kr-antimatter-reactor", "fu_tokamak_reactor_item", amount=1}, + {type="item", name="kr-intergalactic-transceiver", "fu_tokamak_reactor_item", amount=1}, + {type="item", name="kr-intergalactic-transceiver", "gr_materials_magnet", amount=100}, + {type="item", name="kr-intergalactic-transceiver", "gr_materials_fusion_cell_item", amount=10}, } @@ -297,33 +287,33 @@ building_table = { --[ITEMS] item_table = { - {"productivity-module-2", "fi_modules_core_item", 1}, - {"productivity-module-3", "fi_modules_core_item", 3}, - {"speed-module-2", "fi_modules_core_item", 1}, - {"speed-module-3", "fi_modules_core_item", 3}, - {"effectivity-module-2", "fi_modules_core_item", 1}, - {"effectivity-module-3", "fi_modules_core_item", 3}, - {"ai-core", "fu_materials_energy_crystal", 1}, - {"fusion-reactor-equipment","fu_materials_energy_crystal", 25}, - {"imersium-plate", "fi_crushed_crystal_item", 4}, - {"lithium-sulfur-battery", "el_lithium_battery", 1}, - {"empty-dt-fuel", "fu_materials_KFK", 2}, - {"fu_empty_container_recipe","empty-dt-fuel", 1}, - {"energy-control-unit", "fu_materials_energy_crystal", 1}, - {"matter-stabilizer", "fu_materials_empty_container", 1}, + {type="item", name="productivity-module-2", "fi_modules_core_item", amount=1}, + {type="item", name="productivity-module-3", "fi_modules_core_item", amount=3}, + {type="item", name="speed-module-2", "fi_modules_core_item", amount=1}, + {type="item", name="speed-module-3", "fi_modules_core_item", amount=3}, + {type="item", name="effectivity-module-2", "fi_modules_core_item", amount=1}, + {type="item", name="effectivity-module-3", "fi_modules_core_item", amount=3}, + {type="item", name="ai-core", "fu_materials_energy_crystal", amount=1}, + {type="item", name="fusion-reactor-equipment","fu_materials_energy_crystal", amount=25}, + {type="item", name="imersium-plate", "fi_crushed_crystal_item", amount=4}, + {type="item", name="lithium-sulfur-battery", "el_lithium_battery", amount=1}, + {type="item", name="empty-dt-fuel", "fu_materials_KFK", amount=2}, + {type="item", name="fu_empty_container_recipe","empty-dt-fuel", amount=1}, + {type="item", name="energy-control-unit", "fu_materials_energy_crystal", amount=1}, + {type="item", name="matter-stabilizer", "fu_materials_empty_container", amount=1}, --military - {"energy-shield-equipment", "el_energy_crystal_item", 5}, - {"energy-shield-mk2-equipment","fi_energy_crystal_item", 5}, - {"energy-shield-mk3-equipment","fu_materials_energy_crystal", 5}, - {"battery-equipment", "el_lithium_battery", 1}, + {type="item", name="energy-shield-equipment", "el_energy_crystal_item", amount=5}, + {type="item", name="energy-shield-mk2-equipment","fi_energy_crystal_item", amount=5}, + {type="item", name="energy-shield-mk3-equipment","fu_materials_energy_crystal", amount=5}, + {type="item", name="battery-equipment", "el_lithium_battery", amount=1}, --science - {"chemical-science-pack", "el_energy_crystal_item",3}, - {"production-science-pack", "fi_materials_titan", 1}, - {"utility-science-pack", "fi_materials_neodym", 1}, - {"matter-tech-card", "fu_tech_sign_item", 5}, - {"singularity-tech-card", "gr_materials_magnet", 1}, + {type="item", name="chemical-science-pack", "el_energy_crystal_item", amount=3}, + {type="item", name="production-science-pack", "fi_materials_titan", amount=1}, + {type="item", name="utility-science-pack", "fi_materials_neodym", amount=1}, + {type="item", name="matter-tech-card", "fu_tech_sign_item", amount=5}, + {type="item", name="singularity-tech-card", "gr_materials_magnet", amount=1}, } --[TECH] @@ -397,8 +387,6 @@ tech_table = { --[ADD TECH CARDS] add_card_table = { - --{"el_purifier_tech", "space-science-pack"}, - } --[REMOVE TECH CARDS] @@ -467,7 +455,6 @@ data:extend({ results = { {type="fluid", name="fu_tritium", amount=3}, }, - result_count = 1, energy_required = 1, always_show_made_in = true, }, @@ -484,7 +471,6 @@ data:extend({ results = { {type="fluid", name="fu_deuterium", amount=3}, }, - result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -500,7 +486,6 @@ data:extend({ results = { {type="fluid", name="matter", amount=100}, }, - result_count = 1, energy_required = 1, }, }) @@ -530,14 +515,14 @@ add_cards_to_tree(del_doubles(walk_techs("kr-singularity-tech-card", break_con)) if mods["RealisticFusionPower"] then data.raw.recipe["fu_tokamak_reactor_recipe"].ingredients = { - {'fu_materials_magnet',200}, - {'fu_materials_TIM',400}, - {'fu_materials_KFK',400}, - {'concrete',500}, - {'fu_materials_energy_crystal',200}, - {'pump',80}, - {'processing-unit',500}, - {'fu_tech_sign_item',2000}, + {type="item", name="fu_materials_magnet", amount=200}, + {type="item", name="fu_materials_TIM", amount=400}, + {type="item", name="fu_materials_KFK", amount=400}, + {type="item", name="concrete", amount=500}, + {type="item", name="fu_materials_energy_crystal", amount=200}, + {type="item", name="pump", amount=80}, + {type="item", name="processing-unit", amount=500}, + {type="item", name="fu_tech_sign_item", amount=2000}, } data.raw.recipe["fu_empty_container_recipe"].ingredients = { diff --git a/248k_2/scripts/overhaul.lua b/248k_2/scripts/overhaul.lua index 3918e25..e99ecd5 100644 --- a/248k_2/scripts/overhaul.lua +++ b/248k_2/scripts/overhaul.lua @@ -62,58 +62,58 @@ end --[BUILDINGS] building_table = { - {"assembling-machine-2", "el_materials_ALK", 3}, + {type="item", name="assembling-machine-2", "el_materials_ALK", amount=3}, -- - --{"fast-inserter", "el_aluminum_item", 2}, - --{"long-handed-inserter", "el_aluminum_item", 2}, + --{type="item", name="fast-inserter", "el_aluminum_item", amount=2}, + --{type="item", name="long-handed-inserter", "el_aluminum_item", amount=2}, -- - {"engine-unit", "el_materials_ALK", 3}, - {"fast-transport-belt", "el_materials_ALK", 1}, - {"fast-splitter", "el_materials_ALK", 3}, - {"fast-underground-belt", "el_materials_ALK", 8}, - {"chemical-plant", "el_materials_ALK", 6}, - {"oil-refinery", "el_materials_ALK", 6}, - {"medium-electric-pole", "el_materials_ALK", 2}, - {"big-electric-pole", "el_materials_ALK", 4}, + {type="item", name="engine-unit", "el_materials_ALK", amount=3}, + {type="item", name="fast-transport-belt", "el_materials_ALK", amount=1}, + {type="item", name="fast-splitter", "el_materials_ALK", amount=3}, + {type="item", name="fast-underground-belt", "el_materials_ALK", amount=8}, + {type="item", name="chemical-plant", "el_materials_ALK", amount=6}, + {type="item", name="oil-refinery", "el_materials_ALK", amount=6}, + {type="item", name="medium-electric-pole", "el_materials_ALK", amount=2}, + {type="item", name="big-electric-pole", "el_materials_ALK", amount=4}, - {"stack-inserter", "el_energy_crystal_item", 2}, + {type="item", name="stack-inserter", "el_energy_crystal_item", amount=2}, - {"express-splitter", "fi_materials_GFK", 3}, - {"express-transport-belt", "fi_materials_GFK", 1}, - {"express-underground-belt","fi_materials_GFK", 8}, - {"electric-furnace", "fi_materials_GFK", 4}, - {"centrifuge", "fi_materials_GFK", 20}, - {"steam-turbine", "fi_materials_GFK", 15}, - {"heat-exchanger", "fi_materials_GFK", 10}, - {"heat-pipe", "fi_materials_titan",1}, + {type="item", name="express-splitter", "fi_materials_GFK", amount=3}, + {type="item", name="express-transport-belt", "fi_materials_GFK", amount=1}, + {type="item", name="express-underground-belt","fi_materials_GFK", amount=8}, + {type="item", name="electric-furnace", "fi_materials_GFK", amount=4}, + {type="item", name="centrifuge", "fi_materials_GFK", amount=20}, + {type="item", name="steam-turbine", "fi_materials_GFK", amount=15}, + {type="item", name="heat-exchanger", "fi_materials_GFK", amount=10}, + {type="item", name="heat-pipe", "fi_materials_titan", amount=1}, - --{"rocket-silo", "fu_materials_KFK", 40}, + --{type="item", name="rocket-silo", "fu_materials_KFK", amount=40}, - {"beacon", "fi_materials_titan", 8}, - {"substation", "fi_materials_titan", 4}, - {"assembling-machine-3", "fi_materials_titan", 4}, + {type="item", name="beacon", "fi_materials_titan", amount=8}, + {type="item", name="substation", "fi_materials_titan", amount=4}, + {type="item", name="assembling-machine-3", "fi_materials_titan", amount=4}, } --[ITEMS] item_table = { - {"advanced-circuit", "el_materials_ceramic", 2}, - {"processing-unit", "fi_materials_gold", 3}, - {"electric-engine-unit", "fi_materials_gold", 3}, - {"flying-robot-frame", "fi_materials_neodym", 6}, - {"productivity-module-2", "fi_modules_core_item", 1}, - {"productivity-module-3", "fi_modules_core_item", 3}, - {"speed-module-2", "fi_modules_core_item", 1}, - {"speed-module-3", "fi_modules_core_item", 3}, - {"effectivity-module-2", "fi_modules_core_item", 1}, - {"effectivity-module-3", "fi_modules_core_item", 3}, - --{"satellite", "fu_materials_KFK", 10}, + {type="item", name="advanced-circuit", "el_materials_ceramic", amount=2}, + {type="item", name="processing-unit", "fi_materials_gold", amount=3}, + {type="item", name="electric-engine-unit", "fi_materials_gold", amount=3}, + {type="item", name="flying-robot-frame", "fi_materials_neodym", amount=6}, + {type="item", name="productivity-module-2", "fi_modules_core_item", amount=1}, + {type="item", name="productivity-module-3", "fi_modules_core_item", amount=3}, + {type="item", name="speed-module-2", "fi_modules_core_item", amount=1}, + {type="item", name="speed-module-3", "fi_modules_core_item", amount=3}, + {type="item", name="effectivity-module-2", "fi_modules_core_item", amount=1}, + {type="item", name="effectivity-module-3", "fi_modules_core_item", amount=3}, + --{type="item", name="satellite", "fu_materials_KFK", amount=10}, - --{"automation-science-pack", "fi_modules_core_item", 3}, - --{"logistic-science-pack", "fi_modules_core_item", 3}, - {"chemical-science-pack", "el_energy_crystal_item",2}, - {"production-science-pack", "fi_materials_titan", 3}, - {"utility-science-pack", "fi_materials_neodym", 3}, + --{type="item", name="automation-science-pack", "fi_modules_core_item", amount=3}, + --{type="item", name="logistic-science-pack", "fi_modules_core_item", amount=3}, + {type="item", name="chemical-science-pack", "el_energy_crystal_item", amount=2}, + {type="item", name="production-science-pack", "fi_materials_titan", amount=3}, + {type="item", name="utility-science-pack", "fi_materials_neodym", amount=3}, } @@ -183,7 +183,7 @@ add_to_techs(change_table_index(tech_table, tech_structure)) -- if no space exploration mod if not mods["space-exploration"] then -- rocket silo and satellite - add_to_recipes(change_table_index({{"rocket-silo", "fu_materials_KFK", 40}, {"satellite", "fu_materials_KFK", 10}}, recipe_structure)) + add_to_recipes(change_table_index({{type="item", name="rocket-silo", "fu_materials_KFK", 40}, {"satellite", "fu_materials_KFK", amount=10}}, recipe_structure)) add_to_techs(change_table_index({{"rocket-silo", "fu_KFK_tech"}}, tech_structure)) end diff --git a/248k_2/scripts/realisticreactors/overhaul.lua b/248k_2/scripts/realisticreactors/overhaul.lua index 75d19c2..98584e5 100644 --- a/248k_2/scripts/realisticreactors/overhaul.lua +++ b/248k_2/scripts/realisticreactors/overhaul.lua @@ -61,14 +61,6 @@ local function remove_tech_card(tech, card) return end - --in data.raw - --[[ - ingredients = { - {'automation-science-pack',1}, - {'logistic-science-pack',1}, - } - ]] - for i,v in ipairs(data.raw.technology[tech].unit.ingredients) do for j,w in ipairs(v) do if w == card then @@ -140,16 +132,14 @@ end --[BUILDINGS] building_table = { - --{"kr-electrolysis-plant", "el_materials_ALK", 10}, - } --[ITEMS] item_table = { - {"fi_train_equipment_generator_recipe", "fi_tech_fuel", 10}, - {"fi_equipment_player_reactor_recipe", "fi_tech_fuel", 10}, - {"fu_tech_sign_recipe", "fi_tech_fuel", 1}, + {type="item", name="fi_train_equipment_generator_recipe", "fi_tech_fuel", amount=10}, + {type="item", name="fi_equipment_player_reactor_recipe", "fi_tech_fuel", amount=10}, + {type="item", name="fu_tech_sign_recipe", "fi_tech_fuel", amount=1}, } @@ -167,21 +157,16 @@ tech_table = { --[ADD TECH CARDS] add_card_table = { - --{"el_purifier_tech", "space-science-pack"}, - } --[REMOVE TECH CARDS] remove_card_table = { - --{"el_purifier_tech", "logistic-science-pack"}, - } --[REMOVE PREREQUISITES] pre_tech_table = { - --{"nuclear-power", "effectivity-module-2"}, {"nuclear-power", "uranium-processing"}, {"fi_energy_tech", "nuclear-power"}, {"fi_solid_reactor_tech", "fi_refining_tech"}, @@ -234,11 +219,11 @@ table.insert(data.raw.technology["nuclear-power"].effects, { }) data.raw.recipe["realistic-reactor"].ingredients = { - {"fi_solid_reactor_item", 1}, {"fi_tech_fuel", 20}, {"heat-pipe", 20} + {type="item", name="fi_solid_reactor_item", 1}, {"fi_tech_fuel", 20}, {"heat-pipe", amount=20} } data.raw.recipe["breeder-reactor"].ingredients = { - {"fi_solid_reactor_item", 1}, {"fi_tech_fuel", 40}, {"heat-pipe", 20}, {"productivity-module-3", 3} + {type="item", name="fi_solid_reactor_item", 1}, {"fi_tech_fuel", 40}, {"heat-pipe", 20}, {"productivity-module-3", amount=3} } data:extend({ @@ -279,11 +264,10 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'uranium-238',2}, - {'el_materials_ALK',5}, + {type="item", name="uranium-238", amount=2}, + {type="item", name="el_materials_ALK", amount=5}, }, - result = 'fi_test_fuel', - result_count = 1, + results = {{type="item", name='fi_test_fuel', amount=1}}, energy_required = 2, order = 'b-b', }, @@ -293,12 +277,11 @@ data:extend({ enabled = false, category = 'crafting', ingredients = { - {'fi_test_used_fuel', 1}, - {'chemical-science-pack', 2}, - {'uranium-238', 2}, + {type="item", name="fi_test_used_fuel", amount=1}, + {type="item", name="chemical-science-pack", amount=2}, + {type="item", name="uranium-238", amount=2}, }, - result = 'fi_tech_fuel', - result_count = 1, + results = {{type="item", name='fi_tech_fuel', amount=1}}, energy_required = 1, order = 'b-b', }, @@ -308,10 +291,9 @@ data:extend({ enabled = false, category = 'fi_test_fuel_crafting_category', ingredients = { - {'fi_test_fuel', 1} + {type="item", name="fi_test_fuel", amount=1} }, - result = 'fi_test_used_fuel', - result_count = 1, + results = {{type="item", name='fi_test_used_fuel', amount=1}}, energy_required = 5, order = 'b-b', hidden = true, @@ -339,8 +321,8 @@ data:extend({ unit = { count = '500', ingredients = { - {'chemical-science-pack',1}, - {'automation-science-pack',1}, + {type="item", name="chemical-science-pack", amount=1}, + {type="item", name="automation-science-pack", amount=1}, {'logistic-science-pack',1,}, }, time = 30, @@ -359,7 +341,7 @@ data:extend({ map_color = {r=0, g=0, b=1, a=1}, minable = { mining_time = 1, - result = 'fi_solid_reactor_item', + results = {{type="item", name='fi_solid_reactor_item', amount=1}}, }, fixed_recipe = 'fi_use_tech_fuel_recipe', crafting_categories = {"fi_test_fuel_crafting_category"}, diff --git a/248k_2/scripts/umr/data.lua b/248k_2/scripts/umr/data.lua index c871c11..f27b94d 100644 --- a/248k_2/scripts/umr/data.lua +++ b/248k_2/scripts/umr/data.lua @@ -65,8 +65,7 @@ data:extend({ {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_helium_3", amount=100}, }, - result = 'fu_materials_fusion_card', - result_count = 100, + results = {{type="item", name='fu_materials_fusion_card', amount=100}}, energy_required = 100, always_show_made_in = true, }, @@ -79,8 +78,7 @@ data:extend({ {type="fluid", name="fu_deuterium", amount=100}, {type="fluid", name="fu_helium_3", amount=100}, }, - result = 'fu_materials_fusion_card', - result_count = 20, + results = {{type="item", name='fu_materials_fusion_card', amount=20}}, energy_required = 100, always_show_made_in = true, }, From 8233489b4cd5c2d5d41cdd61c81e4bfff50e5545 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 21:42:16 +0200 Subject: [PATCH 5/9] Fix SI units --- 248k_2/prototypes/electronic/el_solar.lua | 6 +++--- 248k_2/prototypes/fusion/fu_burner.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/248k_2/prototypes/electronic/el_solar.lua b/248k_2/prototypes/electronic/el_solar.lua index b71f7da..2f01876 100644 --- a/248k_2/prototypes/electronic/el_solar.lua +++ b/248k_2/prototypes/electronic/el_solar.lua @@ -9,15 +9,15 @@ end local function solar_output() if config("power_output") == "80kW (normal)" then - return "80KW" + return "80kW" end if config("power_output") == "100kW (high)" then - return "100KW" + return "100kW" end if config("power_output") == "160kW (very high)" then - return "160KW" + return "160kW" end return "80kW" diff --git a/248k_2/prototypes/fusion/fu_burner.lua b/248k_2/prototypes/fusion/fu_burner.lua index 3c28a72..7f72af9 100644 --- a/248k_2/prototypes/fusion/fu_burner.lua +++ b/248k_2/prototypes/fusion/fu_burner.lua @@ -57,7 +57,7 @@ data:extend({ module_slots = 4 }, crafting_speed = 1, - energy_usage = '500KW', + energy_usage = '500kW', fluid_boxes = { { base_area = 1, From ac93709ae6779259d701bcf198fd28c52abd8bdd Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 21:47:14 +0200 Subject: [PATCH 6/9] Fix fluidboxes --- .../prototypes/electronic/el_arc_furnace.lua | 88 +++++--------- 248k_2/prototypes/electronic/el_burner.lua | 12 +- 248k_2/prototypes/electronic/el_caster.lua | 88 +++++--------- 248k_2/prototypes/electronic/el_charger.lua | 76 ++++-------- 248k_2/prototypes/electronic/el_grower.lua | 61 +++++----- .../electronic/el_ki/el_ki_core.lua | 108 +++++++++--------- .../prototypes/electronic/el_ki/el_ki_cpu.lua | 6 +- .../electronic/el_ki/el_ki_memory.lua | 6 +- .../electronic/el_ki/fi_ki_circuit.lua | 6 +- .../electronic/el_ki/fu_ki_circuit.lua | 6 +- .../prototypes/electronic/el_pressurizer.lua | 48 +++----- 248k_2/prototypes/electronic/el_purifier.lua | 48 +++----- 248k_2/prototypes/electronic/el_tank.lua | 19 ++- .../electronic/el_water_generator.lua | 8 +- .../fission/fi_compound_machine.lua | 88 +++++--------- 248k_2/prototypes/fission/fi_refinery.lua | 48 ++++---- 248k_2/prototypes/fusion/fu_activator.lua | 30 ++--- 248k_2/prototypes/fusion/fu_boiler.lua | 18 +-- 248k_2/prototypes/fusion/fu_burner.lua | 14 +-- 248k_2/prototypes/fusion/fu_exchanger.lua | 30 ++--- 248k_2/prototypes/fusion/fu_fusor.lua | 14 +-- 248k_2/prototypes/fusion/fu_ingot.lua | 75 ++++++------ 248k_2/prototypes/fusion/fu_laser.lua | 39 +++---- 248k_2/prototypes/fusion/fu_magnet.lua | 56 +++------ 248k_2/prototypes/fusion/fu_plasma.lua | 39 +++---- 248k_2/prototypes/fusion/fu_reactor.lua | 52 ++++----- .../fu_star_engine/fu_star_engine_caster.lua | 30 ++--- .../fu_star_engine/fu_star_engine_cooler.lua | 56 ++++----- .../fu_star_engine_cooler_up.lua | 56 ++++----- .../fu_star_engine/fu_star_engine_core.lua | 64 +++++------ .../fu_star_engine/fu_star_engine_heater.lua | 40 +++---- .../fu_star_engine_heater_left.lua | 40 +++---- 248k_2/prototypes/fusion/fu_turbine.lua | 12 +- 248k_2/prototypes/gravitation/gr_cooker.lua | 57 +++++---- 34 files changed, 619 insertions(+), 819 deletions(-) diff --git a/248k_2/prototypes/electronic/el_arc_furnace.lua b/248k_2/prototypes/electronic/el_arc_furnace.lua index 8dc9d0d..d8e4556 100644 --- a/248k_2/prototypes/electronic/el_arc_furnace.lua +++ b/248k_2/prototypes/electronic/el_arc_furnace.lua @@ -58,55 +58,50 @@ data:extend({ energy_usage = '400kW', fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, -4}}, - }, - production_type = "output" - }, - { - - base_area = 1, - height = 2, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "output", position = {-4, 0}} - }, - production_type = "output" - }, - { - - base_area = 1, - height = 2, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.north, position = {0, -3}}, }, production_type = "output" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.west, position = {-3, 0}} + }, + production_type = "output" + }, + { + + volume = 200, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "output" + }, + { + + volume = 200, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -150,25 +145,4 @@ data:extend({ apparent_volume = 0.1, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_burner.lua b/248k_2/prototypes/electronic/el_burner.lua index 1beb225..9f63ea5 100644 --- a/248k_2/prototypes/electronic/el_burner.lua +++ b/248k_2/prototypes/electronic/el_burner.lua @@ -139,8 +139,8 @@ data:extend({ burns_fluid = true, fluid_usage_per_tick = 1, fluid_box = { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, filter = 'el_desulfurized_kerosene', pipe_covers = pipecoverspictures(), @@ -149,10 +149,10 @@ data:extend({ maximum_temperature = 40, production_type = 'input-output', pipe_connections = { - {type = "input-output", position = {2, 0}}, - {type = "input-output", position = {-2, 0}}, - {type = "input-output", position = {0, 2}}, - {type = "input-output", position = {0, -2}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {1, 0}}, + {flow_direction = "input-output", direction = defines.direction.west, position = {-1, 0}}, + {flow_direction = "input-output", direction = defines.direction.south, position = {0, 1}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {0, -1}}, }, }, fluid_input = { diff --git a/248k_2/prototypes/electronic/el_caster.lua b/248k_2/prototypes/electronic/el_caster.lua index d4c3fd1..776512b 100644 --- a/248k_2/prototypes/electronic/el_caster.lua +++ b/248k_2/prototypes/electronic/el_caster.lua @@ -59,55 +59,50 @@ data:extend({ energy_usage = '100kW', fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, - }, - production_type = "input" - }, - { - - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "input", position = {-4, 0}} - }, - production_type = "input" - }, - { - - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "input", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, 4}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 3}}, }, production_type = "input" }, @@ -144,25 +139,4 @@ data:extend({ apparent_volume = 0.1, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_charger.lua b/248k_2/prototypes/electronic/el_charger.lua index a7852e2..52d7999 100644 --- a/248k_2/prototypes/electronic/el_charger.lua +++ b/248k_2/prototypes/electronic/el_charger.lua @@ -27,7 +27,6 @@ data:extend({ --prototype { name = 'el_charger_entity', - --type = 'furnace', type = 'assembling-machine', icon = sprite('icon.png'), icon_size = 64, @@ -42,10 +41,7 @@ data:extend({ result = 'el_charger_item', }, crafting_categories = {'el_charger_category'}, - --result_inventory_size = 1, - --source_inventory_size = 1, crafting_speed = 1, - --fixed_recipe = 'el_water_pressure_recipe', energy_source = { type = 'electric', usage_priority = 'secondary-input', @@ -54,58 +50,53 @@ data:extend({ fluid_boxes = { { - base_area = 20, + volume = 4000, filter = 'water', - height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, - { - - base_area = 20, - height = 2, + { + + volume = 4000, filter = 'fu_oxygen', base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-4, 0}} - }, - production_type = "output" - }, - { - - base_area = 20, - height = 2, - filter = 'fu_hydrogen', - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.west, position = {-3, 0}} }, production_type = "output" }, { - - base_area = 20, - height = 2, + + volume = 4000, filter = 'fu_hydrogen', base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "output" + }, + { + + volume = 4000, + filter = 'fu_hydrogen', + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -149,25 +140,4 @@ data:extend({ apparent_volume = 0.1, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_grower.lua b/248k_2/prototypes/electronic/el_grower.lua index 90b1500..80591b5 100644 --- a/248k_2/prototypes/electronic/el_grower.lua +++ b/248k_2/prototypes/electronic/el_grower.lua @@ -59,51 +59,50 @@ data:extend({ energy_usage = '200kW', fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {0, -3}}, - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = south_basic_pipe_picture, - pipe_connections = - { - {type = "input", position = {-3, 0}} - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = south_basic_pipe_picture, - pipe_connections = - { - {type = "input", position = {3, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -2}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {0, 3}}, + {flow_direction = "input", direction = defines.direction.west, position = {-2, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {2, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 2}}, }, production_type = "input" }, diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_core.lua b/248k_2/prototypes/electronic/el_ki/el_ki_core.lua index cb7c09a..b8ca2fe 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_core.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_core.lua @@ -100,53 +100,53 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, }, production_type = "input" }, @@ -243,79 +243,79 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.5, 0.5}}, + {flow_direction = "input", direction = defines.direction.east, position = {2.5, 0.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.5, -0.5}}, + {flow_direction = "input", direction = defines.direction.east, position = {2.5, -0.5}}, }, production_type = "input" } @@ -412,105 +412,105 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.5, 0.5}}, + {flow_direction = "input", direction = defines.direction.east, position = {2.5, 0.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.5, -0.5}}, + {flow_direction = "input", direction = defines.direction.east, position = {2.5, -0.5}}, }, production_type = "input" }, { filter = 'fu_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-3.5, 0.5}}, + {flow_direction = "input", direction = defines.direction.west, position = {-2.5, 0.5}}, }, production_type = "input" }, { filter = 'fu_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-3.5, -0.5}}, + {flow_direction = "input", direction = defines.direction.west, position = {-2.5, -0.5}}, }, production_type = "input" } diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua b/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua index 5d99436..396c114 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua b/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua index 5e12763..16e6c1f 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua b/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua index 81efbef..7eb95ff 100644 --- a/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua +++ b/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua b/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua index 59120eb..fdfe679 100644 --- a/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua +++ b/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'fu_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_pressurizer.lua b/248k_2/prototypes/electronic/el_pressurizer.lua index b11bf97..a85555e 100644 --- a/248k_2/prototypes/electronic/el_pressurizer.lua +++ b/248k_2/prototypes/electronic/el_pressurizer.lua @@ -54,54 +54,53 @@ data:extend({ fluid_boxes = { { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -2}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -1}}, }, production_type = "input" }, { filter = 'steam', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-1, 0}} }, production_type = "input" }, { filter = 'el_pressurized_water', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {2, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {1, 0}}, }, production_type = "output" }, { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 1}}, }, production_type = "output" }, @@ -147,25 +146,4 @@ data:extend({ apparent_volume = 0.05, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_purifier.lua b/248k_2/prototypes/electronic/el_purifier.lua index 472e9a2..8d9b79e 100644 --- a/248k_2/prototypes/electronic/el_purifier.lua +++ b/248k_2/prototypes/electronic/el_purifier.lua @@ -60,54 +60,53 @@ data:extend({ fluid_boxes = { { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} }, production_type = "input" }, { filter = 'el_dirty_water', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, }, production_type = "output" }, { filter = 'el_dirty_water', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -144,25 +143,4 @@ data:extend({ apparent_volume = 0.1, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_tank.lua b/248k_2/prototypes/electronic/el_tank.lua index a7e7359..5e72e57 100644 --- a/248k_2/prototypes/electronic/el_tank.lua +++ b/248k_2/prototypes/electronic/el_tank.lua @@ -87,24 +87,23 @@ data:extend({ }, flow_length_in_ticks = 1, fluid_box = { - base_area = 5000, - height = 1, + volume = 500000, base_level = 0, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input-output", position = {-4, 1}}, - {type = "input-output", position = {-4, -1}}, + {flow_direction = "input-output", direction = defines.direction.west, position = {-3, 1}}, + {flow_direction = "input-output", direction = defines.direction.west, position = {-3, -1}}, - {type = "input-output", position = {4, 1}}, - {type = "input-output", position = {4, -1}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {3, 1}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {3, -1}}, - {type = "input-output", position = {1, 4}}, - {type = "input-output", position = {1, -4}}, + {flow_direction = "input-output", direction = defines.direction.south, position = {1, 3}}, + {flow_direction = "input-output", direction = defines.direction.south, position = {-1, 3}}, - {type = "input-output", position = {-1, 4}}, - {type = "input-output", position = {-1, -4}} + {flow_direction = "input-output", direction = defines.direction.north, position = {1, -3}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {-1, -3}} }, production_type = "input-output" }, diff --git a/248k_2/prototypes/electronic/el_water_generator.lua b/248k_2/prototypes/electronic/el_water_generator.lua index 6df2577..83159f2 100644 --- a/248k_2/prototypes/electronic/el_water_generator.lua +++ b/248k_2/prototypes/electronic/el_water_generator.lua @@ -62,8 +62,8 @@ data:extend({ max_power_output = water_output(), effectivity = 0.9, fluid_box = { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, filter = 'el_pressurized_water', minimum_temperature = 0, @@ -72,8 +72,8 @@ data:extend({ pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input-output", position = {2, 0}}, - {type = "input-output", position = {-2, 0}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {1, 0}}, + {flow_direction = "input-output", direction = defines.direction.west, position = {-1, 0}}, }, }, fluid_input = { diff --git a/248k_2/prototypes/fission/fi_compound_machine.lua b/248k_2/prototypes/fission/fi_compound_machine.lua index d6ad533..d719c9e 100644 --- a/248k_2/prototypes/fission/fi_compound_machine.lua +++ b/248k_2/prototypes/fission/fi_compound_machine.lua @@ -58,55 +58,50 @@ data:extend({ energy_usage = '400kW', fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, - }, - production_type = "input" - }, - { - - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "input", position = {-4, 0}} - }, - production_type = "input" - }, - { - - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "input", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, 4}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 3}}, }, production_type = "input" }, @@ -143,25 +138,4 @@ data:extend({ apparent_volume = 0.3, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/fission/fi_refinery.lua b/248k_2/prototypes/fission/fi_refinery.lua index 4279076..ab2fdd3 100644 --- a/248k_2/prototypes/fission/fi_refinery.lua +++ b/248k_2/prototypes/fission/fi_refinery.lua @@ -60,101 +60,101 @@ data:extend({ fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {1, 4}}, + {flow_direction = "input", direction = defines.direction.south, position = {1, 3}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-1, 4}}, + {flow_direction = "input", direction = defines.direction.south, position = {-1, 3}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {1, -4}}, + {flow_direction = "output", direction = defines.direction.north, position = {1, -3}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-1, -4}}, + {flow_direction = "output", direction = defines.direction.north, position = {-1, -3}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, -1}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, -1}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 1}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, 1}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 1}}, + {flow_direction = "output", direction = defines.direction.east, position = {3, 1}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, -1}}, + {flow_direction = "output", direction = defines.direction.east, position = {3, -1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_activator.lua b/248k_2/prototypes/fusion/fu_activator.lua index 51e3b00..d4a9e5a 100644 --- a/248k_2/prototypes/fusion/fu_activator.lua +++ b/248k_2/prototypes/fusion/fu_activator.lua @@ -58,51 +58,51 @@ data:extend({ }, --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {-2, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-1, 0}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 100, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {0, 2}} + {flow_direction = "input", direction = defines.direction.south, position = {0, 1}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 100, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "output", position = {2, 0}}, + {flow_direction = "output", direction = defines.direction.east, position = {1, 0}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 100, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "output", position = {0, -2}}, + {flow_direction = "output", direction = defines.direction.north, position = {0, -1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_boiler.lua b/248k_2/prototypes/fusion/fu_boiler.lua index c637631..a48ce1e 100644 --- a/248k_2/prototypes/fusion/fu_boiler.lua +++ b/248k_2/prototypes/fusion/fu_boiler.lua @@ -66,37 +66,37 @@ data:extend({ fluid_boxes = { { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {-2.5, -0.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} }, production_type = "input" }, { filter = 'fu_hydrogen', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "output", position = {2.5, -0.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, }, production_type = "output" }, { filter = 'fu_oxygen', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "output", position = {0.5, 2.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {0.5, 1.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_burner.lua b/248k_2/prototypes/fusion/fu_burner.lua index 7f72af9..b1dbd48 100644 --- a/248k_2/prototypes/fusion/fu_burner.lua +++ b/248k_2/prototypes/fusion/fu_burner.lua @@ -60,27 +60,25 @@ data:extend({ energy_usage = '500kW', fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, production_type = 'input', pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {2, 0}}, - --{type = "output", position = {-2, 0}}, + {flow_direction = "input", direction = defines.direction.east, position = {1, 0}}, }, }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, production_type = 'output', pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "output", position = {-2, 0}}, - --{type = "output", position = {-2, 0}}, + {flow_direction = "output", direction = defines.direction.west, position = {-1, 0}}, }, } }, diff --git a/248k_2/prototypes/fusion/fu_exchanger.lua b/248k_2/prototypes/fusion/fu_exchanger.lua index 114dda6..2cd95b9 100644 --- a/248k_2/prototypes/fusion/fu_exchanger.lua +++ b/248k_2/prototypes/fusion/fu_exchanger.lua @@ -56,51 +56,51 @@ data:extend({ }, --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2.5, -0.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2.5, 1.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, 1.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {2.5, -0.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {2.5, 1.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, 1.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_fusor.lua b/248k_2/prototypes/fusion/fu_fusor.lua index 7809fc8..92d57b4 100644 --- a/248k_2/prototypes/fusion/fu_fusor.lua +++ b/248k_2/prototypes/fusion/fu_fusor.lua @@ -68,24 +68,24 @@ data:extend({ --fluid fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {-1.5, -3}}, + {flow_direction = "input", direction = defines.direction.north, position = {-1.5, -2}}, }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {1.5, -3}} + {flow_direction = "input", direction = defines.direction.north, position = {1.5, -2}} }, production_type = "input" }, diff --git a/248k_2/prototypes/fusion/fu_ingot.lua b/248k_2/prototypes/fusion/fu_ingot.lua index d8fc26f..3321259 100644 --- a/248k_2/prototypes/fusion/fu_ingot.lua +++ b/248k_2/prototypes/fusion/fu_ingot.lua @@ -59,55 +59,50 @@ data:extend({ }, fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, - }, - production_type = "input" - }, - { - - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "input", position = {-4, 0}} - }, - production_type = "input" - }, - { - - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "input", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, 4}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 3}}, }, production_type = "input" }, @@ -118,10 +113,8 @@ data:extend({ size = {512,512}, scale = 0.54, line_length = 1, - --lines_per_file = 2, frame_count = 1, - --animation_speed = 0.2, - shift = {0,-0.3} + shift = {0,-0.3} }, working_visualisations = { { @@ -159,8 +152,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, -- }, -- }, -- { @@ -169,6 +162,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, +-- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, -- }, -- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_laser.lua b/248k_2/prototypes/fusion/fu_laser.lua index 4adcf87..6fb1aeb 100644 --- a/248k_2/prototypes/fusion/fu_laser.lua +++ b/248k_2/prototypes/fusion/fu_laser.lua @@ -59,55 +59,50 @@ data:extend({ energy_usage = '60MW', fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, }, production_type = "output" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -159,8 +154,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, -- }, -- }, -- { @@ -169,6 +164,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, +-- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, -- }, -- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_magnet.lua b/248k_2/prototypes/fusion/fu_magnet.lua index 5931568..e262c6f 100644 --- a/248k_2/prototypes/fusion/fu_magnet.lua +++ b/248k_2/prototypes/fusion/fu_magnet.lua @@ -59,55 +59,50 @@ data:extend({ }, fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, }, production_type = "output" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -151,25 +146,4 @@ data:extend({ apparent_volume = 0.3, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_plasma.lua b/248k_2/prototypes/fusion/fu_plasma.lua index c44f60c..7f9bf13 100644 --- a/248k_2/prototypes/fusion/fu_plasma.lua +++ b/248k_2/prototypes/fusion/fu_plasma.lua @@ -59,55 +59,50 @@ data:extend({ }, fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, }, production_type = "output" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -159,8 +154,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, -- }, -- }, -- { @@ -169,6 +164,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, +-- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, -- }, -- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_reactor.lua b/248k_2/prototypes/fusion/fu_reactor.lua index f00a6f4..46f01eb 100644 --- a/248k_2/prototypes/fusion/fu_reactor.lua +++ b/248k_2/prototypes/fusion/fu_reactor.lua @@ -62,51 +62,51 @@ data:extend({ fluid_boxes = { { filter = "fu_lead_fluid_cold", - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, 7}} + {flow_direction = "input", direction = defines.direction.south, position = {2, 6}} }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2, -7}}, + {flow_direction = "input", direction = defines.direction.north, position = {-2, -6}}, }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, -7}} + {flow_direction = "input", direction = defines.direction.north, position = {2, -6}} }, production_type = "input" }, { filter = "fu_lead_fluid_hot", - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-2, 7}} + {flow_direction = "output", direction = defines.direction.south, position = {-2, 6}} }, production_type = "output" } @@ -177,51 +177,51 @@ data:extend({ fluid_boxes = { { filter = "fu_lead_fluid_cold", - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, 7}} + {flow_direction = "input", direction = defines.direction.south, position = {2, 6}} }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2, -7}}, + {flow_direction = "input", direction = defines.direction.north, position = {-2, -6}}, }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, -7}} + {flow_direction = "input", direction = defines.direction.north, position = {2, -6}} }, production_type = "input" }, { filter = "fu_lead_fluid_hot", - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-2, 7}} + {flow_direction = "output", direction = defines.direction.south, position = {-2, 6}} }, production_type = "output" } diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua index 9c7bada..7726015 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua @@ -56,47 +56,47 @@ data:extend({ }, --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {-2.5, -0.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {-2.5, 1.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, 1.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "output", position = {2.5, -0.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "output", position = {2.5, 1.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, 1.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua index 4bad7bc..a34f91a 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua @@ -50,87 +50,87 @@ data:extend({ energy_usage = '0.5GW', --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2, -9.5}} + {flow_direction = "input", direction = defines.direction.north, position = {-2, -8.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, -9.5}} + {flow_direction = "input", direction = defines.direction.north, position = {2, -8.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-2, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {-2, 8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {2, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {2, 8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-4, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {-4, 8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {4, 8.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua index 70740f1..28aa229 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua @@ -50,80 +50,80 @@ data:extend({ energy_usage = '0.5GW', --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-2, 9.5}} + {flow_direction = "input", direction = defines.direction.south, position = {-2, 8.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {2, 9.5}} + {flow_direction = "input", direction = defines.direction.south, position = {2, 8.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {0, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {0, -8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-2, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {-2, -8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {2, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {2, -8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-4, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {-4, -8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {4, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {4, -8.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua index 5457bb2..7edd95d 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua @@ -52,87 +52,87 @@ data:extend({ fluid_boxes = { --in --right - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, 3}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, 3}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, 1}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, 1}} }, production_type = "input" }, --left - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, 3}} + {flow_direction = "input", direction = defines.direction.east, position = {8, 3}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, 1}} + {flow_direction = "input", direction = defines.direction.east, position = {8, 1}} }, production_type = "input" }, --out --up - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-2, -5}}, + {flow_direction = "output", direction = defines.direction.north, position = {-2, -4}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {2, -5}}, + {flow_direction = "output", direction = defines.direction.north, position = {2, -4}}, }, production_type = "output" }, --down - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-2, 9}}, + {flow_direction = "output", direction = defines.direction.south, position = {-2, 8}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {2, 9}}, + {flow_direction = "output", direction = defines.direction.south, position = {2, 8}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua index 71ce05d..b1d1164 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua @@ -50,58 +50,58 @@ data:extend({ energy_usage = '0.7GW', --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, 0}} + {flow_direction = "input", direction = defines.direction.east, position = {8, 0}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, 2}} + {flow_direction = "input", direction = defines.direction.east, position = {8, 2}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, -2}} + {flow_direction = "input", direction = defines.direction.east, position = {8, -2}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-11, -1}}, + {flow_direction = "output", direction = defines.direction.west, position = {-10, -1}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-11, 1}}, + {flow_direction = "output", direction = defines.direction.west, position = {-10, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua index f88c104..a55265b 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua @@ -50,58 +50,58 @@ data:extend({ energy_usage = '0.7GW', --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, 0}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, 2}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, 2}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, -2}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, -2}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {11, -1}}, + {flow_direction = "output", direction = defines.direction.east, position = {10, -1}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {11, 1}}, + {flow_direction = "output", direction = defines.direction.east, position = {10, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_turbine.lua b/248k_2/prototypes/fusion/fu_turbine.lua index 22b9664..526f8f7 100644 --- a/248k_2/prototypes/fusion/fu_turbine.lua +++ b/248k_2/prototypes/fusion/fu_turbine.lua @@ -50,17 +50,17 @@ data:extend({ max_power_output = "200MW", fluid_box = { filter = "fu_hot_steam", - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input-output", position = {-4, 0}}, - {type = "input-output", position = {4, 0}}, - {type = "input-output", position = {0, 4}}, - {type = "input-output", position = {0, -4}} + {flow_direction = "input-output", direction = defines.direction.west, position = {-3, 0}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {3, 0}}, + {flow_direction = "input-output", direction = defines.direction.south, position = {0, 3}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {0, -3}} }, production_type = "input-output" }, diff --git a/248k_2/prototypes/gravitation/gr_cooker.lua b/248k_2/prototypes/gravitation/gr_cooker.lua index 7a3814e..880ee06 100644 --- a/248k_2/prototypes/gravitation/gr_cooker.lua +++ b/248k_2/prototypes/gravitation/gr_cooker.lua @@ -52,47 +52,46 @@ data:extend({ energy_usage = '4MW', fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {0, -3}}, - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {-3, 0}} - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {3, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -2}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {0, 3}}, + {flow_direction = "input", direction = defines.direction.west, position = {-2, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {2, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 2}}, }, production_type = "input" }, From e68dfb17f4fd3b9f3748a95793ee7db842c32288 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 22:10:02 +0200 Subject: [PATCH 7/9] Fix emissions_per_minute --- 248k_2/prototypes/electronic/el_burner.lua | 4 ++-- 248k_2/prototypes/electronic/el_diesel_train.lua | 2 +- 248k_2/prototypes/electronic/el_pressurizer.lua | 2 +- 248k_2/prototypes/fission/fi_crafter.lua | 2 +- 248k_2/prototypes/fission/fi_miner.lua | 2 +- 248k_2/prototypes/fission/fi_refinery.lua | 2 +- 248k_2/prototypes/fusion/fu_miner.lua | 2 +- 248k_2/prototypes/gravitation/gr_train.lua | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/248k_2/prototypes/electronic/el_burner.lua b/248k_2/prototypes/electronic/el_burner.lua index 9f63ea5..0f13f2f 100644 --- a/248k_2/prototypes/electronic/el_burner.lua +++ b/248k_2/prototypes/electronic/el_burner.lua @@ -73,7 +73,7 @@ data:extend({ fuel_inventory_size = 3, burnt_inventory_size = 3, effectivity = 0.95, - emissions_per_minute = 20, + emissions_per_minute = { pollution = 20 }, fuel_categories = {"chemical", "charged_fuel"}, smoke = { { @@ -131,7 +131,7 @@ data:extend({ type = 'electric', usage_priority = 'primary-output', input_flow_limit = '0W', - emissions_per_minute = 20, + emissions_per_minute = { pollution = 20 }, }, max_power_output = burner_output(), maximum_temperature = 40, diff --git a/248k_2/prototypes/electronic/el_diesel_train.lua b/248k_2/prototypes/electronic/el_diesel_train.lua index 07da8e6..db58d7b 100644 --- a/248k_2/prototypes/electronic/el_diesel_train.lua +++ b/248k_2/prototypes/electronic/el_diesel_train.lua @@ -64,7 +64,7 @@ data:extend({ fuel_category = 'el_train_fuel', fuel_inventory_size = 3, effectitvity = 1, - emissions_per_minute = 20, + emissions_per_minute = { pollution = 20 }, smoke = { { name = "train-smoke", diff --git a/248k_2/prototypes/electronic/el_pressurizer.lua b/248k_2/prototypes/electronic/el_pressurizer.lua index a85555e..f062822 100644 --- a/248k_2/prototypes/electronic/el_pressurizer.lua +++ b/248k_2/prototypes/electronic/el_pressurizer.lua @@ -48,7 +48,7 @@ data:extend({ type = 'electric', usage_priority = 'secondary-input', input_flow_limit = '60kW', - emissions_per_minute = 25, + emissions_per_minute = { pollution = 25 }, }, energy_usage = '40kW', fluid_boxes = { diff --git a/248k_2/prototypes/fission/fi_crafter.lua b/248k_2/prototypes/fission/fi_crafter.lua index 56f9d92..22bd936 100644 --- a/248k_2/prototypes/fission/fi_crafter.lua +++ b/248k_2/prototypes/fission/fi_crafter.lua @@ -49,7 +49,7 @@ data:extend({ fuel_inventory_size = 3, burnt_inventory_size = 3, effectivity = 0.35, - emissions_per_minute = 20, + emissions_per_minute = { pollution = 20 }, fuel_category = 'fi_basic_fuel' }, energy_usage = '200kW', diff --git a/248k_2/prototypes/fission/fi_miner.lua b/248k_2/prototypes/fission/fi_miner.lua index 57af415..83d9d21 100644 --- a/248k_2/prototypes/fission/fi_miner.lua +++ b/248k_2/prototypes/fission/fi_miner.lua @@ -45,7 +45,7 @@ data:extend({ fuel_inventory_size = 3, burnt_inventory_size = 3, effectivity = 0.35, - emissions_per_minute = 75, + emissions_per_minute = { pollution = 75 }, fuel_category = 'fi_basic_fuel' }, energy_usage = '4MW', diff --git a/248k_2/prototypes/fission/fi_refinery.lua b/248k_2/prototypes/fission/fi_refinery.lua index ab2fdd3..90d1537 100644 --- a/248k_2/prototypes/fission/fi_refinery.lua +++ b/248k_2/prototypes/fission/fi_refinery.lua @@ -45,7 +45,7 @@ data:extend({ energy_source = { type = 'electric', usage_priority = 'secondary-input', - emissions_per_minute = 20, + emissions_per_minute = { pollution = 20 }, --input_flow_limit = '4MW', }, energy_usage = '1MW', diff --git a/248k_2/prototypes/fusion/fu_miner.lua b/248k_2/prototypes/fusion/fu_miner.lua index d2430cc..0347d33 100644 --- a/248k_2/prototypes/fusion/fu_miner.lua +++ b/248k_2/prototypes/fusion/fu_miner.lua @@ -62,7 +62,7 @@ data:extend({ type = "burner", fuel_inventory_size = 1, effectivity = 1, - emissions_per_minute = 20, + emissions_per_minute = { pollution = 20 }, fuel_category = "fu_miner_fuel_category", smoke = { { diff --git a/248k_2/prototypes/gravitation/gr_train.lua b/248k_2/prototypes/gravitation/gr_train.lua index b13335b..191f222 100644 --- a/248k_2/prototypes/gravitation/gr_train.lua +++ b/248k_2/prototypes/gravitation/gr_train.lua @@ -419,7 +419,7 @@ data:extend({ fuel_inventory_size = 3, burnt_inventory_size = 3, effectivity = 0.001, - emissions_per_minute = 10, + emissions_per_minute = { pollution = 10 }, }, --light front_light = { From 65cee50f1feade8e9e2bb8c2c57fe7aa2aca1cec Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 22:13:09 +0200 Subject: [PATCH 8/9] Fix fuel categories --- 248k_2/prototypes/fission/fi_crafter.lua | 2 +- 248k_2/prototypes/fission/fi_miner.lua | 2 +- 248k_2/prototypes/fusion/fu_miner.lua | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/248k_2/prototypes/fission/fi_crafter.lua b/248k_2/prototypes/fission/fi_crafter.lua index 22bd936..da74f56 100644 --- a/248k_2/prototypes/fission/fi_crafter.lua +++ b/248k_2/prototypes/fission/fi_crafter.lua @@ -50,7 +50,7 @@ data:extend({ burnt_inventory_size = 3, effectivity = 0.35, emissions_per_minute = { pollution = 20 }, - fuel_category = 'fi_basic_fuel' + fuel_categories = {'fi_basic_fuel'} }, energy_usage = '200kW', allowed_effects = {"speed", "productivity", "consumption", "pollution"}, diff --git a/248k_2/prototypes/fission/fi_miner.lua b/248k_2/prototypes/fission/fi_miner.lua index 83d9d21..033f103 100644 --- a/248k_2/prototypes/fission/fi_miner.lua +++ b/248k_2/prototypes/fission/fi_miner.lua @@ -46,7 +46,7 @@ data:extend({ burnt_inventory_size = 3, effectivity = 0.35, emissions_per_minute = { pollution = 75 }, - fuel_category = 'fi_basic_fuel' + fuel_categories = {'fi_basic_fuel'} }, energy_usage = '4MW', mining_speed = 4.5, diff --git a/248k_2/prototypes/fusion/fu_miner.lua b/248k_2/prototypes/fusion/fu_miner.lua index 0347d33..a47dbf6 100644 --- a/248k_2/prototypes/fusion/fu_miner.lua +++ b/248k_2/prototypes/fusion/fu_miner.lua @@ -43,7 +43,6 @@ data:extend({ icon_size = 64, flags = {"player-creation","placeable-neutral"}, max_health = 300, - fixed_recipe = '', corpse = 'big-remnants', collision_box = {{-5.4,-5.4},{5.4,5.4}}, selection_box = {{-5.5,-5.5},{5.5,5.5}}, @@ -63,7 +62,7 @@ data:extend({ fuel_inventory_size = 1, effectivity = 1, emissions_per_minute = { pollution = 20 }, - fuel_category = "fu_miner_fuel_category", + fuel_categories = {"fu_miner_fuel_category"}, smoke = { { name = "smoke", From cda1c8110357bfa7601dd830c810c869a4b9c82a Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sun, 6 Jul 2025 22:20:30 +0200 Subject: [PATCH 9/9] Fix beacons --- .../electronic/el_ki/el_ki_beacon.lua | 33 +++++++++-------- .../electronic/el_ki/el_ki_core.lua | 36 +++++++++---------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua b/248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua index fdd91f4..dca4b19 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua @@ -81,11 +81,12 @@ data:extend({ input_flow_limit = '400MW', }, energy_usage = '0.4MW', - module_specification = { - module_slots = 2, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3, - }, + module_slots = 2, + icons_positioning = {{ + inventory_index = defines.inventory.beacon_modules, + shift = {0, 0.5}, + multi_row_initial_height_modifier = -0.3, + }}, supply_area_distance = config('supply_area'), radius_visualisation_picture = { @@ -146,11 +147,12 @@ data:extend({ input_flow_limit = '400MW', }, energy_usage = '4MW', - module_specification = { - module_slots = 6, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3, - }, + module_slots = 6, + icons_positioning = {{ + inventory_index = defines.inventory.beacon_modules, + shift = {0, 0.5}, + multi_row_initial_height_modifier = -0.3, + }}, supply_area_distance = config('supply_area_2'), radius_visualisation_picture = { @@ -211,11 +213,12 @@ data:extend({ input_flow_limit = '400MW', }, energy_usage = '40MW', - module_specification = { - module_slots = 18, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3, - }, + module_slots = 18, + icons_positioning = {{ + inventory_index = defines.inventory.beacon_modules, + shift = {0, 0.5}, + multi_row_initial_height_modifier = -0.3, + }}, supply_area_distance = config('supply_area_3'), radius_visualisation_picture = { diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_core.lua b/248k_2/prototypes/electronic/el_ki/el_ki_core.lua index b8ca2fe..e8f27e7 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_core.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_core.lua @@ -194,12 +194,12 @@ data:extend({ energy_usage = '1W', supply_area_distance = 0, allowed_effects = allowed_modules, - module_specification = - { - module_slots = 2, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3 - }, + module_slots = 2, + icons_positioning = {{ + inventory_index = defines.inventory.beacon_modules, + shift = {0, 0.5}, + multi_row_initial_height_modifier = -0.3, + }}, }, --slave container { @@ -363,12 +363,12 @@ data:extend({ energy_usage = '1W', supply_area_distance = 0, allowed_effects = allowed_modules, - module_specification = - { - module_slots = 2, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3 - }, + module_slots = 2, + icons_positioning = {{ + inventory_index = defines.inventory.beacon_modules, + shift = {0, 0.5}, + multi_row_initial_height_modifier = -0.3, + }}, }, --slave container { @@ -558,12 +558,12 @@ data:extend({ energy_usage = '1W', supply_area_distance = 0, allowed_effects = allowed_modules, - module_specification = - { - module_slots = 2, - module_info_icon_shift = {0, 0.5}, - module_info_multi_row_initial_height_modifier = -0.3 - }, + module_slots = 2, + icons_positioning = {{ + inventory_index = defines.inventory.beacon_modules, + shift = {0, 0.5}, + multi_row_initial_height_modifier = -0.3, + }}, }, --slave container {