This commit is contained in:
2024-08-22 20:45:35 +09:00
parent 0be8e955d4
commit 98c48426d1
12 changed files with 278 additions and 175 deletions

View File

@@ -883,7 +883,9 @@ if mods then
min = 2, min = 2,
max = 3 max = 3
} }
end
if mods['aai-industry'] or mods['big-mining-drill'] then
items['item']['area-mining-drill'] = { items['item']['area-mining-drill'] = {
enabled = settings.startup['PHI-MB'].value, enabled = settings.startup['PHI-MB'].value,
stage = 2, stage = 2,

View File

@@ -97,7 +97,6 @@ if settings.startup['PHI-PB'].value then
end) end)
end end
-- {{filter='name', name='trash-chest', mode='or'}, {filter='name', name='trash-pipe', mode='or'}}
if settings.startup['PHI-CT'].value then if settings.startup['PHI-CT'].value then
if settings.startup['PHI-CT-TRASH'].value then if settings.startup['PHI-CT-TRASH'].value then
script.on_init(trash_check) script.on_init(trash_check)

View File

@@ -3,6 +3,11 @@ local main = require 'main'
local file_stage = 3 local file_stage = 3
data.raw['utility-constants'].default.zoom_to_world_effect_strength = 0 data.raw['utility-constants'].default.zoom_to_world_effect_strength = 0
data.raw['utility-constants'].default.zoom_to_world_can_use_nightvision = true
data.raw['lamp']['small-lamp'].darkness_for_all_lamps_on = 0
data.raw['lamp']['small-lamp'].darkness_for_all_lamps_off = 0
table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-grey', color={r=128, g=128, b=128}})
table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-black', color={r=0, g=0, b=0}})
for _,name in pairs({'furnace', 'lab', 'beacon'}) do for _,name in pairs({'furnace', 'lab', 'beacon'}) do
local entities = {} local entities = {}

View File

