diff --git a/PHI-MB/config.lua b/PHI-MB/config.lua index 44ac55b..970a1e5 100644 --- a/PHI-MB/config.lua +++ b/PHI-MB/config.lua @@ -58,6 +58,26 @@ local items = { tech = 'automation', min = 2, max = 3 + }, + ['electric-mining-drill'] = { + enabled = true, + stage = 1, + type = 'mining-drill', + name = 'electric-mining-drill', + ref_name = 'electric-mining-drill', + tech = 'automation', + min = 2, + max = 3 + }, + ['pumpjack'] = { + enabled = true, + stage = 1, + type = 'mining-drill', + name = 'pumpjack', + ref_name = 'pumpjack', + tech = 'automation', + min = 2, + max = 3 } } diff --git a/PHI-MB/data-updates.lua b/PHI-MB/data-updates.lua index e09304e..1063cb1 100644 --- a/PHI-MB/data-updates.lua +++ b/PHI-MB/data-updates.lua @@ -10,6 +10,8 @@ local function EE(source, tier) if source.type == 'lab' then item.researching_speed = item.researching_speed * (2 ^ (tier - source.min + 1)) + elseif source.type == 'mining-drill' then + item.mining_speed = item.mining_speed * (2 ^ (tier - source.min + 1)) else item.crafting_speed = item.crafting_speed * (2 ^ (tier - source.min + 1)) item.energy_source.emissions_per_minute = item.energy_source.emissions_per_minute * (2 ^ (tier - source.min + 1)) @@ -109,6 +111,17 @@ data.raw['lab']['lab'].fast_replaceable_group = 'lab' data.raw['lab']['lab-2'].fast_replaceable_group = data.raw['lab']['lab'].fast_replaceable_group data.raw['lab']['lab-3'].fast_replaceable_group = data.raw['lab']['lab-2'].fast_replaceable_group +-- electric-mining-drill +data.raw['mining-drill']['electric-mining-drill'].fast_replaceable_group = 'mining-drill' +data.raw['mining-drill']['electric-mining-drill-2'].fast_replaceable_group = data.raw['mining-drill']['electric-mining-drill'].fast_replaceable_group +data.raw['mining-drill']['electric-mining-drill-3'].fast_replaceable_group = data.raw['mining-drill']['electric-mining-drill-2'].fast_replaceable_group + +-- pumpjack +data.raw['mining-drill']['pumpjack'].fast_replaceable_group = 'pumpjack' +data.raw['mining-drill']['pumpjack-2'].fast_replaceable_group = data.raw['mining-drill']['pumpjack'].fast_replaceable_group +data.raw['mining-drill']['pumpjack-3'].fast_replaceable_group = data.raw['mining-drill']['pumpjack-2'].fast_replaceable_group + + if mods['PHI-RS'] then data.raw['assembling-machine']['electric-filter-furnace-2'].fast_replaceable_group = data.raw['assembling-machine']['electric-filter-furnace'].fast_replaceable_group data.raw['assembling-machine']['electric-filter-furnace-3'].fast_replaceable_group = data.raw['assembling-machine']['electric-filter-furnace-2'].fast_replaceable_group diff --git a/PHI-MB/data.lua b/PHI-MB/data.lua index b06c21e..a25e179 100644 --- a/PHI-MB/data.lua +++ b/PHI-MB/data.lua @@ -12,6 +12,8 @@ local function EE(source, tier) if source.type == 'lab' then item.researching_speed = item.researching_speed * (2 ^ (tier - source.min + 1)) + elseif source.type == 'mining-drill' then + item.mining_speed = item.mining_speed * (2 ^ (tier - source.min + 1)) else item.crafting_speed = item.crafting_speed * (2 ^ (tier - source.min + 1)) item.energy_source.emissions_per_minute = item.energy_source.emissions_per_minute * (2 ^ (tier - source.min + 1)) diff --git a/PHI-MB/info.json b/PHI-MB/info.json index cef5b93..2200e36 100644 --- a/PHI-MB/info.json +++ b/PHI-MB/info.json @@ -1,6 +1,6 @@ { "name": "PHI-MB", - "version": "1.0.11", + "version": "1.0.12", "factorio_version": "1.1", "date": "2023-05-08", "title": "Phidias Megabase", diff --git a/PHI-MB/locale/en/locale.cfg b/PHI-MB/locale/en/locale.cfg index 1942a19..4472209 100644 --- a/PHI-MB/locale/en/locale.cfg +++ b/PHI-MB/locale/en/locale.cfg @@ -11,6 +11,10 @@ centrifuge-2=Centrifuge 2 centrifuge-3=Centrifuge 3 lab-2=Lab 2 lab-3=Lab 3 +electric-mining-drill-2=Electric mining drill 2 +electric-mining-drill-3=Electric mining drill 3 +pumpjack-2=Pumpjack 2 +pumpjack-3=Pumpjack 3 electric-filter-furnace-2=Electric filter furnace 2 electric-filter-furnace-3=Electric filter furnace 3 se-space-assembling-machine-2=Space assembling machine 2 @@ -43,6 +47,10 @@ centrifuge-2=Centrifuge 2 centrifuge-3=Centrifuge 3 lab-2=Lab 2 lab-3=Lab 3 +electric-mining-drill-2=Electric mining drill 2 +electric-mining-drill-3=Electric mining drill 3 +pumpjack-2=Pumpjack 2 +pumpjack-3=Pumpjack 3 electric-filter-furnace-2=Electric filter furnace 2 electric-filter-furnace-3=Electric filter furnace 3 industrial-furnace-2=Industrial furnace 2 @@ -75,6 +83,10 @@ centrifuge-2=Processes various uranium-related recipes. centrifuge-3=Processes various uranium-related recipes. lab-2=Lab 2 lab-3=Lab 3 +electric-mining-drill-2=Electric mining drill 2 +electric-mining-drill-3=Electric mining drill 3 +pumpjack-2=Pumpjack 2 +pumpjack-3=Pumpjack 3 electric-filter-furnace-2=Faster and more flexible furnaces. electric-filter-furnace-3=Faster and more flexible furnaces. industrial-furnace-2=Can use advanced smelting and metallurgy recipes but not kiln recipes. diff --git a/PHI-MB/locale/ja/locale.cfg b/PHI-MB/locale/ja/locale.cfg index 03915fb..1cb9b49 100644 --- a/PHI-MB/locale/ja/locale.cfg +++ b/PHI-MB/locale/ja/locale.cfg @@ -11,6 +11,10 @@ centrifuge-2=遠心分離機 2 centrifuge-3=遠心分離機 3 lab-2=研究所 2 lab-3=研究所 3 +electric-mining-drill-2=電動掘削機 2 +electric-mining-drill-3=電動掘削機 3 +pumpjack-2=油井 2 +pumpjack-3=油井 3 electric-filter-furnace-2=電気フィルター炉 2 electric-filter-furnace-3=電気フィルター炉 3 industrial-furnace-2=工業炉 2 @@ -43,6 +47,10 @@ centrifuge-2=遠心分離機 2 centrifuge-3=遠心分離機 3 lab-2=研究所 2 lab-3=研究所 3 +electric-mining-drill-2=電動掘削機 2 +electric-mining-drill-3=電動掘削機 3 +pumpjack-2=油井 2 +pumpjack-3=油井 3 electric-filter-furnace-2=電気フィルター炉 2 electric-filter-furnace-3=電気フィルター炉 3 industrial-furnace-2=工業炉 2 @@ -75,6 +83,10 @@ centrifuge-2=様々なウランに関するレシピを処理します。 centrifuge-3=様々なウランに関するレシピを処理します。 lab-2=研究所 2 lab-3=研究所 3 +electric-mining-drill-2=電動掘削機 2 +electric-mining-drill-3=電動掘削機 3 +pumpjack-2=油井 2 +pumpjack-3=油井 3 electric-filter-furnace-2=より高速で便利な炉です。 electric-filter-furnace-3=より高速で便利な炉です。 industrial-furnace-2=高度な製錬と冶金のレシピを使用できますが、れんがなどを焼けません。 diff --git a/PHI-MB/locale/zh-CN/locale.cfg b/PHI-MB/locale/zh-CN/locale.cfg index f8117fd..e2a6c1a 100644 --- a/PHI-MB/locale/zh-CN/locale.cfg +++ b/PHI-MB/locale/zh-CN/locale.cfg @@ -11,6 +11,10 @@ centrifuge-2=離心機 2 centrifuge-3=離心機 3 lab-2=實驗室 2 lab-3=實驗室 3 +electric-mining-drill-2=電能採礦機 2 +electric-mining-drill-3=電能採礦機 3 +pumpjack-2=抽油幫浦 2 +pumpjack-3=抽油幫浦 3 electric-filter-furnace-2=智慧電爐 2 electric-filter-furnace-3=智慧電爐 3 industrial-furnace-2=工業熔爐 2 @@ -43,6 +47,10 @@ centrifuge-2=離心機 2 centrifuge-3=離心機 3 lab-2=實驗室 2 lab-3=實驗室 3 +electric-mining-drill-2=電能採礦機 2 +electric-mining-drill-3=電能採礦機 3 +pumpjack-2=抽油幫浦 2 +pumpjack-3=抽油幫浦 3 electric-filter-furnace-2=智慧電爐 2 electric-filter-furnace-3=智慧電爐 3 industrial-furnace-2=工業熔爐 2 @@ -75,6 +83,10 @@ centrifuge-2=加工多種有關鈾的配方。 centrifuge-3=加工多種有關鈾的配方。 lab-2=實驗室 2 lab-3=實驗室 3 +electric-mining-drill-2=電能採礦機 2 +electric-mining-drill-3=電能採礦機 3 +pumpjack-2=抽油幫浦 2 +pumpjack-3=抽油幫浦 3 electric-filter-furnace-2=更快速、更方便的熔爐。 electric-filter-furnace-3=更快速、更方便的熔爐。 industrial-furnace-2=與電爐相比,更大、速度快且具有更多插件插槽。需要選擇配方,但可以處理具有多種輸入和流體的高級的配方。 diff --git a/PHI-MB/locale/zh-TW/locale.cfg b/PHI-MB/locale/zh-TW/locale.cfg index f8117fd..e2a6c1a 100644 --- a/PHI-MB/locale/zh-TW/locale.cfg +++ b/PHI-MB/locale/zh-TW/locale.cfg @@ -11,6 +11,10 @@ centrifuge-2=離心機 2 centrifuge-3=離心機 3 lab-2=實驗室 2 lab-3=實驗室 3 +electric-mining-drill-2=電能採礦機 2 +electric-mining-drill-3=電能採礦機 3 +pumpjack-2=抽油幫浦 2 +pumpjack-3=抽油幫浦 3 electric-filter-furnace-2=智慧電爐 2 electric-filter-furnace-3=智慧電爐 3 industrial-furnace-2=工業熔爐 2 @@ -43,6 +47,10 @@ centrifuge-2=離心機 2 centrifuge-3=離心機 3 lab-2=實驗室 2 lab-3=實驗室 3 +electric-mining-drill-2=電能採礦機 2 +electric-mining-drill-3=電能採礦機 3 +pumpjack-2=抽油幫浦 2 +pumpjack-3=抽油幫浦 3 electric-filter-furnace-2=智慧電爐 2 electric-filter-furnace-3=智慧電爐 3 industrial-furnace-2=工業熔爐 2 @@ -75,6 +83,10 @@ centrifuge-2=加工多種有關鈾的配方。 centrifuge-3=加工多種有關鈾的配方。 lab-2=實驗室 2 lab-3=實驗室 3 +electric-mining-drill-2=電能採礦機 2 +electric-mining-drill-3=電能採礦機 3 +pumpjack-2=抽油幫浦 2 +pumpjack-3=抽油幫浦 3 electric-filter-furnace-2=更快速、更方便的熔爐。 electric-filter-furnace-3=更快速、更方便的熔爐。 industrial-furnace-2=與電爐相比,更大、速度快且具有更多插件插槽。需要選擇配方,但可以處理具有多種輸入和流體的高級的配方。 diff --git a/PHI-MB/migrations/migrations.lua b/PHI-MB/migrations/migrations.lua index eb2f6f4..7b25d7f 100644 --- a/PHI-MB/migrations/migrations.lua +++ b/PHI-MB/migrations/migrations.lua @@ -24,6 +24,16 @@ if technologies['automation'].researched then recipes['lab-2'].reload() recipes['lab-3'].enabled = true recipes['lab-3'].reload() + + recipes['electric-mining-drill-2'].enabled = true + recipes['electric-mining-drill-2'].reload() + recipes['electric-mining-drill-3'].enabled = true + recipes['electric-mining-drill-3'].reload() + + recipes['pumpjack-2'].enabled = true + recipes['pumpjack-2'].reload() + recipes['pumpjack-3'].enabled = true + recipes['pumpjack-3'].reload() end if technologies['automation-3'].researched then