From 1a0d8d1fc85b0aae92de3916181a300a9c45eb2c Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Fri, 20 Dec 2024 21:05:11 +0900 Subject: [PATCH] . --- PHI-CL/changelog.txt | 21 +++++++++++++++++++++ PHI-CL/data-final-fixes.lua | 9 +++++++-- PHI-CL/data.lua | 14 +++++++++++++- PHI-CL/info.json | 4 ++-- PHI-CL/locale/en/locale.cfg | 27 ++++++++++++++------------- PHI-CL/locale/ja/locale.cfg | 27 ++++++++++++++------------- PHI-CL/locale/zh-CN/locale.cfg | 27 ++++++++++++++------------- PHI-CL/locale/zh-TW/locale.cfg | 27 ++++++++++++++------------- PHI-CL/settings.lua | 24 ++++++++++++++++-------- 9 files changed, 115 insertions(+), 65 deletions(-) diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index d1dbe95..598abf5 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -1,3 +1,24 @@ +--------------------------------------------------------------------------------------------------- +Version: 3.0.49 +Date: 2024-12-14 + + Features: + - [CL] Some color for the settings. + +--------------------------------------------------------------------------------------------------- +Version: 3.0.48 +Date: 2024-12-14 + + Features: + - [SA] Introduced the heat radius setting. + +--------------------------------------------------------------------------------------------------- +Version: 3.0.47 +Date: 2024-12-12 + + Changes: + - [CT] Changed the gravity requirement of trash chest and linked chest. + --------------------------------------------------------------------------------------------------- Version: 3.0.46 Date: 2024-12-04 diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index 4e9c283..4995c4d 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -3,8 +3,13 @@ local main = require 'main' if mods['space-age'] then for i=2, settings.startup['PHI-EN-SOLAR-TIER'].value do - data.raw.recipe['accumulator-' .. i].category = 'electronics' - data.raw.recipe['solar-panel-' .. i].category = 'electronics' + if data.raw.recipe['accumulator-' .. i] then + data.raw.recipe['accumulator-' .. i].category = 'electronics' + end + + if data.raw.recipe['solar-panel-' .. i] then + data.raw.recipe['solar-panel-' .. i].category = 'electronics' + end end end diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index ae6923f..0af9a64 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -1067,6 +1067,16 @@ if settings.startup['PHI-SA'].value then if mods['space-age'] then data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-SA-ROCKET-CAPACITY'].value * 1000000 data.raw['utility-constants'].default.default_item_weight = settings.startup['PHI-SA-CARGO-WEIGHT'].value + + if settings.startup['PHI-SA-HEAT-RADIUS'].value then + for _, v in pairs(data.raw['reactor']) do + v.heating_radius = settings.startup['PHI-SA-HEAT-RADIUS'].value + end + + for _, v in pairs(data.raw['heat-pipe']) do + v.heating_radius = settings.startup['PHI-SA-HEAT-RADIUS'].value + end + end end if settings.startup['PHI-SA-VANILLA'].value then @@ -1527,6 +1537,7 @@ if settings.startup['PHI-CT'].value then entity.quality_affects_inventory_size = false entity.logistic_mode = nil entity.next_upgrade = nil + entity.surface_conditions = nil entity.picture.layers[1].tint = items['tint'][8] entity.localised_name = item.localised_name data:extend({entity}) @@ -1665,7 +1676,7 @@ if settings.startup['PHI-CT'].value then item.name = 'basic-' .. c item.place_result = item.name item.order = 'b[storage]-h[basic-' .. c .. ']' - item.localised_name = {'name.basic-'.. c} + item.localised_name = {'name.basic-' .. c} data:extend({item}) entity.name = item.name @@ -1720,6 +1731,7 @@ if settings.startup['PHI-CT'].value then entity.inventory_type = 'with_filters_and_bar' entity.inventory_size = 48 entity.gui_mode = 'all' + entity.surface_conditions = nil data:extend({entity}) data:extend({{ diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 4ca4ad3..9bd50cb 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "3.0.46", + "version": "3.0.49", "factorio_version": "2.0", - "date": "2024-12-04", + "date": "2024-12-19", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 21231ed..fb1128d 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -93,18 +93,18 @@ empty-world=Empty world empty-world=Useful for design [mod-setting-name] -PHI-EN=EN Enable compound energy +PHI-EN=[color=255,254,42]EN Enable compound energy[/color] PHI-EN-SOLAR-TIER=EN1 Solar panel tier PHI-EN-POWER-TIER=EN2 Power tier -PHI-MB=MB Enable fast machine +PHI-MB=[color=255,254,42]MB Enable fast machine[/color] PHI-MB-MACHINE-TIER=MB1 Machine tier -PHI-WE=WE Enable military defense +PHI-WE=[color=255,254,42]WE Enable military defense[/color] PHI-WE-TURRET-TIER=WE1 turret tier PHI-WE-RADAR-TIER=WE2 Radar tier -PHI-EQ=EQ Armor equipment +PHI-EQ=[color=255,254,42]EQ Armor equipment[/color] PHI-EQ-POWER-TIER=EQ1 Power tier PHI-EQ-DEFENSE-TIER=EQ2 Defense tier PHI-EQ-TOOL-TIER=EQ3 Tool tier @@ -112,7 +112,7 @@ PHI-EQ-UTILITY-TIER=EQ4 Utility tier PHI-EQ-ARMOR=EQ5 Enable armor PHI-EQ-SIZE=EQ6 Small equipment -PHI-MI=MI Miscellaneous change +PHI-MI=[color=255,254,42]MI Miscellaneous change[/color] PHI-MI-LANDFILL=MI1 Landfill requirement PHI-MI-EFFCY=MI2 Efficiency module efficiency PHI-MI-NUCLEAR=MI3 Nuclear adjustable output @@ -121,17 +121,18 @@ PHI-MI-ROBOT=MI5A Robot efficiency PHI-MI-ROBOT-ENERGY=MI5B Nuclear fussion robot PHI-MI-TRAIN=MI6 Train efficiency -PHI-SA=SA Space Age +PHI-SA=[color=255,254,42]SA Space Age[/color] PHI-SA-ROCKET-CAPACITY=SA1 Rocket capacity PHI-SA-CARGO-WEIGHT=SA2 Rocket cargo weight -PHI-SA-SPOIL=SA3 Enable spoilage -PHI-SA-RESTRICTION=SA4 Disable certain restriction -PHI-SA-GENERIC=SA5 Generic change -PHI-SA-QUALITY=SA6 Quality chance multiplier -PHI-SA-NO-QUALITY=SA7 Disable quality -PHI-SA-VANILLA=SA8 2.0 Vanilla +PHI-SA-HEAT-RADIUS=SA3 Heat radius +PHI-SA-SPOIL=SA4 Enable spoilage +PHI-SA-RESTRICTION=SA5 Disable certain restriction +PHI-SA-GENERIC=SA6 Generic change +PHI-SA-QUALITY=SA7 Quality chance multiplier +PHI-SA-NO-QUALITY=SA8 Disable quality +PHI-SA-VANILLA=SA9 2.0 Vanilla -PHI-CT=CT Creative testing tools +PHI-CT=[color=255,254,42]CT Creative testing tools[/color] PHI-CT-TOOL=CT1 Tool PHI-CT-UTILITY=CT2 Utility PHI-CT-HIDDEN=CT3 Hidden diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index b94fd5f..5a5e536 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -92,18 +92,18 @@ empty-world=空の世界 empty-world=デザインに役立つ [mod-setting-name] -PHI-EN=EN 複合発電を有効にする +PHI-EN=[color=255,254,42]EN 複合発電を有効にする[/color] PHI-EN-SOLAR-TIER=EN1 ソーラーパネルの最高等級 PHI-EN-POWER-TIER=EN2 パワーの最高等級 -PHI-MB=MB より速く機械を有効にする +PHI-MB=[color=255,254,42]MB より速く機械を有効にする[/color] PHI-MB-MACHINE-TIER=MB1 機械の最高等級 -PHI-WE=WE 軍事防衛を有効にする +PHI-WE=[color=255,254,42]WE 軍事防衛を有効にする[/color] PHI-WE-TURRET-TIER=WE1 タレットの最高等級 PHI-WE-RADAR-TIER=WE2 レーダーの最高等級 -PHI-EQ=EQ アーマー設備を有効にする +PHI-EQ=[color=255,254,42]EQ アーマー設備を有効にする[/color] PHI-EQ-POWER-TIER=EQ1 発電モジュールの最高等級 PHI-EQ-DEFENSE-TIER=EQ2 防御モジュールの最高等級 PHI-EQ-TOOL-TIER=EQ3 ツールモジュールの最高等級 @@ -111,7 +111,7 @@ PHI-EQ-UTILITY-TIER=EQ4 ユーティリティモジュールの最高等級 PHI-EQ-ARMOR=EQ5 アーマーを有効にする PHI-EQ-SIZE=EQ6 小さなアーマー設備 -PHI-MI=MI その他の変更 +PHI-MI=[color=255,254,42]MI その他の変更[/color] PHI-MI-LANDFILL=MI1 埋立地要件 PHI-MI-EFFCY=MI2 エネルギーモジュール効率 PHI-MI-NUCLEAR=MI3 原子炉出力の調整可能 @@ -120,17 +120,18 @@ PHI-MI-ROBOT=MI5A ロボット効率 PHI-MI-ROBOT-ENERGY=MI5B 核融合ロボット PHI-MI-TRAIN=MI6 列車効率 -PHI-SA=SA Space Age +PHI-SA=[color=255,254,42]SA Space Age[/color] PHI-SA-ROCKET-CAPACITY=SA1 ロケット容量 PHI-SA-CARGO-WEIGHT=SA2 ロケット積載重量 -PHI-SA-SPOIL=SA3 変質を有効にする -PHI-SA-RESTRICTION=SA4 関連要件を無効にする -PHI-SA-GENERIC=SA5 一般的な変更 -PHI-SA-QUALITY=SA6 品質確率マルチプライヤ -PHI-SA-NO-QUALITY=SA7 品質を無効にする -PHI-SA-VANILLA=SA8 2.0 オリジナル +PHI-SA-HEAT-RADIUS=SA3 熱半径 +PHI-SA-SPOIL=SA4 変質を有効にする +PHI-SA-RESTRICTION=SA5 関連要件を無効にする +PHI-SA-GENERIC=SA6 一般的な変更 +PHI-SA-QUALITY=SA7 品質確率マルチプライヤ +PHI-SA-NO-QUALITY=SA8 品質を無効にする +PHI-SA-VANILLA=SA9 2.0 オリジナル -PHI-CT=CT クリエイティブテストツール +PHI-CT=[color=255,254,42]CT クリエイティブテストツール[/color] PHI-CT-TOOL=CT1 ツール PHI-CT-UTILITY=CT2 ユーティリティ PHI-CT-HIDDEN=CT3 非表示 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 1c8005d..f45d0af 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -92,18 +92,18 @@ empty-world=空的世界 empty-world=對設計有用 [mod-setting-name] -PHI-EN=EN 啟用複合發電 +PHI-EN=[color=255,254,42]EN 啟用複合發電[/color] PHI-EN-SOLAR-TIER=EN1 太陽能板的最高等級 PHI-EN-POWER-TIER=EN2 電力的最高等級 -PHI-MB=MB 啟用快速機器 +PHI-MB=[color=255,254,42]MB 啟用快速機器[/color] PHI-MB-MACHINE-TIER=MB1 機器的最高等級 -PHI-WE=WE 啟用軍事防禦 +PHI-WE=[color=255,254,42]WE 啟用軍事防禦[/color] PHI-WE-TURRET-TIER=WE1 炮塔的最高等級 PHI-WE-RADAR-TIER=WE2 雷達的最高等級 -PHI-EQ=EQ 啟用裝甲設備 +PHI-EQ=[color=255,254,42]EQ 啟用裝甲設備[/color] PHI-EQ-POWER-TIER=EQ1 發電的最高等級 PHI-EQ-DEFENSE-TIER=EQ2 防禦的最高等級 PHI-EQ-TOOL-TIER=EQ3 工具的最高等級 @@ -111,7 +111,7 @@ PHI-EQ-UTILITY-TIER=EQ4 雜項的最高等級 PHI-EQ-ARMOR=EQ5 啟用護甲 PHI-EQ-SIZE=EQ6 小型裝甲裝備 -PHI-MI=MI 雜項小變化 +PHI-MI=[color=255,254,42]MI 雜項小變化[/color] PHI-MI-LANDFILL=MI1 人造陸地需求 PHI-MI-EFFCY=MI2 節能組件效率 PHI-MI-NUCLEAR=MI3 核能反應爐可調輸出 @@ -120,17 +120,18 @@ PHI-MI-ROBOT=MI5A 無人機效率 PHI-MI-ROBOT-ENERGY=MI5B 核融合無人機 PHI-MI-TRAIN=MI6 火車效率 -PHI-SA=SA Space Age +PHI-SA=[color=255,254,42]SA Space Age[/color] PHI-SA-ROCKET-CAPACITY=SA1 火箭容量 PHI-SA-CARGO-WEIGHT=SA2 火箭貨物重量 -PHI-SA-SPOIL=SA3 啟用變質 -PHI-SA-RESTRICTION=SA4 取消相關要求 -PHI-SA-GENERIC=SA5 通用修改 -PHI-SA-QUALITY=SA6 品質概率倍數 -PHI-SA-NO-QUALITY=SA7 停用品質 -PHI-SA-VANILLA=SA8 2.0 原版 +PHI-SA-HEAT-RADIUS=SA3 熱半徑 +PHI-SA-SPOIL=SA4 啟用變質 +PHI-SA-RESTRICTION=SA5 取消相關要求 +PHI-SA-GENERIC=SA6 通用修改 +PHI-SA-QUALITY=SA7 品質概率倍數 +PHI-SA-NO-QUALITY=SA8 停用品質 +PHI-SA-VANILLA=SA9 2.0 原版 -PHI-CT=CT 創意測試工具 +PHI-CT=[color=255,254,42]CT 創意測試工具[/color] PHI-CT-TOOL=CT1 工具 PHI-CT-UTILITY=CT2 雜項 PHI-CT-HIDDEN=CT3 隱藏 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 1c8005d..f45d0af 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -92,18 +92,18 @@ empty-world=空的世界 empty-world=對設計有用 [mod-setting-name] -PHI-EN=EN 啟用複合發電 +PHI-EN=[color=255,254,42]EN 啟用複合發電[/color] PHI-EN-SOLAR-TIER=EN1 太陽能板的最高等級 PHI-EN-POWER-TIER=EN2 電力的最高等級 -PHI-MB=MB 啟用快速機器 +PHI-MB=[color=255,254,42]MB 啟用快速機器[/color] PHI-MB-MACHINE-TIER=MB1 機器的最高等級 -PHI-WE=WE 啟用軍事防禦 +PHI-WE=[color=255,254,42]WE 啟用軍事防禦[/color] PHI-WE-TURRET-TIER=WE1 炮塔的最高等級 PHI-WE-RADAR-TIER=WE2 雷達的最高等級 -PHI-EQ=EQ 啟用裝甲設備 +PHI-EQ=[color=255,254,42]EQ 啟用裝甲設備[/color] PHI-EQ-POWER-TIER=EQ1 發電的最高等級 PHI-EQ-DEFENSE-TIER=EQ2 防禦的最高等級 PHI-EQ-TOOL-TIER=EQ3 工具的最高等級 @@ -111,7 +111,7 @@ PHI-EQ-UTILITY-TIER=EQ4 雜項的最高等級 PHI-EQ-ARMOR=EQ5 啟用護甲 PHI-EQ-SIZE=EQ6 小型裝甲裝備 -PHI-MI=MI 雜項小變化 +PHI-MI=[color=255,254,42]MI 雜項小變化[/color] PHI-MI-LANDFILL=MI1 人造陸地需求 PHI-MI-EFFCY=MI2 節能組件效率 PHI-MI-NUCLEAR=MI3 核能反應爐可調輸出 @@ -120,17 +120,18 @@ PHI-MI-ROBOT=MI5A 無人機效率 PHI-MI-ROBOT-ENERGY=MI5B 核融合無人機 PHI-MI-TRAIN=MI6 火車效率 -PHI-SA=SA Space Age +PHI-SA=[color=255,254,42]SA Space Age[/color] PHI-SA-ROCKET-CAPACITY=SA1 火箭容量 PHI-SA-CARGO-WEIGHT=SA2 火箭貨物重量 -PHI-SA-SPOIL=SA3 啟用變質 -PHI-SA-RESTRICTION=SA4 取消相關要求 -PHI-SA-GENERIC=SA5 通用修改 -PHI-SA-QUALITY=SA6 品質概率倍數 -PHI-SA-NO-QUALITY=SA7 停用品質 -PHI-SA-VANILLA=SA8 2.0 原版 +PHI-SA-HEAT-RADIUS=SA3 熱半徑 +PHI-SA-SPOIL=SA4 啟用變質 +PHI-SA-RESTRICTION=SA5 取消相關要求 +PHI-SA-GENERIC=SA6 通用修改 +PHI-SA-QUALITY=SA7 品質概率倍數 +PHI-SA-NO-QUALITY=SA8 停用品質 +PHI-SA-VANILLA=SA9 2.0 原版 -PHI-CT=CT 創意測試工具 +PHI-CT=[color=255,254,42]CT 創意測試工具[/color] PHI-CT-TOOL=CT1 工具 PHI-CT-UTILITY=CT2 雜項 PHI-CT-HIDDEN=CT3 隱藏 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 4e30e7d..78bf29c 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -174,23 +174,31 @@ data:extend({ maximum_value = 1000, order = 'F02' }, { - type = 'bool-setting', - name = 'PHI-SA-SPOIL', + type = 'int-setting', + name = 'PHI-SA-HEAT-RADIUS', setting_type = 'startup', - default_value = false, + default_value = 1, + minimum_value = 1, + maximum_value = 7, order = 'F03' }, { type = 'bool-setting', - name = 'PHI-SA-RESTRICTION', + name = 'PHI-SA-SPOIL', setting_type = 'startup', default_value = false, order = 'F04' +}, { + type = 'bool-setting', + name = 'PHI-SA-RESTRICTION', + setting_type = 'startup', + default_value = false, + order = 'F05' }, { type = 'bool-setting', name = 'PHI-SA-GENERIC', setting_type = 'startup', default_value = true, - order = 'F05' + order = 'F06' }, { type = 'int-setting', name = 'PHI-SA-QUALITY', @@ -198,19 +206,19 @@ data:extend({ default_value = 10, minimum_value = 1, maximum_value = 100, - order = 'F06' + order = 'F07' }, { type = 'bool-setting', name = 'PHI-SA-NO-QUALITY', setting_type = 'startup', default_value = false, - order = 'F07' + order = 'F08' }, { type = 'bool-setting', name = 'PHI-SA-VANILLA', setting_type = 'startup', default_value = false, - order = 'F08' + order = 'F09' }, { type = 'bool-setting', name = 'PHI-CT',