diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index 3295025..e35078d 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -364,6 +364,7 @@ local items = { ['planet-discovery-fulgora'] = true, ['planet-discovery-aquilo'] = true, ['space-platform-thruster'] = true, + ['recycling'] = true, ['lightning-collector'] = true, ['space-platform'] = true, ['asteroid-reprocessing'] = true, diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index d6a132b..6e3d432 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -483,9 +483,7 @@ if settings.startup['PHI-SA'].value then end end - if settings.startup['PHI-SA-RESTRICTION'].value and mods['space-age'] then - data.raw['character']['character']['mining_categories'] = {'basic-solid', 'hard-solid'} - + if (settings.startup['PHI-SA-RESTRICTION'].value or settings.startup['PHI-SA-VANILLA'].value) and mods['space-age'] then for k, v in pairs(items['space-age']['PHI-SA-RESTRICTION']['surface_conditions']) do data.raw[v][k].surface_conditions = nil end @@ -493,6 +491,10 @@ if settings.startup['PHI-SA'].value then for _, v in pairs(data.raw.recipe) do v.surface_conditions = nil end + end + + if settings.startup['PHI-SA-RESTRICTION'].value and mods['space-age'] then + data.raw['character']['character']['mining_categories'] = {'basic-solid', 'hard-solid'} for _, v in pairs({'heavy-oil', 'lava', 'ammoniacal-solution'}) do if data.raw.fluid[v] then @@ -579,7 +581,7 @@ if settings.startup['PHI-SA'].value then end end - if (settings.startup['PHI-SA-NO-QUALITY'].value or settings.startup['PHI-SA-VANILLA'].value) and mods['quality'] then + if (settings.startup['PHI-SA-MAX-QUALITY'].value or settings.startup['PHI-SA-VANILLA'].value) and mods['space-age'] then for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do data.raw.technology[v] = nil data.raw.module[v] = nil @@ -595,6 +597,11 @@ if settings.startup['PHI-SA'].value then data.raw.quality[v].hidden_in_factoriopedia = true end + data.raw.quality.normal.next = nil + data.raw.quality.normal.next_probability = nil + data.raw.quality.normal.hidden = true + data.raw.quality.normal.hidden_in_factoriopedia = true + 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 @@ -606,21 +613,17 @@ if settings.startup['PHI-SA'].value then 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 settings.startup['PHI-SA-MAX-QUALITY'].value and mods['quality'] then data.raw.quality.normal.level = 5 - data.raw.quality.normal.next = nil - data.raw.quality.normal.next_probability = nil - data.raw.quality.normal.hidden = true - data.raw.quality.normal.hidden_in_factoriopedia = true data.raw.quality.normal.beacon_power_usage_multiplier = 1 / 6 data.raw.quality.normal.mining_drill_resource_drain_multiplier = 1 / 6 data.raw.quality.normal.science_pack_drain_multiplier = 19 / 20 - local new_scale = 1 + (0.3 * data.raw.quality.normal.level) - for _, v in pairs(data.raw['inserter']) do - v.extension_speed = v.extension_speed * new_scale - v.rotation_speed = v.rotation_speed * new_scale + v.extension_speed = v.extension_speed * 2.5 + v.rotation_speed = v.rotation_speed * 2.5 end end @@ -632,7 +635,7 @@ if settings.startup['PHI-SA'].value then end end - if mods['space-age'] and (settings.startup['PHI-SA-GENERIC'].value or settings.startup['PHI-SA-VANILLA'].value) then + if (settings.startup['PHI-SA-GENERIC'].value or settings.startup['PHI-SA-VANILLA'].value) and mods['space-age'] then data.raw.resource['lithium-brine'].infinite = true data.raw.resource['lithium-brine'].minimum = 60000 data.raw.resource['lithium-brine'].normal = 300000 @@ -1033,24 +1036,6 @@ if settings.startup['PHI-SA'].value then data.raw.fluid['fluoroketone-cold'].auto_barrel = false data.raw.fluid['fluoroketone-hot'].auto_barrel = false - data.raw.item['artificial-yumako-soil'].default_import_location = nil - data.raw.item['overgrowth-yumako-soil'].default_import_location = nil - data.raw.item['artificial-jellynut-soil'].default_import_location = nil - data.raw.item['overgrowth-jellynut-soil'].default_import_location = nil - data.raw.item['ice-platform'].default_import_location = nil - data.raw.item['foundation'].default_import_location = nil - data.raw.item['turbo-transport-belt'].default_import_location = nil - data.raw.item['turbo-underground-belt'].default_import_location = nil - data.raw.item['turbo-splitter'].default_import_location = nil - data.raw.item['big-mining-drill'].default_import_location = nil - data.raw.item['railgun-turret'].default_import_location = nil - data.raw.item['tesla-turret'].default_import_location = nil - data.raw.item['stack-inserter'].default_import_location = nil - data.raw.item['fusion-reactor'].default_import_location = nil - data.raw.item['fusion-generator'].default_import_location = nil - data.raw.gun['teslagun'].default_import_location = nil - data.raw.ammo['tesla-ammo'].default_import_location = nil - data.raw.tool['agricultural-science-pack'].hidden = true data.raw.tool['agricultural-science-pack'].hidden_in_factoriopedia = true data.raw.tool['cryogenic-science-pack'].hidden = true @@ -1062,6 +1047,10 @@ if settings.startup['PHI-SA'].value then data.raw.tool['promethium-science-pack'].hidden = true data.raw.tool['promethium-science-pack'].hidden_in_factoriopedia = true + for _, v in pairs(data.raw.lab) do + v.inputs = {'automation-science-pack', 'logistic-science-pack', 'military-science-pack', 'chemical-science-pack', 'production-science-pack', 'utility-science-pack', 'space-science-pack'} + end + data.raw.capsule['bioflux'].hidden = true data.raw.capsule['bioflux'].hidden_in_factoriopedia = true data.raw.capsule['jelly'].hidden = true @@ -1087,10 +1076,6 @@ if settings.startup['PHI-SA'].value then data.raw['kill-achievement']['we-need-bigger-guns'] = nil data.raw['kill-achievement']['size-doesnt-matter'] = nil - for _, v in pairs(data.raw.lab) do - v.inputs = {'automation-science-pack', 'logistic-science-pack', 'military-science-pack', 'chemical-science-pack', 'production-science-pack', 'utility-science-pack', 'space-science-pack'} - end - for _, v in pairs(data.raw.tree) do if v.minable and v.minable.results then v.minable.results = {{type = 'item', name = 'wood', amount = 4}} @@ -1098,7 +1083,7 @@ if settings.startup['PHI-SA'].value then end end - if mods['quality'] and (not settings.startup['PHI-SA-NO-QUALITY'].value) then + if mods['quality'] and (not settings.startup['PHI-SA-MAX-QUALITY'].value) then data.raw.quality.normal.level = 0 data.raw.quality.normal.beacon_power_usage_multiplier = 1 data.raw.quality.normal.mining_drill_resource_drain_multiplier = 1 diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index df23fdf..075796e 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -130,7 +130,7 @@ 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-NO-QUALITY=[color=54,228,255]SA6[/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-VANILLA=[color=54,228,255]SA9[/color] @@ -182,7 +182,7 @@ PHI-SA-SPOIL-FREEZE-RATIO=Freeze spoilage multiplier PHI-SA-RESTRICTION=Disable certain restriction PHI-SA-GENERIC=Generic change PHI-SA-QUALITY=Quality chance multiplier -PHI-SA-NO-QUALITY=Disable quality +PHI-SA-MAX-QUALITY=Max quality PHI-SA-VANILLA=2.0 Vanilla PHI-CT=[color=255,254,42]Creative testing tools[/color] diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index c49117c..248e0bd 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -132,7 +132,7 @@ PHI-SA-SPOIL-FREEZE-RATIO=変質凍結マルチプライヤ PHI-SA-RESTRICTION=関連要件を無効にする PHI-SA-GENERIC=一般的な変更 PHI-SA-QUALITY=品質確率マルチプライヤ -PHI-SA-NO-QUALITY=品質を無効にする +PHI-SA-MAX-QUALITY=最大品質 PHI-SA-VANILLA=2.0 オリジナル PHI-CT=[color=255,254,42]クリエイティブテストツール[/color] diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index d8c2b9e..99fd8ba 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -132,7 +132,7 @@ PHI-SA-SPOIL-FREEZE-RATIO=變質凍結倍數 PHI-SA-RESTRICTION=取消相關要求 PHI-SA-GENERIC=通用修改 PHI-SA-QUALITY=品質概率倍數 -PHI-SA-NO-QUALITY=停用品質 +PHI-SA-MAX-QUALITY=最大品質 PHI-SA-VANILLA=2.0 原版 PHI-CT=[color=255,254,42]創意測試工具[/color] diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index d8c2b9e..99fd8ba 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -132,7 +132,7 @@ PHI-SA-SPOIL-FREEZE-RATIO=變質凍結倍數 PHI-SA-RESTRICTION=取消相關要求 PHI-SA-GENERIC=通用修改 PHI-SA-QUALITY=品質概率倍數 -PHI-SA-NO-QUALITY=停用品質 +PHI-SA-MAX-QUALITY=最大品質 PHI-SA-VANILLA=2.0 原版 PHI-CT=[color=255,254,42]創意測試工具[/color] diff --git a/PHI-CL/note.lua b/PHI-CL/note.lua index 22b8012..3d34c05 100644 --- a/PHI-CL/note.lua +++ b/PHI-CL/note.lua @@ -694,6 +694,13 @@ data.raw['unit-spawner']['gleba-spawner'].autoplace = data.raw['unit-spawner']['biter-spawner'].autoplace data.raw['unit-spawner']['gleba-spawner-small'].autoplace = data.raw['unit-spawner']['spitter-spawner'].autoplace + for _, v in pairs({'artificial-yumako-soil', 'overgrowth-yumako-soil', 'artificial-jellynut-soil', 'overgrowth-jellynut-soil', 'ice-platform', 'foundation', 'turbo-transport-belt', turbo-underground-belt', 'turbo-splitter', 'big-mining-drill', 'railgun-turret', 'tesla-turret', 'stack-inserter', 'fusion-reactor', 'fusion-generator'}) do + data.raw.item[v].default_import_location = nil + end + + data.raw.gun['teslagun'].default_import_location = nil + data.raw.ammo['tesla-ammo'].default_import_location = nil + ** DATA UPDATE if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.startup['PHI-MB-MINING-TIER'].value > 1 then data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 9be4154..cb655ec 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -267,10 +267,10 @@ data:extend({ order = 'D05' }, { type = 'bool-setting', - name = 'PHI-SA-NO-QUALITY', + name = 'PHI-SA-MAX-QUALITY', setting_type = 'startup', default_value = false, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-NO-QUALITY'}, {'mod-setting-name.PHI-SA-NO-QUALITY'}}, + localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-MAX-QUALITY'}, {'mod-setting-name.PHI-SA-MAX-QUALITY'}}, order = 'D06' }, { type = 'bool-setting',