@@ -15,17 +15,29 @@ if settings.startup['PHI-XW-WATER'].value > 0 then
data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}
data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_mask = nil data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_mask = nil
data.raw['offshore-pump']['offshore-pump'].placeable_position_visualization = nil data.raw['offshore-pump']['offshore-pump'].placeable_position_visualization = nil
data.raw['offshore-pump']['offshore-pump'].se_allow_in_space = true
if mods['angelsrefining'] then if mods['angelsrefining'] then
data.raw['offshore-pump']['seafloor-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 data.raw['offshore-pump']['seafloor-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20
data.raw['offshore-pump']['seafloor-pump'].fluid_box.height = 4 data.raw['offshore-pump']['seafloor-pump'].fluid_box.height = 4
data.raw['offshore-pump']['offshore-pump'].fluid_box.level = 5 data.raw['offshore-pump']['seafloor-pump'].fluid_box.level = 5
data.raw['offshore-pump']['seafloor-pump'].flags = {'placeable-neutral', 'player-creation', 'filter-directions'} data.raw['offshore-pump']['seafloor-pump'].flags = {'placeable-neutral', 'player-creation', 'filter-directions'}
data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_box = {{-2, -3}, {2, -2}} data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_box = {{-2, -3}, {2, -2}}
data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}
data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_mask = nil data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_mask = nil
data.raw['offshore-pump']['seafloor-pump'].placeable_position_visualization = nil data.raw['offshore-pump']['seafloor-pump'].placeable_position_visualization = nil
end end
if mods['exotic-industries'] then
data.raw['offshore-pump']['ei_gaia-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20
data.raw['offshore-pump']['ei_gaia-pump'].fluid_box.height = 4
data.raw['offshore-pump']['ei_gaia-pump'].fluid_box.level = 5
data.raw['offshore-pump']['ei_gaia-pump'].flags = {'placeable-neutral', 'player-creation'}
data.raw['offshore-pump']['ei_gaia-pump'].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}}
data.raw['offshore-pump']['ei_gaia-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}
data.raw['offshore-pump']['ei_gaia-pump'].adjacent_tile_collision_mask = nil
data.raw['offshore-pump']['ei_gaia-pump'].placeable_position_visualization = nil
end
end end
if settings.startup['PHI-CT'].value then if settings.startup['PHI-CT'].value then
@@ -41,6 +53,7 @@ if settings.startup['PHI-CT'].value then
entity.minable.result = 'oil-pump' entity.minable.result = 'oil-pump'
entity.fluid = 'crude-oil' entity.fluid = 'crude-oil'
entity.fluid_box.filter = 'crude-oil' entity.fluid_box.filter = 'crude-oil'
entity.se_allow_in_space = true
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -65,6 +78,7 @@ if settings.startup['PHI-CT'].value then
entity.minable.result = 'super-radar' entity.minable.result = 'super-radar'
entity.max_distance_of_sector_revealed = 30 entity.max_distance_of_sector_revealed = 30
entity.max_distance_of_nearby_sector_revealed = 30 entity.max_distance_of_nearby_sector_revealed = 30
entity.se_allow_in_space = true
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -93,7 +107,9 @@ if settings.startup['PHI-CT'].value then
entity.gui_mode = 'none' entity.gui_mode = 'none'
entity.erase_contents_when_mined = true entity.erase_contents_when_mined = true
entity.logistic_mode = nil entity.logistic_mode = nil
entity.next_upgrade = nil
entity.fast_replaceable_group = nil
entity.se_allow_in_space = true
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -130,7 +146,9 @@ if settings.startup['PHI-CT'].value then
entity.type = 'infinity-pipe' entity.type = 'infinity-pipe'
entity.gui_mode = 'none' entity.gui_mode = 'none'
entity.erase_contents_when_mined = true entity.erase_contents_when_mined = true
entity.next_upgrade = nil
entity.fast_replaceable_group = nil
entity.se_allow_in_space = true
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -171,6 +189,7 @@ if settings.startup['PHI-CT'].value then
entity.mining_speed = entity.mining_speed * 16 entity.mining_speed = entity.mining_speed * 16
entity.energy_source.emissions_per_minute = entity.energy_source.emissions_per_minute * 16 entity.energy_source.emissions_per_minute = entity.energy_source.emissions_per_minute * 16
entity.module_specification.module_slots = 8 entity.module_specification.module_slots = 8
entity.se_allow_in_space = true
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -196,6 +215,7 @@ if settings.startup['PHI-CT'].value then
entity.inventory_type = 'with_filters_and_bar' entity.inventory_type = 'with_filters_and_bar'
entity.inventory_size = 48 entity.inventory_size = 48
entity.gui_mode = 'all' entity.gui_mode = 'all'
entity.se_allow_in_space = true
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -218,98 +238,6 @@ 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.place_result = '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})
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})
data.raw.recipe['linked-belt'].hidden = false
item = table.deepcopy(data.raw['item']['linked-belt'])
item.name = 'fast-linked-belt'
item.place_result = 'fast-linked-belt'
item.supgroup = 'transport'
item.order = 'a[transport-belt]-d[linked-belt]-2'
item.tint = {r=255, g=0, b=0, a=1}
data:extend({item})
entity = table.deepcopy(data.raw['linked-belt']['linked-belt'])
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})
data:extend({{
type = 'recipe',
name = 'fast-linked-belt',
energy_required = 2,
enabled = false,
ingredients = {{'linked-belt', 2}},
result = 'fast-linked-belt'
}})
item = table.deepcopy(data.raw['item']['linked-belt'])
item.name = 'express-linked-belt'
item.place_result = 'express-linked-belt'
item.supgroup = 'transport'
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 = '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 = 'express-linked-belt',
energy_required = 2,
enabled = false,
ingredients = {{'fast-linked-belt', 1}, {'linked-belt', 1}},
result = 'express-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
@@ -340,6 +268,37 @@ if settings.startup['PHI-CT'].value then
table.insert(data.raw.technology['logistics-2'].effects, {type='unlock-recipe', recipe='fast-loader'}) table.insert(data.raw.technology['logistics-2'].effects, {type='unlock-recipe', recipe='fast-loader'})
table.insert(data.raw.technology['logistics-3'].effects, {type='unlock-recipe', recipe='express-loader'}) table.insert(data.raw.technology['logistics-3'].effects, {type='unlock-recipe', recipe='express-loader'})
end end
if settings.startup['PHI-CT-ENERGY'].value then
local item = table.deepcopy(data.raw['item']['electric-energy-interface'])
item.name = 'passive-energy-void'
item.place_result = 'passive-energy-void'
data:extend({item})
local entity = table.deepcopy(data.raw['electric-energy-interface']['electric-energy-interface'])
entity.name = 'passive-energy-void'
entity.minable.result = 'passive-energy-void'
entity.energy_source.usage_priority = 'tertiary'
entity.energy_source.emissions_per_minute = 0
entity.energy_source.input_flow_limit = '1TW'
entity.energy_source.output_flow_limit = '0W'
entity.energy_production = '0W'
entity.energy_usage = '1TW'
entity.gui_mode = 'none'
entity.se_allow_in_space = true
data:extend({entity})
data:extend({{
type = 'recipe',
name = 'passive-energy-void',
energy_required = 2,
enabled = false,
ingredients = {{'accumulator', 1}},
result = 'passive-energy-void'
}})
table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'})
end
end end
if settings.startup['PHI-EQ-ARMOR'].value then if settings.startup['PHI-EQ-ARMOR'].value then
@@ -673,7 +632,7 @@ if settings.startup['PHI-MI-PIPE'].value then
end end
end end
if settings.startup['PHI-MB'].value then if settings.startup['PHI-MB'].value and mods['space-exploration'] then
if settings.startup['PHI-MB-MINING-TIER'].value > 1 then if settings.startup['PHI-MB-MINING-TIER'].value > 1 then
data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill'

