added charger, shifted energy crystal fuel value

changelog.txt

@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.0.18
+Date: 04.5.2022
+  Features:
+    - added energy injector to charge energy crystals aswell as water electrolysis
+
+  Changes:
+    - removed fuel values of energy crystals, moved to charged variants
+---------------------------------------------------------------------------------------------------
 Version: 1.0.17
 Date: 03.5.2022
   Features:

data.lua

@@ -22,6 +22,7 @@ require('prototypes/electronic/el_caster')
 require('prototypes/electronic/el_purifier')
 require('prototypes/electronic/el_grower')
 require('prototypes/electronic/el_materials')
+require('prototypes/electronic/el_charger')
 
 require('prototypes/fission/fi_crafter')
 require('prototypes/fission/fi_miner')

locale/en/lang_en.cfg

@@ -18,6 +18,7 @@ el_lithium_battery=Lithium battery
 el_train_fuel_diesel_item=Diesel fuel unit
 el_train_fuel_diesel_energized_item=Energized diesel fuel unit
 el_energy_crystal_item=Mysterious energy crystal
+el_energy_crystal_charged_item=Charged mysterious energy crystal
 el_ki_linker=KI1 linker
 fi_ki_science=KI2 tech
 fu_ki_science=KI3 tech
@@ -44,6 +45,7 @@ fi_used_advanced_fuel_item=Consumed Mox fuel rods
 fi_used_advanced_thorium_fuel_item=Consumed Uranium-233 fuel rods
 fi_used_pure_fuel_item=Consumed high energy Mox fuel rods
 fi_energy_crystal_item=Artificial energy crystal
+fi_energy_crystal_charged_item=Charged artificial energy crystal
 fi_catalyst_crystal_item=Crystal catalyst
 fi_base_crystal_item=Energy crystal matrix
 fi_crushed_crystal_item=Crushed energy crystal
@@ -106,6 +108,7 @@ fu_space_probe_science_item=Exotic science pack
 
 fu_materials_pure_lead=Pure lead
 fu_materials_energy_crystal=High energy crystal
+fu_materials_energy_charged_crystal=Charged high energy crystal
 fu_materials_refined_crystal=Refined crystal
 fu_materials_KFK=Carbon fiber reinforced plastic
 fu_materials_magnet=Magnet
@@ -201,8 +204,8 @@ fi_acid_gas=Acid gas
 
 fu_hydrogen=Hydrogen
 fu_oxygen=Oxygen
-fu_lead_fluid_hot=Liquid lead (1500°C)
-fu_lead_fluid_cold=Liquid lead (500°C)
+fu_lead_fluid_hot=Liquid lead coolant [color=red](1500°C)[/color]
+fu_lead_fluid_cold=Liquid lead coolant [color=blue](500°C)[/color]
 fu_protium=Protium-H[1]
 fu_deuterium=Deuterium-H[2]
 fu_tritium=Tritium-H[3]
@@ -274,6 +277,11 @@ fu_ki_core_item=For usage please look into the ingame booktorio/Informatron wiki
 gr_white_hole_item=This machine can nearly replicate any item you put into!
 gr_materials_white_item=||Well done! You did it. You have reached the ultimate goal. With holding the 248k element you have beaten the 248k mod.||
 
+el_energy_crystal_charged_item=A charged energy crystal. Can be used in the burner generator[item=el_burner_item] to generate power.
+fi_energy_crystal_charged_item=A charged energy crystal. Can be used in the burner generator[item=el_burner_item] to generate power.
+fu_materials_energy_charged_crystal=A charged energy crystal. Can be used in the burner generator[item=el_burner_item] to generate power.
+el_charger_item=can be used to charge items like [color=purple]energy crystals[/color] with energy or seperate water[fluid=water] using various catalysts.
+
 #overhaul
 uranium-fuel-cell-updated=This fuel cell can't be used in realistic reactor.
 
@@ -293,6 +301,7 @@ el_ki_core_entity=KI1 core
 el_ki_beacon_slave_entity=Beacon link slot
 el_ki_core_slave_entity=KI1 core module slot
 el_ki_core_slave_container_entity=KI1 core
+el_charger_entity=Electric energy injector
 fi_ki_beacon_entity=KI2 beacon
 fi_ki_core_entity=KI2 core
 fi_ki_core_slave_entity=KI2 core module slot
