This commit is contained in:
2024-09-28 13:44:33 +09:00
parent 66402f422a
commit 9befc7edc5
2 changed files with 143 additions and 145 deletions

View File

@@ -6,32 +6,122 @@ if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-NUCLEAR-TIER'].
data.raw['fluid']['steam'].max_temperature = 5000 data.raw['fluid']['steam'].max_temperature = 5000
end end
if settings.startup['PHI-XW-WATER'].value > 0 then if settings.startup['PHI-MB'].value then
if mods['angelsrefining'] then for i=2, 3 do
local ocfs = 'offshore-pump' item = table.deepcopy(data.raw['item']['satellite'])
local ofs = 'seafloor-pump' item.name = 'satellite-' .. i
item.rocket_launch_product = {type='item', name='space-science-pack', amount=1000 * (2 ^ (i - 1))}
item.icons = {
{
icon = '__base__/graphics/icons/satellite.png',
tint = items['tint'][i],
icon_size = 64,
icon_mipmaps = 4
}
}
item.order = 'm[satellite]-' .. i
item.localised_name = {'name.satellite'}
item.localised_description = {'description.satellite'}
data:extend({item})
data.raw[ocfs][ofs].pumping_speed = settings.startup['PHI-XW-WATER'].value * 2 local inn
data.raw[ocfs][ofs].flags = {'placeable-neutral', 'player-creation', 'filter-directions'}
data.raw[ocfs][ofs].adjacent_tile_collision_box = {{-2, -3}, {2, -2}} if i == 2 then
data.raw[ocfs][ofs].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} inn = 'satellite'
data.raw[ocfs][ofs].adjacent_tile_collision_mask = nil
data.raw[ocfs][ofs].placeable_position_visualization = nil else
inn = 'satellite-' .. (i - 1)
end end
if mods['exotic-industries'] then data:extend({{
local ocfs = 'offshore-pump' type = 'recipe',
local ofs = 'ei_gaia-pump' name = 'satellite-' .. i,
energy_required = 5,
enabled = false,
icon = '__base__/graphics/icons/satellite.png',
icon_size = 64,
icon_mipmaps = 4,
category = 'crafting',
ingredients = {{inn, 2}},
results = {{name = 'satellite-' .. i, amount = 1}},
localised_name = {'name.satellite'},
localised_description = {'description.satellite'}
}})
data.raw[ocfs][ofs].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20 table.insert(data.raw.technology['space-science-pack'].effects, {type='unlock-recipe', recipe='satellite-' .. i})
data.raw[ocfs][ofs].flags = {'placeable-neutral', 'player-creation'}
data.raw[ocfs][ofs].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}}
data.raw[ocfs][ofs].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}
data.raw[ocfs][ofs].adjacent_tile_collision_mask = nil
data.raw[ocfs][ofs].placeable_position_visualization = nil
end end
end end
if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.startup['PHI-MB-MINING-TIER'].value > 1 then
data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill'
local se = {
type = 'mining-drill',
name = 'se-core-miner-drill',
ref_name = 'se-core-miner-drill',
min = 2,
max = 3
}
for i=2, settings.startup['PHI-MB-MINING-TIER'].value do
local miner_name = 'se-core-miner-' .. i
local drill_name = 'se-core-miner-drill-' .. i
main.EEE(se, i)
data.raw['mining-drill'][drill_name].minable.result = miner_name
data.raw['mining-drill'][drill_name].placeable_by.item = miner_name
local item = table.deepcopy(data.raw['item']['se-core-miner'])
item.name = 'se-core-miner-' .. i
item.place_result = drill_name
item.order = 'zzzz-core-miner-' .. i
item.icons = {
{
icon = '__space-exploration-graphics__/graphics/icons/core-miner.png',
tint = items['tint'][i],
icon_size = 64,
}
}
item.icon = nil
item.icon_size = nil
item.localised_name = {'name.se-core-miner-drill'}
item.localised_description = {'description.se-core-miner-drill'}
data:extend({item})
if i > 2 then
data:extend({{
type = 'recipe',
name = miner_name,
energy_required = 2,
enabled = false,
ingredients = {{name='se-core-miner-' .. (i - 1), amount=1}, {name='se-core-miner', amount=1}},
result = miner_name,
localised_name = {'name.se-core-miner-drill'},
localised_description = {'description.se-core-miner-drill'}
}})
else
data:extend({{
type = 'recipe',
name = miner_name,
energy_required = 2,
enabled = false,
ingredients = {{name='se-core-miner', amount=2}},
result = miner_name,
localised_name = {'name.se-core-miner-drill'},
localised_description = {'description.se-core-miner-drill'}
}})
end
data.raw['mining-drill'][drill_name].fast_replaceable_group = data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group
table.insert(data.raw.technology['se-core-miner'].effects, {type='unlock-recipe', recipe=miner_name})
end
end
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
data:extend({ data:extend({
{ {
@@ -345,71 +435,37 @@ if settings.startup['PHI-RS'].value then
end end
end end
if settings.startup['PHI-MB'].value and mods['space-exploration'] and settings.startup['PHI-MB-MINING-TIER'].value > 1 then if settings.startup['PHI-XW-WATER'].value > 0 then
data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' local ocfs = 'offshore-pump'
local se = { data.raw[ocfs][ocfs].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20
type = 'mining-drill', data.raw[ocfs][ocfs].flags = {'placeable-neutral', 'player-creation'}
name = 'se-core-miner-drill', data.raw[ocfs][ocfs].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}}
ref_name = 'se-core-miner-drill', data.raw[ocfs][ocfs].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}
min = 2, data.raw[ocfs][ocfs].adjacent_tile_collision_mask = nil
max = 3 data.raw[ocfs][ocfs].placeable_position_visualization = nil
} data.raw[ocfs][ocfs].se_allow_in_space = true
for i=2, settings.startup['PHI-MB-MINING-TIER'].value do if mods['angelsrefining'] then
local miner_name = 'se-core-miner-' .. i local ofs = 'seafloor-pump'
local drill_name = 'se-core-miner-drill-' .. i
main.EEE(se, i) data.raw[ocfs][ofs].pumping_speed = settings.startup['PHI-XW-WATER'].value * 2
data.raw['mining-drill'][drill_name].minable.result = miner_name data.raw[ocfs][ofs].flags = {'placeable-neutral', 'player-creation', 'filter-directions'}
data.raw['mining-drill'][drill_name].placeable_by.item = miner_name data.raw[ocfs][ofs].adjacent_tile_collision_box = {{-2, -3}, {2, -2}}
data.raw[ocfs][ofs].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}
local item = table.deepcopy(data.raw['item']['se-core-miner']) data.raw[ocfs][ofs].adjacent_tile_collision_mask = nil
item.name = 'se-core-miner-' .. i data.raw[ocfs][ofs].placeable_position_visualization = nil
item.place_result = drill_name
item.order = 'zzzz-core-miner-' .. i
item.icons = {
{
icon = '__space-exploration-graphics__/graphics/icons/core-miner.png',
tint = items['tint'][i],
icon_size = 64,
}
}
item.icon = nil
item.icon_size = nil
item.localised_name = {'name.se-core-miner-drill'}
item.localised_description = {'description.se-core-miner-drill'}
data:extend({item})
if i > 2 then
data:extend({{
type = 'recipe',
name = miner_name,
energy_required = 2,
enabled = false,
ingredients = {{name='se-core-miner-' .. (i - 1), amount=1}, {name='se-core-miner', amount=1}},
result = miner_name,
localised_name = {'name.se-core-miner-drill'},
localised_description = {'description.se-core-miner-drill'}
}})
else
data:extend({{
type = 'recipe',
name = miner_name,
energy_required = 2,
enabled = false,
ingredients = {{name='se-core-miner', amount=2}},
result = miner_name,
localised_name = {'name.se-core-miner-drill'},
localised_description = {'description.se-core-miner-drill'}
}})
end end
data.raw['mining-drill'][drill_name].fast_replaceable_group = data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group if mods['exotic-industries'] then
table.insert(data.raw.technology['se-core-miner'].effects, {type='unlock-recipe', recipe=miner_name}) local ofs = 'ei_gaia-pump'
data.raw[ocfs][ofs].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20
data.raw[ocfs][ofs].flags = {'placeable-neutral', 'player-creation'}
data.raw[ocfs][ofs].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}}
data.raw[ocfs][ofs].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}
data.raw[ocfs][ofs].adjacent_tile_collision_mask = nil
data.raw[ocfs][ofs].placeable_position_visualization = nil
end end
end end