View File

@@ -1,8 +1,8 @@
{ {
"name": "PHI-CL", "name": "PHI-CL",
"version": "2.0.15", "version": "2.0.23",
"factorio_version": "1.1", "factorio_version": "1.1",
"date": "2024-08-11", "date": "2024-08-21",
"title": "Phidias Collection", "title": "Phidias Collection",
"author": "PHIDIAS0303", "author": "PHIDIAS0303",
"contributers": "", "contributers": "",
@@ -11,9 +11,11 @@
"dependencies": [ "dependencies": [
"base >= 1.1.0", "base >= 1.1.0",
"? aai-industry >= 0.5.0", "? aai-industry >= 0.5.0",
"? big-mining-drill >= 0.1.0",
"? Krastorio2 >= 1.3.0", "? Krastorio2 >= 1.3.0",
"? space-exploration >= 0.6.0", "? space-exploration >= 0.6.0",
"? angelsrefining >= 0.12.0", "? angelsrefining >= 0.12.0",
"? exotic-industries >= 0.6.0",
"? Atomic_Overhaul >= 1.3.0" "? Atomic_Overhaul >= 1.3.0"
] ]
} }

View File

@@ -256,6 +256,8 @@ trash-pipe=Trash pipe
large-area-electric-mining-drill=Large area electric mining drill large-area-electric-mining-drill=Large area electric mining drill
passive-energy-void=Passive energy void
[item-description] [item-description]
solar-panel-mk2-equipment=Provides power for equipment modules. solar-panel-mk2-equipment=Provides power for equipment modules.
solar-panel-mk3-equipment=Provides power for equipment modules. solar-panel-mk3-equipment=Provides power for equipment modules.
@@ -515,6 +517,8 @@ trash-pipe=Trash pipe
large-area-electric-mining-drill=Large area electric mining drill large-area-electric-mining-drill=Large area electric mining drill
passive-energy-void=Passive energy void
[entity-description] [entity-description]
accumulator-2=Stores a limited amount of energy when available production exceeds demand, and releases it in the opposite case. accumulator-2=Stores a limited amount of energy when available production exceeds demand, and releases it in the opposite case.
accumulator-3=Stores a limited amount of energy when available production exceeds demand, and releases it in the opposite case. accumulator-3=Stores a limited amount of energy when available production exceeds demand, and releases it in the opposite case.
@@ -908,6 +912,7 @@ PHI-CT-MINER=Large miner
PHI-CT-LINKED=Linked chest PHI-CT-LINKED=Linked chest
PHI-CT-LOADER=Loader enable PHI-CT-LOADER=Loader enable
PHI-CT-RECIPE=Recipe PHI-CT-RECIPE=Recipe
PHI-CT-ENERGY=Energy
[mod-setting-description] [mod-setting-description]
PHI-EN-SOLAR-TIER=Default 8 ; Disable 1 PHI-EN-SOLAR-TIER=Default 8 ; Disable 1

