diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 65f2783..f8bb521 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -1,3 +1,10 @@ +--------------------------------------------------------------------------------------------------- +Version: 3.0.52 +Date: 2025-01-07 + + Features: + - [SA] Introduced frozen items to make transport spoilable items easier. + --------------------------------------------------------------------------------------------------- Version: 3.0.51 Date: 2025-01-06 diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 784f4f0..a6c406e 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -456,6 +456,77 @@ if settings.startup['PHI-SA'].value then data.raw['tips-and-tricks-item']['spoilables-research'] = nil end + if settings.startup['PHI-SA-SPOIL-FREEZE'].value and mods['space-age'] then + local function spoil_handle(i) + item = table.deepcopy(i) + item.name = 'frozen-' .. i.name + item.order = item.order .. '-f' + + item.icons = { + { + icon = item.icon, + icon_size = 64, + icon_mipmaps = 4 + }, { + icon = data.raw['item']['ice'].icon, + tint = {r=1, g=1, b=1, a=0.5}, + icon_size = 64, + icon_mipmaps = 4 + } + } + + item.icon = nil + item.icon_size = nil + item.icon_mipmaps = nil + item.spoil_ticks = math.floor(i.spoil_ticks * settings.startup['PHI-SA-SPOIL-FREEZE-RATIO'].value / 10) + item.spoil_result = i.name + item.spoil_to_trigger_result = nil + item.localised_name = i.localised_name + data:extend({item}) + + data:extend({{ + type = 'recipe', + name = item.name, + energy_required = 2, + enabled = false, + category = 'cryogenics', + ingredients = {{type='item', name=i.name, amount=1}, {type='fluid', name='fluoroketone-cold', amount=2, ignored_by_stats=2}}, + results = {{type='item', name=item.name, amount=1}, {type='fluid', name='fluoroketone-hot', amount=2, ignored_by_stats=2, ignored_by_productivity=2}}, + allow_productivity = false, + main_product = item.name, + localised_name = i.localised_name + }}) + + data:extend({{ + type = 'recipe', + name = 'unfreeze-' .. i.name, + energy_required = 2, + enabled = false, + category = 'cryogenics', + ingredients = {{type='item', name=item.name, amount=1}}, + results = {{type='item', name=i.name, amount=1}}, + allow_productivity = false, + main_product = i.name, + localised_name = i.localised_name + }}) + + table.insert(data.raw.technology['cryogenic-plant'].effects, {type='unlock-recipe', recipe=item.name}) + table.insert(data.raw.technology['cryogenic-plant'].effects, {type='unlock-recipe', recipe='unfreeze-' .. i.name}) + end + + spoil_handle(data.raw['item']['nutrients']) + spoil_handle(data.raw['item']['captive-biter-spawner']) + spoil_handle(data.raw['item']['biter-egg']) + spoil_handle(data.raw['item']['pentapod-egg']) + spoil_handle(data.raw['capsule']['raw-fish']) + spoil_handle(data.raw['capsule']['yumako-mash']) + spoil_handle(data.raw['capsule']['yumako']) + spoil_handle(data.raw['capsule']['jelly']) + spoil_handle(data.raw['capsule']['jellynut']) + spoil_handle(data.raw['capsule']['bioflux']) + spoil_handle(data.raw.tool['agricultural-science-pack']) + end + if (settings.startup['PHI-SA-RESTRICTION'].value or settings.startup['PHI-SA-VANILLA'].value) and mods['space-age'] then data.raw['assembling-machine']['captive-biter-spawner'].surface_conditions = nil data.raw['agricultural-tower']['agricultural-tower'].surface_conditions = nil @@ -1060,14 +1131,6 @@ if settings.startup['PHI-SA'].value then v.extension_speed = v.extension_speed * new_scale v.rotation_speed = v.rotation_speed * new_scale end - - for _, v in pairs(data.raw['cargo-wagon']) do - v.inventory_size = math.ceil(v.inventory_size * new_scale) - end - - for _, v in pairs(data.raw['fluid-wagon']) do - v.capacity = math.ceil(v.capacity * new_scale) - end end end diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 5270045..a22996d 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "3.0.51", + "version": "3.0.53", "factorio_version": "2.0", - "date": "2025-01-06", + "date": "2025-01-07", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index fb1128d..b2133a6 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -126,11 +126,13 @@ PHI-SA-ROCKET-CAPACITY=SA1 Rocket capacity PHI-SA-CARGO-WEIGHT=SA2 Rocket cargo weight 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-SA-SPOIL-FREEZE=SA5 Freeze spoilage +PHI-SA-SPOIL-FREEZE-RATIO=SA6 Freeze spoilage multiplier +PHI-SA-RESTRICTION=SA7 Disable certain restriction +PHI-SA-GENERIC=SA8 Generic change +PHI-SA-QUALITY=SA9 Quality chance multiplier +PHI-SA-NO-QUALITY=SA10 Disable quality +PHI-SA-VANILLA=SA11 2.0 Vanilla PHI-CT=[color=255,254,42]CT Creative testing tools[/color] PHI-CT-TOOL=CT1 Tool @@ -158,4 +160,5 @@ PHI-MI-LANDFILL=Default 20 PHI-SA-ROCKET-CAPACITY='000 KG PHI-SA-CARGO-WEIGHT=KG +PHI-SA-SPOIL-FREEZE-RATIO=x0.1 PHI-SA-QUALITY=x0.1 diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 5a5e536..82c473b 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -125,11 +125,13 @@ PHI-SA-ROCKET-CAPACITY=SA1 ロケット容量 PHI-SA-CARGO-WEIGHT=SA2 ロケット積載重量 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-SA-SPOIL-FREEZE=SA5 変質凍結 +PHI-SA-SPOIL-FREEZE-RATIO=SA6 変質凍結マルチプライヤ +PHI-SA-RESTRICTION=SA7 関連要件を無効にする +PHI-SA-GENERIC=SA8 一般的な変更 +PHI-SA-QUALITY=SA9 品質確率マルチプライヤ +PHI-SA-NO-QUALITY=SA10 品質を無効にする +PHI-SA-VANILLA=SA11 2.0 オリジナル PHI-CT=[color=255,254,42]CT クリエイティブテストツール[/color] PHI-CT-TOOL=CT1 ツール @@ -157,4 +159,5 @@ PHI-MI-LANDFILL=デフォルト 20 PHI-SA-ROCKET-CAPACITY='000 KG PHI-SA-CARGO-WEIGHT=KG +PHI-SA-SPOIL-FREEZE-RATIO=x0.1 PHI-SA-QUALITY=x0.1 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index f45d0af..49147aa 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -125,11 +125,13 @@ PHI-SA-ROCKET-CAPACITY=SA1 火箭容量 PHI-SA-CARGO-WEIGHT=SA2 火箭貨物重量 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-SA-SPOIL-FREEZE=SA5 變質凍結 +PHI-SA-SPOIL-FREEZE-RATIO=SA6 變質凍結倍數 +PHI-SA-RESTRICTION=SA7 取消相關要求 +PHI-SA-GENERIC=SA8 通用修改 +PHI-SA-QUALITY=SA9 品質概率倍數 +PHI-SA-NO-QUALITY=SA10 停用品質 +PHI-SA-VANILLA=SA11 2.0 原版 PHI-CT=[color=255,254,42]CT 創意測試工具[/color] PHI-CT-TOOL=CT1 工具 @@ -157,4 +159,5 @@ PHI-MI-LANDFILL=預設 20 PHI-SA-ROCKET-CAPACITY='000 KG PHI-SA-CARGO-WEIGHT=KG +PHI-SA-SPOIL-FREEZE-RATIO=x0.1 PHI-SA-QUALITY=x0.1 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index f45d0af..49147aa 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -125,11 +125,13 @@ PHI-SA-ROCKET-CAPACITY=SA1 火箭容量 PHI-SA-CARGO-WEIGHT=SA2 火箭貨物重量 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-SA-SPOIL-FREEZE=SA5 變質凍結 +PHI-SA-SPOIL-FREEZE-RATIO=SA6 變質凍結倍數 +PHI-SA-RESTRICTION=SA7 取消相關要求 +PHI-SA-GENERIC=SA8 通用修改 +PHI-SA-QUALITY=SA9 品質概率倍數 +PHI-SA-NO-QUALITY=SA10 停用品質 +PHI-SA-VANILLA=SA11 2.0 原版 PHI-CT=[color=255,254,42]CT 創意測試工具[/color] PHI-CT-TOOL=CT1 工具 @@ -157,4 +159,5 @@ PHI-MI-LANDFILL=預設 20 PHI-SA-ROCKET-CAPACITY='000 KG PHI-SA-CARGO-WEIGHT=KG +PHI-SA-SPOIL-FREEZE-RATIO=x0.1 PHI-SA-QUALITY=x0.1 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 78bf29c..8ccdc27 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -189,16 +189,30 @@ data:extend({ order = 'F04' }, { type = 'bool-setting', - name = 'PHI-SA-RESTRICTION', + name = 'PHI-SA-SPOIL-FREEZE', setting_type = 'startup', default_value = false, order = 'F05' +}, { + type = 'int-setting', + name = 'PHI-SA-SPOIL-FREEZE-RATIO', + setting_type = 'startup', + default_value = 50, + minimum_value = 1, + maximum_value = 1000, + order = 'F06' +}, { + type = 'bool-setting', + name = 'PHI-SA-RESTRICTION', + setting_type = 'startup', + default_value = false, + order = 'F07' }, { type = 'bool-setting', name = 'PHI-SA-GENERIC', setting_type = 'startup', default_value = true, - order = 'F06' + order = 'F08' }, { type = 'int-setting', name = 'PHI-SA-QUALITY', @@ -206,19 +220,19 @@ data:extend({ default_value = 10, minimum_value = 1, maximum_value = 100, - order = 'F07' + order = 'F09' }, { type = 'bool-setting', name = 'PHI-SA-NO-QUALITY', setting_type = 'startup', default_value = false, - order = 'F08' + order = 'F10' }, { type = 'bool-setting', name = 'PHI-SA-VANILLA', setting_type = 'startup', default_value = false, - order = 'F09' + order = 'F11' }, { type = 'bool-setting', name = 'PHI-CT',