This commit is contained in:
2024-09-28 00:22:29 +09:00
parent 96f72cd9f7
commit 523281c29a
9 changed files with 1025 additions and 4113 deletions

View File

@@ -10,6 +10,10 @@ data.raw['decider-combinator']['decider-combinator'].energy_source.usage_priorit
data.raw['active-defense-equipment']['discharge-defense-equipment'].automatic = true data.raw['active-defense-equipment']['discharge-defense-equipment'].automatic = true
for _, t in pairs(data.raw['tree']) do
t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}}
end
for _,name in pairs({'furnace', 'lab', 'beacon'}) do for _,name in pairs({'furnace', 'lab', 'beacon'}) do
local entities = {} local entities = {}

View File

@@ -89,7 +89,9 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t
equipment_grid = 'equipment-grid-14x14', equipment_grid = 'equipment-grid-14x14',
inventory_size_bonus = 40, inventory_size_bonus = 40,
open_sound = {filename = '__base__/sound/armor-open.ogg', volume = 1}, open_sound = {filename = '__base__/sound/armor-open.ogg', volume = 1},
close_sound = {filename = '__base__/sound/armor-close.ogg', volume = 1} close_sound = {filename = '__base__/sound/armor-close.ogg', volume = 1},
localised_name = {'phi-cl.combine-gen', {'name.power-armor-mk2'}, 3},
localised_description = {'description.power-armor-mk2'}
} }
}) })
@@ -99,7 +101,9 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t
energy_required = 2, energy_required = 2,
enabled = false, enabled = false,
ingredients = {{name='power-armor-mk2', amount=2}}, ingredients = {{name='power-armor-mk2', amount=2}},
result = 'power-armor-mk3' result = 'power-armor-mk3',
localised_name = {'name.power-armor-mk2'},
localised_description = {'description.power-armor-mk2'}
}}) }})
for _, animation in ipairs(data.raw['character']['character']['animations']) do for _, animation in ipairs(data.raw['character']['character']['animations']) do
@@ -117,18 +121,22 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t
end end
if settings.startup['PHI-RS'].value then if settings.startup['PHI-RS'].value then
local item = table.deepcopy(data.raw['furnace']['electric-furnace']) local item = table.deepcopy(data.raw.item['electric-furnace'])
item.name = 'electric-filter-furnace'
item.minable.result = 'electric-filter-furnace'
item.type = 'assembling-machine'
data:extend({item})
item = table.deepcopy(data.raw.item['electric-furnace'])
item.name = 'electric-filter-furnace' item.name = 'electric-filter-furnace'
item.place_result = 'electric-filter-furnace' item.place_result = 'electric-filter-furnace'
item.order = item.order .. '2' item.order = item.order .. '2'
item.localised_name = {'name.electric-filter-furnace'}
item.localised_description = {'description.electric-filter-furnace'}
data:extend({item}) data:extend({item})
local entity = table.deepcopy(data.raw['furnace']['electric-furnace'])
entity.name = 'electric-filter-furnace'
entity.minable.result = 'electric-filter-furnace'
entity.type = 'assembling-machine'
entity.localised_name = {'name.electric-filter-furnace'}
entity.localised_description = {'description.electric-filter-furnace'}
data:extend({entity})
data:extend({{ data:extend({{
type = 'recipe', type = 'recipe',
name = 'electric-filter-furnace', name = 'electric-filter-furnace',
@@ -136,6 +144,8 @@ if settings.startup['PHI-RS'].value then
enabled = false, enabled = false,
ingredients = {{name='electric-furnace', amount=1}}, ingredients = {{name='electric-furnace', amount=1}},
result = 'electric-filter-furnace', result = 'electric-filter-furnace',
localised_name = {'name.electric-filter-furnace'},
localised_description = {'description.electric-filter-furnace'}
}}) }})
table.insert(data.raw.technology[items['item']['electric-filter-furnace'].tech].effects, {type='unlock-recipe', recipe='electric-filter-furnace'}) table.insert(data.raw.technology[items['item']['electric-filter-furnace'].tech].effects, {type='unlock-recipe', recipe='electric-filter-furnace'})
@@ -192,6 +202,8 @@ if settings.startup['PHI-RS'].value then
item = table.deepcopy(data.raw.recipe[k]) item = table.deepcopy(data.raw.recipe[k])
item.enabled = false item.enabled = false
item.name = k .. '-s' .. j item.name = k .. '-s' .. j
item.localised_name = {'name.'} .. k
item.localised_description = {'description.'} .. k
if item.normal then if item.normal then
item.normal.hide_from_player_crafting = true item.normal.hide_from_player_crafting = true
@@ -361,7 +373,8 @@ if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.s
item.icon = nil item.icon = nil
item.icon_size = nil item.icon_size = nil
item.localised_name = {'name.se-core-miner-drill'}
item.localised_description = {'description.se-core-miner-drill'}
data:extend({item}) data:extend({item})
if i > 2 then if i > 2 then
@@ -371,7 +384,9 @@ if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.s
energy_required = 2, energy_required = 2,
enabled = false, enabled = false,
ingredients = {{name='se-core-miner-' .. (i - 1), amount=1}, {name='se-core-miner', amount=1}}, ingredients = {{name='se-core-miner-' .. (i - 1), amount=1}, {name='se-core-miner', amount=1}},
result = miner_name result = miner_name,
localised_name = {'name.se-core-miner-drill'},
localised_description = {'description.se-core-miner-drill'}
}}) }})
else else
@@ -381,7 +396,9 @@ if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.s
energy_required = 2, energy_required = 2,
enabled = false, enabled = false,
ingredients = {{name='se-core-miner', amount=2}}, ingredients = {{name='se-core-miner', amount=2}},
result = miner_name result = miner_name,
localised_name = {'name.se-core-miner-drill'},
localised_description = {'description.se-core-miner-drill'}
}}) }})
end end