View File

@@ -256,6 +256,8 @@ trash-pipe=ごみパイプ
large-area-electric-mining-drill=大型電動掘削機 large-area-electric-mining-drill=大型電動掘削機
passive-energy-void=パッシブエネルギーボイド
[item-description] [item-description]
solar-panel-mk2-equipment=装備用モジュールに電力を供給します。 solar-panel-mk2-equipment=装備用モジュールに電力を供給します。
solar-panel-mk3-equipment=装備用モジュールに電力を供給します。 solar-panel-mk3-equipment=装備用モジュールに電力を供給します。
@@ -515,6 +517,8 @@ trash-pipe=ごみパイプ
large-area-electric-mining-drill=大型電動掘削機 large-area-electric-mining-drill=大型電動掘削機
passive-energy-void=パッシブエネルギーボイド
[entity-description] [entity-description]
accumulator-2=供給可能な電力が需要量を上回っている時に電力を貯蔵します。需要量が上回っている場合は放電します。 accumulator-2=供給可能な電力が需要量を上回っている時に電力を貯蔵します。需要量が上回っている場合は放電します。
accumulator-3=供給可能な電力が需要量を上回っている時に電力を貯蔵します。需要量が上回っている場合は放電します。 accumulator-3=供給可能な電力が需要量を上回っている時に電力を貯蔵します。需要量が上回っている場合は放電します。
@@ -908,6 +912,7 @@ PHI-CT-MINER=大型電動掘削機
PHI-CT-LINKED=リンクされたチェスト PHI-CT-LINKED=リンクされたチェスト
PHI-CT-LOADER=ローダーを有効にする PHI-CT-LOADER=ローダーを有効にする
PHI-CT-RECIPE=レシピ PHI-CT-RECIPE=レシピ
PHI-CT-ENERGY=エネルギー
[mod-setting-description] [mod-setting-description]
PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1 PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1

View File

@@ -256,6 +256,8 @@ trash-pipe=垃圾管
large-area-electric-mining-drill=大型電能採礦機 large-area-electric-mining-drill=大型電能採礦機
passive-energy-void=被動能量消除器
[item-description] [item-description]
solar-panel-mk2-equipment=替裝備的模組供電。 solar-panel-mk2-equipment=替裝備的模組供電。
solar-panel-mk3-equipment=替裝備的模組供電。 solar-panel-mk3-equipment=替裝備的模組供電。
@@ -515,6 +517,8 @@ trash-pipe=垃圾管
large-area-electric-mining-drill=大型電能採礦機 large-area-electric-mining-drill=大型電能採礦機
passive-energy-void=被動能量消除器
[entity-description] [entity-description]
accumulator-2=在發電超出用電量時,可儲存有限電力;反之則會釋放電力。 accumulator-2=在發電超出用電量時,可儲存有限電力;反之則會釋放電力。
accumulator-3=在發電超出用電量時,可儲存有限電力;反之則會釋放電力。 accumulator-3=在發電超出用電量時,可儲存有限電力;反之則會釋放電力。
@@ -908,6 +912,7 @@ PHI-CT-MINER=大型電能採礦機
PHI-CT-LINKED=連結箱 PHI-CT-LINKED=連結箱
PHI-CT-LOADER=裝卸機啟用 PHI-CT-LOADER=裝卸機啟用
PHI-CT-RECIPE=配方 PHI-CT-RECIPE=配方
PHI-CT-ENERGY=能量
[mod-setting-description] [mod-setting-description]
PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1

View File