@@ -381,6 +390,7 @@ el_kerosene_tech=Kerosene processing
 el_train_tech=Diesel train
 el_crystal_tech=Energy crystal refining
 el_ki_tech=KI1 technology
+el_charger_tech=Charger
 fi_stage_tech=Fission stage
 
 fi_energy_tech=Nuclear fission energy
@@ -541,6 +551,7 @@ fi_advanced_fuel=Advanced nuclear fuel
 fi_pure_fuel=High energy nuclear fuel
 fi_test_fuel=Nuclear research fuel
 fu_miner_fuel_category=Miner drills
+charged_fuel=Charged energy crystal
 
 #settings
 [mod-setting-name]

prototypes/248k_subgroups.lua

@@ -422,6 +422,10 @@ data:extend({
         name = 'fi_pure_fuel',
         type = 'fuel-category',
     },
+    {
+        name = 'charged_fuel',
+        type = 'fuel-category',
+    },
     --train_equip
     {
         name = 'el_train_equipment',
@@ -445,6 +449,10 @@ data:extend({
         name = 'el_arc_furnace_category',
         type = 'recipe-category',
     },
+    {
+        name = 'el_charger_category',
+        type = 'recipe-category',
+    },
     {
         name = 'el_caster_category',
         type = 'recipe-category',

prototypes/248k_techs.lua

@@ -132,6 +132,31 @@ data:extend({
             time = 30,
         },
     },
+    {
+        name = 'el_charger_tech',
+        type = 'technology',
+        icon = sprite('el_charger_tech.png'),
+        icon_size = 128,
+        prerequisites = {'el_burner_tech'},
+        effects = {
+            { 
+                type = 'unlock-recipe',
+                recipe = 'el_charger_recipe',
+            },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'el_charge_crystal_recipe',
+            }
+        },
+        unit = {
+            count = '50',
+            ingredients = {
+                {'automation-science-pack',1},
+                {'logistic-science-pack',1},
+            },
+            time = 30,
+        },
+    },
     {
         name = 'el_caster_tech',
         type = 'technology',
@@ -912,7 +937,8 @@ data:extend({
             'el_burner_tech',
             'el_water_generator_tech',
             'el_train_tech',
-            'el_ki_tech'
+            'el_ki_tech',
+            'el_charger_tech'
         },
         effects = {
             {
@@ -1460,6 +1486,10 @@ data:extend({
                 type = 'unlock-recipe',
                 recipe = 'fi_fuel_train_crystal_recipe',
             },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fi_charge_crystal_recipe',
+            },
         },
         unit = {
             count = '150',
@@ -2041,6 +2071,10 @@ data:extend({
                 type = 'unlock-recipe',
                 recipe = 'fu_boiler_hydrogen_oxygen_1_recipe',
             },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fu_charger_hydrogen_oxygen_recipe',
+            },
         },
         unit = {
             count = '800',
@@ -2067,6 +2101,10 @@ data:extend({
                 type = 'unlock-recipe',
                 recipe = 'fu_boiler_hydrogen_oxygen_2_recipe',
             },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fu_charger_hydrogen_oxygen_1_recipe',
+            },
         },
         unit = {
             count = '2000',
@@ -2094,6 +2132,10 @@ data:extend({
                 type = 'unlock-recipe',
                 recipe = 'fu_boiler_hydrogen_oxygen_3_recipe',
             },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fu_charger_hydrogen_oxygen_2_recipe',
+            },
         },
         unit = {
             count = '6000',
@@ -2151,6 +2193,10 @@ data:extend({
                 type = 'unlock-recipe',
                 recipe = 'fu_refined_crystal_recipe',
             },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fu_charge_crystal_recipe',
+            },
         },
         unit = {
             count = '1000',

prototypes/el_recipes.lua

@@ -1238,6 +1238,33 @@ data:extend({
         result_count = 1,
         energy_required = 5,
     },
+    {
+        name = 'el_charger_recipe',
+        type = 'recipe',
+        enabled = 'false',
+        category = 'crafting',
+        ingredients = {
+            {'iron-gear-wheel',40},
+            {'steel-plate',25},
+            {'stone-furnace',2}
+        },
+        result = 'el_charger_item',
+        result_count = 1,
+        energy_required = 4,
+    },
+    {
+        name = 'el_charge_crystal_recipe',
+        type = 'recipe',
+        enabled = 'false',
+        category = 'el_charger_category',
+        ingredients = {
+            {type='item', name='el_energy_crystal_item', amount=1, propability=0.95},
+        },
+        result = 'el_energy_crystal_charged_item',
+        result_count = 1,
+        energy_required = 2,
+        always_show_made_in = true,
+    },
 
 
     

prototypes/electronic/el_burner.lua

@@ -71,8 +71,10 @@ data:extend({
         burner = {
             type = 'burner',
             fuel_inventory_size = 3,
-            effectivity = 0.9,
+            burnt_inventory_size = 3,
+            effectivity = 0.95,
             emissions_per_minute = 20,
+            fuel_categories = {"chemical", "charged_fuel"},
             smoke = {
                 {
                     name = 'smoke',

prototypes/electronic/el_charger.lua

@@ -0,0 +1,172 @@
+--local functions
+local function config(name)
+    return settings.startup['el_charger_'..name].value
+end
+
+local function sprite(name)
+    return '__248k__/ressources/electronic/el_charger/el_charger_'..name
+end
+
+--item
+data:extend({
+    {
+        name = 'el_charger_item',
+        type = 'item',
+        icon = sprite('icon.png'),
+        icon_size = 64,
+        place_result = 'el_charger_entity',
+        stack_size = 20,
+        subgroup = 'el_item_subgroup_c',
+        order = 'a-b',
+    },
+
+})
+
+--entity
+data:extend({
+  --prototype
+  {
+      name = 'el_charger_entity',
+      type = 'furnace',
+      icon = sprite('icon.png'),
+      icon_size = 64,
+      flags = {"player-creation","placeable-neutral"},
+      max_health = 300,
+      corpse = 'big-remnants',
+      collision_box = {{-3.4,-3.4},{3.4,3.4}},
+      selection_box = {{-3.5,-3.5},{3.5,3.5}},
+      map_color = {r=0, g=0, b=1, a=1},
+      minable = {
+          mining_time = 1,
+          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',
+      },
+      energy_usage = '10MW',
+      fluid_boxes = {
+        {
+          
+          base_area = 20,
+          filter = 'water',
+          height = 2,
+          base_level = -1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = grey_south_pipe_picture,
+          pipe_connections =
+          {
+            {type = "input", position = {0, -4}},
+          },
+          production_type = "input"
+        },
+        { 
+          
+          base_area = 20,
+          height = 2,
+          filter = 'fu_oxygen',
+          base_level = 1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = grey_south_pipe_picture,
+          pipe_connections =
+          {
+            {type = "output", position = {-4, 0}}
+          },
+          production_type = "output"
+        },
+        { 
+          
+          base_area = 20,
+          height = 2,
+          filter = 'fu_hydrogen',
+          base_level = 1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = grey_south_pipe_picture,
+          pipe_connections =
+          {
+            {type = "output", position = {4, 0}},
+            --{type = "output", position = {2, -2.5}}
+          },
+          production_type = "output"
+        },
+        {
+          
+          base_area = 20,
+          height = 2,
+          filter = 'fu_hydrogen',
+          base_level = 1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = grey_south_pipe_picture,
+          pipe_connections =
+          {
+            {type = "output", position = {0, 4}},
+          },
+          production_type = "output"
+        },
+      },
+      --animation
+      animation = {
+        filename = sprite('entity_base.png'),
+        size = {512,512},
+        scale = 0.54,
+        line_length = 1,
+        --lines_per_file = 2,
+        frame_count = 1,
+        --animation_speed = 0.2,
+        shift = {0,-0.3} 
+      },
+      working_visualisations = {
+        {
+          animation = 
+          {
+            filename = sprite('entity_overlay.png'),
+            size = {512,512},
+            scale = 0.54,
+            line_length = 3,
+            lines_per_file = 1,
+            frame_count = 3,
+            animation_speed = 0.2,
+            shift = {0,-0.3} 
+          },
+          light = {
+            type = "basic",
+            intensity = 1,
+            size = 15,
+            color = {r=0.12 ,g=0.5 ,b=0.85 },
+          }
+        }
+      },
+      
+      working_sound =
+      {
+        sound = {filename = "__base__/sound/chemical-plant-3.ogg" },
+        apparent_volume = 0.1,
+      },
+  },
+})
+
+--{
+--    production_type = "input",
+    --pipe_picture = assembler2pipepictures(),
+    --pipe_covers = pipecoverspictures(),
+--    base_area = 10,
+--    base_level = -1,
+--    pipe_connections = {
+--        { type="input", position = {-2, -2,5} },
+--        { type="input", position = {2, -2.5} },
+--    },
+--  },
+--  {
+--    production_type = "output",
+    --pipe_picture = assembler2pipepictures(),
+    --pipe_covers = pipecoverspictures(),
+--    base_area = 10,
+--    base_level = 1,
+--    pipe_connections = {{ type="output", position = {2, 2.5} }},
+--  },
+--  off_when_no_fluid_recipe = true

prototypes/electronic/el_energy_crystal.lua

@@ -17,11 +17,21 @@ data:extend({
         stack_size = 500,
         subgroup = 'el_item_subgroup_a',
         order = 'a-c',
+    },
+    {
+        name = 'el_energy_crystal_charged_item',
+        type = 'item',
+        icon = sprite('charged_item.png'),
+        icon_size = 64,
+        stack_size = 100,
+        subgroup = 'el_item_subgroup_a',
+        order = 'a-c',
         fuel_glow_color = {r=0.1,g=0.74,b=0.39,a=0.5},
-        fuel_category = 'chemical',
+        fuel_category = 'charged_fuel',
         fuel_acceleration_multiplier = 1,
         fuel_emissions_multiplier = 1,
         fuel_top_speed_multiplier = 1,
         fuel_value = '20MJ',
+        burnt_result = 'el_energy_crystal_item',
     },
 })

prototypes/fi_recipes.lua

@@ -1369,4 +1369,17 @@ data:extend({
         order = 'a-a',
         always_show_made_in = true,
     },
+    {
+        name = 'fi_charge_crystal_recipe',
+        type = 'recipe',
+        enabled = 'false',
+        category = 'el_charger_category',
+        ingredients = {
+            {type='item', name='fi_energy_crystal_item', amount=1, propability=0.95},
+        },
+        result = 'fi_energy_crystal_charged_item',
+        result_count = 1,
+        energy_required = 10,
+        always_show_made_in = true,
+    },
 })

prototypes/fission/fi_energy_crystal.lua

@@ -17,12 +17,22 @@ data:extend({
         stack_size = 500,
         subgroup = 'fi_item_subgroup_b',
         order = 'a-c',
+    },
+    {
+        name = 'fi_energy_crystal_charged_item',
+        type = 'item',
+        icon = sprite('charged_item.png'),
+        icon_size = 64,
+        stack_size = 100,
+        subgroup = 'fi_item_subgroup_b',
+        order = 'a-c',
         fuel_glow_color = {r=0.1,g=0.74,b=0.39,a=0.5},
-        fuel_category = 'chemical',
+        fuel_category = 'charged_fuel',
         fuel_acceleration_multiplier = 1,
         fuel_emissions_multiplier = 1,
         fuel_top_speed_multiplier = 1,
-        fuel_value = '150MJ',
+        fuel_value = '100MJ',
+        burnt_result = 'fi_energy_crystal_item',
     },
     {
         name = 'fi_crushed_crystal_item',

prototypes/fu_recipes.lua

@@ -168,8 +168,8 @@ data:extend({
             {type="fluid", name="water", amount=150},
         },
         results = {
-            {type="fluid", name="fu_hydrogen", amount=100, temperature=40},
-            {type="fluid", name="fu_oxygen", amount=50, temperature=40}
+            {type="fluid", name="fu_hydrogen", amount=100},
+            {type="fluid", name="fu_oxygen", amount=50}
         },
         result_count = 1,
         energy_required = 1,
@@ -184,8 +184,8 @@ data:extend({
             {type="fluid", name="water", amount=300},
         },
         results = {
-            {type="fluid", name="fu_hydrogen", amount=200, temperature=40},
-            {type="fluid", name="fu_oxygen", amount=100, temperature=40}
+            {type="fluid", name="fu_hydrogen", amount=200},
+            {type="fluid", name="fu_oxygen", amount=100}
         },
         result_count = 1,
         energy_required = 1,
@@ -200,8 +200,8 @@ data:extend({
             {type="fluid", name="water", amount=650},
         },
         results = {
-            {type="fluid", name="fu_hydrogen", amount=500, temperature=40},
-            {type="fluid", name="fu_oxygen", amount=150, temperature=40},
+            {type="fluid", name="fu_hydrogen", amount=500},
+            {type="fluid", name="fu_oxygen", amount=150},
         },
         result_count = 1,
         energy_required = 1,
@@ -216,7 +216,7 @@ data:extend({
             {type="fluid", name="water", amount=1100},
         },
         results = {
-            {type="fluid", name="fu_hydrogen", amount=1000, temperature=40},
+            {type="fluid", name="fu_hydrogen", amount=1000},
         },
         result_count = 1,
         energy_required = 1,
@@ -1642,7 +1642,68 @@ data:extend({
         energy_required = 6,
         subgroup = 'fi_item_subgroup_b',
     },
-    
-    
-
+    {
+        name = 'fu_charge_crystal_recipe',
+        type = 'recipe',
+        enabled = 'false',
+        category = 'el_charger_category',
+        ingredients = {
+            {type='item', name='fu_materials_energy_crystal', amount=1, propability=0.95},
+        },
+        result = 'fu_materials_energy_charged_crystal',
+        result_count = 1,
+        energy_required = 30,
+        always_show_made_in = true,
+    },
+    {
+        name = 'fu_charger_hydrogen_oxygen_recipe',
+        type = 'recipe',
+        category = 'el_charger_category',
+        main_product = 'fu_hydrogen',
+        enabled = 'false',
+        ingredients = {
+            {type="item", name="fi_crushed_coal_item", amount=1},
+            {type="fluid", name="water", amount=150},
+        },
+        results = {
+            {type="fluid", name="fu_hydrogen", amount=100},
+            {type="fluid", name="fu_oxygen", amount=50}
+        },
+        result_count = 1,
+        energy_required = 5,
+    },
+    {
+        name = 'fu_charger_hydrogen_oxygen_1_recipe',
+        type = 'recipe',
+        category = 'el_charger_category',
+        main_product = 'fu_hydrogen',
+        enabled = 'false',
+        ingredients = {
+            {type="item", name="fi_materials_gold", amount=1},
+            {type="fluid", name="water", amount=300},
+        },
+        results = {
+            {type="fluid", name="fu_hydrogen", amount=200},
+            {type="fluid", name="fu_oxygen", amount=100}
+        },
+        result_count = 1,
+        energy_required = 5,
+    },
+    {
+        name = 'fu_charger_hydrogen_oxygen_2_recipe',
+        type = 'recipe',
+        category = 'el_charger_category',
+        main_product = 'fu_hydrogen',
+        enabled = 'false',
+        ingredients = {
+            {type="item", name="fi_materials_titan", amount=1},
+            {type="fluid", name="water", amount=650},
+        },
+        results = {
+            {type="fluid", name="fu_hydrogen", amount=500},
+            {type="fluid", name="fu_oxygen", amount=150}
+        },
+        result_count = 1,
+        energy_required = 5,
+    },
 })

prototypes/fusion/fu_materials.lua

@@ -18,6 +18,22 @@ data:extend({
         subgroup = 'fu_item_subgroup_a',
         order = 'a-a',
     },
+    {
+        name = 'fu_materials_energy_charged_crystal',
+        type = 'item',
+        icon = sprite('energy_crystal_charged.png'),
+        icon_size = 64,
+        stack_size = 100,
+        subgroup = 'fu_item_subgroup_a',
+        order = 'a-a',
+        fuel_glow_color = {r=0.1,g=0.74,b=0.39,a=0.5},
+        fuel_category = 'charged_fuel',
+        fuel_acceleration_multiplier = 1,
+        fuel_emissions_multiplier = 1,
+        fuel_top_speed_multiplier = 1,
+        fuel_value = '300MJ',
+        burnt_result = 'fu_materials_energy_crystal',
+    },
     {
         name = 'fu_materials_refined_crystal',
         type = 'item',