View File

@@ -50,18 +50,6 @@ if settings.startup['PHI-EN'].value and settings.startup['PHI-EN-SOLAR-TIER'].va
end end
end end
if settings.startup['PHI-XW-WATER'].value > 0 then
local ofs = 'offshore-pump'
data.raw[ofs][ofs].pumping_speed = settings.startup['PHI-XW-WATER'].value * 20
data.raw[ofs][ofs].flags = {'placeable-neutral', 'player-creation'}
data.raw[ofs][ofs].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}}
data.raw[ofs][ofs].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}
data.raw[ofs][ofs].adjacent_tile_collision_mask = nil
data.raw[ofs][ofs].placeable_position_visualization = nil
data.raw[ofs][ofs].se_allow_in_space = true
end
if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-OIL'].value then if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-OIL'].value then
local item = table.deepcopy(data.raw['item']['offshore-pump']) local item = table.deepcopy(data.raw['item']['offshore-pump'])
item.name = 'oil-pump' item.name = 'oil-pump'
@@ -525,52 +513,6 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value t
data.raw['locomotive']['locomotive'].burner.burnt_inventory_size = 1 data.raw['locomotive']['locomotive'].burner.burnt_inventory_size = 1
end end
if settings.startup['PHI-MB'].value then
for i=2, 3 do
item = table.deepcopy(data.raw['item']['satellite'])
item.name = 'satellite-' .. i
item.rocket_launch_product = {type='item', name='space-science-pack', amount=1000 * (2 ^ (i - 1))}
item.icons = {
{
icon = '__base__/graphics/icons/satellite.png',
tint = items['tint'][i],
icon_size = 64,
icon_mipmaps = 4
}
}
item.order = 'm[satellite]-' .. i
item.localised_name = {'name.satellite'}
item.localised_description = {'description.satellite'}
data:extend({item})
local inn
if i == 2 then
inn = 'satellite'
else
inn = 'satellite-' .. (i - 1)
end
data:extend({{
type = 'recipe',
name = 'satellite-' .. i,
energy_required = 5,
enabled = false,
icon = '__base__/graphics/icons/satellite.png',
icon_size = 64,
icon_mipmaps = 4,
category = 'crafting',
ingredients = {{inn, 2}},
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})
end
end
if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-REPAIR'].value then if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-REPAIR'].value then
data.raw['repair-tool']['repair-pack'].speed = 2 * settings.startup['PHI-MI-REPAIR'].value data.raw['repair-tool']['repair-pack'].speed = 2 * settings.startup['PHI-MI-REPAIR'].value
data.raw['repair-tool']['repair-pack'].durability = 300 * settings.startup['PHI-MI-REPAIR'].value data.raw['repair-tool']['repair-pack'].durability = 300 * settings.startup['PHI-MI-REPAIR'].value
@@ -746,8 +688,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_name = {'name.basic-'.. chests[i]}
item.localised_description = {'description.'.. chests[i]} item.localised_description = {'description.basic-'.. chests[i]}
data:extend({item}) data:extend({item})
entity.inventory_type = 'with_filters_and_bar' entity.inventory_type = 'with_filters_and_bar'
@@ -755,8 +697,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_name = {'name.basic-'.. chests[i]}
entity.localised_description = {'description.'.. chests[i]} entity.localised_description = {'description.basic-'.. chests[i]}
data:extend({entity}) data:extend({entity})
data:extend({{ data:extend({{
@@ -765,9 +707,9 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-CHEST'].value t
energy_required = 2, energy_required = 2,
enabled = false, enabled = false,
ingredients = {{chests[i], 1}}, ingredients = {{chests[i], 1}},
result = 'basic-' .. chests[i], results = {{name = 'basic-' .. chests[i], amount = 1}},
localised_name = {'name.'.. chests[i]}, localised_name = {'name.basic-'.. chests[i]},
localised_description = {'description.'.. chests[i]} localised_description = {'description.basic-'.. chests[i]}
}}) }})
end end