@@ -256,6 +256,8 @@ trash-pipe=垃圾管
large-area-electric-mining-drill=大型電能採礦機 large-area-electric-mining-drill=大型電能採礦機
passive-energy-void=被動能量消除器
[item-description] [item-description]
solar-panel-mk2-equipment=替裝備的模組供電。 solar-panel-mk2-equipment=替裝備的模組供電。
solar-panel-mk3-equipment=替裝備的模組供電。 solar-panel-mk3-equipment=替裝備的模組供電。
@@ -515,6 +517,8 @@ trash-pipe=垃圾管
large-area-electric-mining-drill=大型電能採礦機 large-area-electric-mining-drill=大型電能採礦機
passive-energy-void=被動能量消除器
[entity-description] [entity-description]
accumulator-2=在發電超出用電量時,可儲存有限電力;反之則會釋放電力。 accumulator-2=在發電超出用電量時,可儲存有限電力;反之則會釋放電力。
accumulator-3=在發電超出用電量時,可儲存有限電力;反之則會釋放電力。 accumulator-3=在發電超出用電量時,可儲存有限電力;反之則會釋放電力。
@@ -908,6 +912,7 @@ PHI-CT-MINER=大型電能採礦機
PHI-CT-LINKED=連結箱 PHI-CT-LINKED=連結箱
PHI-CT-LOADER=裝卸機啟用 PHI-CT-LOADER=裝卸機啟用
PHI-CT-RECIPE=配方 PHI-CT-RECIPE=配方
PHI-CT-ENERGY=能量
[mod-setting-description] [mod-setting-description]
PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1

View File