View File

@@ -3,6 +3,53 @@ local graphics_location = '__PHI-CL__/graphics/'
local main = require 'main' local main = require 'main'
local file_stage = 1 local file_stage = 1
if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-SOLAR-TIER'].value and settings.startup['PHI-EN-STEAM-TIER'].value and settings.startup['PHI-EN-NUCLEAR-TIER'].value then
local ml = math.max(settings.startup['PHI-EN-SOLAR-TIER'].value, settings.startup['PHI-EN-STEAM-TIER'].value, settings.startup['PHI-EN-NUCLEAR-TIER'].value)
for i=1, 7 do
local tn = 'compound-energy-' .. i
local prereq
local e = true
if i > 1 then
prereq = {'compound-energy-' .. (i - 1)}
else
prereq = {'solar-energy', 'advanced-electronics', 'electric-energy-accumulators'}
end
if i > ml then
e = false
end
data:extend({{
type = 'technology',
name = tn,
enabled = e,
prerequisites = prereq,
effects = {},
unit = {
count = math.floor(100 * (i ^ 1.6)),
ingredients = {
{'automation-science-pack', 1},
{'logistic-science-pack', 1}
},
time = 60
},
icons = {
{
icon = '__base__/graphics/technology/solar-energy.png',
icon_size = 256,
tint = items['tint'][i]
}
},
order = 'a-h-' .. i,
localised_name = {'phi-cl.combine', {'technology-name.compound-energy'}, i},
localised_description = {'technology-description.compound-energy'}
}})
end
end
if settings.startup['PHI-XW-WATER'].value > 0 then if settings.startup['PHI-XW-WATER'].value > 0 then
data.raw['offshore-pump']['offshore-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 data.raw['offshore-pump']['offshore-pump'].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20
data.raw['offshore-pump']['offshore-pump'].flags = {'placeable-neutral', 'player-creation'} data.raw['offshore-pump']['offshore-pump'].flags = {'placeable-neutral', 'player-creation'}
@@ -31,7 +78,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-OIL'].value the
item.icon = nil item.icon = nil
item.icon_size = nil item.icon_size = nil
item.icon_mipmaps = nil item.icon_mipmaps = nil
item.localised_name = {'name.oil-pump'}
item.localised_description = {'description.oil-pump'}
data:extend({item}) data:extend({item})
local entity = table.deepcopy(data.raw['offshore-pump']['offshore-pump']) local entity = table.deepcopy(data.raw['offshore-pump']['offshore-pump'])
@@ -40,6 +88,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-OIL'].value the
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 entity.se_allow_in_space = true
entity.localised_name = {'name.oil-pump'}
entity.localised_description = {'description.oil-pump'}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -48,7 +98,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-OIL'].value the
energy_required = 2, energy_required = 2,
enabled = true, enabled = true,
ingredients = {{'electronic-circuit', 2}, {'pipe', 1}, {'iron-gear-wheel', 1}}, ingredients = {{'electronic-circuit', 2}, {'pipe', 1}, {'iron-gear-wheel', 1}},
result = 'oil-pump' result = 'oil-pump',
localised_name = {'name.oil-pump'},
localised_description = {'description.oil-pump'}
}}) }})
end end
@@ -70,6 +122,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-RADAR'].value t
item.icon = nil item.icon = nil
item.icon_size = nil item.icon_size = nil
item.icon_mipmaps = nil item.icon_mipmaps = nil
item.localised_name = {'name.super-radar'}
item.localised_description = {'description.super-radar'}
data:extend({item}) data:extend({item})
local entity = table.deepcopy(data.raw['radar']['radar']) local entity = table.deepcopy(data.raw['radar']['radar'])
@@ -80,6 +134,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-RADAR'].value t
entity.pictures.layers[1].tint = items['tint'][8] entity.pictures.layers[1].tint = items['tint'][8]
entity.pictures.layers[1].hr_version.tint = items['tint'][8] entity.pictures.layers[1].hr_version.tint = items['tint'][8]
entity.se_allow_in_space = true entity.se_allow_in_space = true
entity.localised_name = {'name.super-radar'}
entity.localised_description = {'description.super-radar'}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -88,7 +144,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-RADAR'].value t
energy_required = 2, energy_required = 2,
enabled = true, enabled = true,
ingredients = {{'electronic-circuit', 5}, {'iron-gear-wheel', 5}, {'iron-plate', 10}}, ingredients = {{'electronic-circuit', 5}, {'iron-gear-wheel', 5}, {'iron-plate', 10}},
result = 'super-radar' result = 'super-radar',
localised_name = {'name.super-radar'},
localised_description = {'description.super-radar'}
}}) }})
end end
@@ -110,6 +168,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value t
item.icon = nil item.icon = nil
item.icon_size = nil item.icon_size = nil
item.icon_mipmaps = nil item.icon_mipmaps = nil
item.localised_name = {'name.trash-chest'}
item.localised_description = {'description.trash-chest'}
data:extend({item}) data:extend({item})
local entity = table.deepcopy(data.raw['container']['steel-chest']) local entity = table.deepcopy(data.raw['container']['steel-chest'])
@@ -126,6 +186,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value t
entity.picture.layers[1].tint = items['tint'][8] entity.picture.layers[1].tint = items['tint'][8]
entity.picture.layers[1].hr_version.tint = items['tint'][8] entity.picture.layers[1].hr_version.tint = items['tint'][8]
entity.se_allow_in_space = true entity.se_allow_in_space = true
entity.localised_name = {'name.trash-chest'}
entity.localised_description = {'description.trash-chest'}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -134,7 +196,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value t
energy_required = 2, energy_required = 2,
enabled = false, enabled = false,
ingredients = {{'steel-chest', 1}}, ingredients = {{'steel-chest', 1}},
result = 'trash-chest' result = 'trash-chest',
localised_name = {'name.trash-chest'},
localised_description = {'description.trash-chest'}
}}) }})
table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='trash-chest'}) table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='trash-chest'})
@@ -156,6 +220,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value t
item.icon = nil item.icon = nil
item.icon_size = nil item.icon_size = nil
item.icon_mipmaps = nil item.icon_mipmaps = nil
item.localised_name = {'name.trash-pipe'}
item.localised_description = {'description.trash-pipe'}
data:extend({item}) data:extend({item})
entity = table.deepcopy(data.raw['pipe']['pipe']) entity = table.deepcopy(data.raw['pipe']['pipe'])
@@ -177,6 +243,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value t
end end
entity.se_allow_in_space = true entity.se_allow_in_space = true
entity.localised_name = {'name.trash-pipe'}
entity.localised_description = {'description.trash-pipe'}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -185,7 +253,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRASH'].value t
energy_required = 2, energy_required = 2,
enabled = false, enabled = false,
ingredients = {{'iron-plate', 1}}, ingredients = {{'iron-plate', 1}},
result = 'trash-pipe' result = 'trash-pipe',
localised_name = {'name.trash-pipe'},
localised_description = {'description.trash-pipe'}
}}) }})
table.insert(data.raw.technology['automation'].effects, {type='unlock-recipe', recipe='trash-pipe'}) table.insert(data.raw.technology['automation'].effects, {type='unlock-recipe', recipe='trash-pipe'})
@@ -196,6 +266,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-MINER'].value t
item.name = 'large-area-electric-mining-drill' item.name = 'large-area-electric-mining-drill'
item.place_result = 'large-area-electric-mining-drill' item.place_result = 'large-area-electric-mining-drill'
item.order = 'zc' item.order = 'zc'
item.localised_name = {'name.large-area-electric-mining-drill'}
item.localised_description = {'description.large-area-electric-mining-drill'}
data:extend({item}) data:extend({item})
local entity = table.deepcopy(data.raw['mining-drill']['electric-mining-drill']) local entity = table.deepcopy(data.raw['mining-drill']['electric-mining-drill'])
@@ -208,6 +280,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-MINER'].value t
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 entity.se_allow_in_space = true
entity.localised_name = {'name.large-area-electric-mining-drill'}
entity.localised_description = {'description.large-area-electric-mining-drill'}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -216,7 +290,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-MINER'].value t
energy_required = 2, energy_required = 2,
enabled = true, enabled = true,
ingredients = {{'electric-mining-drill', 16}}, ingredients = {{'electric-mining-drill', 16}},
result = 'large-area-electric-mining-drill' result = 'large-area-electric-mining-drill',
localised_name = {'name.large-area-electric-mining-drill'},
localised_description = {'description.large-area-electric-mining-drill'}
}}) }})
end end
@@ -330,6 +406,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-ENERGY'].value
local item = table.deepcopy(data.raw['item']['electric-energy-interface']) local item = table.deepcopy(data.raw['item']['electric-energy-interface'])
item.name = 'passive-energy-void' item.name = 'passive-energy-void'
item.place_result = '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}) data:extend({item})
local entity = table.deepcopy(data.raw['electric-energy-interface']['electric-energy-interface']) local entity = table.deepcopy(data.raw['electric-energy-interface']['electric-energy-interface'])
@@ -343,6 +421,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-ENERGY'].value
entity.energy_usage = '1TW' entity.energy_usage = '1TW'
entity.gui_mode = 'none' entity.gui_mode = 'none'
entity.se_allow_in_space = true entity.se_allow_in_space = true
entity.localised_name = {'name.passive-energy-void'}
entity.localised_description = {'description.passive-energy-void'}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -351,7 +431,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-ENERGY'].value
energy_required = 2, energy_required = 2,
enabled = false, enabled = false,
ingredients = {{'accumulator', 1}}, ingredients = {{'accumulator', 1}},
result = 'passive-energy-void' result = 'passive-energy-void',
localised_name = {'name.passive-energy-void'},
localised_description = {'description.passive-energy-void'}
}}) }})
table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'}) table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type='unlock-recipe', recipe='passive-energy-void'})
@@ -371,6 +453,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value t
item.icon = graphics_location .. 'battery.png' item.icon = graphics_location .. 'battery.png'
item.order = 'qa' item.order = 'qa'
item.stack_size = 100 item.stack_size = 100
item.localised_name = {'name.empty-train-battery'}
item.localised_description = {'description.empty-train-battery'}
data:extend({item}) data:extend({item})
data:extend({{ data:extend({{
@@ -389,7 +473,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value t
name = 'empty-train-battery', name = 'empty-train-battery',
amount = 1 amount = 1
} }
} },
localised_name = {'name.empty-train-battery'},
localised_description = {'description.empty-train-battery'}
}}) }})
for _, v in pairs(data.raw.module) do for _, v in pairs(data.raw.module) do
@@ -404,6 +490,8 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value t
item.fuel_value = '1GJ' item.fuel_value = '1GJ'
item.icon = graphics_location .. 'battery.png' item.icon = graphics_location .. 'battery.png'
item.stack_size = 10 item.stack_size = 10
item.localised_name = {'name.charged-train-battery'}
item.localised_description = {'description.charged-train-battery'}
data:extend({item}) data:extend({item})
data:extend({{ data:extend({{
@@ -427,7 +515,9 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value t
probability = 0.005, probability = 0.005,
amount = 5 amount = 5
} }
} },
localised_name = {'name.charged-train-battery'},
localised_description = {'description.charged-train-battery'}
}}) }})
data.raw['locomotive']['locomotive'].burner.burnt_inventory_size = 1 data.raw['locomotive']['locomotive'].burner.burnt_inventory_size = 1
@@ -447,6 +537,8 @@ if settings.startup['PHI-MB'].value then
} }
} }
item.order = 'm[satellite]-' .. i item.order = 'm[satellite]-' .. i
item.localised_name = {'name.satellite'}
item.localised_description = {'description.satellite'}
data:extend({item}) data:extend({item})
local inn local inn
@@ -468,7 +560,9 @@ if settings.startup['PHI-MB'].value then
icon_mipmaps = 4, icon_mipmaps = 4,
category = 'crafting', category = 'crafting',
ingredients = {{inn, 2}}, ingredients = {{inn, 2}},
results = {{name = 'satellite-' .. i, amount = 1}} results = {{name = 'satellite-' .. i, amount = 1}},
localised_name = {'name.satellite'},
localised_description = {'description.satellite'}
}}) }})
table.insert(data.raw.technology['space-science-pack'].effects, {type='unlock-recipe', recipe='satellite-' .. i}) table.insert(data.raw.technology['space-science-pack'].effects, {type='unlock-recipe', recipe='satellite-' .. i})
@@ -569,6 +663,8 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value th
item.name = 'electric-boiler' item.name = 'electric-boiler'
item.place_result = 'electric-boiler' item.place_result = 'electric-boiler'
item.order = 'b[steam-power]-a[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}) data:extend({item})
local entity = table.deepcopy(data.raw['boiler']['boiler']) local entity = table.deepcopy(data.raw['boiler']['boiler'])
@@ -588,6 +684,8 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value th
entity.fire_flicker_enabled = false entity.fire_flicker_enabled = false
entity.fire_glow_flicker_enabled = false entity.fire_glow_flicker_enabled = false
entity.fire = {} entity.fire = {}
entity.localised_name = {'name.electric-boiler'}
entity.localised_description = {'description.electric-boiler'}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -597,6 +695,8 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value th
enabled = true, enabled = true,
ingredients = {{name='boiler', amount=1}, {name='electronic-circuit', amount=1}}, ingredients = {{name='boiler', amount=1}, {name='electronic-circuit', amount=1}},
result = 'electric-boiler', result = 'electric-boiler',
localised_name = {'name.electric-boiler'},
localised_description = {'description.electric-boiler'}
}}) }})
-- electric boiler -- electric boiler
@@ -628,6 +728,8 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t
item.name = 'basic-' .. chests[i] item.name = 'basic-' .. chests[i]
item.place_result = 'basic-' .. chests[i] item.place_result = 'basic-' .. chests[i]
item.order = 'b[storage]-h[basic-' .. chests[i] .. ']' item.order = 'b[storage]-h[basic-' .. chests[i] .. ']'
item.localised_name = {'name.'} .. chests[i]
item.localised_description = {'description.'} .. chests[i]
data:extend({item}) data:extend({item})
entity.inventory_type = 'with_filters_and_bar' entity.inventory_type = 'with_filters_and_bar'
@@ -635,6 +737,8 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t
entity.max_logistic_slots = 1 entity.max_logistic_slots = 1
entity.name = 'basic-' .. chests[i] entity.name = 'basic-' .. chests[i]
entity.minable.result = 'basic-' .. chests[i] entity.minable.result = 'basic-' .. chests[i]
entity.localised_name = {'name.'} .. chests[i]
entity.localised_description = {'description.'} .. chests[i]
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -644,6 +748,8 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t
enabled = false, enabled = false,
ingredients = {{chests[i], 1}}, ingredients = {{chests[i], 1}},
result = 'basic-' .. chests[i], result = 'basic-' .. chests[i],
localised_name = {'name.'} .. chests[i],
localised_description = {'description.'} .. chests[i]
}}) }})
end end

