From 09dbb25cf4fa376520fe35a532874e3c639e70ee Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Fri, 9 Aug 2024 19:15:57 +0900 Subject: [PATCH] . --- .gitignore | 1 + PHI-CL/data-updates.lua | 92 +++++++++++++++++++++++++++++++++++++++++ PHI-CL/main.lua | 92 +++++++++++++++++++---------------------- PHI-CL/settings.lua | 2 +- 4 files changed, 137 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 83717a6..4e3d044 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .vscode/settings.json PHI-CL/.vscode/settings.json +*.zip diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index 346becb..e63626f 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -184,6 +184,7 @@ if settings.startup['PHI-CT'].value then if settings.startup['PHI-CT-LINKED'].value then local item = table.deepcopy(data.raw['item']['linked-chest']) + item.supgroup = 'storage' item.order = 'a[items]-d[linked-chest]' data:extend({item}) @@ -212,6 +213,97 @@ if settings.startup['PHI-CT'].value then table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='linked-chest'}) table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='linked-chest-return'}) + + --[[ + item = table.deepcopy(data.raw['item']['linked-belt']) + item.name = 'linked-belt' + item.supgroup = 'transport' + item.order = 'a[transport-belt]-d[linked-belt]-1' + item.tint = {r=170, g=126, b=103, a=1} + data:extend({item}) + + item.name = 'fast-linked-belt' + item.order = 'a[transport-belt]-d[linked-belt]-2' + item.tint = {r=255, g=0, b=0, a=1} + data:extend({item}) + + item.name = 'express-linked-belt' + item.order = 'a[transport-belt]-d[linked-belt]-3' + item.tint = {r=0, g=0, b=255, a=1} + data:extend({item}) + + entity = table.deepcopy(data.raw['linked-belt']['linked-belt']) + entity.name = 'linked-belt' + entity.speed = 0.03125 + entity.next_upgrade = 'fast-linked-belt' + entity.minable.result = 'linked-belt' + + for _,v in pairs(entity.structure) do + v.sheet.tint = {r=170, g=126, b=103, a=1} + v.sheet.hr_version.tint = {r=170, g=126, b=103, a=1} + end + + data:extend({entity}) + + entity.name = 'fast-linked-belt' + entity.speed = 0.0625 + entity.next_upgrade = 'express-linked-belt' + entity.minable.result = 'fast-linked-belt' + + for _,v in pairs(entity.structure) do + v.sheet.tint = {r=255, g=0, b=0, a=1} + v.sheet.hr_version.tint = {r=255, g=0, b=0, a=1} + end + + data:extend({entity}) + + entity.name = 'express-linked-belt' + entity.speed = 0.09375 + entity.next_upgrade = nil + entity.minable.result = 'express-linked-belt' + + for _,v in pairs(entity.structure) do + v.sheet.tint = {r=0, g=0, b=255, a=1} + v.sheet.hr_version.tint = {r=0, g=0, b=255, a=1} + end + + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'linked-belt', + energy_required = 2, + enabled = false, + ingredients = {{'underground-belt', 4}}, + result = 'linked-belt' + }}) + + data:extend({{ + type = 'recipe', + name = 'fast-linked-belt', + energy_required = 2, + enabled = false, + ingredients = {{'linked-belt', 2}}, + result = 'fast-linked-belt' + }}) + + data:extend({{ + type = 'recipe', + name = 'express-linked-belt', + energy_required = 2, + enabled = false, + ingredients = {{'fast-linked-belt', 2}}, + result = 'express-linked-belt' + }}) + + data.raw['linked-belt']['linked-belt'].fast_replaceable_group = 'linked-belt' + data.raw['linked-belt']['fast-linked-belt'].fast_replaceable_group = data.raw['linked-belt']['linked-belt'].fast_replaceable_group + data.raw['linked-belt']['express-linked-belt'].fast_replaceable_group = data.raw['linked-belt']['fast-linked-belt'].fast_replaceable_group + + table.insert(data.raw.technology['logistics'].effects, {type='unlock-recipe', recipe='linked-belt'}) + table.insert(data.raw.technology['logistics-2'].effects, {type='unlock-recipe', recipe='fast-linked-belt'}) + table.insert(data.raw.technology['logistics-3'].effects, {type='unlock-recipe', recipe='express-linked-belt'}) + ]] end if settings.startup['PHI-CT-LOADER'].value then diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index 295b5f5..d891cf6 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -4,46 +4,46 @@ local items = require 'config' local main = {} local tint = { - ['2'] = { - r = 0.2, - g = 0.9, - b = 0.2, + [2] = { + r = 51, + g = 229, + b = 51, a = 0.7 }, - ['3'] = { - r = 0.2, - g = 0.2, - b = 0.9, + [3] = { + r = 51, + g = 51, + b = 229, a = 0.7 }, - ['4'] = { - r = 0.2, - g = 0.9, - b = 0.9, + [4] = { + r = 51, + g = 229, + b = 229, a = 0.7 }, - ['5'] = { - r = 0.5, + [5] = { + r = 127, g = 0, - b = 0.5, + b = 127, a = 0.5 }, - ['6'] = { - r = 0.9, - g = 0.7, - b = 0.2, + [6] = { + r = 229, + g = 178, + b = 51, a = 0.7 }, - ['7'] = { - r = 0.5, - g = 0.2, + [7] = { + r = 127, + g = 51, b = 0, a = 0.2 }, - ['8'] = { - r = 0.5, - g = 0.2, - b = 0.5, + [8] = { + r = 127, + g = 51, + b = 127, a = 0.2 }, } @@ -181,29 +181,25 @@ function main.EEE(source, tier) item.type = 'assembling-machine' end - --[[ - if item.picture.layers then - if item.picture.layers[1][1].tint then - item.picture.layers[1][1].tint = tint[tier] - end + if item.picture then + if item.picture.layers then + item.picture.layers[1].tint = tint[tier] - if item.picture.layers[1][1].hr_version then - item.picture.layers[1][1].hr_version.tint = tint[tier] + if item.picture.layers[1].hr_version then + item.picture.layers[1].hr_version.tint = tint[tier] + end end end - if tier > 1 then - if item.icons and item.icons[1] and item.icons[1][1] then - item.icons[1][1].tint = tint[tier] + if item.pictures then + if item.pictures.layers then + item.pictures.layers[1].tint = tint[tier] + + if item.pictures.layers[1].hr_version then + item.pictures.layers[1].hr_version.tint = tint[tier] + end end end - ]] - - -- item.animation.layers[1].filename = graphics_location .. source .. '-e.png' - -- item.animation.layers[1].hr_version.filename = graphics_location .. source ..'-eh.png' - -- item.icon = graphics_location .. source .. '-i.png' - -- item.icon_size = 64 - -- item.icon_mipmaps = 4 data:extend({item}) end @@ -326,15 +322,13 @@ function main.EI(source, tier) else item.name = source.name item.place_result = source.name - - --[[ - if item.icons then - item.icons[1][1].tint = tint[tier] - end - ]] end end + if item.icons then + item.icons[1].tint = tint[tier] + end + item.order = item.order .. tier data:extend({item}) end diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index dcb9ddb..a2793cc 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -486,7 +486,7 @@ data:extend({ order = 'JA05' }, { type = 'bool-setting', - name = 'PHI-MI-LOADER', + name = 'PHI-CT-LOADER', setting_type = 'startup', default_value = true, order = 'JA06'