@@ -4,48 +4,44 @@ local items = require 'config'
local main = {} local main = {}
local tint = { local tint = {
[2] = { [2] = {r=140, g=142, b=200},
r = 51, [3] = {r=242, g=161, b=26},
g = 229, [4] = {r=255, g=254, b=42},
b = 51, [5] = {r=54, g=228, b=255},
a = 0.7 [6] = {r=253, g=0, b=97},
}, [7] = {r=0, g=209, b=102},
[3] = { [8] = {r=233, g=63, b=233}
r = 51, }
g = 51,
b = 229, local entity_tint = {
a = 0.7 'picture',
}, 'pictures',
[4] = { 'animation',
r = 51, 'vertical_animation',
g = 229, 'structure',
b = 229, 'heat_glow_sprites',
a = 0.7 'integration_patch'
}, }
[5] = {
r = 127, local entity_mining_tint = {
g = 0, 'graphics_set',
b = 127, 'wet_mining_graphics_set'
a = 0.5 }
},
[6] = { local entity_lab_tint = {
r = 229, {
g = 178, ['a'] = 'on_animation',
b = 51, ['n'] = 3
a = 0.7
},
[7] = {
r = 127,
g = 51,
b = 0,
a = 0.2
},
[8] = {
r = 127,
g = 51,
b = 127,
a = 0.2
}, },
{
['a'] = 'off_animation',
['n'] = 2
}
}
local entity_accumulator_tint = {
'charge_animation',
'discharge_animation'
} }
-- entity -- entity
@@ -53,8 +49,8 @@ function main.EEE(source, tier)
local item = table.deepcopy(data.raw[source.type][source.ref_name]) local item = table.deepcopy(data.raw[source.type][source.ref_name])
item.name = source.name .. '-' .. tier item.name = source.name .. '-' .. tier
item.minable.result = source.name .. '-' .. tier item.minable.result = item.name
item.max_health = item.max_health * (2 ^ (tier - source.min + 1)) item.max_health = item.max_health * (tier - source.min + 1)
if (tier < source.max) then if (tier < source.max) then
item.next_upgrade = source.name .. '-' .. (tier + 1) item.next_upgrade = source.name .. '-' .. (tier + 1)
@@ -104,16 +100,25 @@ function main.EEE(source, tier)
item.energy_source.input_flow_limit = (source.base * 60 * (4 ^ (tier - source.min + 1))) .. 'kW' item.energy_source.input_flow_limit = (source.base * 60 * (4 ^ (tier - source.min + 1))) .. 'kW'
item.energy_source.output_flow_limit = (source.base * 60 * (4 ^ (tier - source.min + 1))) .. 'kW' item.energy_source.output_flow_limit = (source.base * 60 * (4 ^ (tier - source.min + 1))) .. 'kW'
--[[ for _, v in pairs(entity_accumulator_tint) do
item.charge_animation.layers[1].layers[1].filename = item.picture.layers[1].filename if item[v] and item[v].layers then
item.charge_animation.layers[1].layers[1].tint = {r = 1, g = 1, b = 1, a = 1} if item[v].layers[1] and item[v].layers[1].layers and item[v].layers[1].layers[1] then
item.charge_animation.layers[1].layers[1].hr_version.filename = item.picture.layers[1].hr_version.filename item[v].layers[1].layers[1].tint = tint[tier]
item.charge_animation.layers[1].layers[1].hr_version.tint = {r = 1, g = 1, b = 1, a = 1}
item.discharge_animation.layers[1].layers[1].filename = item.picture.layers[1].filename if item[v].layers[1].layers[1].hr_version then
item.discharge_animation.layers[1].layers[1].tint = {r = 1, g = 1, b = 1, a = 1} item[v].layers[1].layers[1].hr_version.tint = tint[tier]
item.discharge_animation.layers[1].layers[1].hr_version.filename = item.picture.layers[1].hr_version.filename end
item.discharge_animation.layers[1].layers[1].hr_version.tint = {r = 1, g = 1, b = 1, a = 1} end
]]
if item[v].layers[2] then
item[v].layers[2].tint = tint[tier]
if item[v].layers[2].hr_version then
item[v].layers[2].hr_version.tint = tint[tier]
end
end
end
end
elseif (source.type == 'solar-panel') then elseif (source.type == 'solar-panel') then
item.production = (source.base * (4 ^ (tier - source.min + 1))) .. 'kW' item.production = (source.base * (4 ^ (tier - source.min + 1))) .. 'kW'
@@ -181,25 +186,100 @@ function main.EEE(source, tier)
item.type = 'assembling-machine' item.type = 'assembling-machine'
end end
if item.picture then for _, ve in pairs(entity_tint) do
if item.picture.layers then if item[ve] then
item.picture.layers[1].tint = tint[tier] if item[ve].layers and item[ve].layers[1] then
item[ve].layers[1].tint = tint[tier]
if item.picture.layers[1].hr_version then if item[ve].layers[1].hr_version then
item.picture.layers[1].hr_version.tint = tint[tier] item[ve].layers[1].hr_version.tint = tint[tier]
end
end
for _, v in pairs(item[ve]) do
if v.layers then
if v.layers[1] then
v.layers[1].tint = tint[tier]
if v.layers[1].hr_version then
v.layers[1].hr_version.tint = tint[tier]
end end
end end
end end
if item.pictures then for i=1, #v, 1 do
if item.pictures.layers then if v[i].layers and v[i].layers[1] then
item.pictures.layers[1].tint = tint[tier] v[i].layers[1].tint = tint[tier]
if item.pictures.layers[1].hr_version then if v[i].layers[1].hr_version then
item.pictures.layers[1].hr_version.tint = tint[tier] v[i].layers[1].hr_version.tint = tint[tier]
end end
end end
end end
end
end
end
if item.idle_animation and item.idle_animation.layers then
local i = 1
while i < #item.idle_animation.layers do
if item.idle_animation.layers[i] then
item.idle_animation.layers[i].tint = tint[tier]
if item.idle_animation.layers[i].hr_version then
item.idle_animation.layers[i].hr_version.tint = tint[tier]
end
end
i = i + 2
if not item.idle_animation.layers[i] then
break
end
end
end
for _, v in pairs(entity_lab_tint) do
if item[v['a']] and item[v['a']].layers then
for i=1, v['n'], 1 do
if item[v['a']].layers[i] then
item[v['a']].layers[i].tint = tint[tier]
if item[v['a']].layers[i].hr_version then
item[v['a']].layers[i].hr_version.tint = tint[tier]
end
end
end
end
end
for _, e in pairs(entity_mining_tint) do
if item[e] and item[e].animation then
for _, d in pairs(item[e].animation) do
if d.layers then
d.layers[1].tint = tint[tier]
d.layers[2].tint = tint[tier]
if d.layers[1].hr_version then
d.layers[1].hr_version.tint = tint[tier]
end
if d.layers[2].hr_version then
d.layers[2].hr_version.tint = tint[tier]
end
end
end
end
end
if item.base_picture and item.base_picture.sheets then
item.base_picture.sheets[1].tint = tint[tier]
if item.base_picture.sheets[1].hr_version then
item.base_picture.sheets[1].hr_version.tint = tint[tier]
end
end
data:extend({item}) data:extend({item})
end end
@@ -288,14 +368,14 @@ function main.EEQ(source, tier)
width = w * 32, width = w * 32,
height = h * 32, height = h * 32,
priority = 'medium', priority = 'medium',
-- tint = tint[tier], tint = tint[tier],
hr_version = { hr_version = {
filename = '__base__/graphics/equipment/hr-' .. source.graphics_name .. '.png', filename = '__base__/graphics/equipment/hr-' .. source.graphics_name .. '.png',
width = w * 64, width = w * 64,
height = h * 64, height = h * 64,
priority = 'medium', priority = 'medium',
-- tint = tint[tier], scale = 0.5,
scale = 0.5 tint = tint[tier]
} }
} }
@@ -309,10 +389,6 @@ function main.EI(source, tier)
if source.category == 'equipment' then if source.category == 'equipment' then
item['name'] = source.name .. '-mk' .. tier .. '-equipment' item['name'] = source.name .. '-mk' .. tier .. '-equipment'
item.placed_as_equipment_result = source.name .. '-mk' .. tier .. '-equipment' item.placed_as_equipment_result = source.name .. '-mk' .. tier .. '-equipment'
-- item.subgroup = 'equipment'
-- item.stack_size = 20
-- item.default_request_amount = 5
-- item.icons = {{icon = '__base__/graphics/icons/' .. source.graphics_name .. '.png', icon_mipmaps = 4, icon_size = 64}}
else else
if tier > 1 then if tier > 1 then
@@ -325,8 +401,28 @@ function main.EI(source, tier)
end end
end end
if item.icons then if item.icons and item.icons[1] then
item.icons[1].tint = tint[tier] item.icons[1].tint = tint[tier]
elseif item.icon then
item.icons = {
{
icon = item.icon,
tint = tint[tier]
}
}
item.icon = nil
if item.icon_size then
item.icons[1].icon_size = item.icon_size
item.icon_size = nil
end
if item.icon_mipmaps then
item.icons[1].icon_mipmaps = item.icon_mipmaps
item.icon_mipmaps = nil
end
end end
item.order = item.order .. tier item.order = item.order .. tier

