From 28b3671aeaaaa50dc9469bd0b3e8c273aec26f18 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Tue, 3 Dec 2024 18:12:36 +0900 Subject: [PATCH] . --- PHI-CL/changelog.txt | 9 ++++++++- PHI-CL/data-final-fixes.lua | 7 +++++++ PHI-CL/data.lua | 31 ++++++++++++++++++++++--------- PHI-CL/info.json | 2 +- 4 files changed, 38 insertions(+), 11 deletions(-) diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index 47b9008..341f64e 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -1,3 +1,11 @@ +--------------------------------------------------------------------------------------------------- +Version: 3.0.45 +Date: 2024-12-03 + + Changes: + - [CL] Changed some existing code structure and logic. + - [SA] Changed the logic of map generation. + --------------------------------------------------------------------------------------------------- Version: 3.0.44 Date: 2024-12-01 @@ -5,7 +13,6 @@ Date: 2024-12-01 Changes: - [SA] Changed the fluid box from 2 to 3 on each side for thruster. - [SA] Changed the asteroid generation settings. - - [SA] Changed the logic of map generation. --------------------------------------------------------------------------------------------------- Version: 3.0.43 diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index c4ac29b..4e9c283 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -1,6 +1,13 @@ local items = require 'config' 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' + end +end + for _, v in pairs(items['item']) do if v.enabled and (v.max >= v.min) then v.category = 'item' diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 382f697..12b96b1 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -542,7 +542,7 @@ if settings.startup['PHI-SA'].value then data.raw.technology['railgun'].prerequisites = {'military-3', 'utility-science-pack'} data.raw.technology['railgun'].unit = {count = 1000, time = 60, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'military-science-pack', 1}, {'chemical-science-pack', 1}, {'utility-science-pack', 1}}} - table.insert(data.raw['space-platform-starter-pack']['space-platform-starter-pack'].initial_items, {type='item',name='railgun-turret', amount=6}) + table.insert(data.raw.technology['railgun'].effects, {type='give-item',item='railgun-turret', count=10}) for k, v in pairs(items['space-age']['technology_1']) do if data.raw.technology[k] then @@ -656,27 +656,40 @@ if settings.startup['PHI-SA'].value then regular_rq_factor_multiplier = 1 } + --[[ data.raw['noise-expression']['demolisher_starting_area']['demolisher_starting_area'] = '0 < starting_spot_at_angle{angle = vulcanus_mountains_angle - 5 * vulcanus_starting_direction, distance = 256 * vulcanus_starting_area_radius + 32, radius = 24 * 32, x_distortion = 0, y_distortion = 0}' data.raw.planet['nauvis'].map_gen_settings.territory_settings = data.raw.planet['vulcanus'].map_gen_settings.territory_settings + ]] for _, v in pairs({'platform_science', 'platform_moving', 'platform_messy_nuclear', 'vulcanus_lava_forge', 'vulcanus_crossing', 'vulcanus_punishmnent', 'vulcanus_sulfur_drop', 'gleba_agri_towers', 'gleba_pentapod_ponds', 'gleba_egg_escape', 'gleba_farm_attack', 'gleba_grotto', 'fulgora_city_crossing', 'fulgora_recycling_hell', 'fulgora_nightfall', 'fulgora_race', 'aquilo_send_help', 'aquilo_starter'}) do data.raw['utility-constants']['default'].main_menu_simulations[v] = nil end - for k, _ in pairs(items['space-age']['gleba_tree']) do - if data.raw.tree[k] then - data.raw.tree[k].autoplace['tile_restriction'] = {'natural-yumako-soil', 'natural-jellynut-soil', 'wetland-yumako', 'wetland-jellynut'} - end - end - for _, v in pairs({'artificial-yumako-soil', 'overgrowth-yumako-soil', 'artificial-jellynut-soil', 'overgrowth-jellynut-soil'}) do data.raw.tile[v].sprite_usage_surface = 'any' data.raw.item[v].place_as_tile.condition = {layers={water_tile=true}} data.raw.item[v].place_as_tile.tile_condition = nil end - for _, v in pairs({'yumako-tree', 'jellystem', 'tree-plant'}) do - table.insert(data.raw['plant'][v].autoplace.tile_restriction, 'space-platform-foundation') + table.insert(data.raw['plant']['tree-plant'].autoplace.tile_restriction, 'space-platform-foundation') + table.insert(data.raw['plant']['tree-plant'].autoplace.tile_restriction, 'ice-platform') + table.insert(data.raw['plant']['tree-plant'].autoplace.tile_restriction, 'foundation') + table.insert(data.raw['plant']['tree-plant'].autoplace.tile_restriction, 'landfill') + + for _, v in pairs({'yumako-tree', 'jellystem'}) do + local trs = table.deepcopy(data.raw['plant']['tree-plant'].autoplace.tile_restriction) + + for _, v2 in pairs(data.raw['plant'][v].autoplace.tile_restriction) do + table.insert(trs, v2) + end + + data.raw['plant'][v].autoplace.tile_restriction = trs + end + + for k, _ in pairs(items['space-age']['gleba_tree']) do + if data.raw.tree[k] then + data.raw.tree[k].autoplace['tile_restriction'] = data.raw['plant']['tree-plant'].autoplace.tile_restriction + end end for _, v in pairs({'vulcanus', 'gleba', 'fulgora', 'aquilo'}) do diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 01a3f05..d0088e8 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,6 +1,6 @@ { "name": "PHI-CL", - "version": "3.0.44", + "version": "3.0.45", "factorio_version": "2.0", "date": "2024-12-03", "title": "Phidias Collection",