KI science tweak

changelog.txt

@@ -1,8 +1,30 @@
 ---------------------------------------------------------------------------------------------------
-Version: 0.6.4
+Version: 0.9.0
 Date: 14.7.2021
+  WARNING:
+    - This version contains major changes so updating on an exiting save can work but is not advised
+  Features:
+    - added new composite materials
+    - added ore purification
+    - added ore smelting
+    - added a bunch of new machines
+    - overhauled fusion tech
+    - rebalanced exotic science
+    - added a lot of intermediates
+    - reorganised tech tree
+    - added ES-es locale - big thanks to Seraphim
+    - added a way to re-heat liquid lead
+    - added some recipes to accept 248k prod. modules
   Changes:
-    - Portable nuclear reactor is now cheaper
+    - portable nuclear reactor is now cheaper
+    - KIX science cost tweaked
+    - adjusted S-lab hitbox
+    - fixed fusor energy input
+    - nerved el_burner effectivity to 90 percent
+    - nerved solar panel output 
+    - Future train 1 is now available in fusion stage
+    - Future train 1 now uses nuclear fuel
+    - KI2/KI3 core now directly produce KI science - may not migrate properly from old versions
 ---------------------------------------------------------------------------------------------------
 Version: 0.6.3
 Date: 13.7.2021

prototypes/248k_techs.lua