View File

@@ -1,6 +1,6 @@
{ {
"name": "PHI-CL", "name": "PHI-CL",
"version": "2.0.40", "version": "2.0.41",
"factorio_version": "1.1", "factorio_version": "1.1",
"date": "2024-09-27", "date": "2024-09-27",
"title": "Phidias Collection", "title": "Phidias Collection",
@@ -16,6 +16,6 @@
"? space-exploration >= 0.6.0", "? space-exploration >= 0.6.0",
"? angelsrefining >= 0.12.0", "? angelsrefining >= 0.12.0",
"? exotic-industries >= 0.6.0", "? exotic-industries >= 0.6.0",
"? Atomic_Overhaul >= 1.3.0" "(?) Atomic_Overhaul >= 1.3.0"
] ]
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -283,6 +283,15 @@ function main.EEE(source, tier)
end end
end end
if tier > 1 then
item.localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tier}
else
item.localised_name = {'name.' .. source.ref_name}
end
item.localised_description = {'description.' .. source.ref_name}
data:extend({item}) data:extend({item})
end end
@@ -381,6 +390,9 @@ function main.EEQ(source, tier)
} }
} }
item.localised_name = {'phi-cl.combine-gen', {'name.' .. source.ref_name}, tier}
item.localised_description = {'description.' .. source.ref_name}
data:extend({item}) data:extend({item})
end end
@@ -428,6 +440,16 @@ function main.EI(source, tier)
end end
item.order = item.order .. tier item.order = item.order .. tier
if tier > 1 then
item.localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tier}
else
item.localised_name = {'name.' .. source.ref_name}
end
item.localised_description = {'description.' .. source.ref_name}
data:extend({item}) data:extend({item})
end end
@@ -436,6 +458,8 @@ function main.ER(source, tier)
local new_name = source.name local new_name = source.name
local ingredient_name = source.name local ingredient_name = source.name
local result_name = source.name local result_name = source.name
local localised_name
local localised_description = {'description.' .. source.ref_name}
if source.category == 'equipment' then if source.category == 'equipment' then
if (tier == 2) then if (tier == 2) then
@@ -448,6 +472,8 @@ function main.ER(source, tier)
new_name = new_name .. '-mk' .. tier .. '-equipment' new_name = new_name .. '-mk' .. tier .. '-equipment'
result_name = result_name .. '-mk' .. tier .. '-equipment' result_name = result_name .. '-mk' .. tier .. '-equipment'
localised_name = {'phi-cl.combine-gen', {'name.' .. source.ref_name}, tier}
else else
if tier > 2 then if tier > 2 then
ingredient_name = ingredient_name .. '-' .. (tier - 1) ingredient_name = ingredient_name .. '-' .. (tier - 1)
@@ -455,6 +481,13 @@ function main.ER(source, tier)
new_name = new_name .. '-' .. tier new_name = new_name .. '-' .. tier
result_name = result_name .. '-' .. tier result_name = result_name .. '-' .. tier
if tier > 1 then
localised_name = {'phi-cl.combine', {'name.' .. source.ref_name}, tier}
else
localised_name = {'name.' .. source.ref_name}
end
end end
if (source.tech == 'compound-energy') then if (source.tech == 'compound-energy') then
@@ -466,6 +499,8 @@ function main.ER(source, tier)
enabled = false, enabled = false,
ingredients = {{name=ingredient_name, amount=4}}, ingredients = {{name=ingredient_name, amount=4}},
result = result_name, result = result_name,
localised_name = localised_name,
localised_description = localised_description
}}) }})
else else
@@ -477,6 +512,8 @@ function main.ER(source, tier)
enabled = false, enabled = false,
ingredients = {{name=ingredient_name, amount=1}, {name=source.name, amount=1}}, ingredients = {{name=ingredient_name, amount=1}, {name=source.name, amount=1}},
result = result_name, result = result_name,
localised_name = localised_name,
localised_description = localised_description
}}) }})
else else
@@ -487,6 +524,8 @@ function main.ER(source, tier)
enabled = false, enabled = false,
ingredients = {{name=ingredient_name, amount=2}}, ingredients = {{name=ingredient_name, amount=2}},
result = result_name, result = result_name,
localised_name = localised_name,
localised_description = localised_description
}}) }})
end end
end end
@@ -499,6 +538,8 @@ function main.ER(source, tier)
enabled = false, enabled = false,
ingredients = {{name=ingredient_name, amount=2}}, ingredients = {{name=ingredient_name, amount=2}},
result = result_name, result = result_name,
localised_name = localised_name,
localised_description = localised_description
}}) }})
end end
end end
@@ -506,42 +547,7 @@ end
-- technology -- technology
function main.ET(source, tier) function main.ET(source, tier)
if (source.tech == 'compound-energy') then if (source.tech == 'compound-energy') then
if not data.raw.technology['compound-energy-' .. (tier - 1)] then table.insert(data.raw.technology['compound-energy-' .. (tier - 1)].effects, {type='unlock-recipe', recipe=source.name .. '-' .. tier})
local prereq
if (tier == 2) then
prereq = {'solar-energy', 'advanced-electronics', 'electric-energy-accumulators'}
else
prereq = {'compound-energy-' .. (tier - 2)}
end
local item = {
type = 'technology',
name = 'compound-energy-' .. (tier - 1),
icon_size = 256,
icon = '__base__/graphics/technology/solar-energy.png',
effects = {
{type='unlock-recipe', recipe=source.name .. '-' .. tier}
},
prerequisites = prereq,
unit = {
count = 200 * (tier - 1),
ingredients = {
{'automation-science-pack', 2},
{'logistic-science-pack', 2}
},
time = 120
},
order = 'a-h-' .. alpha_order[tier + 1]
}
data:extend({item})
else
if tier <= source.max then
table.insert(data.raw.technology['compound-energy-' .. (tier - 1)].effects, {type='unlock-recipe', recipe=source.name .. '-' .. tier})
end
end
elseif data.raw.technology[source.tech] then elseif data.raw.technology[source.tech] then
local recipe_name = source.name local recipe_name = source.name