Merge branch 'master' of https://github.com/PreLeyZero/248K

control.lua

@@ -176,6 +176,17 @@ script.on_event({
     end
 )
 
+script.on_event({
+    defines.events.on_research_finished
+    },
+    function(e)
+        if e.research and (e.research.name == "fu_ki_plus_1_tech" or e.research.name == "fu_ki_plus_2_tech") then
+            if not global.ki then global.ki = {} end
+            global.ki.dirty = true
+        end
+    end
+)
+
 --===================================================================================================================
 
 --config change

locale/ko/lang_ko.cfg

@@ -117,6 +117,8 @@ fu_materials_magnet_card=자화 데이터
 fu_materials_laser_card=레이저 데이터
 fu_materials_empty_container=빈 중성자 용기
 fu_materials_charged_container=충전된 중성자 용기
+fu_materials_stone=바위 파편
+fu_miner_fuel_item=드릴
 
 
 gr_materials_fusion_cell_item=소형 핵융합 셀
@@ -339,6 +341,7 @@ fu_star_engine_heater_left_entity=스타 엔진 - 가열 장치 (왼쪽)
 fu_laser_entity=레이저 설비
 fu_plasma_entity=플라즈마 설비
 fu_magnet_entity=자화 설비
+fu_miner_entity=돌 채석기
 
 gr_crafter_entity=핵융합 조립 기계
 gr_magnet_train_pre_entity=전자기 서스펜션 기차 1
@@ -414,6 +417,7 @@ fu_reactor_tech=스텔라레이터 원자로
 fu_tokamak_tech=토카막 원자로
 fu_robo_tech=고급 로봇
 fu_activator_tech=고급 동위원소
+fu_miner_tech=돌 채광
 
 fu_hydrogen_1_tech=수소 정제 1
 fu_hydrogen_2_tech=수소 정제 2
@@ -536,6 +540,7 @@ fi_basic_fuel=기본 핵 연료
 fi_advanced_fuel=고급 핵 연료
 fi_pure_fuel=고에너지 핵 연료
 fi_test_fuel=핵 연구 연료
+fu_miner_fuel_category=채광용 드릴
 
 #settings
 [mod-setting-name]

scripts/gravitation/gr_black_hole_script.lua

@@ -23,6 +23,7 @@
 --===================================================================================================================
 
 function gr_black_hole_init()
+    if not global.black_hole then --init is not guaranteed to run only once during whole game(?)
         global.black_hole =  {}
         global.black_hole.base = {}
         global.black_hole.energy = {}
@@ -32,6 +33,7 @@ function gr_black_hole_init()
         global.black_hole.gui = {}
         global.black_hole.gui.frame = nil
         global.black_hole.gui.id = nil
+    end
 end
 
 --===================================================================================================================
@@ -266,7 +268,7 @@ function black_hole_base_update()
 
                             stable = stable - 1
                             if total then
-                                if stabilizer then
+                                if new_stabilizer then --have no idea why "stabilizer" stated here
                                     stable = stable + new_stabilizer
                                 end
                             end
@@ -311,9 +313,10 @@ end
 
 function can_make_black_hole_energy(entity)
     if entity.valid then
-        inv = entity.get_inventory(defines.inventory.chest)
-        total = inv.get_item_count() - inv.get_item_count("gr_materials_stabilizer_item")
-        stabilizer = inv.get_item_count("gr_materials_stabilizer_item")
+        -- local statement is very important to avoid MP desync and save/load cycle mismatch
+        local inv = entity.get_inventory(defines.inventory.chest)
+        local total = inv.get_item_count() - inv.get_item_count("gr_materials_stabilizer_item")
+        local stabilizer = inv.get_item_count("gr_materials_stabilizer_item")
         if (stabilizer >= 100) and (total >= 1000) then
             return true
         else