@@ -466,6 +466,10 @@ data:extend({
             { 
                 type = 'unlock-recipe',
                 recipe = 'fi_ki_circuit_fluid_recipe',
+            },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fi_ki_cpu_memory_circuit_recipe',
             }
         },
         unit = {
@@ -500,6 +504,10 @@ data:extend({
             { 
                 type = 'unlock-recipe',
                 recipe = 'fu_ki_circuit_fluid_recipe',
+            },
+            { 
+                type = 'unlock-recipe',
+                recipe = 'fu_ki_cpu_memory_circuit_recipe',
             }
         },
         unit = {

prototypes/el_recipes.lua

@@ -795,33 +795,33 @@ data:extend({
         type = 'recipe',
         enabled = 'false',
         category = 'fi_ki_core_category',
-        icon = sprite('fluids/el_pressurized_water.png'),
-        icon_size = 64,
-        subgroup = 'el_item_subgroup_f',
         ingredients = {
-            {type="fluid", name="el_ki_cpu_fluid", amount=550},
+            {type="fluid", name="el_ki_cpu_fluid", amount=550*3},
-            {type="fluid", name="el_ki_memory_fluid", amount=550},
+            {type="fluid", name="el_ki_memory_fluid", amount=550*3},
-            {type="fluid", name="fi_ki_circuit_fluid", amount=550}    
+            {type="fluid", name="fi_ki_circuit_fluid", amount=550*3}    
         },
-        results = {},
+        results = {
-        energy_required = 15,
+            {type='item', name='fi_ki_science', amount=1}
+        },
+        energy_required = 15*3,
+        always_show_made_in = true
     },
     {
         name = 'fu_ki_cpu_memory_circuit_recipe',
         type = 'recipe',
         enabled = 'false',
         category = 'fu_ki_core_category',
-        icon = sprite('fluids/el_pressurized_water.png'),
-        icon_size = 64,
-        subgroup = 'el_item_subgroup_f',
         ingredients = {
-            {type="fluid", name="el_ki_cpu_fluid", amount=550},
+            {type="fluid", name="el_ki_cpu_fluid", amount=550*3},
-            {type="fluid", name="el_ki_memory_fluid", amount=550},
+            {type="fluid", name="el_ki_memory_fluid", amount=550*3},
-            {type="fluid", name="fi_ki_circuit_fluid", amount=550},
+            {type="fluid", name="fi_ki_circuit_fluid", amount=550*3},
-            {type="fluid", name="fu_ki_circuit_fluid", amount=550}    
+            {type="fluid", name="fu_ki_circuit_fluid", amount=550*3}    
         },
-        results = {},
+        results = {
-        energy_required = 15,
+            {type='item', name='fu_ki_science', amount=1}
+        },
+        energy_required = 15*3,
+        always_show_made_in = true
     },
     {
         name = 'el_arc_furnace_recipe',

prototypes/electronic/el_burner.lua

@@ -55,7 +55,7 @@ data:extend({
         burner = {
             type = 'burner',
             fuel_inventory_size = 3,
-            effectivity = 1.2,
+            effectivity = 0.9,
             emissions_per_minute = 20,
             smoke = {
                 {

prototypes/electronic/el_ki/el_ki_linker.lua

@@ -24,8 +24,8 @@ data:extend({
         durability = 1,
         icon_size = 64,
         stack_size = 10000,
-        subgroup = 'el_item_subgroup_b',
+        subgroup = 'fi_item_subgroup_k',
-        order = 'a-b',
+        order = 'c-a',
     },
     {
         name = 'fu_ki_science',
@@ -34,8 +34,8 @@ data:extend({
         durability = 1,
         icon_size = 64,
         stack_size = 10000,
-        subgroup = 'el_item_subgroup_b',
+        subgroup = 'fu_item_subgroup_k',
-        order = 'a-b',
+        order = 'c-a',
     },
     {
         name = "el_ki_selection_tool",

prototypes/fission/fi_modules.lua

@@ -12,12 +12,21 @@ local limitation_list = {
     'el_grow_energy_crystal_recipe',
     'fi_compound_material_recipe',
     'fi_materials_industrial_steel_recipe',
+    'fi_GFK_recipe',
+    'fi_NFK_recipe',
+    'fu_KFK_recipe',
+    'fu_TIM_recipe',
     'fu_lead_ore_recipe',
     'fi_base_crystal_recipe',
     'fi_catalyst_crystal_recipe',
     'fi_energy_crystal_recipe',
     'fi_glass_fiber_recipe',
-    'fi_natural_fiber_recipe'
+    'fi_natural_fiber_recipe',
+    'fu_carbon_fiber_recipe',
+    'fu_tech_sign_recipe',
+    'gr_pcb_recipe',
+    'gr_gold_wire_recipe',
+    'gr_circuit_recipe'
 }
 
 --item
@@ -35,7 +44,7 @@ data:extend({
         effect = {
             consumption = {bonus = 0.9},
             speed = {bonus = -0.2},
-            productivity = {bonus = 0.08},
+            productivity = {bonus = 0.06},
             pollution = {bonus = 0.3}
         },
         limitation = limitation_list,
@@ -54,7 +63,7 @@ data:extend({
         effect = {
             consumption = {bonus = 1.4},
             speed = {bonus = -0.35},
-            productivity = {bonus = 0.12},
+            productivity = {bonus = 0.10},
             pollution = {bonus = 0.6}
         },
         limitation = limitation_list,
@@ -73,7 +82,7 @@ data:extend({
         effect = {
             consumption = {bonus = 2.6},
             speed = {bonus = -0.6},
-            productivity = {bonus = 0.20},
+            productivity = {bonus = 0.12},
             pollution = {bonus = 0.9}
         },
         limitation = limitation_list,

prototypes/gr_recipes.lua

@@ -6,10 +6,10 @@ data:extend({
         enabled = 'false',
         ingredients = {
             {'fi_crafter_item',2},
-            {'fi_industrial_steel_item',100},
+            {'fu_materials_KFK',100},
-            {'fi_compound_material_item',100},
+            {'fu_materials_magnet',10},
             {'gr_materials_fusion_cell_item',1},
-            {'processing-unit',50}
+            {'gr_materials_circuit',10}
         },
         result = 'gr_crafter_item',
         result_count = 1,

scripts/electronic/el_ki_script.lua

@@ -160,7 +160,7 @@ end
 function make_ki_buffer1(entity)
     register_ki_buffer1(entity)
     make_slave_ki_buffer1(entity)
-    make_container_ki_buffer1(entity)
+    --make_container_ki_buffer1(entity)
     global.ki.dirty = true
     --gui.update_main()
 end
@@ -168,7 +168,7 @@ end
 function make_ki_buffer2(entity)
     register_ki_buffer2(entity)
     make_slave_ki_buffer2(entity)
-    make_container_ki_buffer2(entity)
+    --make_container_ki_buffer2(entity)
     global.ki.dirty = true
     --gui.update_main()
 end
@@ -200,7 +200,10 @@ function destroy_fi_core(entity,player_index,robot)
         return
     end
     destroy_slave_ki_core(entity,global.ki.buffer1[entity.unit_number].slave,player_index,robot)
-    destroy_slave_ki_core(entity,global.ki.buffer1[entity.unit_number].container,player_index,robot)
+
+    if global.ki.buffer1[entity.unit_number].container then 
+        destroy_slave_ki_core(entity,global.ki.buffer1[entity.unit_number].container,player_index,robot)
+    end
     unregister_ki_buffer1(entity)
     global.ki.dirty = true
     --gui.update_main()
@@ -214,7 +217,10 @@ function destroy_fu_core(entity,player_index,robot)
         return
     end
     destroy_slave_ki_core(entity,global.ki.buffer2[entity.unit_number].slave,player_index,robot)
-    destroy_slave_ki_core(entity,global.ki.buffer2[entity.unit_number].container,player_index,robot)
+
+    if global.ki.buffer2[entity.unit_number].container then 
+        destroy_slave_ki_core(entity,global.ki.buffer2[entity.unit_number].container,player_index,robot)
+    end
     unregister_ki_buffer2(entity)
     global.ki.dirty = true
     --gui.update_main()
@@ -422,17 +428,17 @@ function el_ki_buffer1_working()
                 global.ki.dirty = true
             end
 
-            if global.ki.buffer1[i].entity.products_finished >= 3 then
+            --if global.ki.buffer1[i].entity.products_finished >= 3 then
-                if global.ki.buffer1[i].container then
+            --    if global.ki.buffer1[i].container then
-                    local container = global.ki.buffer1[i].container
+            --        local container = global.ki.buffer1[i].container
-                    local container_inv = container.get_inventory(defines.inventory.chest)
+            --        local container_inv = container.get_inventory(defines.inventory.chest)
 
-                    if container_inv.can_insert({name='fi_ki_science', count=1}) then
+            --        if container_inv.can_insert({name='fi_ki_science', count=1}) then
-                        container_inv.insert({name='fi_ki_science', count=1})
+            --            container_inv.insert({name='fi_ki_science', count=1})
-                        global.ki.buffer1[i].entity.products_finished = 0
+            --            global.ki.buffer1[i].entity.products_finished = 0
-                    end
+            --        end
-                end
+            --    end
-            end
+            --end
         end
     end
 end
@@ -447,17 +453,17 @@ function el_ki_buffer2_working()
                 global.ki.dirty = true
             end
 
-            if global.ki.buffer2[i].entity.products_finished >= 3 then
+            --if global.ki.buffer2[i].entity.products_finished >= 3 then
-                if global.ki.buffer2[i].container then
+            --    if global.ki.buffer2[i].container then
-                    local container = global.ki.buffer2[i].container
+            --        local container = global.ki.buffer2[i].container
-                    local container_inv = container.get_inventory(defines.inventory.chest)
+            --        local container_inv = container.get_inventory(defines.inventory.chest)
 
-                    if container_inv.can_insert({name='fu_ki_science', count=1}) then
+            --        if container_inv.can_insert({name='fu_ki_science', count=1}) then
-                        container_inv.insert({name='fu_ki_science', count=1})
+            --            container_inv.insert({name='fu_ki_science', count=1})
-                        global.ki.buffer2[i].entity.products_finished = 0
+            --            global.ki.buffer2[i].entity.products_finished = 0
-                    end
+            --        end
-                end
+            --    end
-            end
+            --end
         end
     end
 end