This commit is contained in:
2024-08-09 19:15:57 +09:00
parent fc1af48028
commit 09dbb25cf4
4 changed files with 137 additions and 50 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
.vscode/settings.json .vscode/settings.json
PHI-CL/.vscode/settings.json PHI-CL/.vscode/settings.json
*.zip

View File

@@ -184,6 +184,7 @@ if settings.startup['PHI-CT'].value then
if settings.startup['PHI-CT-LINKED'].value then if settings.startup['PHI-CT-LINKED'].value then
local item = table.deepcopy(data.raw['item']['linked-chest']) local item = table.deepcopy(data.raw['item']['linked-chest'])
item.supgroup = 'storage'
item.order = 'a[items]-d[linked-chest]' item.order = 'a[items]-d[linked-chest]'
data:extend({item}) 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'})
table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='linked-chest-return'}) 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 end
if settings.startup['PHI-CT-LOADER'].value then if settings.startup['PHI-CT-LOADER'].value then

View File

@@ -4,46 +4,46 @@ local items = require 'config'
local main = {} local main = {}
local tint = { local tint = {
['2'] = { [2] = {
r = 0.2, r = 51,
g = 0.9, g = 229,
b = 0.2, b = 51,
a = 0.7 a = 0.7
}, },
['3'] = { [3] = {
r = 0.2, r = 51,
g = 0.2, g = 51,
b = 0.9, b = 229,
a = 0.7 a = 0.7
}, },
['4'] = { [4] = {
r = 0.2, r = 51,
g = 0.9, g = 229,
b = 0.9, b = 229,
a = 0.7 a = 0.7
}, },
['5'] = { [5] = {
r = 0.5, r = 127,
g = 0, g = 0,
b = 0.5, b = 127,
a = 0.5 a = 0.5
}, },
['6'] = { [6] = {
r = 0.9, r = 229,
g = 0.7, g = 178,
b = 0.2, b = 51,
a = 0.7 a = 0.7
}, },
['7'] = { [7] = {
r = 0.5, r = 127,
g = 0.2, g = 51,
b = 0, b = 0,
a = 0.2 a = 0.2
}, },
['8'] = { [8] = {
r = 0.5, r = 127,
g = 0.2, g = 51,
b = 0.5, b = 127,
a = 0.2 a = 0.2
}, },
} }
@@ -181,29 +181,25 @@ function main.EEE(source, tier)
item.type = 'assembling-machine' item.type = 'assembling-machine'
end end
--[[ if item.picture then
if item.picture.layers then if item.picture.layers then
if item.picture.layers[1][1].tint then item.picture.layers[1].tint = tint[tier]
item.picture.layers[1][1].tint = tint[tier]
end
if item.picture.layers[1][1].hr_version then if item.picture.layers[1].hr_version then
item.picture.layers[1][1].hr_version.tint = tint[tier] item.picture.layers[1].hr_version.tint = tint[tier]
end
end end
end end
if tier > 1 then if item.pictures then
if item.icons and item.icons[1] and item.icons[1][1] then if item.pictures.layers then
item.icons[1][1].tint = tint[tier] item.pictures.layers[1].tint = tint[tier]
end
end
]]
-- item.animation.layers[1].filename = graphics_location .. source .. '-e.png' if item.pictures.layers[1].hr_version then
-- item.animation.layers[1].hr_version.filename = graphics_location .. source ..'-eh.png' item.pictures.layers[1].hr_version.tint = tint[tier]
-- item.icon = graphics_location .. source .. '-i.png' end
-- item.icon_size = 64 end
-- item.icon_mipmaps = 4 end
data:extend({item}) data:extend({item})
end end
@@ -326,13 +322,11 @@ function main.EI(source, tier)
else else
item.name = source.name item.name = source.name
item.place_result = source.name item.place_result = source.name
end
end
--[[
if item.icons then if item.icons then
item.icons[1][1].tint = tint[tier] item.icons[1].tint = tint[tier]
end
]]
end
end end
item.order = item.order .. tier item.order = item.order .. tier

View File

@@ -486,7 +486,7 @@ data:extend({
order = 'JA05' order = 'JA05'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-MI-LOADER', name = 'PHI-CT-LOADER',
setting_type = 'startup', setting_type = 'startup',
default_value = true, default_value = true,
order = 'JA06' order = 'JA06'