diff --git a/248k_2/bk_sprites.lua b/248k_2/bk_sprites.lua index 60be19c..0a13c3e 100644 --- a/248k_2/bk_sprites.lua +++ b/248k_2/bk_sprites.lua @@ -1,5 +1,5 @@ local function sprite(name) - return '__248k_2__/ressources/booktorio/bk_sprite_'..name + return '__248k__/ressources/booktorio/bk_sprite_'..name end data:extend( @@ -31,7 +31,7 @@ data:extend( { type = "sprite", name = "bk_sprite_4", - filename = '__248k_2__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png', + filename = '__248k__/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_2__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png', + filename = '__248k__/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 de58d7d..4beb1e6 100644 --- a/248k_2/data.lua +++ b/248k_2/data.lua @@ -122,7 +122,7 @@ data:extend({ { type = "sprite", name = "sprite_248kmainbutton", - filename = "__248k_2__/ressources/groups/gr_group_icon.png", + filename = "__248k__/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 c3997d0..f72ec30 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_2__/ressources/elements/'..name + return '__248k__/ressources/elements/'..name end data:extend({ diff --git a/248k_2/prototypes/248k_fluids.lua b/248k_2/prototypes/248k_fluids.lua index 9301d38..16d8259 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_2__/ressources/fluids/'..name + return '__248k__/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 4dd6c07..8d7ef23 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_2__/ressources/groups/'..name + return '__248k__/ressources/groups/'..name end data:extend({ diff --git a/248k_2/prototypes/248k_techs.lua b/248k_2/prototypes/248k_techs.lua index f55bc27..adba950 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_2__/ressources/techs/'..name + return '__248k__/ressources/techs/'..name end --techs data:extend({ @@ -385,7 +385,7 @@ data:extend({ { name = 'el_kerosene_tech', type = 'technology', - icon = '__248k_2__/ressources/techs/el_kerosene_tech.png', + icon = '__248k__/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 345f1bc..fc62ed6 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_2__/ressources/'..name + return '__248k__/ressources/'..name end --settings check @@ -11,14 +11,15 @@ data:extend({ { name = 'el_solar_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'el_aluminum_item',30}, + {'concrete',20}, + {'electronic-circuit',40}, + {'copper-plate',20}, }, - results = {{type="item", name='el_solar_item', amount=2}}, + result = 'el_solar_item', + result_count = 2, energy_required = 4, order = 'a-a-2', }, @@ -28,15 +29,16 @@ data:extend({ { name = 'el_lithium_basic_battery_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', subgroup = 'el_item_subgroup_b', ingredients = { - {type="item", name="el_lithium_item", amount=4}, - {type="item", name="iron-plate", amount=4}, - {type="item", name="copper-plate", amount=4}, + {'el_lithium_item',4}, + {'iron-plate',4}, + {'copper-plate',4}, }, - results = {{type="item", name='battery', amount=12}}, + result = 'battery', + result_count = 12, energy_required = 20, order = 'b-a', }, @@ -44,81 +46,86 @@ data:extend({ { name = 'el_lithium_battery_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="el_lithium_item", amount=4}, - {type="item", name="iron-plate", amount=4}, - {type="item", name="steel-plate", amount=4}, + {'el_lithium_item',4}, + {'iron-plate',4}, + {'steel-plate',4}, }, - results = {{type="item", name='el_lithium_battery', amount=2}}, + result = 'el_lithium_battery', + result_count = 2, energy_required = 10, }, --el_burner { name = 'el_burner_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {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} + {'iron-gear-wheel',40}, + {'steel-plate',15}, + {'el_materials_ALK',10}, + {'electronic-circuit',10} }, - results = {{type="item", name='el_burner_item', amount=1}}, + result = 'el_burner_item', + result_count = 1, energy_required = 4, }, { name = 'el_burner_kerosene_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="el_burner_item", amount=1}, - {type="item", name="pipe", amount=20}, - {type="item", name="electronic-circuit", amount=20}, + {'el_burner_item',1}, + {'pipe',20}, + {'electronic-circuit',20}, }, - results = {{type="item", name='el_burner_kerosene_item', amount=1}}, + result = 'el_burner_kerosene_item', + result_count = 1, energy_required = 4, }, --el_water_generator { name = 'el_water_generator_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {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}, + {'iron-gear-wheel',60}, + {'engine-unit',15}, + {'el_materials_ALK',20}, + {'electronic-circuit',20}, + {'pipe',30}, + {'copper-cable',20}, }, - results = {{type="item", name='el_water_generator_item', amount=2}}, + result = 'el_water_generator_item', + result_count = 2, energy_required = 4, }, --el_pressurizer { name = 'el_pressurizer_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {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} + {'iron-gear-wheel',20}, + {'pipe',15}, + {'el_materials_ALK',10}, + {'electronic-circuit',10} }, - results = {{type="item", name='el_pressurizer_item', amount=1}}, + result = 'el_pressurizer_item', + result_count = 1, energy_required = 4, }, --el_water_pressure { 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, @@ -137,23 +144,24 @@ data:extend({ { name = 'el_diesel_train_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {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}, + {'locomotive',1}, + {'engine-unit',15}, + {'iron-gear-wheel',40}, + {'advanced-circuit',15}, + {'el_materials_ALK',25}, }, - results = {{type="item", name='el_diesel_train_item', amount=1}}, + result = 'el_diesel_train_item', + result_count = 1, energy_required = 20, }, --el_kerosene { name = 'el_kerosene_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'oil-processing', main_product = 'el_kerosene', ingredients = { @@ -165,35 +173,37 @@ 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 = { { - icon = "__248k_2__/ressources/fluids/el_kerosene.png" + icon = "__248k__/ressources/fluids/el_kerosene.png" }, { - icon = "__248k_2__/ressources/icons/overlay_2.png" + icon = "__248k__/ressources/icons/overlay_2.png" } } }, { name = 'el_tank_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="storage-tank", amount=4}, - {type="item", name="steel-plate", amount=50}, - {type="item", name="el_aluminum_item", amount=150}, + {'storage-tank', 4}, + {'steel-plate', 50}, + {'el_aluminum_item', 150}, }, - results = {{type="item", name='el_tank_item', amount=1}}, + result = 'el_tank_item', + result_count = 1, energy_required = 4, }, --el_desulfurized_kerosene { name = 'el_desulfurized_kerosene_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'chemistry', main_product = 'el_desulfurized_kerosene', ingredients = { @@ -203,13 +213,14 @@ 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 { name = 'el_usage_acidic_water_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'chemistry', subgroup = 'el_item_subgroup_e', main_product = 'sulfuric-acid', @@ -221,13 +232,14 @@ 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 { 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', @@ -237,13 +249,14 @@ data:extend({ results = { {type="item", name="el_train_fuel_diesel_item", amount=1}, }, + result_count = 1, energy_required = 10, }, --el_generator_equip { name = 'el_train_equipment_generator_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', subgroup = 'el_item_subgroup_d', ingredients = { @@ -254,13 +267,14 @@ data:extend({ results = { {type="item", name="el_train_equipment_generator_item", amount=1}, }, + result_count = 1, energy_required = 25, }, --el_accelerator_equip { name = 'el_train_equipment_accelerator_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', subgroup = 'el_item_subgroup_d', ingredients = { @@ -271,13 +285,14 @@ data:extend({ results = { {type="item", name="el_train_equipment_accelerator_item", amount=1}, }, + result_count = 1, energy_required = 25, }, --el_energy_crystal { 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}, @@ -286,6 +301,7 @@ data:extend({ results = { {type="item", name="el_energy_crystal_item", amount=2}, }, + result_count = 1, energy_required = 10, always_show_made_in = true }, @@ -293,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}, @@ -302,13 +318,14 @@ data:extend({ results = { {type="item", name="el_train_fuel_diesel_energized_item", amount=4}, }, + result_count = 1, energy_required = 5, }, --el_ki_beacon { name = 'el_ki_beacon_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=20}, @@ -318,12 +335,13 @@ data:extend({ results = { {type="item", name="el_ki_beacon_item", amount=1}, }, + result_count = 1, energy_required = 6, }, { name = 'fi_ki_beacon_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=20}, @@ -334,12 +352,13 @@ data:extend({ results = { {type="item", name="fi_ki_beacon_item", amount=1}, }, + result_count = 1, energy_required = 6, }, { name = 'fu_ki_beacon_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="fu_materials_KFK", amount=20}, @@ -350,13 +369,14 @@ data:extend({ results = { {type="item", name="fu_ki_beacon_item", amount=1}, }, + result_count = 1, energy_required = 6, }, --el_ki_core { name = 'el_ki_core_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=100}, @@ -373,12 +393,13 @@ data:extend({ results = { {type="item", name="el_ki_core_item", amount=1}, }, + result_count = 1, energy_required = 60, }, { name = 'fi_ki_core_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="fi_crafter_item", amount=10}, @@ -393,12 +414,13 @@ data:extend({ results = { {type="item", name="fi_ki_core_item", amount=1}, }, + result_count = 1, energy_required = 60, }, { name = 'fu_ki_core_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="fu_materials_KFK", amount=100}, @@ -416,13 +438,14 @@ data:extend({ results = { {type="item", name="fu_ki_core_item", amount=1}, }, + result_count = 1, energy_required = 60, }, --el_ki_memory_entity { name = 'el_ki_memory_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=40}, @@ -433,12 +456,13 @@ data:extend({ results = { {type="item", name="el_ki_memory_item", amount=1}, }, + result_count = 1, energy_required = 30, }, { name = 'fi_ki_circuit_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="fi_materials_neodym", amount=20}, @@ -449,12 +473,13 @@ data:extend({ results = { {type="item", name="fi_ki_circuit_item", amount=1}, }, + result_count = 1, energy_required = 30, }, { name = 'fu_ki_circuit_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="fu_materials_KFK", amount=40}, @@ -467,13 +492,14 @@ data:extend({ results = { {type="item", name="fu_ki_circuit_item", amount=1}, }, + result_count = 1, energy_required = 30, }, --el_ki_memory_fluid { name = 'el_ki_memory_fluid_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'el_ki_memory_category', main_product = 'el_ki_memory_fluid', ingredients = { @@ -489,17 +515,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_ki_memory_fluid.png" + icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_1.png" + icon = "__248k__/ressources/icons/overlay_1.png" } } }, { 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 = { @@ -515,17 +541,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_ki_memory_fluid.png" + icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_2.png" + icon = "__248k__/ressources/icons/overlay_2.png" } } }, { 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 = { @@ -541,17 +567,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_ki_memory_fluid.png" + icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_3.png" + icon = "__248k__/ressources/icons/overlay_3.png" } } }, { 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 = { @@ -566,17 +592,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_ki_memory_fluid.png" + icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_4.png" + icon = "__248k__/ressources/icons/overlay_4.png" } } }, { name = 'fu_ki_circuit_fluid_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { @@ -591,17 +617,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fu_ki_circuit_fluid.png" + icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_1.png" + icon = "__248k__/ressources/icons/overlay_1.png" } } }, { 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 = { @@ -616,17 +642,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fu_ki_circuit_fluid.png" + icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_2.png" + icon = "__248k__/ressources/icons/overlay_2.png" } } }, { 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 = { @@ -640,17 +666,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fu_ki_circuit_fluid.png" + icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_3.png" + icon = "__248k__/ressources/icons/overlay_3.png" } } }, { 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 = { @@ -664,17 +690,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fu_ki_circuit_fluid.png" + icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_4.png" + icon = "__248k__/ressources/icons/overlay_4.png" } } }, { name = 'fi_ki_circuit_fluid_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_ki_circuit_category', main_product = 'fi_ki_circuit_fluid', ingredients = { @@ -689,17 +715,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fi_ki_circuit_fluid.png" + icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_1.png" + icon = "__248k__/ressources/icons/overlay_1.png" } } }, { 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 = { @@ -714,17 +740,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fi_ki_circuit_fluid.png" + icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_2.png" + icon = "__248k__/ressources/icons/overlay_2.png" } } }, { 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 = { @@ -738,17 +764,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fi_ki_circuit_fluid.png" + icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_3.png" + icon = "__248k__/ressources/icons/overlay_3.png" } } }, { 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 = { @@ -761,10 +787,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fi_ki_circuit_fluid.png" + icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_4.png" + icon = "__248k__/ressources/icons/overlay_4.png" } } }, @@ -772,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}, @@ -783,13 +809,14 @@ data:extend({ results = { {type="item", name="el_ki_cpu_item", amount=1}, }, - energy_required = 30, + result_count = 1, + energy_required = 30, }, --el_ki_cpu_fluid { name = 'el_ki_cpu_fluid_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'el_ki_cpu_category', main_product = 'el_ki_cpu_fluid', ingredients = { @@ -805,17 +832,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_ki_cpu_fluid.png" + icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_1.png" + icon = "__248k__/ressources/icons/overlay_1.png" } } }, { 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 = { @@ -831,17 +858,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_ki_cpu_fluid.png" + icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_2.png" + icon = "__248k__/ressources/icons/overlay_2.png" } } }, { 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 = { @@ -857,17 +884,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_ki_cpu_fluid.png" + icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_3.png" + icon = "__248k__/ressources/icons/overlay_3.png" } } }, { 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 = { @@ -882,10 +909,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_ki_cpu_fluid.png" + icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" }, { - icon = "__248k_2__/ressources/icons/overlay_4.png" + icon = "__248k__/ressources/icons/overlay_4.png" } } }, @@ -894,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, @@ -909,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}, @@ -925,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}, @@ -942,61 +969,65 @@ data:extend({ { name = 'el_arc_furnace_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="iron-gear-wheel", amount=40}, - {type="item", name="steel-plate", amount=25}, - {type="item", name="stone-furnace", amount=2} + {'iron-gear-wheel',40}, + {'steel-plate',25}, + {'stone-furnace',2} }, - results = {{type="item", name='el_arc_furnace_item', amount=1}}, + result = 'el_arc_furnace_item', + result_count = 1, energy_required = 4, }, { name = 'el_caster_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="iron-gear-wheel", amount=40}, - {type="item", name="steel-plate", amount=25}, - {type="item", name="electronic-circuit", amount=20} + {'iron-gear-wheel',40}, + {'steel-plate',25}, + {'electronic-circuit',20} }, - results = {{type="item", name='el_caster_item', amount=1}}, + result = 'el_caster_item', + result_count = 1, energy_required = 4, }, { name = 'el_purifier_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="iron-gear-wheel", amount=40}, - {type="item", name="steel-plate", amount=15}, - {type="item", name="electronic-circuit", amount=10} + {'iron-gear-wheel',40}, + {'steel-plate',15}, + {'electronic-circuit',10} }, - results = {{type="item", name='el_purifier_item', amount=1}}, + result = 'el_purifier_item', + result_count = 1, energy_required = 4, }, { name = 'el_grower_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {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} + {'iron-gear-wheel',40}, + {'steel-plate',15}, + {'el_materials_ALK',15}, + {'electronic-circuit',10} }, - results = {{type="item", name='el_grower_item', amount=1}}, + result = 'el_grower_item', + result_count = 1, energy_required = 4, }, { name = 'el_purify_stone_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'el_purifier_category', main_product = 'el_dirty_water', ingredients = { @@ -1015,17 +1046,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_dirty_water.png" + icon = "__248k__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_stone.png" + icon = "__248k__/ressources/icons/overlay_stone.png" } } }, { name = 'el_purify_stone_2_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'el_purifier_category', main_product = 'el_dirty_water', ingredients = { @@ -1042,10 +1073,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_dirty_water.png" + icon = "__248k__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_stone.png" + icon = "__248k__/ressources/icons/overlay_stone.png" } } @@ -1053,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 = { @@ -1070,10 +1101,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_dirty_water.png" + icon = "__248k__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_iron.png" + icon = "__248k__/ressources/icons/overlay_iron.png" } } @@ -1081,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 = { @@ -1098,17 +1129,17 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_dirty_water.png" + icon = "__248k__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_copper.png" + icon = "__248k__/ressources/icons/overlay_copper.png" } } }, { name = 'el_purify_stone_acidic_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'el_purifier_category', main_product = 'el_energy_crystal_item', ingredients = { @@ -1129,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 = { @@ -1152,12 +1183,13 @@ data:extend({ { name = 'el_aluminum_item_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'smelting', ingredients = { - {type="item", name="el_aluminum_ore_item", amount=2}, + {'el_aluminum_ore_item',2}, }, - results = {{type="item", name='el_aluminum_item', amount=4}}, + result = 'el_aluminum_item', + result_count = 4, energy_required = 2, always_show_made_in = true, order = 'a-c', @@ -1165,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 = { @@ -1181,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}, @@ -1196,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}, @@ -1212,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}, @@ -1228,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}, @@ -1243,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}, @@ -1259,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}, @@ -1274,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}, @@ -1290,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}, @@ -1305,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}, @@ -1321,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}, @@ -1335,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 = { @@ -1350,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 = { @@ -1365,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 = { @@ -1380,7 +1412,7 @@ data:extend({ { name = 'el_kerosene_basic_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'oil-processing', main_product = 'el_kerosene', ingredients = { @@ -1391,46 +1423,49 @@ 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 = { { - icon = "__248k_2__/ressources/fluids/el_kerosene.png" + icon = "__248k__/ressources/fluids/el_kerosene.png" }, { - icon = "__248k_2__/ressources/icons/overlay_1.png" + icon = "__248k__/ressources/icons/overlay_1.png" } } }, { name = 'el_charger_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="iron-gear-wheel", amount=40}, - {type="item", name="steel-plate", amount=25}, - {type="item", name="stone-furnace", amount=2} + {'iron-gear-wheel',40}, + {'steel-plate',25}, + {'stone-furnace',2} }, - results = {{type="item", name='el_charger_item', amount=1}}, + result = 'el_charger_item', + result_count = 1, energy_required = 4, }, { 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}, }, - results = {{type="item", name='el_energy_crystal_charged_item', amount=1}}, + result = 'el_energy_crystal_charged_item', + result_count = 1, energy_required = 2, always_show_made_in = true, }, { name = 'el_grenade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'el_grenade', ingredients = { @@ -1440,6 +1475,7 @@ data:extend({ results = { {type="item", name="el_grenade", amount=1}, }, + result_count = 1, energy_required = 4, }, diff --git a/248k_2/prototypes/electronic/el_aluminum.lua b/248k_2/prototypes/electronic/el_aluminum.lua index 6405eb8..f3502d6 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_2__/ressources/electronic/el_aluminum/el_aluminum_'..name + return '__248k__/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 4475a7b..2d9bd0e 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_2__/ressources/electronic/el_ammo/el_ammo_'..name + return '__248k__/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 d8e4556..b9d5751 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_2__/ressources/electronic/el_arc_furnace/el_arc_furnace_'..name + return '__248k__/ressources/electronic/el_arc_furnace/el_arc_furnace_'..name end --item @@ -58,50 +58,55 @@ data:extend({ energy_usage = '400kW', fluid_boxes = { { - - volume = 200, + + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {0, -3}}, + {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}} }, production_type = "output" }, { - - volume = 200, + + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {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}}, + {type = "output", position = {0, 4}}, }, production_type = "output" }, @@ -145,4 +150,25 @@ data:extend({ apparent_volume = 0.1, }, }, -}) \ No newline at end of file +}) + +--{ +-- 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 diff --git a/248k_2/prototypes/electronic/el_burner.lua b/248k_2/prototypes/electronic/el_burner.lua index 0f13f2f..a295280 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_2__/ressources/electronic/el_burner/el_burner_'..name + return '__248k__/ressources/electronic/el_burner/el_burner_'..name end local function burner_output() @@ -73,7 +73,7 @@ data:extend({ fuel_inventory_size = 3, burnt_inventory_size = 3, effectivity = 0.95, - emissions_per_minute = { pollution = 20 }, + emissions_per_minute = 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 = { pollution = 20 }, + emissions_per_minute = 20, }, max_power_output = burner_output(), maximum_temperature = 40, @@ -139,8 +139,8 @@ data:extend({ burns_fluid = true, fluid_usage_per_tick = 1, fluid_box = { - - volume = 200, + base_area = 1, + height = 2, 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 = { - {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}}, + {type = "input-output", position = {2, 0}}, + {type = "input-output", position = {-2, 0}}, + {type = "input-output", position = {0, 2}}, + {type = "input-output", position = {0, -2}}, }, }, fluid_input = { diff --git a/248k_2/prototypes/electronic/el_caster.lua b/248k_2/prototypes/electronic/el_caster.lua index 776512b..28d809c 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_2__/ressources/electronic/el_caster/el_caster_'..name + return '__248k__/ressources/electronic/el_caster/el_caster_'..name end --item @@ -59,50 +59,55 @@ data:extend({ energy_usage = '100kW', fluid_boxes = { { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, + {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}} }, production_type = "input" }, { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {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}}, + {type = "input", position = {0, 4}}, }, production_type = "input" }, @@ -139,4 +144,25 @@ data:extend({ apparent_volume = 0.1, }, }, -}) \ No newline at end of file +}) + +--{ +-- 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 diff --git a/248k_2/prototypes/electronic/el_charger.lua b/248k_2/prototypes/electronic/el_charger.lua index 52d7999..9ce31b8 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_2__/ressources/electronic/el_charger/el_charger_'..name + return '__248k__/ressources/electronic/el_charger/el_charger_'..name end --item @@ -27,6 +27,7 @@ data:extend({ --prototype { name = 'el_charger_entity', + --type = 'furnace', type = 'assembling-machine', icon = sprite('icon.png'), icon_size = 64, @@ -41,7 +42,10 @@ 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', @@ -50,53 +54,58 @@ data:extend({ fluid_boxes = { { - volume = 4000, + base_area = 20, filter = 'water', + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, + {type = "input", position = {0, -4}}, }, production_type = "input" }, - { - - volume = 4000, + { + + base_area = 20, + height = 2, filter = 'fu_oxygen', base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.west, position = {-3, 0}} + {type = "output", position = {-4, 0}} }, production_type = "output" }, - { - - volume = 4000, + { + + base_area = 20, + height = 2, filter = 'fu_hydrogen', base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} }, production_type = "output" }, { - - volume = 4000, + + base_area = 20, + height = 2, 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}}, + {type = "output", position = {0, 4}}, }, production_type = "output" }, @@ -140,4 +149,25 @@ data:extend({ apparent_volume = 0.1, }, }, -}) \ No newline at end of file +}) + +--{ +-- 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 diff --git a/248k_2/prototypes/electronic/el_diesel_train.lua b/248k_2/prototypes/electronic/el_diesel_train.lua index db58d7b..3f965fb 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_2__/ressources/electronic/el_diesel_train/el_diesel_train_'..name + return '__248k__/ressources/electronic/el_diesel_train/el_diesel_train_'..name end --item @@ -64,7 +64,7 @@ data:extend({ fuel_category = 'el_train_fuel', fuel_inventory_size = 3, effectitvity = 1, - emissions_per_minute = { pollution = 20 }, + emissions_per_minute = 20, smoke = { { name = "train-smoke", diff --git a/248k_2/prototypes/electronic/el_energy_crystal.lua b/248k_2/prototypes/electronic/el_energy_crystal.lua index 6993ed4..6ce7e20 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_2__/ressources/electronic/el_energy_crystal/el_energy_crystal_'..name + return '__248k__/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 80591b5..18654bd 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_2__/ressources/electronic/el_grower/el_grower_'..name + return '__248k__/ressources/electronic/el_grower/el_grower_'..name end --item @@ -59,50 +59,51 @@ data:extend({ energy_usage = '200kW', fluid_boxes = { { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -2}}, + {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}} }, production_type = "input" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {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}}, + {type = "input", position = {0, 3}}, }, production_type = "input" }, 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 dca4b19..6789d6a 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_2__/ressources/electronic/el_ki/el_ki_beacon/el_ki_beacon_'..name + return '__248k__/ressources/electronic/el_ki/el_ki_beacon/el_ki_beacon_'..name end local function config_blueprintable(name,int) @@ -81,12 +81,11 @@ data:extend({ input_flow_limit = '400MW', }, energy_usage = '0.4MW', - module_slots = 2, - icons_positioning = {{ - inventory_index = defines.inventory.beacon_modules, - shift = {0, 0.5}, - multi_row_initial_height_modifier = -0.3, - }}, + module_specification = { + module_slots = 2, + module_info_icon_shift = {0, 0.5}, + module_info_multi_row_initial_height_modifier = -0.3, + }, supply_area_distance = config('supply_area'), radius_visualisation_picture = { @@ -147,12 +146,11 @@ data:extend({ input_flow_limit = '400MW', }, energy_usage = '4MW', - module_slots = 6, - icons_positioning = {{ - inventory_index = defines.inventory.beacon_modules, - shift = {0, 0.5}, - multi_row_initial_height_modifier = -0.3, - }}, + module_specification = { + module_slots = 6, + module_info_icon_shift = {0, 0.5}, + module_info_multi_row_initial_height_modifier = -0.3, + }, supply_area_distance = config('supply_area_2'), radius_visualisation_picture = { @@ -213,12 +211,11 @@ data:extend({ input_flow_limit = '400MW', }, energy_usage = '40MW', - module_slots = 18, - icons_positioning = {{ - inventory_index = defines.inventory.beacon_modules, - shift = {0, 0.5}, - multi_row_initial_height_modifier = -0.3, - }}, + module_specification = { + module_slots = 18, + module_info_icon_shift = {0, 0.5}, + module_info_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 e8f27e7..56e9e1b 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_2__/ressources/electronic/el_ki/el_ki_core/el_ki_core_'..name + return '__248k__/ressources/electronic/el_ki/el_ki_core/el_ki_core_'..name end local function core_input(core_number) @@ -100,53 +100,53 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, + {type = "input", position = {0.5, -3.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, + {type = "input", position = {-0.5, -3.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, + {type = "input", position = {0.5, 3.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, + {type = "input", position = {-0.5, 3.5}}, }, production_type = "input" }, @@ -194,12 +194,12 @@ data:extend({ energy_usage = '1W', supply_area_distance = 0, allowed_effects = allowed_modules, - module_slots = 2, - icons_positioning = {{ - inventory_index = defines.inventory.beacon_modules, - shift = {0, 0.5}, - multi_row_initial_height_modifier = -0.3, - }}, + module_specification = + { + module_slots = 2, + module_info_icon_shift = {0, 0.5}, + module_info_multi_row_initial_height_modifier = -0.3 + }, }, --slave container { @@ -243,79 +243,79 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, + {type = "input", position = {0.5, -3.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, + {type = "input", position = {-0.5, -3.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, + {type = "input", position = {0.5, 3.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, + {type = "input", position = {-0.5, 3.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {2.5, 0.5}}, + {type = "input", position = {3.5, 0.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {2.5, -0.5}}, + {type = "input", position = {3.5, -0.5}}, }, production_type = "input" } @@ -363,12 +363,12 @@ data:extend({ energy_usage = '1W', supply_area_distance = 0, allowed_effects = allowed_modules, - module_slots = 2, - icons_positioning = {{ - inventory_index = defines.inventory.beacon_modules, - shift = {0, 0.5}, - multi_row_initial_height_modifier = -0.3, - }}, + module_specification = + { + module_slots = 2, + module_info_icon_shift = {0, 0.5}, + module_info_multi_row_initial_height_modifier = -0.3 + }, }, --slave container { @@ -412,105 +412,105 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, + {type = "input", position = {0.5, -3.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, + {type = "input", position = {-0.5, -3.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, + {type = "input", position = {0.5, 3.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, + {type = "input", position = {-0.5, 3.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {2.5, 0.5}}, + {type = "input", position = {3.5, 0.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {2.5, -0.5}}, + {type = "input", position = {3.5, -0.5}}, }, production_type = "input" }, { filter = 'fu_ki_circuit_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-2.5, 0.5}}, + {type = "input", position = {-3.5, 0.5}}, }, production_type = "input" }, { filter = 'fu_ki_circuit_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-2.5, -0.5}}, + {type = "input", position = {-3.5, -0.5}}, }, production_type = "input" } @@ -558,12 +558,12 @@ data:extend({ energy_usage = '1W', supply_area_distance = 0, allowed_effects = allowed_modules, - module_slots = 2, - icons_positioning = {{ - inventory_index = defines.inventory.beacon_modules, - shift = {0, 0.5}, - multi_row_initial_height_modifier = -0.3, - }}, + module_specification = + { + module_slots = 2, + module_info_icon_shift = {0, 0.5}, + module_info_multi_row_initial_height_modifier = -0.3 + }, }, --slave container { 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 396c114..4a7d350 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_2__/ressources/electronic/el_ki/el_ki_cpu/el_ki_cpu_'..name + return '__248k__/ressources/electronic/el_ki/el_ki_cpu/el_ki_cpu_'..name end --item @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, + {type = "output", position = {0, 2}}, }, production_type = "output" }, 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 fef56a8..d9e5b3d 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_2__/ressources/electronic/el_ki/el_ki_linker/el_ki_'..name + return '__248k__/ressources/electronic/el_ki/el_ki_linker/el_ki_'..name end data:extend({ @@ -43,8 +43,7 @@ data:extend({ stack_size = 1, icon_size = 64, icon = sprite('selection_tool.png'), - flags = {"mod-openable","only-in-cursor"}, - hidden = true, + flags = {"hidden","mod-openable","only-in-cursor"}, selection_color = {r=0.79, g=0.4, b=0, a=0.5 }, selection_mode = {"any-entity"}, selection_cursor_box_type = "entity", @@ -57,7 +56,7 @@ data:extend({ { type = "sprite", name = "el_ki_not_operable_icon", - filename = "__248k_2__/ressources/electronic/el_ki/el_ki_linker/el_ki_not_operable_icon.png", + filename = "__248k__/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 16e6c1f..1942428 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_2__/ressources/electronic/el_ki/el_ki_memory/el_ki_memory_'..name + return '__248k__/ressources/electronic/el_ki/el_ki_memory/el_ki_memory_'..name end --item @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_memory_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, + {type = "output", position = {0, 2}}, }, 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 7eb95ff..8171c0a 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_2__/ressources/electronic/el_ki/fi_ki_circuit/fi_ki_circuit_'..name + return '__248k__/ressources/electronic/el_ki/fi_ki_circuit/fi_ki_circuit_'..name end --item @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'fi_ki_circuit_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, + {type = "output", position = {0, 2}}, }, 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 fdfe679..d10b525 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_2__/ressources/electronic/el_ki/fu_ki_circuit/fu_ki_circuit_'..name + return '__248k__/ressources/electronic/el_ki/fu_ki_circuit/fu_ki_circuit_'..name end --item @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'fu_ki_circuit_fluid', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, + {type = "output", position = {0, 2}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_lithium.lua b/248k_2/prototypes/electronic/el_lithium.lua index 64592a6..37765c3 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_2__/ressources/electronic/el_lithium/el_lithium_'..name + return '__248k__/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 1a72a42..493a2f3 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_2__/ressources/electronic/el_materials/el_materials_'..name + return '__248k__/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 f062822..37e5708 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_2__/ressources/electronic/el_pressurizer/el_pressurizer_'..name + return '__248k__/ressources/electronic/el_pressurizer/el_pressurizer_'..name end --item @@ -48,59 +48,60 @@ data:extend({ type = 'electric', usage_priority = 'secondary-input', input_flow_limit = '60kW', - emissions_per_minute = { pollution = 25 }, + emissions_per_minute = 25, }, energy_usage = '40kW', fluid_boxes = { { filter = 'water', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -1}}, + {type = "input", position = {0, -2}}, }, production_type = "input" }, { filter = 'steam', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-1, 0}} + {type = "input", position = {-2, 0}} }, production_type = "input" }, { filter = 'el_pressurized_water', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {1, 0}}, + {type = "output", position = {2, 0}}, + --{type = "output", position = {2, -2.5}} }, production_type = "output" }, { filter = 'water', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {0, 1}}, + {type = "output", position = {0, 2}}, }, production_type = "output" }, @@ -146,4 +147,25 @@ data:extend({ apparent_volume = 0.05, }, }, -}) \ No newline at end of file +}) + +--{ +-- 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 diff --git a/248k_2/prototypes/electronic/el_purifier.lua b/248k_2/prototypes/electronic/el_purifier.lua index 8d9b79e..c8b848c 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_2__/ressources/electronic/el_purifier/el_purifier_'..name + return '__248k__/ressources/electronic/el_purifier/el_purifier_'..name end --item @@ -60,53 +60,54 @@ data:extend({ fluid_boxes = { { filter = 'water', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, + {type = "input", position = {0, -4}}, }, production_type = "input" }, { filter = 'water', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + {type = "input", position = {-4, 0}} }, production_type = "input" }, { filter = 'el_dirty_water', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} }, production_type = "output" }, { filter = 'el_dirty_water', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, + {type = "output", position = {0, 4}}, }, production_type = "output" }, @@ -143,4 +144,25 @@ data:extend({ apparent_volume = 0.1, }, }, -}) \ No newline at end of file +}) + +--{ +-- 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 diff --git a/248k_2/prototypes/electronic/el_solar.lua b/248k_2/prototypes/electronic/el_solar.lua index 2f01876..279386c 100644 --- a/248k_2/prototypes/electronic/el_solar.lua +++ b/248k_2/prototypes/electronic/el_solar.lua @@ -4,20 +4,20 @@ local function config(name) end local function sprite(name) - return '__248k_2__/ressources/electronic/el_solar/el_solar_'..name + return '__248k__/ressources/electronic/el_solar/el_solar_'..name 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/electronic/el_tank.lua b/248k_2/prototypes/electronic/el_tank.lua index 5e72e57..023df3e 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_2__/ressources/electronic/el_tank/el_tank_'..name + return '__248k__/ressources/electronic/el_tank/el_tank_'..name end local tank_color = {r=1.7,g=1.7,b=1.7} @@ -87,23 +87,24 @@ data:extend({ }, flow_length_in_ticks = 1, fluid_box = { - volume = 500000, + base_area = 5000, + height = 1, base_level = 0, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {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 = {4, 1}}, + {type = "input-output", position = {4, -1}}, - {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}} + {type = "input-output", position = {-1, 4}}, + {type = "input-output", position = {-1, -4}} }, production_type = "input-output" }, diff --git a/248k_2/prototypes/electronic/el_train_equipment.lua b/248k_2/prototypes/electronic/el_train_equipment.lua index c410d62..5100bef 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_2__/ressources/electronic/el_train_equipment/el_train_equipment_'..name + return '__248k__/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 7d206a9..fe0bef2 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_2__/ressources/electronic/el_train_fuel/el_train_fuel_'..name + return '__248k__/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 83159f2..46b1d53 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_2__/ressources/electronic/el_water_generator/el_water_generator_'..name + return '__248k__/ressources/electronic/el_water_generator/el_water_generator_'..name end local function water_output() @@ -62,8 +62,8 @@ data:extend({ max_power_output = water_output(), effectivity = 0.9, fluid_box = { - - volume = 200, + base_area = 1, + height = 2, 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 = { - {flow_direction = "input-output", direction = defines.direction.east, position = {1, 0}}, - {flow_direction = "input-output", direction = defines.direction.west, position = {-1, 0}}, + {type = "input-output", position = {2, 0}}, + {type = "input-output", position = {-2, 0}}, }, }, fluid_input = { diff --git a/248k_2/prototypes/fi_recipes.lua b/248k_2/prototypes/fi_recipes.lua index ff918cf..1fee9bf 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_2__/ressources/'..name + return '__248k__/ressources/'..name end data:extend({ @@ -12,161 +12,173 @@ data:extend({ { name = 'fi_crafter_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'concrete',30}, + {'fi_materials_GFK',20}, + {'iron-gear-wheel',20}, + {'electronic-circuit',15}, + {'el_energy_crystal_item',4}, }, - results = {{type="item", name='fi_crafter_item', amount=1}}, + result = 'fi_crafter_item', + result_count = 1, energy_required = 4, }, { name = 'fi_castor_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="concrete", amount=50}, - {type="item", name="fi_materials_GFK", amount=40}, - {type="item", name="el_tank_item", amount=1} + {'concrete',50}, + {'fi_materials_GFK',40}, + {'el_tank_item',1} }, - results = {{type="item", name='fi_castor_item', amount=1}}, + result = 'fi_castor_item', + result_count = 1, energy_required = 4, }, --crusher { name = 'fi_crusher_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'concrete',60}, + {'el_materials_ALK',20}, + {'iron-gear-wheel',40}, + {'engine-unit',15}, + {'el_energy_crystal_item',10}, }, - results = {{type="item", name='fi_crusher_item', amount=1}}, + result = 'fi_crusher_item', + result_count = 1, energy_required = 4, }, --miner { name = 'fi_miner_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'concrete',100}, + {'fi_compound_material_item',60}, + {'iron-gear-wheel',40}, + {'electric-mining-drill',8}, + {'engine-unit',10}, }, - results = {{type="item", name='fi_miner_item', amount=1}}, + result = 'fi_miner_item', + result_count = 1, energy_required = 4, }, --fuels { name = 'fi_basic_fuel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="uranium-235", amount=1}, - {type="item", name="uranium-238", amount=19}, - {type="item", name="el_materials_ALK", amount=10}, + {'uranium-235',1}, + {'uranium-238',19}, + {'el_materials_ALK',10}, }, - results = {{type="item", name='fi_basic_fuel_item', amount=8}}, + result = 'fi_basic_fuel_item', + result_count = 8, energy_required = 20, }, { name = 'fi_basic_thorium_fuel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="fi_thorium232_item", amount=10}, - {type="item", name="uranium-238", amount=10}, - {type="item", name="el_materials_ALK", amount=10}, + {'fi_thorium232_item',10}, + {'uranium-238',10}, + {'el_materials_ALK',10}, }, - results = {{type="item", name='fi_basic_thorium_fuel_item', amount=8}}, + result = 'fi_basic_thorium_fuel_item', + result_count = 8, energy_required = 20, }, { name = 'fi_advanced_fuel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="fi_plutonium239_item", amount=1}, - {type="item", name="uranium-238", amount=19}, - {type="item", name="el_materials_ALK", amount=10}, + {'fi_plutonium239_item',1}, + {'uranium-238',19}, + {'el_materials_ALK',10}, }, - results = {{type="item", name='fi_advanced_fuel_item', amount=2}}, + result = 'fi_advanced_fuel_item', + result_count = 2, energy_required = 20, }, { name = 'fi_advanced_thorium_fuel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="fi_uranium233_item", amount=4}, - {type="item", name="uranium-238", amount=16}, - {type="item", name="el_materials_ALK", amount=10}, + {'fi_uranium233_item',4}, + {'uranium-238',16}, + {'el_materials_ALK',10}, }, - results = {{type="item", name='fi_advanced_thorium_fuel_item', amount=2}}, + result = 'fi_advanced_thorium_fuel_item', + result_count = 2, energy_required = 20, }, { name = 'fi_pure_fuel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="uranium-235", amount=1}, - {type="item", name="fi_plutonium239_item", amount=1}, - {type="item", name="el_materials_ALK", amount=10}, + {'uranium-235',1}, + {'fi_plutonium239_item',1}, + {'el_materials_ALK',10}, }, - results = {{type="item", name='fi_pure_fuel_item', amount=1}}, + result = 'fi_pure_fuel_item', + result_count = 1, energy_required = 20, }, --reactor { name = 'fi_solid_reactor_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'steel-plate',450}, + {'concrete',400}, + {'fi_materials_GFK',300}, + {'fi_materials_NFK',300}, + {'fi_energy_crystal_item',40}, + {'advanced-circuit',500}, }, - results = {{type="item", name='fi_solid_reactor_item', amount=1}}, + result = 'fi_solid_reactor_item', + result_count = 1, energy_required = 20, }, --material { name = 'fi_compound_material_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="el_aluminum_item", amount=15}, - {type="item", name="steel-plate", amount=10}, - {type="item", name="iron-plate", amount=20}, + {'el_aluminum_item',15}, + {'steel-plate',10}, + {'iron-plate',20}, }, - results = {{type="item", name='fi_compound_material_item', amount=2}}, + result = 'fi_compound_material_item', + result_count = 2, energy_required = 4, }, { name = 'fi_low-density-structure_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crafting_category', subgroup = 'fi_item_subgroup_b', ingredients = { - {type="item", name="fi_materials_glass_fiber", amount=3}, - {type="item", name="el_materials_ALK", amount=3}, - {type="item", name="copper-plate", amount=30}, + {'fi_materials_glass_fiber',3}, + {'el_materials_ALK',3}, + {'copper-plate',30}, }, - results = {{type="item", name='low-density-structure', amount=4}}, + result = 'low-density-structure', + result_count = 4, energy_required = 20, order = 'b-b', always_show_made_in = true, @@ -176,82 +188,87 @@ data:extend({ { name = 'fi_plutonium239_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'centrifuging', main_product = 'fi_plutonium239_item', ingredients = { - {type="item", name="fi_used_basic_fuel_item", amount=6}, + {'fi_used_basic_fuel_item',6}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {type="item", name="fi_plutonium239_item", amount=1}, - {type="item", name="fi_materials_waste", amount=1}, + {'fi_plutonium239_item',1}, + {'fi_materials_waste',1}, {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, + result_count = 1, energy_required = 20, }, { name = 'fi_thorium232_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting-with-fluid', main_product = 'fi_thorium232_item', ingredients = { - {type="item", name="stone", amount=80}, - {type="item", name="el_energy_crystal_item", amount=2}, + {'stone',80}, + {'el_energy_crystal_item',2}, {type="fluid", name="sulfuric-acid", amount=140}, }, results = { - {type="item", name="fi_thorium232_item", amount=2}, - {type="item", name="uranium-238", amount=3} + {'fi_thorium232_item',2}, + {'uranium-238',3} }, + result_count = 1, energy_required = 40, }, { name = 'fi_uranium233_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'centrifuging', main_product = 'fi_uranium233_item', ingredients = { - {type="item", name="fi_used_basic_thorium_fuel_item", amount=6}, + {'fi_used_basic_thorium_fuel_item',6}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {type="item", name="fi_uranium233_item", amount=1}, - {type="item", name="fi_materials_waste", amount=1}, + {'fi_uranium233_item',1}, + {'fi_materials_waste',1}, {type="item", name="fi_materials_empty_solution", amount=1, probability=0.95}, }, + result_count = 1, energy_required = 20, }, { name = 'fi_atomic_bomb_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="explosive-rocket", amount=10}, - {type="item", name="fi_plutonium239_item", amount=10}, - {type="item", name="rocket-control-unit", amount=10} + {'explosive-rocket',10}, + {'fi_plutonium239_item',10}, + {'rocket-control-unit',10} }, - results = {{type="item", name='atomic-bomb', amount=1}}, + result = 'atomic-bomb', + result_count = 1, energy_required = 20, }, --wideraufbereitung { name = 'fi_advanced_fuel_recycle_recipe', type = 'recipe', - enabled = false, + enabled = 'false', main_product = 'uranium-238', category = 'centrifuging', ingredients = { - {type="item", name="fi_used_advanced_fuel_item", amount=4}, + {'fi_used_advanced_fuel_item',4}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {type="item", name="uranium-238", amount=1}, - {type="item", name="fi_materials_waste", amount=1}, + {'uranium-238',1}, + {'fi_materials_waste',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', @@ -260,18 +277,19 @@ data:extend({ { name = 'fi_advanced_thorium_fuel_recycle_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'centrifuging', main_product = 'uranium-238', ingredients = { - {type="item", name="fi_used_advanced_thorium_fuel_item", amount=4}, + {'fi_used_advanced_thorium_fuel_item',4}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {type="item", name="uranium-238", amount=1}, - {type="item", name="fi_materials_waste", amount=1}, + {'uranium-238',1}, + {'fi_materials_waste',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', @@ -280,18 +298,19 @@ data:extend({ { name = 'fi_pure_fuel_recycle_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'centrifuging', main_product = 'uranium-238', ingredients = { - {type="item", name="fi_used_pure_fuel_item", amount=4}, + {'fi_used_pure_fuel_item',4}, {type="item", name="fi_materials_solution", amount=1}, }, results = { - {type="item", name="uranium-238", amount=1}, - {type="item", name="fi_materials_waste", amount=1}, + {'uranium-238',1}, + {'fi_materials_waste',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', @@ -301,94 +320,101 @@ data:extend({ { name = 'fi_equipment_player_reactor_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="fi_solid_reactor_item", amount=1}, - {type="item", name="fi_pure_fuel_item", amount=1}, + {'fi_solid_reactor_item',1}, + {'fi_pure_fuel_item',1}, }, - results = {{type="item", name='fi_equipment_player_reactor_item', amount=6}}, + result = 'fi_equipment_player_reactor_item', + result_count = 6, energy_required = 20, }, { name = 'fi_equipment_player_shield_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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} + {'fi_energy_crystal_item',20}, + {'low-density-structure',10}, + {'processing-unit',10}, + {'energy-shield-mk2-equipment',5} }, - results = {{type="item", name='fi_equipment_player_shield_item', amount=1}}, + result = 'fi_equipment_player_shield_item', + result_count = 1, energy_required = 20, }, { name = 'fi_train_equipment_generator_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fi_solid_reactor_item',1}, + {'low-density-structure',10}, + {'iron-gear-wheel',20}, + {'fi_pure_fuel_item',1}, }, - results = {{type="item", name='fi_train_equipment_generator_item', amount=6}}, + result = 'fi_train_equipment_generator_item', + result_count = 6, energy_required = 20, }, --crystals { 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}, {type="fluid", name="fi_crystal_fluid", amount=50}, }, - results = {{type="item", name='fi_energy_crystal_item', amount=2}}, + result = 'fi_energy_crystal_item', + result_count = 2, energy_required = 4, always_show_made_in = true, }, { name = 'fi_catalyst_crystal_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'centrifuging', ingredients = { - {type="item", name="el_train_fuel_diesel_energized_item", amount=1}, + {'el_train_fuel_diesel_energized_item',1}, }, - results = {{type="item", name='fi_catalyst_crystal_item', amount=2}}, + result = 'fi_catalyst_crystal_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_base_crystal_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting-with-fluid', ingredients = { {type="fluid", name="fi_crystal_fluid", amount=100}, {type="item", name="fi_catalyst_crystal_item", amount=1}, }, - results = {{type="item", name='fi_base_crystal_item', amount=2}}, + result = 'fi_base_crystal_item', + result_count = 2, energy_required = 6, }, { name = 'fi_crushed_crystal_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="el_energy_crystal_item", amount=1}, + {'el_energy_crystal_item',1}, }, - results = {{type="item", name='fi_crushed_crystal_item', amount=2}}, + result = 'fi_crushed_crystal_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_crystal_fluid_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'chemistry', main_product = 'fi_crystal_fluid', ingredients = { @@ -404,96 +430,104 @@ data:extend({ { name = 'fi_fuel_train_crystal_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="fi_energy_crystal_charged_item", amount=1}, - {type="item", name="el_train_fuel_diesel_item", amount=4}, + {'fi_energy_crystal_charged_item',1}, + {'el_train_fuel_diesel_item',4}, }, - results = {{type="item", name='fi_fuel_train_crystal_item', amount=4}}, + result = 'fi_fuel_train_crystal_item', + result_count = 4, energy_required = 5, }, --crushed { name = 'fi_crushed_lithium_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="el_lithium_item", amount=1}, + {'el_lithium_item',1}, }, - results = {{type="item", name='fi_crushed_lithium_item', amount=2}}, + result = 'fi_crushed_lithium_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_crushed_iron_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="iron-plate", amount=1}, + {'iron-plate',1}, }, - results = {{type="item", name='fi_crushed_iron_item', amount=2}}, + result = 'fi_crushed_iron_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_crushed_copper_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="copper-plate", amount=1}, + {'copper-plate',1}, }, - results = {{type="item", name='fi_crushed_copper_item', amount=2}}, + result = 'fi_crushed_copper_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_crushed_aluminum_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="el_aluminum_item", amount=1}, + {'el_aluminum_item',1}, }, - results = {{type="item", name='fi_crushed_aluminum_item', amount=2}}, + result = 'fi_crushed_aluminum_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_crushed_coal_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="coal", amount=1}, + {'coal',1}, }, - results = {{type="item", name='fi_crushed_coal_item', amount=2}}, + result = 'fi_crushed_coal_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_crushed_stone_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="stone", amount=1}, + {'stone',1}, }, - results = {{type="item", name='fi_crushed_stone_item', amount=2}}, + result = 'fi_crushed_stone_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_crushed_uranium_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="uranium-238", amount=1}, + {'uranium-238',1}, }, - results = {{type="item", name='fi_crushed_uranium_item', amount=2}}, + result = 'fi_crushed_uranium_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, @@ -501,36 +535,39 @@ data:extend({ { name = 'fi_materials_industrial_steel_blend_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fi_crushed_coal_item',3}, + {'fi_crushed_iron_item',4}, + {'fi_crushed_aluminum_item',1}, }, - results = {{type="item", name='fi_industrial_steel_blend_item', amount=2}}, + result = 'fi_industrial_steel_blend_item', + result_count = 2, energy_required = 4, }, { name = 'fi_materials_industrial_steel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'smelting', ingredients = { - {type="item", name="fi_industrial_steel_blend_item", amount=4}, + {'fi_industrial_steel_blend_item',4}, }, - results = {{type="item", name='fi_industrial_steel_item', amount=2}}, + result = 'fi_industrial_steel_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, { name = 'fi_materials_steel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'smelting', ingredients = { - {type="item", name="fi_industrial_steel_blend_item", amount=1}, + {'fi_industrial_steel_blend_item',1}, }, - results = {{type="item", name='steel-plate', amount=4}}, + result = 'steel-plate', + result_count = 4, energy_required = 6, subgroup = 'fi_item_subgroup_b', order = 'b-a', @@ -540,145 +577,156 @@ data:extend({ { name = 'fi_robo_port_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fi_robo_charger_item',1}, + {'fi_materials_GFK',40}, + {'fi_materials_titan',10}, + {'fi_materials_NFK',20}, }, - results = {{type="item", name='fi_robo_port_item', amount=1}}, + result = 'fi_robo_port_item', + result_count = 1, energy_required = 6, }, { name = 'fi_robo_charger_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'roboport',1}, + {'el_materials_ALK',60}, + {'fi_energy_crystal_item',25}, + {'el_energy_crystal_item',25}, }, - results = {{type="item", name='fi_robo_charger_item', amount=1}}, + result = 'fi_robo_charger_item', + result_count = 1, energy_required = 6, }, --modules { name = 'fi_modules_base_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="low-density-structure", amount=2}, - {type="item", name="advanced-circuit", amount=6}, + {'low-density-structure',2}, + {'advanced-circuit',6}, }, - results = {{type="item", name='fi_modules_base_item', amount=1}}, + result = 'fi_modules_base_item', + result_count = 1, energy_required = 6, }, { name = 'fi_modules_core_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="fi_modules_base_item", amount=1}, - {type="item", name="fi_materials_GFK", amount=1}, + {'fi_modules_base_item',1}, + {'fi_materials_GFK',1}, }, - results = {{type="item", name='fi_modules_core_item', amount=1}}, + result = 'fi_modules_core_item', + result_count = 1, energy_required = 6, }, { name = 'fi_modules_productivity_1_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="fi_modules_core_item", amount=1}, - {type="item", name="productivity-module", amount=2}, - {type="item", name="advanced-circuit", amount=6}, + {'fi_modules_core_item',1}, + {'productivity-module',2}, + {'advanced-circuit',6}, }, - results = {{type="item", name='fi_modules_productivity_1_item', amount=1}}, + result = 'fi_modules_productivity_1_item', + result_count = 1, energy_required = 6, }, { name = 'fi_modules_productivity_2_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fi_modules_productivity_1_item',4}, + {'fi_modules_core_item',1}, + {'productivity-module-2',2}, + {'processing-unit',6}, }, - results = {{type="item", name='fi_modules_productivity_2_item', amount=1}}, + result = 'fi_modules_productivity_2_item', + result_count = 1, energy_required = 6, }, { name = 'fi_modules_productivity_3_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fi_modules_productivity_2_item',4}, + {'fi_modules_core_item',1}, + {'productivity-module-3',2}, + {'fu_tech_sign_item',40}, }, - results = {{type="item", name='fi_modules_productivity_3_item', amount=1}}, + result = 'fi_modules_productivity_3_item', + result_count = 1, energy_required = 6, }, { name = 'fi_modules_productivity_4_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fi_modules_productivity_3_item',6}, + {'fi_modules_core_item',1}, + {'gr_materials_stack_up_item',4}, }, - results = {{type="item", name='fi_modules_productivity_4_item', amount=1}}, + result = 'fi_modules_productivity_4_item', + result_count = 1, energy_required = 6, }, { name = 'fi_modules_productivity_5_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fi_modules_productivity_4_item',6}, + {'fi_modules_core_item',1}, + {'gr_materials_stack_down_item',4}, }, - results = {{type="item", name='fi_modules_productivity_5_item', amount=1}}, + result = 'fi_modules_productivity_5_item', + result_count = 1, energy_required = 6, }, { name = 'fi_modules_productivity_6_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fi_modules_productivity_5_item',6}, + {'fi_modules_core_item',1}, + {'gr_materials_fusion_cell_item',4}, }, - results = {{type="item", name='fi_modules_productivity_6_item', amount=1}}, + result = 'fi_modules_productivity_6_item', + result_count = 1, energy_required = 6, }, { name = 'fi_fiberer_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {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}, + {'concrete',60}, + {'el_materials_ALK',20}, + {'iron-gear-wheel',40}, + {'engine-unit',15}, + {'el_energy_crystal_item',10}, }, - results = {{type="item", name='fi_fiberer_item', amount=1}}, + result = 'fi_fiberer_item', + result_count = 1, energy_required = 4, }, { name = 'fi_natural_fiber_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_fiberer_category', main_product = 'fi_materials_natural_fiber', ingredients = { @@ -694,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 = { @@ -710,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}, @@ -725,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}, @@ -740,19 +788,20 @@ data:extend({ { name = 'fi_crushed_glass_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="fi_materials_glass", amount=1}, + {'fi_materials_glass',1}, }, - results = {{type="item", name='fi_crushed_glass_item', amount=2}}, + result = 'fi_crushed_glass_item', + result_count = 2, energy_required = 1, always_show_made_in = true, }, { name = 'fi_flourite_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting-with-fluid', main_product = 'fi_materials_flourite', ingredients = { @@ -768,7 +817,7 @@ data:extend({ { name = 'fi_strong_acid_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'chemistry', main_product = 'fi_strong_acid', ingredients = { @@ -787,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 = { @@ -807,10 +856,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fi_dirty_water.png" + icon = "__248k__/ressources/fluids/fi_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_stone.png" + icon = "__248k__/ressources/icons/overlay_stone.png" } }, subgroup = 'fi_item_subgroup_f', @@ -819,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 = { @@ -838,10 +887,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fi_dirty_water.png" + icon = "__248k__/ressources/fluids/fi_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_iron.png" + icon = "__248k__/ressources/icons/overlay_iron.png" } }, subgroup = 'fi_item_subgroup_f', @@ -850,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 = { @@ -869,10 +918,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fi_dirty_water.png" + icon = "__248k__/ressources/fluids/fi_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_copper.png" + icon = "__248k__/ressources/icons/overlay_copper.png" } }, subgroup = 'fi_item_subgroup_f', @@ -881,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 = { @@ -901,10 +950,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/fi_dirty_water.png" + icon = "__248k__/ressources/fluids/fi_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_uranium.png" + icon = "__248k__/ressources/icons/overlay_uranium.png" } }, subgroup = 'fi_item_subgroup_f', @@ -915,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}, @@ -930,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}, @@ -945,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}, @@ -960,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}, @@ -975,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}, @@ -990,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}, @@ -1005,21 +1054,22 @@ data:extend({ { name = 'fi_compound_machine_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'concrete',60}, + {'el_materials_ALK',60}, + {'iron-gear-wheel',40}, + {'engine-unit',15}, + {'el_energy_crystal_item',20}, }, - results = {{type="item", name='fi_compound_machine_item', amount=1}}, + result = 'fi_compound_machine_item', + result_count = 1, energy_required = 4, }, { name = 'fi_NFK_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_compound_machine_category', ingredients = { {type="fluid", name="petroleum-gas", amount=10}, @@ -1036,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}, @@ -1053,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 = { @@ -1071,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 = { @@ -1089,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 = { @@ -1107,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, @@ -1123,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 = { @@ -1140,7 +1190,7 @@ data:extend({ { name = 'fi_solution_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'chemistry', main_product = 'fi_materials_solution', ingredients = { @@ -1163,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 = { @@ -1183,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 = { @@ -1201,13 +1251,13 @@ data:extend({ { name = 'fi_refinery_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="oil-refinery", amount=1}, - {type="item", name="concrete", amount=60}, - {type="item", name="el_materials_ALK", amount=20}, - {type="item", name="engine-unit", amount=15}, + {'concrete',60}, + {'el_materials_ALK',20}, + {'engine-unit',15}, }, results = { {type="item", name="fi_refinery_item", amount=1} @@ -1218,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, @@ -1240,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, @@ -1263,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, @@ -1286,7 +1336,7 @@ data:extend({ { name = 'fi_crack_sulfur_gas_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'chemistry', main_product = 'sulfur', ingredients = { @@ -1305,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 = { @@ -1324,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, @@ -1344,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, @@ -1365,19 +1415,20 @@ 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}, }, - results = {{type="item", name='fi_energy_crystal_charged_item', amount=1}}, + result = 'fi_energy_crystal_charged_item', + result_count = 1, energy_required = 10, always_show_made_in = true, }, { name = 'fi_ceramic_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting-with-fluid', ingredients = { {type="fluid", name="steam", amount=45}, @@ -1393,7 +1444,7 @@ data:extend({ { name = 'fi_grenade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fi_grenade', ingredients = { @@ -1403,12 +1454,13 @@ data:extend({ results = { {type="item", name="fi_grenade", amount=1}, }, + result_count = 1, energy_required = 4, }, { name = 'fi_solid_1_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'chemistry', main_product = 'solid-fuel', icon = sprite('icons/fi_solid_2.png'), @@ -1419,6 +1471,7 @@ 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', @@ -1426,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'), @@ -1437,6 +1490,7 @@ 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', @@ -1444,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'), @@ -1456,6 +1510,7 @@ 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', @@ -1463,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'), @@ -1475,6 +1530,7 @@ 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', @@ -1482,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'), @@ -1494,6 +1550,7 @@ 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', @@ -1501,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 = { @@ -1511,13 +1568,14 @@ data:extend({ results = { {type="item", name="fi_materials_rich_solution", amount=1}, }, + result_count = 1, energy_required = 0.2, always_show_made_in = true, }, { name = 'fi_rich_solution_unpack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting-with-fluid', main_product = 'fi_dirty_water', ingredients = { @@ -1527,13 +1585,14 @@ 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, }, { name = 'fi_dirty_solution_pack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting-with-fluid', main_product = 'fi_materials_dirty_solution', ingredients = { @@ -1543,13 +1602,14 @@ data:extend({ results = { {type="item", name="fi_materials_dirty_solution", amount=1}, }, + result_count = 1, energy_required = 0.2, always_show_made_in = true, }, { name = 'fi_dirty_solution_unpack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting-with-fluid', main_product = 'el_dirty_water', ingredients = { @@ -1559,6 +1619,7 @@ 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', @@ -1567,7 +1628,7 @@ data:extend({ { name = 'fi_upgrade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fi_materials_upgrade', ingredients = { @@ -1578,13 +1639,14 @@ data:extend({ results = { {type="item", name="fi_materials_upgrade", amount=2}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, { name = 'fi_miner_upgrade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fu_miner_item_2', ingredients = { @@ -1594,13 +1656,14 @@ data:extend({ results = { {type="item", name="fu_miner_item_2", amount=1}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, { name = 'fu_upgrade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fu_materials_upgrade', ingredients = { @@ -1611,13 +1674,14 @@ data:extend({ results = { {type="item", name="fu_materials_upgrade", amount=2}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, { name = 'fu_miner_upgrade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fu_miner_item_3', ingredients = { @@ -1627,13 +1691,14 @@ data:extend({ results = { {type="item", name="fu_miner_item_3", amount=1}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, { name = 'gr_upgrade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'gr_materials_upgrade', ingredients = { @@ -1644,13 +1709,14 @@ data:extend({ results = { {type="item", name="gr_materials_upgrade", amount=2}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, { name = 'gr_miner_upgrade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fu_miner_item_4', ingredients = { @@ -1660,6 +1726,7 @@ 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/fission/fi_castor.lua b/248k_2/prototypes/fission/fi_castor.lua index 592b69d..c1ce159 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_2__/ressources/fission/fi_castor/fi_castor_'..name + return '__248k__/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 d719c9e..b1ade83 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_2__/ressources/fission/fi_compound_machine/fi_compound_machine_'..name + return '__248k__/ressources/fission/fi_compound_machine/fi_compound_machine_'..name end --item @@ -58,50 +58,55 @@ data:extend({ energy_usage = '400kW', fluid_boxes = { { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, + {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}} }, production_type = "input" }, { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {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}}, + {type = "input", position = {0, 4}}, }, production_type = "input" }, @@ -138,4 +143,25 @@ data:extend({ apparent_volume = 0.3, }, }, -}) \ No newline at end of file +}) + +--{ +-- 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 diff --git a/248k_2/prototypes/fission/fi_compound_material.lua b/248k_2/prototypes/fission/fi_compound_material.lua index 4752f65..8afe2a5 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_2__/ressources/fission/fi_compound_material/fi_compound_material_'..name + return '__248k__/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 da74f56..f40720d 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_2__/ressources/fission/fi_crafter/fi_crafter_'..name + return '__248k__/ressources/fission/fi_crafter/fi_crafter_'..name end --item @@ -49,8 +49,8 @@ data:extend({ fuel_inventory_size = 3, burnt_inventory_size = 3, effectivity = 0.35, - emissions_per_minute = { pollution = 20 }, - fuel_categories = {'fi_basic_fuel'} + emissions_per_minute = 20, + fuel_category = 'fi_basic_fuel' }, energy_usage = '200kW', allowed_effects = {"speed", "productivity", "consumption", "pollution"}, diff --git a/248k_2/prototypes/fission/fi_crushed.lua b/248k_2/prototypes/fission/fi_crushed.lua index b7bc0f1..888644e 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_2__/ressources/fission/fi_crushed/fi_crushed_'..name + return '__248k__/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 1ea824a..9ebbd38 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_2__/ressources/fission/fi_crusher/fi_crusher_'..name + return '__248k__/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 7ecb6cc..caee42e 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_2__/ressources/fission/fi_energy_crystal/fi_energy_crystal_'..name + return '__248k__/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 5630b24..260afec 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_2__/ressources/fission/fi_equipment/fi_equipment_'..name + return '__248k__/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 ced2b55..2f4c9e1 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_2__/ressources/fission/fi_fiberer/fi_fiberer_'..name + return '__248k__/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 110aa2e..26dfb0e 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_2__/ressources/fission/fi_fuel/fi_fuel_'..name + return '__248k__/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 d4b6a13..bc8538c 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_2__/ressources/fission/fi_materials/fi_materials_'..name + return '__248k__/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 033f103..21dd6d5 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_2__/ressources/fission/fi_miner/fi_miner_'..name + return '__248k__/ressources/fission/fi_miner/fi_miner_'..name end --item @@ -45,8 +45,8 @@ data:extend({ fuel_inventory_size = 3, burnt_inventory_size = 3, effectivity = 0.35, - emissions_per_minute = { pollution = 75 }, - fuel_categories = {'fi_basic_fuel'} + emissions_per_minute = 75, + fuel_category = 'fi_basic_fuel' }, energy_usage = '4MW', mining_speed = 4.5, diff --git a/248k_2/prototypes/fission/fi_modules.lua b/248k_2/prototypes/fission/fi_modules.lua index 5aa8187..e250620 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_2__/ressources/fission/fi_modules/fi_modules_'..name + return '__248k__/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 90d1537..f456e3f 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_2__/ressources/fission/fi_refinery/fi_refinery_'..name + return '__248k__/ressources/fission/fi_refinery/fi_refinery_'..name end --item @@ -45,7 +45,7 @@ data:extend({ energy_source = { type = 'electric', usage_priority = 'secondary-input', - emissions_per_minute = { pollution = 20 }, + emissions_per_minute = 20, --input_flow_limit = '4MW', }, energy_usage = '1MW', @@ -60,101 +60,101 @@ data:extend({ fluid_boxes = { { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {1, 3}}, + {type = "input", position = {1, 4}}, }, production_type = "input" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {-1, 3}}, + {type = "input", position = {-1, 4}}, }, production_type = "input" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {1, -3}}, + {type = "output", position = {1, -4}}, }, production_type = "output" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {-1, -3}}, + {type = "output", position = {-1, -4}}, }, production_type = "output" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-3, -1}}, + {type = "input", position = {-4, -1}}, }, production_type = "input" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-3, 1}}, + {type = "input", position = {-4, 1}}, }, production_type = "input" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {3, 1}}, + {type = "output", position = {4, 1}}, }, production_type = "output" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {3, -1}}, + {type = "output", position = {4, -1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fission/fi_robo.lua b/248k_2/prototypes/fission/fi_robo.lua index fb7c6cc..0985c02 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_2__/ressources/fission/fi_robo/fi_robo_'..name + return '__248k__/ressources/fission/fi_robo/fi_robo_'..name end --item @@ -138,7 +138,7 @@ data:extend({ }, circuit_connector_sprites = { led_red = { - filename = "__248k_2__/ressources/64x64_empty.png", + filename = "__248k__/ressources/64x64_empty.png", width = 64, height = 64, shift = {0, 0}, @@ -146,7 +146,7 @@ data:extend({ size = 1 }, led_green = { - filename = "__248k_2__/ressources/64x64_empty.png", + filename = "__248k__/ressources/64x64_empty.png", width = 64, height = 64, shift = {0, 0}, @@ -154,7 +154,7 @@ data:extend({ size = 1 }, led_blue = { - filename = "__248k_2__/ressources/64x64_empty.png", + filename = "__248k__/ressources/64x64_empty.png", width = 64, height = 64, shift = {0, 0}, @@ -162,7 +162,7 @@ data:extend({ size = 1 }, led_light = { - filename = "__248k_2__/ressources/64x64_empty.png", + filename = "__248k__/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 b8c2c17..0f435d9 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_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_'..name + return '__248k__/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 e2ffa58..2b0331b 100644 --- a/248k_2/prototypes/fu_recipes.lua +++ b/248k_2/prototypes/fu_recipes.lua @@ -3,53 +3,56 @@ data:extend({ { name = 'fu_fusor_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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} + {'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} }, - results = {{type="item", name='fu_fusor_item', amount=1}}, + result = 'fu_fusor_item', + result_count = 1, energy_required = 6, }, --reactor { name = 'fu_stelar_reactor_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_stelar_reactor_item', amount=1}}, + result = 'fu_stelar_reactor_item', + result_count = 1, energy_required = 60, }, { name = 'fu_tokamak_reactor_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_tokamak_reactor_item', amount=1}}, + result = 'fu_tokamak_reactor_item', + result_count = 1, energy_required = 60, }, @@ -57,30 +60,32 @@ data:extend({ { name = 'fu_boiler_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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} + {'heat-exchanger',4}, + {'fu_materials_TIM',20}, + {'fu_materials_KFK',20}, + {'fi_materials_GFK',20}, + {'concrete',100}, + {'heat-pipe',20} }, - results = {{type="item", name='fu_boiler_item', amount=1}}, + result = 'fu_boiler_item', + result_count = 1, energy_required = 2, }, --burner { name = 'fu_burner_recipe', type = 'recipe', - enabled = false, + enabled = 'false', hidden = false, ingredients = { - {type="item", name="el_burner_item", amount=1}, - {type="item", name="pipe", amount=20}, - {type="item", name="electronic-circuit", amount=20} + {'el_burner_item',1}, + {'pipe',20}, + {'electronic-circuit',20} }, - results = {{type="item", name='fu_burner_item', amount=1}}, + result = 'fu_burner_item', + result_count = 1, energy_required = 2, }, --tech sign @@ -88,12 +93,13 @@ 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}, }, - results = {{type="item", name='fu_materials_fusion_card', amount=10}}, + result = 'fu_materials_fusion_card', + result_count = 10, energy_required = 100, always_show_made_in = true, }, @@ -101,12 +107,13 @@ 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}, }, - results = {{type="item", name='fu_materials_fusion_card', amount=100}}, + result = 'fu_materials_fusion_card', + result_count = 100, energy_required = 100, always_show_made_in = true, }, @@ -114,12 +121,13 @@ 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}, }, - results = {{type="item", name='fu_materials_fusion_card', amount=500}}, + result = 'fu_materials_fusion_card', + result_count = 500, energy_required = 100, always_show_made_in = true, }, @@ -127,11 +135,12 @@ 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}, }, - results = {{type="item", name='fu_materials_fusion_card', amount=50}}, + result = 'fu_materials_fusion_card', + result_count = 50, energy_required = 100, always_show_made_in = true, }, @@ -139,11 +148,12 @@ 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}, }, - results = {{type="item", name='fu_materials_fusion_card', amount=1}}, + result = 'fu_materials_fusion_card', + result_count = 1, energy_required = 100, always_show_made_in = true, }, @@ -153,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}, }, @@ -161,15 +171,16 @@ 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, icons = { { - icon = "__248k_2__/ressources/elements/fu_hydrogen.png" + icon = "__248k__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k_2__/ressources/icons/overlay_1.png" + icon = "__248k__/ressources/icons/overlay_1.png" } }, subgroup = 'fu_item_subgroup_e', @@ -180,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}, }, @@ -188,15 +199,16 @@ 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, icons = { { - icon = "__248k_2__/ressources/elements/fu_hydrogen.png" + icon = "__248k__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k_2__/ressources/icons/overlay_2.png" + icon = "__248k__/ressources/icons/overlay_2.png" } }, subgroup = 'fu_item_subgroup_e', @@ -207,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}, }, @@ -215,15 +227,16 @@ 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, icons = { { - icon = "__248k_2__/ressources/elements/fu_hydrogen.png" + icon = "__248k__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k_2__/ressources/icons/overlay_3.png" + icon = "__248k__/ressources/icons/overlay_3.png" } }, subgroup = 'fu_item_subgroup_e', @@ -234,22 +247,23 @@ data:extend({ type = 'recipe', category = 'fu_boiler_crafting_category', main_product = 'fu_hydrogen', - enabled = false, + enabled = 'false', ingredients = { {type="fluid", name="water", amount=1100}, }, results = { {type="fluid", name="fu_hydrogen", amount=1000}, }, + result_count = 1, energy_required = 1, always_show_made_in = true, icon_size = 64, icons = { { - icon = "__248k_2__/ressources/elements/fu_hydrogen.png" + icon = "__248k__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k_2__/ressources/icons/overlay_4.png" + icon = "__248k__/ressources/icons/overlay_4.png" } }, subgroup = 'fu_item_subgroup_e', @@ -260,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}, }, @@ -276,13 +290,14 @@ 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}, }, results = { {type="fluid", name="fu_lithium_6", amount=5}, }, + result_count = 1, energy_required = 1, always_show_made_in = true, }, @@ -291,19 +306,20 @@ 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}, }, - results = {{type="item", name='fu_lead_ore_item', amount=4}}, + result = 'fu_lead_ore_item', + result_count = 4, energy_required = 2, }, --lead ore { name = 'fu_lead_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'el_caster_category', ingredients = { {type="fluid", name="fu_arc_pure_lead", amount=100}, @@ -319,24 +335,26 @@ 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}, }, - results = {{type="item", name='fu_crushed_lead_item', amount=2}}, + result = 'fu_crushed_lead_item', + result_count = 2, energy_required = 2, }, { 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}, }, results = { {type="fluid", name="fu_lead_fluid_cold", amount=100}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -345,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}, @@ -353,13 +371,14 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=1000}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -368,13 +387,14 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=1000}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -383,6 +403,7 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=1000}, }, + result_count = 1, energy_required = 1, }, { @@ -390,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}, @@ -401,6 +422,7 @@ 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', @@ -411,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}, @@ -422,6 +444,7 @@ 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', @@ -433,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}, @@ -441,13 +464,14 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=110000}, }, + result_count = 1, energy_required = 100, }, { 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}, @@ -456,13 +480,14 @@ data:extend({ results = { {type="fluid", name="fu_lead_fluid_hot", amount=180000}, }, + result_count = 1, energy_required = 100, }, --exchanger { 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}, @@ -472,6 +497,7 @@ data:extend({ results = { {type="item", name="fu_exchanger_item", amount=1}, }, + result_count = 1, energy_required = 10, }, { @@ -479,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}, @@ -488,6 +514,7 @@ 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', @@ -498,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}, @@ -507,6 +534,7 @@ 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', @@ -517,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}, @@ -525,6 +553,7 @@ 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', @@ -533,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}, @@ -543,6 +572,7 @@ data:extend({ results = { {type="item", name="fu_turbine_item", amount=1}, }, + result_count = 1, energy_required = 10, }, { @@ -550,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}, @@ -559,6 +589,7 @@ 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', @@ -568,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}, @@ -577,13 +608,14 @@ data:extend({ {type="item", name="el_lithium_battery", amount=10}, {type="item", name="flying-robot-frame", amount=4}, }, - results = {{type="item", name='fu_robo_logistic_item', amount=1}}, + result = 'fu_robo_logistic_item', + result_count = 1, energy_required = 10, }, { 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}, @@ -592,14 +624,15 @@ data:extend({ {type="item", name="el_lithium_battery", amount=10}, {type="item", name="flying-robot-frame", amount=4}, }, - results = {{type="item", name='fu_robo_construction_item', amount=1}}, + result = 'fu_robo_construction_item', + result_count = 1, energy_required = 10, }, --fu activator { 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}, @@ -607,7 +640,8 @@ data:extend({ {type="item", name="fu_materials_KFK", amount=40}, {type="item", name="fu_materials_TIM", amount=60}, }, - results = {{type="item", name='fu_activator_item', amount=1}}, + result = 'fu_activator_item', + result_count = 1, energy_required = 10, }, { @@ -615,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}, @@ -624,6 +658,7 @@ 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, }, @@ -632,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}, @@ -641,6 +676,7 @@ 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, }, @@ -648,88 +684,93 @@ data:extend({ { name = 'fu_star_engine_cooler_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_star_engine_cooler_item', amount=1}}, + result = 'fu_star_engine_cooler_item', + result_count = 1, energy_required = 60, }, { name = 'fu_star_engine_cooler_up_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_star_engine_cooler_up_item', amount=1}}, + result = 'fu_star_engine_cooler_up_item', + result_count = 1, energy_required = 60, }, { name = 'fu_star_engine_heater_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_star_engine_heater_item', amount=1}}, + result = 'fu_star_engine_heater_item', + result_count = 1, energy_required = 60, }, { name = 'fu_star_engine_heater_left_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_star_engine_heater_left_item', amount=1}}, + result = 'fu_star_engine_heater_left_item', + result_count = 1, energy_required = 60, }, { name = 'fu_star_engine_core_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_star_engine_core_item', amount=1}}, + result = 'fu_star_engine_core_item', + result_count = 1, energy_required = 200, }, --star fusion @@ -738,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}, @@ -746,6 +787,7 @@ data:extend({ results = { {type="fluid", name="fu_protium_heated", amount=13000}, }, + result_count = 1, energy_required = 1, }, --core @@ -753,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}, @@ -761,13 +803,14 @@ data:extend({ results = { {type="fluid", name="fu_iron_heated", amount=500*2}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -775,13 +818,14 @@ data:extend({ results = { {type="fluid", name="fu_copper_heated", amount=500*2}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -789,13 +833,14 @@ data:extend({ results = { {type="fluid", name="fu_sulfur_heated", amount=500*2}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -803,13 +848,14 @@ data:extend({ results = { {type="fluid", name="fu_lithium_7_heated", amount=500*2}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -817,13 +863,14 @@ data:extend({ results = { {type="fluid", name="fu_uranium_235_heated", amount=500*2}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -831,6 +878,7 @@ data:extend({ results = { {type="fluid", name="fu_uranium_238_heated", amount=500*2}, }, + result_count = 1, energy_required = 1, }, --cooler @@ -838,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}, @@ -846,13 +894,14 @@ data:extend({ results = { {type="fluid", name="fu_iron", amount=500}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -860,13 +909,14 @@ data:extend({ results = { {type="fluid", name="fu_copper", amount=500}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -874,13 +924,14 @@ data:extend({ results = { {type="fluid", name="fu_sulfur", amount=500}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -888,13 +939,14 @@ data:extend({ results = { {type="fluid", name="fu_lithium_7", amount=500}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -902,13 +954,14 @@ data:extend({ results = { {type="fluid", name="fu_uranium_235", amount=500}, }, + result_count = 1, energy_required = 1, }, { 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}, @@ -916,6 +969,7 @@ data:extend({ results = { {type="fluid", name="fu_uranium_238", amount=500}, }, + result_count = 1, energy_required = 1, }, --caster @@ -923,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}, @@ -931,13 +985,14 @@ data:extend({ results = { {type="item", name="iron-plate", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -945,13 +1000,14 @@ data:extend({ results = { {type="item", name="copper-plate", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -959,13 +1015,14 @@ data:extend({ results = { {type="item", name="sulfur", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -973,13 +1030,14 @@ data:extend({ results = { {type="item", name="el_lithium_item", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -987,13 +1045,14 @@ data:extend({ results = { {type="item", name="uranium-235", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -1001,6 +1060,7 @@ data:extend({ results = { {type="item", name="uranium-238", amount=500}, }, + result_count = 1, energy_required = 6, }, --space probes @@ -1008,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}, @@ -1020,6 +1080,7 @@ data:extend({ results = { {type="item", name="fu_space_probe_sputnik_item", amount=1}, }, + result_count = 1, energy_required = 20, always_show_made_in = true, }, @@ -1027,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}, @@ -1038,6 +1099,7 @@ data:extend({ results = { {type="item", name="fu_space_probe_probe_item", amount=1}, }, + result_count = 1, energy_required = 20, always_show_made_in = true, }, @@ -1045,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}, @@ -1056,6 +1118,7 @@ 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, }, @@ -1064,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}, @@ -1072,6 +1135,7 @@ 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, }, @@ -1080,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}, @@ -1090,6 +1154,7 @@ 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, }, @@ -1098,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}, @@ -1107,13 +1172,14 @@ data:extend({ results = { {type="item", name="fu_space_probe_science_item", amount=200}, }, + result_count = 1, energy_required = 3, }, { 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}, @@ -1122,6 +1188,7 @@ data:extend({ results = { {type="item", name="fu_space_probe_science_item_1", amount=200}, }, + result_count = 1, energy_required = 3, }, --crystals @@ -1129,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}, @@ -1138,29 +1205,31 @@ data:extend({ results = { {type="item", name="fi_energy_crystal_item", amount=1}, }, + result_count = 1, energy_required = 6, }, { name = 'fu_laser_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_laser_item', amount=1}}, + result = 'fu_laser_item', + result_count = 1, energy_required = 4, }, { 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 = { @@ -1171,6 +1240,7 @@ 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, }, @@ -1178,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}, @@ -1187,45 +1257,48 @@ data:extend({ results = { {type="item", name="fu_materials_refined_crystal", amount=1} }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, { name = 'fu_plasma_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_plasma_item', amount=1}}, + result = 'fu_plasma_item', + result_count = 1, energy_required = 4, }, { name = 'fu_magnet_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='fu_magnet_item', amount=1}}, + result = 'fu_magnet_item', + result_count = 1, energy_required = 4, }, { name = 'fu_magnet_1_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_magnet_category', main_product = 'fu_materials_magnet', ingredients = { @@ -1243,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}, @@ -1260,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}, @@ -1276,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}, @@ -1292,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}, @@ -1310,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 = { @@ -1326,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 = { @@ -1343,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 = { @@ -1361,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 = { @@ -1380,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}, @@ -1395,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}, @@ -1413,19 +1486,20 @@ 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}, }, results = { {type="fluid", name="fu_lead_fluid_cold", amount=100}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -1435,6 +1509,7 @@ data:extend({ results = { {type="item", name="fu_materials_empty_container", amount=1}, }, + result_count = 1, energy_required = 6, }, { @@ -1442,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}, }, @@ -1450,6 +1525,7 @@ 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, }, { @@ -1457,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}, }, @@ -1465,6 +1541,7 @@ 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, }, { @@ -1472,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}, }, @@ -1480,6 +1557,7 @@ 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, }, { @@ -1487,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}, }, @@ -1495,6 +1573,7 @@ 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, }, { @@ -1502,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}, }, @@ -1510,6 +1589,7 @@ 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 @@ -1517,7 +1597,7 @@ data:extend({ name = 'fu_burn_oxygen_recipe', type = 'recipe', category = 'fu_burner_category', - icon = '__248k_2__/ressources/elements/fu_oxygen.png', + icon = '__248k__/ressources/elements/fu_oxygen.png', icon_size = 64, enabled = true, hidden = true, @@ -1525,6 +1605,7 @@ 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', @@ -1541,6 +1622,7 @@ 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', @@ -1556,6 +1638,7 @@ 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', @@ -1571,6 +1654,7 @@ 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', @@ -1589,6 +1673,7 @@ 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', @@ -1602,6 +1687,7 @@ 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', @@ -1622,6 +1708,7 @@ 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', @@ -1637,6 +1724,7 @@ 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', @@ -1653,18 +1741,20 @@ data:extend({ results = { {type="item", name="fu_miner_fuel_item", amount=1}, }, + result_count = 1, energy_required = 6, subgroup = 'fi_item_subgroup_b', }, { 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}, }, - results = {{type="item", name='fu_materials_energy_charged_crystal', amount=1}}, + result = 'fu_materials_energy_charged_crystal', + result_count = 1, energy_required = 30, always_show_made_in = true, }, @@ -1673,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}, @@ -1683,15 +1773,16 @@ 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, icons = { { - icon = "__248k_2__/ressources/elements/fu_hydrogen.png" + icon = "__248k__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k_2__/ressources/icons/overlay_1.png" + icon = "__248k__/ressources/icons/overlay_1.png" } }, subgroup = 'fu_item_subgroup_e', @@ -1702,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}, @@ -1712,15 +1803,16 @@ 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, icons = { { - icon = "__248k_2__/ressources/elements/fu_hydrogen.png" + icon = "__248k__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k_2__/ressources/icons/overlay_2.png" + icon = "__248k__/ressources/icons/overlay_2.png" } }, subgroup = 'fu_item_subgroup_e', @@ -1731,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}, @@ -1741,15 +1833,16 @@ 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, icons = { { - icon = "__248k_2__/ressources/elements/fu_hydrogen.png" + icon = "__248k__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k_2__/ressources/icons/overlay_3.png" + icon = "__248k__/ressources/icons/overlay_3.png" } }, subgroup = 'fu_item_subgroup_e', @@ -1760,22 +1853,23 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'fu_hydrogen', - enabled = false, + enabled = 'false', ingredients = { {type="fluid", name="water", amount=1100}, }, results = { {type="fluid", name="fu_hydrogen", amount=1000}, }, + result_count = 1, energy_required = 5, always_show_made_in = true, icon_size = 64, icons = { { - icon = "__248k_2__/ressources/elements/fu_hydrogen.png" + icon = "__248k__/ressources/elements/fu_hydrogen.png" }, { - icon = "__248k_2__/ressources/icons/overlay_4.png" + icon = "__248k__/ressources/icons/overlay_4.png" } }, subgroup = 'fu_item_subgroup_e', @@ -1784,7 +1878,7 @@ data:extend({ { name = 'fu_grenade_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fu_grenade', ingredients = { @@ -1794,12 +1888,13 @@ data:extend({ results = { {type="item", name="fu_grenade", amount=1}, }, + result_count = 1, energy_required = 4, }, { name = 'fu_lab_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fu_lab_item', ingredients = { @@ -1813,31 +1908,33 @@ data:extend({ results = { {type="item", name="fu_lab_item", amount=1}, }, + result_count = 1, energy_required = 10, }, { name = 'fu_ingot_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fu_ingot_item', ingredients = { - {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}, + {'concrete',50}, + {'fu_materials_TIM',40}, + {'fu_materials_KFK',40}, + {'fi_materials_GFK',40}, + {'iron-gear-wheel',20}, + {'electric-furnace',2}, }, results = { {type="item", name="fu_ingot_item", amount=1}, }, + result_count = 1, energy_required = 5, }, { name = 'fu_gold_ingot_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_ingot_category', main_product = 'fu_materials_gold_ingot', ingredients = { @@ -1847,6 +1944,7 @@ 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', @@ -1855,7 +1953,7 @@ data:extend({ { name = 'fu_gold_plate_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fi_materials_gold', ingredients = { @@ -1864,6 +1962,7 @@ 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', @@ -1872,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 = { @@ -1882,6 +1981,7 @@ 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', @@ -1890,7 +1990,7 @@ data:extend({ { name = 'fu_neodym_plate_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fi_materials_neodym', ingredients = { @@ -1899,6 +1999,7 @@ 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', @@ -1907,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 = { @@ -1917,6 +2018,7 @@ 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', @@ -1925,7 +2027,7 @@ data:extend({ { name = 'fu_titan_plate_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fi_materials_titan', ingredients = { @@ -1934,6 +2036,7 @@ 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', @@ -1942,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 = { @@ -1952,6 +2055,7 @@ 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', @@ -1960,7 +2064,7 @@ data:extend({ { name = 'fu_lead_plate_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', main_product = 'fu_lead_item', ingredients = { @@ -1969,6 +2073,7 @@ 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', @@ -1977,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 = { @@ -1987,6 +2092,7 @@ 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', @@ -1994,10 +2100,10 @@ data:extend({ icon_size = 64, icons = { { - icon = "__248k_2__/ressources/fluids/el_dirty_water.png" + icon = "__248k__/ressources/fluids/el_dirty_water.png" }, { - icon = "__248k_2__/ressources/icons/overlay_slag.png" + icon = "__248k__/ressources/icons/overlay_slag.png" } }, }, diff --git a/248k_2/prototypes/fusion/fu_activator.lua b/248k_2/prototypes/fusion/fu_activator.lua index d4a9e5a..0888e1c 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_2__/ressources/fusion/fu_activator/fu_activator_'..name + return '__248k__/ressources/fusion/fu_activator/fu_activator_'..name end --item @@ -58,51 +58,51 @@ data:extend({ }, --fluids fluid_boxes = { - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-1, 0}} + {type = "input", position = {-2, 0}} }, production_type = "input" }, - { - - volume = 100, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {0, 1}} + {type = "input", position = {0, 2}} }, production_type = "input" }, - { - - volume = 100, + { + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {1, 0}}, + {type = "output", position = {2, 0}}, }, production_type = "output" }, { - - volume = 100, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {0, -1}}, + {type = "output", position = {0, -2}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_boiler.lua b/248k_2/prototypes/fusion/fu_boiler.lua index a48ce1e..2fe74f4 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_2__/ressources/fusion/fu_boiler/fu_boiler_'..name + return '__248k__/ressources/fusion/fu_boiler/fu_boiler_'..name end --item @@ -66,37 +66,37 @@ data:extend({ fluid_boxes = { { filter = 'water', - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} + {type = "input", position = {-2.5, -0.5}} }, production_type = "input" }, { filter = 'fu_hydrogen', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, + {type = "output", position = {2.5, -0.5}}, }, production_type = "output" }, { filter = 'fu_oxygen', - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {0.5, 1.5}}, + {type = "output", position = {0.5, 2.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_burner.lua b/248k_2/prototypes/fusion/fu_burner.lua index b1dbd48..827c92e 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_2__/ressources/fusion/fu_burner/fu_burner_'..name + return '__248k__/ressources/fusion/fu_burner/fu_burner_'..name end --item @@ -57,28 +57,30 @@ data:extend({ module_slots = 4 }, crafting_speed = 1, - energy_usage = '500kW', + energy_usage = '500KW', fluid_boxes = { { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, production_type = 'input', pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {1, 0}}, + {type = "input", position = {2, 0}}, + --{type = "output", position = {-2, 0}}, }, }, { - - volume = 200, + base_area = 1, + height = 2, base_level = 1, production_type = 'output', pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.west, position = {-1, 0}}, + {type = "output", position = {-2, 0}}, + --{type = "output", position = {-2, 0}}, }, } }, diff --git a/248k_2/prototypes/fusion/fu_exchanger.lua b/248k_2/prototypes/fusion/fu_exchanger.lua index 2cd95b9..be49bb3 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_2__/ressources/fusion/fu_exchanger/fu_exchanger_'..name + return '__248k__/ressources/fusion/fu_exchanger/fu_exchanger_'..name end --item @@ -56,51 +56,51 @@ data:extend({ }, --fluids fluid_boxes = { - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} + {type = "input", position = {-2.5, -0.5}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-1.5, 1.5}} + {type = "input", position = {-2.5, 1.5}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, + {type = "output", position = {2.5, -0.5}}, }, production_type = "output" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {1.5, 1.5}}, + {type = "output", position = {2.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 92d57b4..a71f82d 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_2__/ressources/fusion/fu_fusor/fu_fusor_'..name + return '__248k__/ressources/fusion/fu_fusor/fu_fusor_'..name end --item @@ -68,24 +68,24 @@ data:extend({ --fluid fluid_boxes = { { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {-1.5, -2}}, + {type = "input", position = {-1.5, -3}}, }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {1.5, -2}} + {type = "input", position = {1.5, -3}} }, production_type = "input" }, diff --git a/248k_2/prototypes/fusion/fu_ingot.lua b/248k_2/prototypes/fusion/fu_ingot.lua index 3321259..287f1f5 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_2__/ressources/fusion/fu_ingot/fu_ingot_'..name + return '__248k__/ressources/fusion/fu_ingot/fu_ingot_'..name end --item @@ -59,50 +59,55 @@ data:extend({ }, fluid_boxes = { { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, + {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}} }, production_type = "input" }, { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {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}}, + {type = "input", position = {0, 4}}, }, production_type = "input" }, @@ -113,8 +118,10 @@ data:extend({ size = {512,512}, scale = 0.54, line_length = 1, + --lines_per_file = 2, frame_count = 1, - shift = {0,-0.3} + --animation_speed = 0.2, + shift = {0,-0.3} }, working_visualisations = { { @@ -152,8 +159,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, --- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, +-- { type="input", position = {-2, -2,5} }, +-- { type="input", position = {2, -2.5} }, -- }, -- }, -- { @@ -162,6 +169,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, +-- pipe_connections = {{ type="output", position = {2, 2.5} }}, -- }, -- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_lab.lua b/248k_2/prototypes/fusion/fu_lab.lua index 214e32a..9782bc0 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_2__/ressources/fusion/fu_lab/fu_lab_'..name..".png" + return '__248k__/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 6fb1aeb..99b12ce 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_2__/ressources/fusion/fu_laser/fu_laser_'..name + return '__248k__/ressources/fusion/fu_laser/fu_laser_'..name end --item @@ -59,50 +59,55 @@ data:extend({ energy_usage = '60MW', fluid_boxes = { { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, + {type = "input", position = {0, -4}}, }, production_type = "input" }, - { - - volume = 200, + { + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + {type = "input", position = {-4, 0}} }, production_type = "input" }, - { - - volume = 200, + { + + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} }, production_type = "output" }, { - - volume = 200, + + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, + {type = "output", position = {0, 4}}, }, production_type = "output" }, @@ -154,8 +159,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, --- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, +-- { type="input", position = {-2, -2,5} }, +-- { type="input", position = {2, -2.5} }, -- }, -- }, -- { @@ -164,6 +169,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, +-- pipe_connections = {{ type="output", position = {2, 2.5} }}, -- }, -- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_lead.lua b/248k_2/prototypes/fusion/fu_lead.lua index 91fb527..36e8b58 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_2__/ressources/fusion/fu_lead/fu_lead_'..name + return '__248k__/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 e262c6f..b7187a1 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_2__/ressources/fusion/fu_magnet/fu_magnet_'..name + return '__248k__/ressources/fusion/fu_magnet/fu_magnet_'..name end --item @@ -59,50 +59,55 @@ data:extend({ }, fluid_boxes = { { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, + {type = "input", position = {0, -4}}, }, production_type = "input" }, - { - - volume = 200, + { + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + {type = "input", position = {-4, 0}} }, production_type = "input" }, - { - - volume = 200, + { + + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} }, production_type = "output" }, { - - volume = 200, + + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, + {type = "output", position = {0, 4}}, }, production_type = "output" }, @@ -146,4 +151,25 @@ data:extend({ apparent_volume = 0.3, }, }, -}) \ No newline at end of file +}) + +--{ +-- 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 diff --git a/248k_2/prototypes/fusion/fu_materials.lua b/248k_2/prototypes/fusion/fu_materials.lua index 773ff7a..71ef2f0 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_2__/ressources/fusion/fu_materials/fu_materials_'..name + return '__248k__/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 a47dbf6..51521e1 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_2__/ressources/fusion/fu_miner/fu_miner_'..name + return '__248k__/ressources/fusion/fu_miner/fu_miner_'..name end --item @@ -43,6 +43,7 @@ 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}}, @@ -61,8 +62,8 @@ data:extend({ type = "burner", fuel_inventory_size = 1, effectivity = 1, - emissions_per_minute = { pollution = 20 }, - fuel_categories = {"fu_miner_fuel_category"}, + emissions_per_minute = 20, + fuel_category = "fu_miner_fuel_category", smoke = { { name = "smoke", @@ -116,7 +117,7 @@ miner2.icons = { icon = miner2.icon }, { - icon = "__248k_2__/ressources/icons/fi_upgrade.png" + icon = "__248k__/ressources/icons/fi_upgrade.png" } } miner2.icon = nil @@ -131,7 +132,7 @@ miner3.icons = { icon = miner3.icon }, { - icon = "__248k_2__/ressources/icons/fu_upgrade.png" + icon = "__248k__/ressources/icons/fu_upgrade.png" } } miner3.icon = nil @@ -147,7 +148,7 @@ miner4.icons = { icon = miner4.icon }, { - icon = "__248k_2__/ressources/icons/gr_upgrade.png" + icon = "__248k__/ressources/icons/gr_upgrade.png" } } miner4.icon = nil @@ -163,7 +164,7 @@ miner2_item.icons = { icon = miner2_item.icon }, { - icon = "__248k_2__/ressources/icons/fi_upgrade.png" + icon = "__248k__/ressources/icons/fi_upgrade.png" } } miner2_item.icon = nil @@ -176,7 +177,7 @@ miner3_item.icons = { icon = miner3_item.icon }, { - icon = "__248k_2__/ressources/icons/fu_upgrade.png" + icon = "__248k__/ressources/icons/fu_upgrade.png" } } miner3_item.icon = nil @@ -191,7 +192,7 @@ miner4_item.icons = { icon = miner4_item.icon }, { - icon = "__248k_2__/ressources/icons/gr_upgrade.png" + icon = "__248k__/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 7f9bf13..7474dd9 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_2__/ressources/fusion/fu_plasma/fu_plasma_'..name + return '__248k__/ressources/fusion/fu_plasma/fu_plasma_'..name end --item @@ -59,50 +59,55 @@ data:extend({ }, fluid_boxes = { { - - volume = 200, + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, + {type = "input", position = {0, -4}}, }, production_type = "input" }, - { - - volume = 200, + { + + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + {type = "input", position = {-4, 0}} }, production_type = "input" }, - { - - volume = 200, + { + + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} }, production_type = "output" }, { - - volume = 200, + + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, + {type = "output", position = {0, 4}}, }, production_type = "output" }, @@ -154,8 +159,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, --- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, +-- { type="input", position = {-2, -2,5} }, +-- { type="input", position = {2, -2.5} }, -- }, -- }, -- { @@ -164,6 +169,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, +-- pipe_connections = {{ type="output", 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 46f01eb..1974a72 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_2__/ressources/fusion/fu_reactor/fu_reactor_'..name + return '__248k__/ressources/fusion/fu_reactor/fu_reactor_'..name end --item @@ -62,51 +62,51 @@ data:extend({ fluid_boxes = { { filter = "fu_lead_fluid_cold", - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {2, 6}} + {type = "input", position = {2, 7}} }, production_type = "input" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {-2, -6}}, + {type = "input", position = {-2, -7}}, }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {2, -6}} + {type = "input", position = {2, -7}} }, production_type = "input" }, { filter = "fu_lead_fluid_hot", - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {-2, 6}} + {type = "output", position = {-2, 7}} }, production_type = "output" } @@ -177,51 +177,51 @@ data:extend({ fluid_boxes = { { filter = "fu_lead_fluid_cold", - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {2, 6}} + {type = "input", position = {2, 7}} }, production_type = "input" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {-2, -6}}, + {type = "input", position = {-2, -7}}, }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {2, -6}} + {type = "input", position = {2, -7}} }, production_type = "input" }, { filter = "fu_lead_fluid_hot", - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {-2, 6}} + {type = "output", position = {-2, 7}} }, production_type = "output" } diff --git a/248k_2/prototypes/fusion/fu_robo.lua b/248k_2/prototypes/fusion/fu_robo.lua index 9858317..5f90f37 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_2__/ressources/fusion/fu_robo/fu_robo_'..name + return '__248k__/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 b0a305a..b1fc87e 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_2__/ressources/fusion/fu_space_probe/fu_space_probe_'..name + return '__248k__/ressources/fusion/fu_space_probe/fu_space_probe_'..name end --item @@ -17,7 +17,7 @@ data:extend({ icon_size = 64, stack_size = 1, subgroup = 'fu_item_subgroup_d', - rocket_launch_products = {{type="item", name="fu_space_probe_data_card_1_item", amount=10}}, + rocket_launch_product = {'fu_space_probe_data_card_1_item',10}, order = 'd-a', }, { @@ -27,7 +27,7 @@ data:extend({ icon_size = 64, stack_size = 1, subgroup = 'fu_item_subgroup_d', - rocket_launch_products = {{type="item", name="fu_space_probe_data_card_3_item", amount=10}}, + rocket_launch_product = {'fu_space_probe_data_card_3_item',10}, order = 'd-b', }, { @@ -37,7 +37,7 @@ data:extend({ icon_size = 64, stack_size = 1, subgroup = 'fu_item_subgroup_d', - rocket_launch_products = {{type="item", name="fu_space_probe_ore_item", amount=100}}, + rocket_launch_product = {'fu_space_probe_ore_item',100}, order = 'd-c', }, --data cards 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 7726015..9333753 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_2__/ressources/fusion/fu_star_engine/fu_star_engine_caster/fu_star_engine_caster_'..name + return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_caster/fu_star_engine_caster_'..name end --item @@ -56,47 +56,47 @@ data:extend({ }, --fluids fluid_boxes = { - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} + {type = "input", position = {-2.5, -0.5}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-1.5, 1.5}} + {type = "input", position = {-2.5, 1.5}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, + {type = "output", position = {2.5, -0.5}}, }, production_type = "output" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {1.5, 1.5}}, + {type = "output", position = {2.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 a34f91a..ef1e6d0 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_2__/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_'..name + return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_'..name end --item @@ -50,87 +50,87 @@ data:extend({ energy_usage = '0.5GW', --fluids fluid_boxes = { - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {-2, -8.5}} + {type = "input", position = {-2, -9.5}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {2, -8.5}} + {type = "input", position = {2, -9.5}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {0, 8.5}}, + {type = "output", position = {0, 9.5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {-2, 8.5}}, + {type = "output", position = {-2, 9.5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {2, 8.5}}, + {type = "output", position = {2, 9.5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {-4, 8.5}}, + {type = "output", position = {-4, 9.5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {4, 8.5}}, + {type = "output", position = {4, 9.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 28aa229..223a08e 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_2__/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_'..name + return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_'..name end --item @@ -50,80 +50,80 @@ data:extend({ energy_usage = '0.5GW', --fluids fluid_boxes = { - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {-2, 8.5}} + {type = "input", position = {-2, 9.5}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.south, position = {2, 8.5}} + {type = "input", position = {2, 9.5}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {0, -8.5}}, + {type = "output", position = {0, -9.5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {-2, -8.5}}, + {type = "output", position = {-2, -9.5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {2, -8.5}}, + {type = "output", position = {2, -9.5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {-4, -8.5}}, + {type = "output", position = {-4, -9.5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {4, -8.5}}, + {type = "output", position = {4, -9.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 7edd95d..521bf4a 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_2__/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_'..name + return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_'..name end --item @@ -52,87 +52,87 @@ data:extend({ fluid_boxes = { --in --right - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-8, 3}} + {type = "input", position = {-9, 3}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-8, 1}} + {type = "input", position = {-9, 1}} }, production_type = "input" }, --left - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {8, 3}} + {type = "input", position = {9, 3}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {8, 1}} + {type = "input", position = {9, 1}} }, production_type = "input" }, --out --up - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {-2, -4}}, + {type = "output", position = {-2, -5}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.north, position = {2, -4}}, + {type = "output", position = {2, -5}}, }, production_type = "output" }, --down - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {-2, 8}}, + {type = "output", position = {-2, 9}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.south, position = {2, 8}}, + {type = "output", position = {2, 9}}, }, 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 b1d1164..fd2c04d 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_2__/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_'..name + return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_'..name end --item @@ -50,58 +50,58 @@ data:extend({ energy_usage = '0.7GW', --fluids fluid_boxes = { - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {8, 0}} + {type = "input", position = {9, 0}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {8, 2}} + {type = "input", position = {9, 2}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.east, position = {8, -2}} + {type = "input", position = {9, -2}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.west, position = {-10, -1}}, + {type = "output", position = {-11, -1}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.west, position = {-10, 1}}, + {type = "output", position = {-11, 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 a55265b..bd0a5e2 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_2__/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_'..name + return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_'..name end --item @@ -50,58 +50,58 @@ data:extend({ energy_usage = '0.7GW', --fluids fluid_boxes = { - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-8, 0}} + {type = "input", position = {-9, 0}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-8, 2}} + {type = "input", position = {-9, 2}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = -1, pipe_connections = { - {flow_direction = "input", direction = defines.direction.west, position = {-8, -2}} + {type = "input", position = {-9, -2}} }, production_type = "input" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {10, -1}}, + {type = "output", position = {11, -1}}, }, production_type = "output" }, - { - - volume = 200, + { + base_area = 1, + height = 2, base_level = 1, pipe_connections = { - {flow_direction = "output", direction = defines.direction.east, position = {10, 1}}, + {type = "output", position = {11, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_turbine.lua b/248k_2/prototypes/fusion/fu_turbine.lua index 526f8f7..7b4afe3 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_2__/ressources/fusion/fu_turbine/fu_turbine_'..name + return '__248k__/ressources/fusion/fu_turbine/fu_turbine_'..name end --item @@ -50,17 +50,17 @@ data:extend({ max_power_output = "200MW", fluid_box = { filter = "fu_hot_steam", - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {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}} + {type = "input-output", position = {-4, 0}}, + {type = "input-output", position = {4, 0}}, + {type = "input-output", position = {0, 4}}, + {type = "input-output", position = {0, -4}} }, production_type = "input-output" }, diff --git a/248k_2/prototypes/gr_recipes.lua b/248k_2/prototypes/gr_recipes.lua index f34e3f7..fdab89d 100644 --- a/248k_2/prototypes/gr_recipes.lua +++ b/248k_2/prototypes/gr_recipes.lua @@ -3,59 +3,63 @@ data:extend({ { name = 'gr_crafter_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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} + {'fi_crafter_item',2}, + {'fu_materials_KFK',100}, + {'fu_materials_magnet',10}, + {'gr_materials_fusion_cell_item',1}, + {'gr_materials_circuit',10} }, - results = {{type="item", name='gr_crafter_item', amount=1}}, + result = 'gr_crafter_item', + result_count = 1, energy_required = 6, }, { name = 'gr_materials_fusion_cell_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crafting_category', ingredients = { - {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} + {'fu_space_probe_up_matter_item',1}, + {'fu_tech_sign_item',40}, + {'fusion-reactor-equipment',1} }, - results = {{type="item", name='gr_materials_fusion_cell_item', amount=1}}, + result = 'gr_materials_fusion_cell_item', + result_count = 1, energy_required = 35, }, { name = 'gr_materials_stack_down_item_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fu_space_probe_down_matter_item',2}, + {'low-density-structure',10}, + {'fu_space_probe_data_card_3_item',1}, }, - results = {{type="item", name='gr_materials_stack_down_item', amount=1}}, + result = 'gr_materials_stack_down_item', + result_count = 1, energy_required = 10, }, { name = 'gr_materials_stack_up_item_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'fu_space_probe_up_matter_item',2}, + {'low-density-structure',10}, + {'fu_space_probe_data_card_3_item',1}, }, - results = {{type="item", name='gr_materials_stack_up_item', amount=1}}, + result = 'gr_materials_stack_up_item', + result_count = 1, energy_required = 10, }, { 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}, @@ -63,13 +67,14 @@ data:extend({ results = { {type="item", name="iron-gear-wheel", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -77,13 +82,14 @@ data:extend({ results = { {type="item", name="steel-plate", amount=500}, }, + result_count = 1, energy_required = 6, }, --train { 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}, @@ -94,12 +100,13 @@ data:extend({ results = { {type="item", name="gr_magnet_train_item", amount=1}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -110,12 +117,13 @@ data:extend({ results = { {type="item", name="gr_magnet_wagon_item", amount=1}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -126,12 +134,13 @@ data:extend({ results = { {type="item", name="gr_magnet_tanker_item", amount=1}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -142,12 +151,13 @@ data:extend({ results = { {type="item", name="gr_magnet_train_pre_item", amount=1}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -158,12 +168,13 @@ data:extend({ results = { {type="item", name="gr_magnet_wagon_pre_item", amount=1}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -174,6 +185,7 @@ data:extend({ results = { {type="item", name="gr_magnet_tanker_pre_item", amount=1}, }, + result_count = 1, energy_required = 6, }, --kovarex for matter @@ -181,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} @@ -190,6 +202,7 @@ 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 }, @@ -197,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} @@ -206,6 +219,7 @@ 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 }, @@ -213,98 +227,104 @@ data:extend({ { name = 'gr_charger_recipe', type = 'recipe', - enabled = false, + enabled = 'false', main_product = 'gr_charger_item', ingredients = { - {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} + {'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} }, results = { {type="item", name="gr_charger_item", amount=1} }, + result_count = 1, energy_required = 5 }, { name = 'gr_stabilizer_recipe', type = 'recipe', category = 'gr_charger_category', - enabled = false, + enabled = 'false', main_product = 'gr_materials_stabilizer_item', ingredients = { - {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}, + {'gr_materials_crushed_exotic_item',1}, + {'fu_materials_energy_crystal',10}, + {'fu_tech_sign_item',10}, }, results = { {type="item", name="gr_materials_stabilizer_item", amount=4} }, + result_count = 1, energy_required = 4, always_show_made_in = true }, { name = 'gr_crushed_exotic_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_crushing', ingredients = { - {type="item", name="fu_space_probe_ore_item", amount=1}, + {'fu_space_probe_ore_item',1}, }, - results = {{type="item", name='gr_materials_crushed_exotic_item', amount=2}}, + result = 'gr_materials_crushed_exotic_item', + result_count = 2, energy_required = 2, always_show_made_in = true }, { name = 'gr_black_hole_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='gr_black_hole_item', amount=1}}, + result = 'gr_black_hole_item', + result_count = 1, energy_required = 200, }, { name = 'gr_white_hole_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='gr_white_hole_item', amount=1}}, + result = 'gr_white_hole_item', + result_count = 1, energy_required = 200, }, { name = 'gr_lab_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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}, + {'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}, }, - results = {{type="item", name='gr_lab_item', amount=1}}, + result = 'gr_lab_item', + result_count = 1, energy_required = 20, }, --endgame @@ -312,25 +332,27 @@ data:extend({ { name = 'gr_red_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="automation-science-pack", amount=100}, - {type="item", name="gr_materials_data_item", amount=1} + {'automation-science-pack',100}, + {'gr_materials_data_item',1} }, - results = {{type="item", name='gr_materials_red_data_item', amount=1}}, + result = 'gr_materials_red_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, { name = 'gr_red_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="gr_materials_red_data_item", amount=36}, + {'gr_materials_red_data_item',36}, }, - results = {{type="item", name='gr_materials_red_item', amount=1}}, + result = 'gr_materials_red_item', + result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -339,26 +361,28 @@ data:extend({ { name = 'gr_green_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="logistic-science-pack", amount=100}, - {type="item", name="gr_materials_data_item", amount=1} + {'logistic-science-pack',100}, + {'gr_materials_data_item',1} }, - results = {{type="item", name='gr_materials_green_data_item', amount=1}}, + result = 'gr_materials_green_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, { name = 'gr_green_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="gr_materials_green_data_item", amount=72}, - {type="item", name="gr_materials_red_item", amount=2} + {'gr_materials_green_data_item',72}, + {'gr_materials_red_item',2} }, - results = {{type="item", name='gr_materials_green_item', amount=1}}, + result = 'gr_materials_green_item', + result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -367,26 +391,28 @@ data:extend({ { name = 'gr_blue_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="chemical-science-pack", amount=100}, - {type="item", name="gr_materials_data_item", amount=1} + {'chemical-science-pack',100}, + {'gr_materials_data_item',1} }, - results = {{type="item", name='gr_materials_blue_data_item', amount=1}}, + result = 'gr_materials_blue_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, { name = 'gr_blue_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="gr_materials_blue_data_item", amount=155}, - {type="item", name="gr_materials_green_item", amount=2} + {'gr_materials_blue_data_item',155}, + {'gr_materials_green_item',2} }, - results = {{type="item", name='gr_materials_blue_item', amount=1}}, + result = 'gr_materials_blue_item', + result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -395,26 +421,28 @@ data:extend({ { name = 'gr_purple_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="production-science-pack", amount=100}, - {type="item", name="gr_materials_data_item", amount=1} + {'production-science-pack',100}, + {'gr_materials_data_item',1} }, - results = {{type="item", name='gr_materials_purple_data_item', amount=1}}, + result = 'gr_materials_purple_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, { name = 'gr_purple_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="gr_materials_purple_data_item", amount=310}, - {type="item", name="gr_materials_blue_item", amount=2} + {'gr_materials_purple_data_item',310}, + {'gr_materials_blue_item',2} }, - results = {{type="item", name='gr_materials_purple_item', amount=1}}, + result = 'gr_materials_purple_item', + result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -423,26 +451,28 @@ data:extend({ { name = 'gr_yellow_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="utility-science-pack", amount=100}, - {type="item", name="gr_materials_data_item", amount=1} + {'utility-science-pack',100}, + {'gr_materials_data_item',1} }, - results = {{type="item", name='gr_materials_yellow_data_item', amount=1}}, + result = 'gr_materials_yellow_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, { name = 'gr_yellow_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="gr_materials_yellow_data_item", amount=620}, - {type="item", name="gr_materials_purple_item", amount=2} + {'gr_materials_yellow_data_item',620}, + {'gr_materials_purple_item',2} }, - results = {{type="item", name='gr_materials_yellow_item', amount=1}}, + result = 'gr_materials_yellow_item', + result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -452,26 +482,28 @@ data:extend({ { name = 'gr_grey_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="space-science-pack", amount=100}, - {type="item", name="gr_materials_data_item", amount=1} + {'space-science-pack',100}, + {'gr_materials_data_item',1} }, - results = {{type="item", name='gr_materials_grey_data_item', amount=1}}, + result = 'gr_materials_grey_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, { name = 'gr_grey_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="gr_materials_grey_data_item", amount=1240}, - {type="item", name="gr_materials_yellow_item", amount=2} + {'gr_materials_grey_data_item',1240}, + {'gr_materials_yellow_item',2} }, - results = {{type="item", name='gr_materials_grey_item', amount=1}}, + result = 'gr_materials_grey_item', + result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -480,26 +512,28 @@ data:extend({ { name = 'gr_white_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="fu_space_probe_science_item", amount=100}, - {type="item", name="gr_materials_data_item", amount=1} + {'fu_space_probe_science_item',100}, + {'gr_materials_data_item',1} }, - results = {{type="item", name='gr_materials_white_data_item', amount=1}}, + result = 'gr_materials_white_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, { name = 'gr_white_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {type="item", name="gr_materials_white_data_item", amount=2480}, - {type="item", name="gr_materials_grey_item", amount=2} + {'gr_materials_white_data_item',2480}, + {'gr_materials_grey_item',2} }, - results = {{type="item", name='gr_materials_white_item', amount=1}}, + result = 'gr_materials_white_item', + result_count = 1, energy_required = 100, always_show_made_in = true }, @@ -513,29 +547,31 @@ data:extend({ { name = 'gr_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {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} + {'gr_materials_crushed_exotic_item',1}, + {'gr_materials_stabilizer_item',1}, + {'gr_materials_circuit',20}, + {'fi_modules_base_item',10} }, - results = {{type="item", name='gr_materials_data_item', amount=1}}, + result = 'gr_materials_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, { name = 'gr_stacked_data_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fu_fusor_crafting_category', ingredients = { - {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} + {'gr_materials_data_item',3}, + {'gr_materials_stack_up_item',1}, + {'gr_materials_stack_down_item',1} }, - results = {{type="item", name='gr_materials_stacked_data_item', amount=1}}, + result = 'gr_materials_stacked_data_item', + result_count = 1, energy_required = 10, always_show_made_in = true }, @@ -543,122 +579,131 @@ data:extend({ { name = 'gr_red_pack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'gr_charger_category', ingredients = { - {type="item", name="automation-science-pack", amount=100}, - {type="item", name="gr_materials_stacked_data_item", amount=1} + {'automation-science-pack',100}, + {'gr_materials_stacked_data_item',1} }, - results = {{type="item", name='gr_materials_red_pack_item', amount=100}}, + result = 'gr_materials_red_pack_item', + result_count = 100, energy_required = 10, always_show_made_in = true }, { name = 'gr_green_pack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'gr_charger_category', ingredients = { - {type="item", name="logistic-science-pack", amount=100}, - {type="item", name="gr_materials_stacked_data_item", amount=1} + {'logistic-science-pack',100}, + {'gr_materials_stacked_data_item',1} }, - results = {{type="item", name='gr_materials_green_pack_item', amount=100}}, + result = 'gr_materials_green_pack_item', + result_count = 100, energy_required = 10, always_show_made_in = true }, { name = 'gr_blue_pack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'gr_charger_category', ingredients = { - {type="item", name="chemical-science-pack", amount=100}, - {type="item", name="gr_materials_stacked_data_item", amount=1} + {'chemical-science-pack',100}, + {'gr_materials_stacked_data_item',1} }, - results = {{type="item", name='gr_materials_blue_pack_item', amount=100}}, + result = 'gr_materials_blue_pack_item', + result_count = 100, energy_required = 10, always_show_made_in = true }, { name = 'gr_purple_pack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'gr_charger_category', ingredients = { - {type="item", name="production-science-pack", amount=100}, - {type="item", name="gr_materials_stacked_data_item", amount=1} + {'production-science-pack',100}, + {'gr_materials_stacked_data_item',1} }, - results = {{type="item", name='gr_materials_purple_pack_item', amount=100}}, + result = 'gr_materials_purple_pack_item', + result_count = 100, energy_required = 10, always_show_made_in = true }, { name = 'gr_yellow_pack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'gr_charger_category', ingredients = { - {type="item", name="utility-science-pack", amount=100}, - {type="item", name="gr_materials_stacked_data_item", amount=1} + {'utility-science-pack',100}, + {'gr_materials_stacked_data_item',1} }, - results = {{type="item", name='gr_materials_yellow_pack_item', amount=100}}, + result = 'gr_materials_yellow_pack_item', + result_count = 100, energy_required = 10, always_show_made_in = true }, { name = 'gr_grey_pack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'gr_charger_category', ingredients = { - {type="item", name="space-science-pack", amount=100}, - {type="item", name="gr_materials_stacked_data_item", amount=1} + {'space-science-pack',100}, + {'gr_materials_stacked_data_item',1} }, - results = {{type="item", name='gr_materials_grey_pack_item', amount=100}}, + result = 'gr_materials_grey_pack_item', + result_count = 100, energy_required = 10, always_show_made_in = true }, { name = 'gr_white_pack_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'gr_charger_category', ingredients = { - {type="item", name="fu_space_probe_science_item", amount=100}, - {type="item", name="gr_materials_stacked_data_item", amount=1} + {'fu_space_probe_science_item',100}, + {'gr_materials_stacked_data_item',1} }, - results = {{type="item", name='gr_materials_white_pack_item', amount=100}}, + result = 'gr_materials_white_pack_item', + result_count = 100, energy_required = 10, always_show_made_in = true }, { name = 'gr_materials_charge_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {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} + {'fu_space_probe_science_item',100}, + {'low-density-structure',40}, + {'gr_materials_fusion_cell_item',10}, + {'discharge-defense-equipment',10} }, - results = {{type="item", name='gr_materials_charge_item', amount=1}}, + result = 'gr_materials_charge_item', + result_count = 1, energy_required = 10, }, { name = 'gr_materials_charge_remote_recipe', type = 'recipe', - enabled = false, + enabled = 'false', ingredients = { - {type="item", name="gr_materials_fusion_cell_item", amount=1} + {'gr_materials_fusion_cell_item',1} }, - results = {{type="item", name='gr_materials_charge_remote', amount=1}}, + result = 'gr_materials_charge_remote', + result_count = 1, energy_required = 10, }, { name = 'gr_circuit_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting-with-fluid', main_product = 'gr_materials_circuit', ingredients = { @@ -677,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}, }, @@ -690,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}, @@ -709,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 = { @@ -728,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/prototypes/gravitation/gr_black_hole.lua b/248k_2/prototypes/gravitation/gr_black_hole.lua index 98352a0..41060cd 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_2__/ressources/gravitation/gr_black_hole/gr_black_hole_'..name + return '__248k__/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 14536ab..02267f3 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_2__/ressources/gravitation/gr_charger/gr_charger_'..name + return '__248k__/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 880ee06..1e7d3b0 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_2__/ressources/gravitation/gr_cooker/gr_cooker_'..name + return '__248k__/ressources/gravitation/gr_cooker/gr_cooker_'..name end --item @@ -52,46 +52,47 @@ data:extend({ energy_usage = '4MW', fluid_boxes = { { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {flow_direction = "input", direction = defines.direction.north, position = {0, -2}}, + {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}} }, production_type = "input" }, { - - volume = 200, + base_area = 1, + height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {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}}, + {type = "input", position = {0, 3}}, }, production_type = "input" }, diff --git a/248k_2/prototypes/gravitation/gr_crafter.lua b/248k_2/prototypes/gravitation/gr_crafter.lua index 95b18f2..948b483 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_2__/ressources/gravitation/gr_crafter/gr_crafter_'..name + return '__248k__/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 7672d50..49a131f 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_2__/ressources/gravitation/gr_lab/gr_lab_'..name + return '__248k__/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 2debb39..3dd143b 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_2__/ressources/gravitation/gr_materials/gr_materials_'..name + return '__248k__/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 191f222..b56debd 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_2__/ressources/gravitation/gr_magnet_train/gr_magnet_train_'..name + return '__248k__/ressources/gravitation/gr_magnet_train/gr_magnet_train_'..name end --item @@ -419,7 +419,7 @@ data:extend({ fuel_inventory_size = 3, burnt_inventory_size = 3, effectivity = 0.001, - emissions_per_minute = { pollution = 10 }, + emissions_per_minute = 10, }, --light front_light = { diff --git a/248k_2/prototypes/gravitation/gr_white_hole.lua b/248k_2/prototypes/gravitation/gr_white_hole.lua index 539f8d3..df30d24 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_2__/ressources/gravitation/gr_white_hole/gr_white_hole_'..name + return '__248k__/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 f8a2330..5d1c87d 100644 --- a/248k_2/prototypes/grenades.lua +++ b/248k_2/prototypes/grenades.lua @@ -1,5 +1,5 @@ local function sprite(name) - return '__248k_2__/ressources/grenade/'..name + return '__248k__/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 2fdc308..28b12dc 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_2__/ressources/pipe_covers/"..name..".png" + return "__248k__/ressources/pipe_covers/"..name..".png" end empty_sprite = { diff --git a/248k_2/scripts/SE/data-final-fixes.lua b/248k_2/scripts/SE/data-final-fixes.lua index b66a50f..e44f41a 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, {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}) +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}) --se-energy-material-pack-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}) +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}) --ki -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}) +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}) --modules -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}) +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}) data.raw.technology["gr_stage_tech"].prerequisites = { diff --git a/248k_2/scripts/clean_up.lua b/248k_2/scripts/clean_up.lua index f6c5b57..f7d5f03 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].hidden = true + data.raw.item[v].flags = { "hidden" } end if data.raw["item-with-tags"][v] then - data.raw["item-with-tags"][v].hidden = true + data.raw["item-with-tags"][v].flags = { "hidden" } end end end diff --git a/248k_2/scripts/electronic/el_burner.lua b/248k_2/scripts/electronic/el_burner.lua index 02abde4..868341e 100644 --- a/248k_2/scripts/electronic/el_burner.lua +++ b/248k_2/scripts/electronic/el_burner.lua @@ -1,25 +1,31 @@ function make_burner_recipe(item) if string.find(item, "dummy") then return end -- fix for ElectricTrains crash local blank = { - name = "fu_burn_"..item.."_recipe", + name = 'fu_burn_oxygen_recipe', type = 'recipe', category = 'fu_burner_category', - icon = '__248k_2__/ressources/elements/fu_oxygen.png', + icon = '__248k__/ressources/elements/fu_oxygen.png', icon_size = 64, enabled = true, hidden = true, ingredients = { - {type="item", name=item, amount=1}, + {type="item", name="blank", amount=1}, }, results = {}, + result_count = 1, energy_required = 0.1, always_show_made_in = true, subgroup = 'fu_item_subgroup_f', } - if data.raw.item[item].icon then + blank["name"] = "fu_burn_"..item.."_recipe" + blank["ingredients"] = { + {item,1} + } + 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 bf80a0a..1c31a06 100644 --- a/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua +++ b/248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua @@ -1,28 +1,36 @@ function gr_make_white_hole_recipe(item) - 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, - } - }) + 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}) 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() + +gr_white_hole_recipe_generator() \ No newline at end of file diff --git a/248k_2/scripts/ind2/data-final-fixes.lua b/248k_2/scripts/ind2/data-final-fixes.lua index ea0d98f..f3b65b9 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_2__/ressources/techs/'..name + return '__248k__/ressources/techs/'..name end data.raw["assembling-machine"]["oil-refinery"].fixed_recipe = nil @@ -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}, @@ -37,13 +37,14 @@ data:extend({ results = { {type="item", name="stainless-ingot", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -51,13 +52,14 @@ data:extend({ results = { {type="item", name="invar-ingot", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -65,13 +67,14 @@ data:extend({ results = { {type="item", name="cupronickel-ingot", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -79,13 +82,14 @@ data:extend({ results = { {type="item", name="chromium-ingot", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -93,13 +97,14 @@ data:extend({ results = { {type="item", name="gold-ingot", amount=500}, }, + result_count = 1, energy_required = 6, }, { 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}, @@ -107,6 +112,7 @@ data:extend({ results = { {type="item", name="tellurium-ingot", amount=500}, }, + result_count = 1, energy_required = 6, }, { diff --git a/248k_2/scripts/informatron/inf_sprites.lua b/248k_2/scripts/informatron/inf_sprites.lua index 0557bc6..1ed2fa1 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_2__/ressources/booktorio/bk_sprite_'..name + return '__248k__/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_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_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_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 354616e..905de9d 100644 --- a/248k_2/scripts/krastorio2/data-final-fixes.lua +++ b/248k_2/scripts/krastorio2/data-final-fixes.lua @@ -11,10 +11,11 @@ data:extend({ always_show_made_in = true, ingredients = { - {type="item", name="fi_crushed_lithium_item", amount=10}, + {"fi_crushed_lithium_item", 10}, {type="fluid", name="mineral-water", amount=100} }, - results = {{type="item", name="lithium-chloride", amount=10}}, + result = "lithium-chloride", + result_count = 10, category = "chemistry" }, { @@ -22,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}, @@ -32,6 +33,7 @@ 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', @@ -42,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}, @@ -52,6 +54,7 @@ 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', @@ -62,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}, @@ -72,6 +75,7 @@ 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', @@ -82,13 +86,14 @@ data:extend({ type = 'recipe', category = 'el_charger_category', main_product = 'hydrogen', - enabled = false, + enabled = 'false', ingredients = { {type="fluid", name="water", amount=1100}, }, results = { {type="fluid", name="hydrogen", amount=1000}, }, + result_count = 1, energy_required = 5, subgroup = 'fu_item_subgroup_e', order = 'a-a', @@ -106,6 +111,7 @@ 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', @@ -124,6 +130,7 @@ 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', @@ -142,6 +149,7 @@ 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', @@ -160,6 +168,7 @@ 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', @@ -179,6 +188,7 @@ 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, }, @@ -187,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}, @@ -196,6 +206,7 @@ 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', @@ -206,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}, @@ -215,6 +226,7 @@ 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', @@ -224,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}, @@ -232,6 +244,7 @@ data:extend({ results = { {type="fluid", name="matter", amount=500}, }, + result_count = 1, energy_required = 1, }, { @@ -239,13 +252,14 @@ data:extend({ type = 'recipe', category = 'chemistry', main_product = 'fu_deuterium', - enabled = false, + enabled = 'false', ingredients = { {type="fluid", name="heavy-water", amount=10}, }, results = { {type="fluid", name="fu_deuterium", amount=4}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -254,20 +268,21 @@ data:extend({ type = 'recipe', category = 'chemistry', main_product = 'fu_tritium', - enabled = false, + enabled = 'false', ingredients = { {type="item", name="tritium", amount=1}, }, results = { {type="fluid", name="fu_tritium", amount=10}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, { name = 'fu_ki_core_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=100}, @@ -280,18 +295,20 @@ 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, }, { 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 = '__248k__/ressources/fluids/el_pressurized_water.png', icon_size = 64, main_product = 'el_pressurized_water', ingredients = { @@ -307,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}, @@ -346,11 +363,34 @@ 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 @@ -368,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_2__/ressources/fusion/fu_space_probe/fu_space_probe_science_item_krastorio.png" +data.raw.tool["fu_space_probe_science_item"].icon = "__248k__/ressources/fusion/fu_space_probe/fu_space_probe_science_item_krastorio.png" diff --git a/248k_2/scripts/krastorio2/overhaul.lua b/248k_2/scripts/krastorio2/overhaul.lua index 3219bf4..9ca3068 100644 --- a/248k_2/scripts/krastorio2/overhaul.lua +++ b/248k_2/scripts/krastorio2/overhaul.lua @@ -71,6 +71,14 @@ 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 @@ -240,46 +248,48 @@ end --[BUILDINGS] building_table = { - {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}, + {"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="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}, + {"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}, --logistics - {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-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-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}, + {"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}, } @@ -287,33 +297,33 @@ building_table = { --[ITEMS] item_table = { - {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}, + {"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}, --military - {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}, + {"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}, --science - {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}, + {"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}, } --[TECH] @@ -387,6 +397,8 @@ tech_table = { --[ADD TECH CARDS] add_card_table = { + --{"el_purifier_tech", "space-science-pack"}, + } --[REMOVE TECH CARDS] @@ -429,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}, @@ -448,13 +460,14 @@ data:extend({ type = 'recipe', category = 'chemistry', main_product = 'fu_tritium', - enabled = false, + enabled = 'false', ingredients = { {type="item", name="tritium", amount=1}, }, results = { {type="fluid", name="fu_tritium", amount=3}, }, + result_count = 1, energy_required = 1, always_show_made_in = true, }, @@ -463,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}, @@ -471,6 +484,7 @@ data:extend({ results = { {type="fluid", name="fu_deuterium", amount=3}, }, + result_count = 1, energy_required = 10, always_show_made_in = true, }, @@ -478,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}, @@ -486,6 +500,7 @@ data:extend({ results = { {type="fluid", name="matter", amount=100}, }, + result_count = 1, energy_required = 1, }, }) @@ -515,14 +530,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 = { - {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}, + {'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}, } data.raw.recipe["fu_empty_container_recipe"].ingredients = { diff --git a/248k_2/scripts/legacy_icons.lua b/248k_2/scripts/legacy_icons.lua index 9adc1b7..08c1a72 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_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" + 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" end \ No newline at end of file diff --git a/248k_2/scripts/menu_simulation.lua b/248k_2/scripts/menu_simulation.lua index 791838d..144a500 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_2__/ressources/menu_simulation/248k_menu_1.zip", + save = "__248k__/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_2__/ressources/menu_simulation/248k_menu_2.zip", + save = "__248k__/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_2__/ressources/menu_simulation/248k_menu_3.zip", + save = "__248k__/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_2__/ressources/menu_simulation/248k_menu_6.zip", + save = "__248k__/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/overhaul.lua b/248k_2/scripts/overhaul.lua index e99ecd5..3918e25 100644 --- a/248k_2/scripts/overhaul.lua +++ b/248k_2/scripts/overhaul.lua @@ -62,58 +62,58 @@ end --[BUILDINGS] building_table = { - {type="item", name="assembling-machine-2", "el_materials_ALK", amount=3}, + {"assembling-machine-2", "el_materials_ALK", 3}, -- - --{type="item", name="fast-inserter", "el_aluminum_item", amount=2}, - --{type="item", name="long-handed-inserter", "el_aluminum_item", amount=2}, + --{"fast-inserter", "el_aluminum_item", 2}, + --{"long-handed-inserter", "el_aluminum_item", 2}, -- - {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}, + {"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="stack-inserter", "el_energy_crystal_item", amount=2}, + {"stack-inserter", "el_energy_crystal_item", 2}, - {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}, + {"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="rocket-silo", "fu_materials_KFK", amount=40}, + --{"rocket-silo", "fu_materials_KFK", 40}, - {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}, + {"beacon", "fi_materials_titan", 8}, + {"substation", "fi_materials_titan", 4}, + {"assembling-machine-3", "fi_materials_titan", 4}, } --[ITEMS] item_table = { - {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}, + {"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="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}, + --{"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}, } @@ -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({{type="item", name="rocket-silo", "fu_materials_KFK", 40}, {"satellite", "fu_materials_KFK", amount=10}}, recipe_structure)) + add_to_recipes(change_table_index({{"rocket-silo", "fu_materials_KFK", 40}, {"satellite", "fu_materials_KFK", 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 98584e5..d359781 100644 --- a/248k_2/scripts/realisticreactors/overhaul.lua +++ b/248k_2/scripts/realisticreactors/overhaul.lua @@ -61,6 +61,14 @@ 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 @@ -132,14 +140,16 @@ end --[BUILDINGS] building_table = { + --{"kr-electrolysis-plant", "el_materials_ALK", 10}, + } --[ITEMS] item_table = { - {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}, + {"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}, } @@ -157,16 +167,21 @@ 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"}, @@ -219,18 +234,18 @@ table.insert(data.raw.technology["nuclear-power"].effects, { }) data.raw.recipe["realistic-reactor"].ingredients = { - {type="item", name="fi_solid_reactor_item", 1}, {"fi_tech_fuel", 20}, {"heat-pipe", amount=20} + {"fi_solid_reactor_item", 1}, {"fi_tech_fuel", 20}, {"heat-pipe", 20} } data.raw.recipe["breeder-reactor"].ingredients = { - {type="item", name="fi_solid_reactor_item", 1}, {"fi_tech_fuel", 40}, {"heat-pipe", 20}, {"productivity-module-3", amount=3} + {"fi_solid_reactor_item", 1}, {"fi_tech_fuel", 40}, {"heat-pipe", 20}, {"productivity-module-3", 3} } data:extend({ { name = 'fi_test_fuel', type = 'item', - icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_test_item.png', + icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_test_item.png', icon_size = 64, stack_size = 20, subgroup = 'fi_item_subgroup_b', @@ -243,7 +258,7 @@ data:extend({ { name = 'fi_test_used_fuel', type = 'item', - icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_test_used_item.png', + icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_test_used_item.png', icon_size = 64, stack_size = 100, subgroup = 'fi_item_subgroup_b', @@ -252,7 +267,7 @@ data:extend({ { name = 'fi_tech_fuel', type = 'item', - icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_tech_item.png', + icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_tech_item.png', icon_size = 64, stack_size = 100, subgroup = 'fi_item_subgroup_b', @@ -261,39 +276,42 @@ data:extend({ { name = 'fi_test_fuel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="uranium-238", amount=2}, - {type="item", name="el_materials_ALK", amount=5}, + {'uranium-238',2}, + {'el_materials_ALK',5}, }, - results = {{type="item", name='fi_test_fuel', amount=1}}, + result = 'fi_test_fuel', + result_count = 1, energy_required = 2, order = 'b-b', }, { name = 'fi_tech_fuel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="fi_test_used_fuel", amount=1}, - {type="item", name="chemical-science-pack", amount=2}, - {type="item", name="uranium-238", amount=2}, + {'fi_test_used_fuel', 1}, + {'chemical-science-pack', 2}, + {'uranium-238', 2}, }, - results = {{type="item", name='fi_tech_fuel', amount=1}}, + result = 'fi_tech_fuel', + result_count = 1, energy_required = 1, order = 'b-b', }, { name = 'fi_use_tech_fuel_recipe', type = 'recipe', - enabled = false, + enabled = 'false', category = 'fi_test_fuel_crafting_category', ingredients = { - {type="item", name="fi_test_fuel", amount=1} + {'fi_test_fuel', 1} }, - results = {{type="item", name='fi_test_used_fuel', amount=1}}, + result = 'fi_test_used_fuel', + result_count = 1, energy_required = 5, order = 'b-b', hidden = true, @@ -301,7 +319,7 @@ data:extend({ { name = 'fi_solid_reactor_tech', type = 'technology', - icon = '__248k_2__/ressources/techs/fi_solid_reactor_tech.png', + icon = '__248k__/ressources/techs/fi_solid_reactor_tech.png', icon_size = 128, prerequisites = {'fi_energy_tech','fi_refining_tech'}, effects = { @@ -321,8 +339,8 @@ data:extend({ unit = { count = '500', ingredients = { - {type="item", name="chemical-science-pack", amount=1}, - {type="item", name="automation-science-pack", amount=1}, + {'chemical-science-pack',1}, + {'automation-science-pack',1}, {'logistic-science-pack',1,}, }, time = 30, @@ -331,7 +349,7 @@ data:extend({ { name = 'fi_solid_reactor_entity', type = 'assembling-machine', - icon = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_icon.png', + icon = '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_icon.png', icon_size = 64, flags = {"player-creation","placeable-neutral"}, max_health = 300, @@ -341,7 +359,7 @@ data:extend({ map_color = {r=0, g=0, b=1, a=1}, minable = { mining_time = 1, - results = {{type="item", name='fi_solid_reactor_item', amount=1}}, + result = 'fi_solid_reactor_item', }, fixed_recipe = 'fi_use_tech_fuel_recipe', crafting_categories = {"fi_test_fuel_crafting_category"}, @@ -351,7 +369,7 @@ data:extend({ }, energy_usage = "1W", animation = { - filename = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation.png', + filename = '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation.png', width = 960, height = 960, shift = {0, 0}, @@ -360,7 +378,7 @@ data:extend({ working_visualisations = { { animation = { - filename = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation_2.png', + filename = '__248k__/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 7a8eaf8..afc7ce1 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_2__/ressources/science/'..name..'.png' + return '__248k__/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 f27b94d..df3486d 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_2__/ressources/techs/fu_fusor_tech.png', + icon = '__248k__/ressources/techs/fu_fusor_tech.png', icon_size = 128, prerequisites = { 'fu_magnet_tech','fu_basic_elements_tech' @@ -60,12 +60,13 @@ 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}, }, - results = {{type="item", name='fu_materials_fusion_card', amount=100}}, + result = 'fu_materials_fusion_card', + result_count = 100, energy_required = 100, always_show_made_in = true, }, @@ -73,12 +74,13 @@ 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}, }, - results = {{type="item", name='fu_materials_fusion_card', amount=20}}, + result = 'fu_materials_fusion_card', + result_count = 20, energy_required = 100, always_show_made_in = true, },