View File

@@ -43,7 +43,6 @@ for _, force in pairs(game.forces) do
end end
end end
if technologies['power-armor-mk2'].researched then if technologies['power-armor-mk2'].researched then
if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value then if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value then
recipes['power-armor-mk3'].enabled = true recipes['power-armor-mk3'].enabled = true
@@ -133,5 +132,21 @@ for _, force in pairs(game.forces) do
recipes['express-loader'].reload() recipes['express-loader'].reload()
end end
end end
if settings.startup['PHI-CT-ENERGY'].value then
if technologies['electric-energy-accumulators'].researched then
recipes['passive-energy-void'].enabled = true
recipes['passive-energy-void'].reload()
end
end
end
if settings.startup['PHI-MB'].value and mods['space-exploration'] then
if technologies['se-core-miner'].researched then
for i=1, settings.startup['PHI-MB-MINING-TIER'].value do
recipes['se-core-miner-' .. i].enabled = true
recipes['se-core-miner-' .. i].reload()
end
end
end end
end end

View File

@@ -496,11 +496,17 @@ data:extend({
setting_type = 'startup', setting_type = 'startup',
default_value = true, default_value = true,
order = 'JA07' order = 'JA07'
}, {
type = 'bool-setting',
name = 'PHI-CT-ENERGY',
setting_type = 'startup',
default_value = true,
order = 'JA08'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-CT-TILE', name = 'PHI-CT-TILE',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = true,
order = 'JB01' order = 'JB01'
}, { }, {
type = 'string-setting', type = 'string-setting',
@@ -510,5 +516,4 @@ data:extend({
allowed_values = {'concrete', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4', 'hazard-concrete-left', 'hazard-concrete-right', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'landfill', 'out-of-map', 'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3', 'refined-concrete', 'refined-hazard-concrete-left', 'refined-hazard-concrete-right', 'sand-1', 'sand-2', 'sand-3', 'stone-path', 'tutorial-grid', 'water', 'water-green', 'water-mud', 'water-shallow'}, allowed_values = {'concrete', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4', 'hazard-concrete-left', 'hazard-concrete-right', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'landfill', 'out-of-map', 'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3', 'refined-concrete', 'refined-hazard-concrete-left', 'refined-hazard-concrete-right', 'sand-1', 'sand-2', 'sand-3', 'stone-path', 'tutorial-grid', 'water', 'water-green', 'water-mud', 'water-shallow'},
order = 'JB02' order = 'JB02'
} }
} })
)