From 57200407bc5953ede967e6a0c4429ff28a6cae94 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Thu, 31 Oct 2024 15:06:12 +0900 Subject: [PATCH] . --- PHI-CL/data.lua | 37 +++++++------------------------- PHI-CL/info.json | 2 +- PHI-CL/main.lua | 21 +++++++----------- PHI-CL/migrations/migrations.lua | 20 ++++++++--------- 4 files changed, 27 insertions(+), 53 deletions(-) diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 5ecc440..9df9bfa 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -77,7 +77,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value th entity.max_distance_of_nearby_sector_revealed = 35 entity.pictures.layers[1].tint = items['tint'][8] entity.localised_name = {'name.super-radar'} - entity.localised_description = {'description.super-radar'} data:extend({entity}) data:extend({{ @@ -88,15 +87,13 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value th ingredients = {{type='item', name='electronic-circuit', amount=5}, {type='item', name='iron-gear-wheel', amount=5}, {type='item', name='iron-plate', amount=10}}, results = {{type='item', name='super-radar', amount=1}}, main_product = 'super-radar', - localised_name = {'name.super-radar'}, - localised_description = {'description.super-radar'} + localised_name = {'name.super-radar'} }}) item = table.deepcopy(data.raw['item']['electric-energy-interface']) item.name = 'passive-energy-void' item.place_result = 'passive-energy-void' item.localised_name = {'name.passive-energy-void'} - item.localised_description = {'description.passive-energy-void'} data:extend({item}) entity = table.deepcopy(data.raw['electric-energy-interface']['electric-energy-interface']) @@ -111,7 +108,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value th entity.energy_usage = '1PW' entity.gui_mode = 'none' entity.localised_name = {'name.passive-energy-void'} - entity.localised_description = {'description.passive-energy-void'} data:extend({entity}) data:extend({{ @@ -122,8 +118,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value th ingredients = {{type='item', name='accumulator', amount=1}}, results = {{type='item', name='passive-energy-void', amount=1}}, main_product = 'passive-energy-void', - localised_name = {'name.passive-energy-void'}, - localised_description = {'description.passive-energy-void'} + localised_name = {'name.passive-energy-void'} }}) table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'}) @@ -147,7 +142,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value th item.icon_size = nil item.icon_mipmaps = nil item.localised_name = {'name.super-pump'} - item.localised_description = item.localised_description data:extend({item}) entity = table.deepcopy(data.raw['offshore-pump']['offshore-pump']) @@ -167,7 +161,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value th entity.tile_buildability_rules = nil entity.fluid_source_offset = nil entity.localised_name = {'name.super-pump'} - entity.localised_description = entity.localised_description data:extend({entity}) data:extend({{ @@ -178,8 +171,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value th ingredients = {{type='item', name='electronic-circuit', amount=2}, {type='item', name='pipe', amount=1}, {type='item', name='iron-gear-wheel', amount=1}}, results = {{type='item', name='super-pump', amount=1}}, main_product = 'super-pump', - localised_name = {'name.super-pump'}, - localised_description = nil + localised_name = {'name.super-pump'} }}) for _, v in pairs(data.raw.fluid) do @@ -205,8 +197,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TOOL'].value th hide_from_player_crafting = true, allow_productivity = false, crafting_machine_tint = {primary=v.flow_color}, - localised_name = v.localised_name, - localised_description = nil + localised_name = v.localised_name }}) end end @@ -231,7 +222,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value item.icon_size = nil item.icon_mipmaps = nil item.localised_name = {'name.trash-chest'} - item.localised_description = {'description.trash-chest'} data:extend({item}) local entity = table.deepcopy(data.raw['container']['steel-chest']) @@ -246,7 +236,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value entity.next_upgrade = nil entity.picture.layers[1].tint = items['tint'][8] entity.localised_name = {'name.trash-chest'} - entity.localised_description = {'description.trash-chest'} data:extend({entity}) data:extend({{ @@ -257,8 +246,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value ingredients = {{type='item', name='steel-chest', amount=1}}, results = {{type='item', name='trash-chest', amount=1}}, main_product = 'trash-chest', - localised_name = {'name.trash-chest'}, - localised_description = {'description.trash-chest'} + localised_name = {'name.trash-chest'} }}) table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='trash-chest'}) @@ -281,7 +269,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value item.icon_size = nil item.icon_mipmaps = nil item.localised_name = {'name.trash-pipe'} - item.localised_description = {'description.trash-pipe'} data:extend({item}) entity = table.deepcopy(data.raw['pipe']['pipe']) @@ -303,7 +290,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value entity.se_allow_in_space = true entity.localised_name = {'name.trash-pipe'} - entity.localised_description = {'description.trash-pipe'} data:extend({entity}) data:extend({{ @@ -314,8 +300,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value ingredients = {{type='item', name='iron-plate', amount=1}}, results = {{type='item', name='trash-pipe', amount=1}}, main_product = 'trash-pipe', - localised_name = {'name.trash-pipe'}, - localised_description = {'description.trash-pipe'} + localised_name = {'name.trash-pipe'} }}) table.insert(data.raw.technology['automation'].effects, {type='unlock-recipe', recipe='trash-pipe'}) @@ -325,7 +310,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value item.place_result = 'electric-boiler' item.order = 'b[steam-power]-a[electric-boiler]' item.localised_name = {'name.electric-boiler'} - item.localised_description = {'description.electric-boiler'} data:extend({item}) entity = table.deepcopy(data.raw['boiler']['boiler']) @@ -356,7 +340,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value entity.fire_glow_flicker_enabled = false entity.fire = {} entity.localised_name = {'name.electric-boiler'} - entity.localised_description = {'description.electric-boiler'} data:extend({entity}) data:extend({{ @@ -367,8 +350,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value ingredients = {{type='item', name='boiler', amount=1}, {type='item', name='electronic-circuit', amount=1}}, results = {{type='item', name='electric-boiler', amount=1}}, main_product = 'electric-boiler', - localised_name = {'name.electric-boiler'}, - localised_description = {'description.electric-boiler'} + localised_name = {'name.electric-boiler'} }}) -- electric boiler @@ -398,7 +380,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value item.place_result = 'basic-' .. c item.order = 'b[storage]-h[basic-' .. c .. ']' item.localised_name = {'name.basic-'.. c} - item.localised_description = {'description.basic-'.. c} data:extend({item}) entity.inventory_type = 'with_filters_and_bar' @@ -407,7 +388,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value entity.name = 'basic-' .. c entity.minable.result = 'basic-' .. c entity.localised_name = {'name.basic-'.. c} - entity.localised_description = {'description.basic-'.. c} data:extend({entity}) data:extend({{ @@ -418,8 +398,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-UTILITY'].value ingredients = {{type='item', name=c, amount=1}}, results = {{type='item', name='basic-' .. c, amount=1}}, main_product = 'basic-' .. c, - localised_name = {'name.basic-' .. c}, - localised_description = {'description.basic-' .. c} + localised_name = {'name.basic-' .. c} }}) end diff --git a/PHI-CL/info.json b/PHI-CL/info.json index 99f3dda..f38f82b 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,6 +1,6 @@ { "name": "PHI-CL", - "version": "3.0.5", + "version": "3.0.6", "factorio_version": "2.0", "date": "2024-10-31", "title": "Phidias Collection", diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index ad39657..0a9ce15 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -185,6 +185,10 @@ function main.EEE(source, tier) tint_handle(item, tier, {'picture', 'pictures', 'frames', 'working_visualisations', 'animation', 'horizontal_animation', 'vertical_animation', 'structure', 'integration_patch', 'graphics_set'}) + if item.graphics_set and item.graphics_set.working_visualisations and item.graphics_set.working_visualisations.animation then + tint_handle(item.graphics_set.working_visualisations.animation, tier, {'frames'}) + end + if item.idle_animation and item.idle_animation.layers then local i = 1 @@ -212,8 +216,6 @@ function main.EEE(source, tier) item.localised_name = {'name.' .. source.ref_name} end - item.localised_description = item.localised_description - data:extend({item}) end @@ -278,7 +280,6 @@ function main.EEQ(source, tier) end item.localised_name = {'phi-cl.combine-gen', {'name.' .. source.ref_name}, tostring(tier)} - item.localised_description = item.localised_description data:extend({item}) end @@ -330,8 +331,6 @@ function main.EI(source, tier) item.localised_name = {'name.' .. source.ref_name} end - item.localised_description = item.localised_description - data:extend({item}) end @@ -378,8 +377,7 @@ function main.ER(source, tier) ingredients = {{type='item', name=ingredient_name, amount=4}}, results = {{type='item', name=result_name, amount=1}}, main_product = result_name, - localised_name = data.raw[source.type][new_name].localised_name, - localised_description = data.raw[source.type][new_name].localised_description + localised_name = {'phi-cl.combine', data.raw[source.type][new_name].localised_name, ''} }}) else @@ -393,8 +391,7 @@ function main.ER(source, tier) ingredients = {{type='item', name=ingredient_name, amount=1}, {type='item', name=source.name, amount=1}}, results = {{type='item', name=result_name, amount=1}}, main_product = result_name, - localised_name = data.raw[source.type][new_name].localised_name, - localised_description = data.raw[source.type][new_name].localised_description + localised_name = {'phi-cl.combine', data.raw[source.type][new_name].localised_name, ''} }}) else @@ -407,8 +404,7 @@ function main.ER(source, tier) ingredients = {{type='item', name=ingredient_name, amount=2}}, results = {{type='item', name=result_name, amount=1}}, main_product = result_name, - localised_name = data.raw[source.type][new_name].localised_name, - localised_description = data.raw[source.type][new_name].localised_description + localised_name = {'phi-cl.combine', data.raw[source.type][new_name].localised_name, ''} }}) end end @@ -423,8 +419,7 @@ function main.ER(source, tier) ingredients = {{type='item', name=ingredient_name, amount=2}}, results = {{type='item', name=result_name, amount=1}}, main_product = result_name, - localised_name = data.raw[source.type][new_name].localised_name, - localised_description = data.raw[source.type][new_name].localised_description + localised_name = {'phi-cl.combine', data.raw[source.type][new_name].localised_name, ''} }}) end end diff --git a/PHI-CL/migrations/migrations.lua b/PHI-CL/migrations/migrations.lua index 07bf58e..d91e5a9 100644 --- a/PHI-CL/migrations/migrations.lua +++ b/PHI-CL/migrations/migrations.lua @@ -60,19 +60,19 @@ for _, force in pairs(game.forces) do end if (technologies['construction-robotics'] and technologies['construction-robotics'].researched) or (technologies['logistic-robotics'] and technologies['logistic-robotics'].researched) then - recipes['basic-logistic-chest-passive-provider'].enabled = true - recipes['basic-logistic-chest-passive-provider'].reload() - recipes['basic-logistic-chest-storage'].enabled = true - recipes['basic-logistic-chest-storage'].reload() + recipes['basic-passive-provider-chest'].enabled = true + recipes['basic-passive-provider-chest'].reload() + recipes['basic-storage-chest'].enabled = true + recipes['basic-storage-chest'].reload() end if technologies['logistic-system'] and technologies['logistic-system'].researched then - recipes['basic-logistic-chest-active-provider'].enabled = true - recipes['basic-logistic-chest-active-provider'].reload() - recipes['basic-logistic-chest-buffer'].enabled = true - recipes['basic-logistic-chest-buffer'].reload() - recipes['basic-logistic-chest-requester'].enabled = true - recipes['basic-logistic-chest-requester'].reload() + recipes['basic-active-provider-chest'].enabled = true + recipes['basic-active-provider-chest'].reload() + recipes['basic-buffer-chest'].enabled = true + recipes['basic-buffer-chest'].reload() + recipes['basic-requester-chest'].enabled = true + recipes['basic-requester-chest'].reload() end end