diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 7a7ef35..cb5e71f 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -1,3 +1,10 @@ +--------------------------------------------------------------------------------------------------- +Version: 3.0.104 +Date: 2025-05-22 + + Changes: + - [SA] Support for default max quality setting is dropped. + --------------------------------------------------------------------------------------------------- Version: 3.0.103 Date: 2025-05-22 diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index dbd87c1..6919a24 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -380,7 +380,7 @@ if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup end end -if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup['PHI-SA-MAX-QUALITY'].value) or settings.startup['PHI-VP'].value) then +if mods['space-age'] and settings.startup['PHI-VP'].value then for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do data.raw.technology[v].hidden = true data.raw.technology[v].hidden_in_factoriopedia = true @@ -408,20 +408,7 @@ if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup data.raw.quality[v].hidden_in_factoriopedia = true end - data.raw['tips-and-tricks-item']['quality'] = nil - data.raw['tips-and-tricks-item']['quality-modules'] = nil - data.raw['tips-and-tricks-item']['quality-factoriopedia'] = nil - data.raw['tips-and-tricks-item']['quality-probabilities'] = nil - - data.raw['produce-achievement']['crafting-with-quality'] = nil - data.raw['module-transfer-achievement']['make-it-better'] = nil - data.raw['produce-achievement']['my-modules-are-legendary'] = nil - data.raw['equip-armor-achievement']['look-at-my-shiny-rare-armor'] = nil - data.raw['use-item-achievement']['todays-fish-is-trout-a-la-creme'] = nil - data.raw['place-equipment-achievement']['no-room-for-more'] = nil -end - -if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup['PHI-SA-MAX-QUALITY'].value)) then + --[[ data.raw.quality['normal'].level = data.raw.quality['legendary'].level data.raw.quality['normal'].beacon_power_usage_multiplier = data.raw.quality['legendary'].beacon_power_usage_multiplier data.raw.quality['normal'].mining_drill_resource_drain_multiplier = data.raw.quality['legendary'].mining_drill_resource_drain_multiplier @@ -433,34 +420,19 @@ if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup v.extension_speed = v.extension_speed * q_s v.rotation_speed = v.rotation_speed * q_s end + ]] - for _, v in pairs(data.raw['asteroid']) do - if v.max_health then - v.max_health = v.max_health / q_s - end - end + data.raw['tips-and-tricks-item']['quality'] = nil + data.raw['tips-and-tricks-item']['quality-modules'] = nil + data.raw['tips-and-tricks-item']['quality-factoriopedia'] = nil + data.raw['tips-and-tricks-item']['quality-probabilities'] = nil - for _, e in pairs({data.raw['unit-spawner'], data.raw['unit'], data.raw['turret']}) do - for _, v in pairs(e) do - if v.max_health then - v.max_health = v.max_health / q_s - end - - --[[ - if v.attack_parameters then - if v.attack_parameters.damage_modifier then - v.attack_parameters.damage_modifier = v.attack_parameters.damage_modifier / q_s - elseif v.attack_parameters.ammo_type and v.attack_parameters.ammo_type.action and v.attack_parameters.ammo_type.action.action_delivery and v.attack_parameters.ammo_type.action.action_delivery.target_effects and v.attack_parameters.ammo_type.action.action_delivery.target_effects.damage and v.attack_parameters.ammo_type.action.action_delivery.target_effects.damage.amount then - v.attack_parameters.ammo_type.action.action_delivery.target_effects.damage.amount = v.attack_parameters.ammo_type.action.action_delivery.target_effects.damage.amount / q_s - end - - if v.attack_parameters.range then - v.attack_parameters.range = v.attack_parameters.range * 2 / 3 - end - end - ]] - end - end + data.raw['produce-achievement']['crafting-with-quality'] = nil + data.raw['module-transfer-achievement']['make-it-better'] = nil + data.raw['produce-achievement']['my-modules-are-legendary'] = nil + data.raw['equip-armor-achievement']['look-at-my-shiny-rare-armor'] = nil + data.raw['use-item-achievement']['todays-fish-is-trout-a-la-creme'] = nil + data.raw['place-equipment-achievement']['no-room-for-more'] = nil end if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup['PHI-SA-GENERIC'].value) or settings.startup['PHI-VP'].value) then @@ -1243,6 +1215,7 @@ if settings.startup['PHI-VP'].value then data.raw['lab']['biolab'].researching_speed = 3 data.raw['lab']['biolab'].energy_usage = '180kW' data.raw['lab']['biolab'].energy_source.emissions_per_minute = nil + data.raw['chain-active-trigger']['chain-tesla-turret-chain'].fork_chance = 0.3 table.insert(data.raw['fluid-turret']['flamethrower-turret'].attack_parameters.fluids, {type = 'sulfuric-acid', damage_modifier = 1.2}) diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 0132083..11f8932 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,6 +1,6 @@ { "name": "PHI-CL", - "version": "3.0.103", + "version": "3.0.104", "factorio_version": "2.0", "date": "2025-05-22", "title": "Phidias Collection", diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 0399581..53702b8 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -123,9 +123,8 @@ PHI-SA-SPOIL=[color=54,228,255]SA2[/color] PHI-SA-SPOIL-FREEZE=[color=54,228,255]SA3[/color] PHI-SA-SPOIL-FREEZE-RATIO=[color=54,228,255]SA4[/color] PHI-SA-QUALITY=[color=54,228,255]SA5[/color] -PHI-SA-MAX-QUALITY=[color=54,228,255]SA6[/color] -PHI-SA-RESTRICTION=[color=54,228,255]SA7[/color] -PHI-SA-GENERIC=[color=54,228,255]SA8[/color] +PHI-SA-RESTRICTION=[color=54,228,255]SA6[/color] +PHI-SA-GENERIC=[color=54,228,255]SA7[/color] PHI-VP=[color=255,254,42]VP[/color] @@ -163,10 +162,9 @@ PHI-SA-HEAT-RADIUS=Heat radius PHI-SA-SPOIL=Enable spoilage PHI-SA-SPOIL-FREEZE=Freeze spoilage PHI-SA-SPOIL-FREEZE-RATIO=Freeze spoilage multiplier +PHI-SA-QUALITY=Quality chance multiplier PHI-SA-RESTRICTION=Disable certain restriction PHI-SA-GENERIC=Generic change -PHI-SA-QUALITY=Quality chance multiplier -PHI-SA-MAX-QUALITY=Max quality PHI-VP=[color=255,254,42]Vanilla Plus[/color] diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 3b61ceb..505bdd5 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -122,10 +122,9 @@ PHI-SA-HEAT-RADIUS=熱半径 PHI-SA-SPOIL=変質を有効にする PHI-SA-SPOIL-FREEZE=変質凍結 PHI-SA-SPOIL-FREEZE-RATIO=変質凍結マルチプライヤ +PHI-SA-QUALITY=品質確率マルチプライヤ PHI-SA-RESTRICTION=関連要件を無効にする PHI-SA-GENERIC=一般的な変更 -PHI-SA-QUALITY=品質確率マルチプライヤ -PHI-SA-MAX-QUALITY=最大品質 PHI-VP=[color=255,254,42]バニラプラス[/color] diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 6278a97..170c760 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -122,10 +122,9 @@ PHI-SA-HEAT-RADIUS=熱半徑 PHI-SA-SPOIL=啟用變質 PHI-SA-SPOIL-FREEZE=變質凍結 PHI-SA-SPOIL-FREEZE-RATIO=變質凍結倍數 +PHI-SA-QUALITY=品質概率倍數 PHI-SA-RESTRICTION=取消相關要求 PHI-SA-GENERIC=通用修改 -PHI-SA-QUALITY=品質概率倍數 -PHI-SA-MAX-QUALITY=最大品質 PHI-VP=[color=255,254,42]原版加[/color] diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 6278a97..170c760 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -122,10 +122,9 @@ PHI-SA-HEAT-RADIUS=熱半徑 PHI-SA-SPOIL=啟用變質 PHI-SA-SPOIL-FREEZE=變質凍結 PHI-SA-SPOIL-FREEZE-RATIO=變質凍結倍數 +PHI-SA-QUALITY=品質概率倍數 PHI-SA-RESTRICTION=取消相關要求 PHI-SA-GENERIC=通用修改 -PHI-SA-QUALITY=品質概率倍數 -PHI-SA-MAX-QUALITY=最大品質 PHI-VP=[color=255,254,42]原版加[/color] diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 231fee4..c0c4957 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -220,27 +220,20 @@ data:extend({ maximum_value = 100, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-QUALITY'}, {'mod-setting-name.PHI-SA-QUALITY'}}, order = 'C05' -}, { - type = 'bool-setting', - name = 'PHI-SA-MAX-QUALITY', - setting_type = 'startup', - default_value = false, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-MAX-QUALITY'}, {'mod-setting-name.PHI-SA-MAX-QUALITY'}}, - order = 'C06' }, { type = 'bool-setting', name = 'PHI-SA-RESTRICTION', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-RESTRICTION'}, {'mod-setting-name.PHI-SA-RESTRICTION'}}, - order = 'C07' + order = 'C06' }, { type = 'bool-setting', name = 'PHI-SA-GENERIC', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-GENERIC'}, {'mod-setting-name.PHI-SA-GENERIC'}}, - order = 'C08' + order = 'C07' }, { type = 'bool-setting', name = 'PHI-VP',