From e05f5174dabf1c7c769d39ba8f22950ca5556c85 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Mon, 17 Jun 2024 02:08:40 +0900 Subject: [PATCH] . --- {PHI-MB => OLD/PHI-MB}/.editorconfig | 0 {PHI-MB => OLD/PHI-MB}/.luacheckrc | 0 {PHI-MB => OLD/PHI-MB}/changelog.txt | 0 {PHI-MB => OLD/PHI-MB}/config.lua | 0 {PHI-MB => OLD/PHI-MB}/data-updates.lua | 0 {PHI-MB => OLD/PHI-MB}/data.lua | 0 {PHI-MB => OLD/PHI-MB}/info.json | 0 {PHI-MB => OLD/PHI-MB}/locale/en/locale.cfg | 0 {PHI-MB => OLD/PHI-MB}/locale/ja/locale.cfg | 0 .../PHI-MB}/locale/zh-CN/locale.cfg | 0 .../PHI-MB}/locale/zh-TW/locale.cfg | 0 .../PHI-MB}/migrations/migrations.lua | 0 {PHI-MB => OLD/PHI-MB}/settings.lua | 0 {PHI-MB => OLD/PHI-MB}/thumbnail.png | Bin {PHI-WE => OLD/PHI-WE}/.editorconfig | 0 {PHI-WE => OLD/PHI-WE}/.luacheckrc | 0 {PHI-WE => OLD/PHI-WE}/changelog.txt | 0 {PHI-WE => OLD/PHI-WE}/config.lua | 0 {PHI-WE => OLD/PHI-WE}/data-updates.lua | 0 {PHI-WE => OLD/PHI-WE}/data.lua | 0 {PHI-WE => OLD/PHI-WE}/info.json | 0 {PHI-WE => OLD/PHI-WE}/locale/en/locale.cfg | 0 {PHI-WE => OLD/PHI-WE}/locale/ja/locale.cfg | 0 .../PHI-WE}/locale/zh-CN/locale.cfg | 0 .../PHI-WE}/locale/zh-TW/locale.cfg | 0 .../PHI-WE}/migrations/migrations.lua | 0 {PHI-WE => OLD/PHI-WE}/settings.lua | 0 {PHI-WE => OLD/PHI-WE}/thumbnail.png | Bin {PHI-XW => OLD/PHI-XW}/.editorconfig | 0 {PHI-XW => OLD/PHI-XW}/.luacheckrc | 0 {PHI-XW => OLD/PHI-XW}/changelog.txt | 0 {PHI-XW => OLD/PHI-XW}/data.lua | 0 {PHI-XW => OLD/PHI-XW}/info.json | 0 {PHI-XW => OLD/PHI-XW}/locale/en/locale.cfg | 0 {PHI-XW => OLD/PHI-XW}/locale/ja/locale.cfg | 0 .../PHI-XW}/locale/zh-CN/locale.cfg | 0 .../PHI-XW}/locale/zh-TW/locale.cfg | 0 {PHI-XW => OLD/PHI-XW}/settings.lua | 0 {PHI-XW => OLD/PHI-XW}/thumbnail.png | Bin PHI-CL/data-updates.lua | 23 ++++++++ PHI-CL/info.json | 1 + PHI-CL/locale/en/locale.cfg | 2 + PHI-CL/locale/ja/locale.cfg | 2 + PHI-CL/locale/zh-CN/locale.cfg | 2 + PHI-CL/locale/zh-TW/locale.cfg | 2 + PHI-CL/settings.lua | 51 ++++++++++++++++++ 46 files changed, 83 insertions(+) rename {PHI-MB => OLD/PHI-MB}/.editorconfig (100%) rename {PHI-MB => OLD/PHI-MB}/.luacheckrc (100%) rename {PHI-MB => OLD/PHI-MB}/changelog.txt (100%) rename {PHI-MB => OLD/PHI-MB}/config.lua (100%) rename {PHI-MB => OLD/PHI-MB}/data-updates.lua (100%) rename {PHI-MB => OLD/PHI-MB}/data.lua (100%) rename {PHI-MB => OLD/PHI-MB}/info.json (100%) rename {PHI-MB => OLD/PHI-MB}/locale/en/locale.cfg (100%) rename {PHI-MB => OLD/PHI-MB}/locale/ja/locale.cfg (100%) rename {PHI-MB => OLD/PHI-MB}/locale/zh-CN/locale.cfg (100%) rename {PHI-MB => OLD/PHI-MB}/locale/zh-TW/locale.cfg (100%) rename {PHI-MB => OLD/PHI-MB}/migrations/migrations.lua (100%) rename {PHI-MB => OLD/PHI-MB}/settings.lua (100%) rename {PHI-MB => OLD/PHI-MB}/thumbnail.png (100%) rename {PHI-WE => OLD/PHI-WE}/.editorconfig (100%) rename {PHI-WE => OLD/PHI-WE}/.luacheckrc (100%) rename {PHI-WE => OLD/PHI-WE}/changelog.txt (100%) rename {PHI-WE => OLD/PHI-WE}/config.lua (100%) rename {PHI-WE => OLD/PHI-WE}/data-updates.lua (100%) rename {PHI-WE => OLD/PHI-WE}/data.lua (100%) rename {PHI-WE => OLD/PHI-WE}/info.json (100%) rename {PHI-WE => OLD/PHI-WE}/locale/en/locale.cfg (100%) rename {PHI-WE => OLD/PHI-WE}/locale/ja/locale.cfg (100%) rename {PHI-WE => OLD/PHI-WE}/locale/zh-CN/locale.cfg (100%) rename {PHI-WE => OLD/PHI-WE}/locale/zh-TW/locale.cfg (100%) rename {PHI-WE => OLD/PHI-WE}/migrations/migrations.lua (100%) rename {PHI-WE => OLD/PHI-WE}/settings.lua (100%) rename {PHI-WE => OLD/PHI-WE}/thumbnail.png (100%) rename {PHI-XW => OLD/PHI-XW}/.editorconfig (100%) rename {PHI-XW => OLD/PHI-XW}/.luacheckrc (100%) rename {PHI-XW => OLD/PHI-XW}/changelog.txt (100%) rename {PHI-XW => OLD/PHI-XW}/data.lua (100%) rename {PHI-XW => OLD/PHI-XW}/info.json (100%) rename {PHI-XW => OLD/PHI-XW}/locale/en/locale.cfg (100%) rename {PHI-XW => OLD/PHI-XW}/locale/ja/locale.cfg (100%) rename {PHI-XW => OLD/PHI-XW}/locale/zh-CN/locale.cfg (100%) rename {PHI-XW => OLD/PHI-XW}/locale/zh-TW/locale.cfg (100%) rename {PHI-XW => OLD/PHI-XW}/settings.lua (100%) rename {PHI-XW => OLD/PHI-XW}/thumbnail.png (100%) diff --git a/PHI-MB/.editorconfig b/OLD/PHI-MB/.editorconfig similarity index 100% rename from PHI-MB/.editorconfig rename to OLD/PHI-MB/.editorconfig diff --git a/PHI-MB/.luacheckrc b/OLD/PHI-MB/.luacheckrc similarity index 100% rename from PHI-MB/.luacheckrc rename to OLD/PHI-MB/.luacheckrc diff --git a/PHI-MB/changelog.txt b/OLD/PHI-MB/changelog.txt similarity index 100% rename from PHI-MB/changelog.txt rename to OLD/PHI-MB/changelog.txt diff --git a/PHI-MB/config.lua b/OLD/PHI-MB/config.lua similarity index 100% rename from PHI-MB/config.lua rename to OLD/PHI-MB/config.lua diff --git a/PHI-MB/data-updates.lua b/OLD/PHI-MB/data-updates.lua similarity index 100% rename from PHI-MB/data-updates.lua rename to OLD/PHI-MB/data-updates.lua diff --git a/PHI-MB/data.lua b/OLD/PHI-MB/data.lua similarity index 100% rename from PHI-MB/data.lua rename to OLD/PHI-MB/data.lua diff --git a/PHI-MB/info.json b/OLD/PHI-MB/info.json similarity index 100% rename from PHI-MB/info.json rename to OLD/PHI-MB/info.json diff --git a/PHI-MB/locale/en/locale.cfg b/OLD/PHI-MB/locale/en/locale.cfg similarity index 100% rename from PHI-MB/locale/en/locale.cfg rename to OLD/PHI-MB/locale/en/locale.cfg diff --git a/PHI-MB/locale/ja/locale.cfg b/OLD/PHI-MB/locale/ja/locale.cfg similarity index 100% rename from PHI-MB/locale/ja/locale.cfg rename to OLD/PHI-MB/locale/ja/locale.cfg diff --git a/PHI-MB/locale/zh-CN/locale.cfg b/OLD/PHI-MB/locale/zh-CN/locale.cfg similarity index 100% rename from PHI-MB/locale/zh-CN/locale.cfg rename to OLD/PHI-MB/locale/zh-CN/locale.cfg diff --git a/PHI-MB/locale/zh-TW/locale.cfg b/OLD/PHI-MB/locale/zh-TW/locale.cfg similarity index 100% rename from PHI-MB/locale/zh-TW/locale.cfg rename to OLD/PHI-MB/locale/zh-TW/locale.cfg diff --git a/PHI-MB/migrations/migrations.lua b/OLD/PHI-MB/migrations/migrations.lua similarity index 100% rename from PHI-MB/migrations/migrations.lua rename to OLD/PHI-MB/migrations/migrations.lua diff --git a/PHI-MB/settings.lua b/OLD/PHI-MB/settings.lua similarity index 100% rename from PHI-MB/settings.lua rename to OLD/PHI-MB/settings.lua diff --git a/PHI-MB/thumbnail.png b/OLD/PHI-MB/thumbnail.png similarity index 100% rename from PHI-MB/thumbnail.png rename to OLD/PHI-MB/thumbnail.png diff --git a/PHI-WE/.editorconfig b/OLD/PHI-WE/.editorconfig similarity index 100% rename from PHI-WE/.editorconfig rename to OLD/PHI-WE/.editorconfig diff --git a/PHI-WE/.luacheckrc b/OLD/PHI-WE/.luacheckrc similarity index 100% rename from PHI-WE/.luacheckrc rename to OLD/PHI-WE/.luacheckrc diff --git a/PHI-WE/changelog.txt b/OLD/PHI-WE/changelog.txt similarity index 100% rename from PHI-WE/changelog.txt rename to OLD/PHI-WE/changelog.txt diff --git a/PHI-WE/config.lua b/OLD/PHI-WE/config.lua similarity index 100% rename from PHI-WE/config.lua rename to OLD/PHI-WE/config.lua diff --git a/PHI-WE/data-updates.lua b/OLD/PHI-WE/data-updates.lua similarity index 100% rename from PHI-WE/data-updates.lua rename to OLD/PHI-WE/data-updates.lua diff --git a/PHI-WE/data.lua b/OLD/PHI-WE/data.lua similarity index 100% rename from PHI-WE/data.lua rename to OLD/PHI-WE/data.lua diff --git a/PHI-WE/info.json b/OLD/PHI-WE/info.json similarity index 100% rename from PHI-WE/info.json rename to OLD/PHI-WE/info.json diff --git a/PHI-WE/locale/en/locale.cfg b/OLD/PHI-WE/locale/en/locale.cfg similarity index 100% rename from PHI-WE/locale/en/locale.cfg rename to OLD/PHI-WE/locale/en/locale.cfg diff --git a/PHI-WE/locale/ja/locale.cfg b/OLD/PHI-WE/locale/ja/locale.cfg similarity index 100% rename from PHI-WE/locale/ja/locale.cfg rename to OLD/PHI-WE/locale/ja/locale.cfg diff --git a/PHI-WE/locale/zh-CN/locale.cfg b/OLD/PHI-WE/locale/zh-CN/locale.cfg similarity index 100% rename from PHI-WE/locale/zh-CN/locale.cfg rename to OLD/PHI-WE/locale/zh-CN/locale.cfg diff --git a/PHI-WE/locale/zh-TW/locale.cfg b/OLD/PHI-WE/locale/zh-TW/locale.cfg similarity index 100% rename from PHI-WE/locale/zh-TW/locale.cfg rename to OLD/PHI-WE/locale/zh-TW/locale.cfg diff --git a/PHI-WE/migrations/migrations.lua b/OLD/PHI-WE/migrations/migrations.lua similarity index 100% rename from PHI-WE/migrations/migrations.lua rename to OLD/PHI-WE/migrations/migrations.lua diff --git a/PHI-WE/settings.lua b/OLD/PHI-WE/settings.lua similarity index 100% rename from PHI-WE/settings.lua rename to OLD/PHI-WE/settings.lua diff --git a/PHI-WE/thumbnail.png b/OLD/PHI-WE/thumbnail.png similarity index 100% rename from PHI-WE/thumbnail.png rename to OLD/PHI-WE/thumbnail.png diff --git a/PHI-XW/.editorconfig b/OLD/PHI-XW/.editorconfig similarity index 100% rename from PHI-XW/.editorconfig rename to OLD/PHI-XW/.editorconfig diff --git a/PHI-XW/.luacheckrc b/OLD/PHI-XW/.luacheckrc similarity index 100% rename from PHI-XW/.luacheckrc rename to OLD/PHI-XW/.luacheckrc diff --git a/PHI-XW/changelog.txt b/OLD/PHI-XW/changelog.txt similarity index 100% rename from PHI-XW/changelog.txt rename to OLD/PHI-XW/changelog.txt diff --git a/PHI-XW/data.lua b/OLD/PHI-XW/data.lua similarity index 100% rename from PHI-XW/data.lua rename to OLD/PHI-XW/data.lua diff --git a/PHI-XW/info.json b/OLD/PHI-XW/info.json similarity index 100% rename from PHI-XW/info.json rename to OLD/PHI-XW/info.json diff --git a/PHI-XW/locale/en/locale.cfg b/OLD/PHI-XW/locale/en/locale.cfg similarity index 100% rename from PHI-XW/locale/en/locale.cfg rename to OLD/PHI-XW/locale/en/locale.cfg diff --git a/PHI-XW/locale/ja/locale.cfg b/OLD/PHI-XW/locale/ja/locale.cfg similarity index 100% rename from PHI-XW/locale/ja/locale.cfg rename to OLD/PHI-XW/locale/ja/locale.cfg diff --git a/PHI-XW/locale/zh-CN/locale.cfg b/OLD/PHI-XW/locale/zh-CN/locale.cfg similarity index 100% rename from PHI-XW/locale/zh-CN/locale.cfg rename to OLD/PHI-XW/locale/zh-CN/locale.cfg diff --git a/PHI-XW/locale/zh-TW/locale.cfg b/OLD/PHI-XW/locale/zh-TW/locale.cfg similarity index 100% rename from PHI-XW/locale/zh-TW/locale.cfg rename to OLD/PHI-XW/locale/zh-TW/locale.cfg diff --git a/PHI-XW/settings.lua b/OLD/PHI-XW/settings.lua similarity index 100% rename from PHI-XW/settings.lua rename to OLD/PHI-XW/settings.lua diff --git a/PHI-XW/thumbnail.png b/OLD/PHI-XW/thumbnail.png similarity index 100% rename from PHI-XW/thumbnail.png rename to OLD/PHI-XW/thumbnail.png diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index 13049d6..84f7451 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -245,3 +245,26 @@ end if items['item']['nuclear-reactor'].enabled then data.raw['fluid']['steam'].max_temperature = 5000 end + +if settings.startup['PHI-XW-WATER'].value > 0 then + data.raw['offshore-pump']['offshore-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 + data.raw['offshore-pump']['offshore-pump'].fluid_box.height = 4 + data.raw['offshore-pump']['offshore-pump'].fluid_box.level = 5 + data.raw['offshore-pump']['offshore-pump'].flags = {'placeable-neutral', 'player-creation'} + data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}} + data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} + data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_mask = nil + data.raw['offshore-pump']['offshore-pump'].placeable_position_visualization = nil + + if mods['angelsrefining'] then + data.raw['offshore-pump']['seafloor-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 + data.raw['offshore-pump']['seafloor-pump'].fluid_box.height = 4 + data.raw['offshore-pump']['offshore-pump'].fluid_box.level = 5 + data.raw['offshore-pump']['seafloor-pump'].flags = {'placeable-neutral', 'player-creation', 'filter-directions'} + data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_box = {{-2, -3}, {2, -2}} + data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} + data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_mask = nil + data.raw['offshore-pump']['seafloor-pump'].placeable_position_visualization = nil + data.raw['offshore-pump']['seafloor-pump'].max_health = 400 + end +end diff --git a/PHI-CL/info.json b/PHI-CL/info.json index b525e05..5a72092 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -13,6 +13,7 @@ "? aai-industry >= 0.5.0", "? Krastorio2 >= 1.3.0", "? space-exploration >= 0.6.0", + "? angelsrefining >= 0.12.0", "? Atomic_Overhaul >= 1.3.0" ] } \ No newline at end of file diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 71f0347..40efb10 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -583,6 +583,7 @@ PHI-WE-LASER-TIER=Laser turret PHI-WE-FLAME-TIER=Flamethrower turret PHI-WE-GUN-TIER=Gun turret PHI-WE-RADAR-TIER=Radar +PHI-XW-WATER=Water [mod-setting-description] PHI-EN-SOLAR-TIER=Default 8 ; Disable 1 @@ -599,3 +600,4 @@ PHI-WE-LASER-TIER=Default 3 ; Disable 1 PHI-WE-FLAME-TIER=Default 3 ; Disable 1 PHI-WE-GUN-TIER=Default 3 ; Disable 1 PHI-WE-RADAR-TIER=Default 3 ; Disable 1 +PHI-XW-WATER=Default 1 ; Disable 0 diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index e1f7999..ae886da 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -583,6 +583,7 @@ PHI-WE-LASER-TIER=レーザータレット PHI-WE-FLAME-TIER=火炎放射タレット PHI-WE-GUN-TIER=ガンタレット PHI-WE-RADAR-TIER=レーダー +PHI-XW-WATER=水 [mod-setting-description] PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1 @@ -599,3 +600,4 @@ PHI-WE-LASER-TIER=デフォルト 3 ; 止める 1 PHI-WE-FLAME-TIER=デフォルト 3 ; 止める 1 PHI-WE-GUN-TIER=デフォルト 3 ; 止める 1 PHI-WE-RADAR-TIER=デフォルト 3 ; 止める 1 +PHI-XW-WATER=デフォルト 1 ; 止める 0 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index c799d8a..25e4565 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -583,6 +583,7 @@ PHI-WE-LASER-TIER=雷射炮塔 PHI-WE-FLAME-TIER=火焰噴射器 PHI-WE-GUN-TIER=機槍炮塔 PHI-WE-RADAR-TIER=雷達 +PHI-XW-WATER=水 [mod-setting-description] PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 @@ -599,3 +600,4 @@ PHI-WE-LASER-TIER=預設 3 ; 停用 1 PHI-WE-FLAME-TIER=預設 3 ; 停用 1 PHI-WE-GUN-TIER=預設 3 ; 停用 1 PHI-WE-RADAR-TIER=預設 3 ; 停用 1 +PHI-XW-WATER=預設 1 ; 停用 0 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index c799d8a..25e4565 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -583,6 +583,7 @@ PHI-WE-LASER-TIER=雷射炮塔 PHI-WE-FLAME-TIER=火焰噴射器 PHI-WE-GUN-TIER=機槍炮塔 PHI-WE-RADAR-TIER=雷達 +PHI-XW-WATER=水 [mod-setting-description] PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 @@ -599,3 +600,4 @@ PHI-WE-LASER-TIER=預設 3 ; 停用 1 PHI-WE-FLAME-TIER=預設 3 ; 停用 1 PHI-WE-GUN-TIER=預設 3 ; 停用 1 PHI-WE-RADAR-TIER=預設 3 ; 停用 1 +PHI-XW-WATER=預設 1 ; 停用 0 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index c7cde3a..7248af7 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -13,6 +13,21 @@ data:extend({ default_value = true, order = 'A2' }, + { + type = 'bool-setting', + name = 'PHI-WE', + setting_type = 'startup', + default_value = true, + order = 'A3' + }, + { + type = 'int-setting', + name = 'PHI-XW-WATER', + setting_type = 'startup', + default_value = 1, + allowed_values = {0, 1, 2, 3, 4, 5}, + order = 'A7' + }, { type = 'int-setting', name = 'PHI-EN-SOLAR-TIER', @@ -83,6 +98,42 @@ data:extend({ default_value = 3, allowed_values = {1, 2, 3}, order = 'C7' + }, + { + type = 'int-setting', + name = 'PHI-WE-LASER-TIER', + setting_type = 'startup', + default_value = 3, + allowed_values = {1, 2, 3}, + order = 'D1' + }, { + type = 'int-setting', + name = 'PHI-WE-FLAME-TIER', + setting_type = 'startup', + default_value = 3, + allowed_values = {1, 2, 3}, + order = 'D2' + }, { + type = 'int-setting', + name = 'PHI-WE-GUN-TIER', + setting_type = 'startup', + default_value = 3, + allowed_values = {1, 2, 3}, + order = 'D3' + }, { + type = 'int-setting', + name = 'PHI-WE-RADAR-TIER', + setting_type = 'startup', + default_value = 3, + allowed_values = {1, 2, 3}, + order = 'D4' + }, { + type = 'int-setting', + name = 'PHI-XW-WATER', + setting_type = 'startup', + default_value = 5, + allowed_values = {1, 2, 3, 4, 5}, + order = 'H1' } } ) \ No newline at end of file