This commit is contained in:
2023-04-17 23:31:25 +09:00
parent 904419b3c9
commit 118f964150
14 changed files with 167 additions and 216 deletions

View File

View File

@@ -2,6 +2,79 @@ local alpha_order = {'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm'}
local graphics_location = '__PHI-EQ__/graphics/'
local items = {'solar-panel', 'fusion-reactor', 'personal-laser-defense', 'battery', 'energy-shield', 'personal-roboport', 'night-vision', 'exoskeleton'}
local item_min = {
['solar-panel'] = 2,
['fusion-reactor'] = 2,
['personal-laser-defense'] = 2,
['battery'] = 3,
['energy-shield'] = 3,
['personal-roboport'] = 3,
['night-vision'] = 2,
['exoskeleton'] = 2
}
local item_max = {
['solar-panel'] = 8,
['fusion-reactor'] = 8,
['personal-laser-defense'] = 8,
['battery'] = 8,
['energy-shield'] = 8,
['personal-roboport'] = 8,
['night-vision'] = 2,
['exoskeleton'] = 2
}
if game.active_mods['space-exploration'] then
items = {'solar-panel', 'fusion-reactor', 'personal-laser-defense', 'battery', 'energy-shield', 'personal-roboport'}
item_min['solar-panel'] = 3
item_min['fusion-reactor'] = 3
item_min['personal-laser-defense'] = 5
item_min['battery'] = 4
item_min['energy-shield'] = 7
item_min['personal-roboport'] = 3
else
data:extend({
{
type = 'equipment-grid',
name = 'equipment-grid-14x14',
width = 14,
height = 14,
equipment_categories = {'armor'}
},
{
type = 'armor',
name = 'power-armor-mk3',
icon = '__base__/graphics/icons/power-armor-mk2.png',
icon_size = 64, icon_mipmaps = 4,
resistances = {{type = 'physical', decrease = 20, percent = 50}, {type = 'acid', decrease = 20, percent = 80},
{type = 'explosion', decrease = 70, percent = 60}, {type = 'fire', decrease = 20, percent = 80},
{type = 'laser', decrease = 20, percent = 50}, {type = 'electric', decrease = 20, percent = 50},
{type = 'impact', decrease = 20, percent = 50}, {type = 'poison', decrease = 20, percent = 50}},
subgroup = 'armor',
order = 'eb[power-armor-mk3]',
stack_size = 1,
infinite = true,
equipment_grid = 'equipment-grid-14x14',
inventory_size_bonus = 40,
open_sound = {filename = '__base__/sound/armor-open.ogg', volume = 1},
close_sound = {filename = '__base__/sound/armor-close.ogg', volume = 1}
}
})
data:extend({{
type = 'recipe',
name = 'power-armor-mk3',
energy_required = 5,
enabled = 'false',
ingredients = {{'power-armor-mk2', 2}},
result = 'power-armor-mk3'
}})
table.insert(data.raw.technology['power-armor-mk2'].effects, {type='unlock-recipe', recipe='power-armor-mk3'})
end
-- equipment
local function EE(source, tier)
local item = {}
@@ -145,64 +218,14 @@ for _, animation in ipairs(data.raw['character']['character']['animations']) do
end
end
data:extend({
{
type = 'equipment-grid',
name = 'equipment-grid-14x14',
width = 14,
height = 14,
equipment_categories = {'armor'}
},
{
type = 'armor',
name = 'power-armor-mk3',
icon = '__base__/graphics/icons/power-armor-mk2.png',
icon_size = 64, icon_mipmaps = 4,
resistances = {{type = 'physical', decrease = 20, percent = 50}, {type = 'acid', decrease = 20, percent = 80},
{type = 'explosion', decrease = 70, percent = 60}, {type = 'fire', decrease = 20, percent = 80},
{type = 'laser', decrease = 20, percent = 50}, {type = 'electric', decrease = 20, percent = 50},
{type = 'impact', decrease = 20, percent = 50}, {type = 'poison', decrease = 20, percent = 50}},
subgroup = 'armor',
order = 'eb[power-armor-mk3]',
stack_size = 1,
infinite = true,
equipment_grid = 'equipment-grid-14x14',
inventory_size_bonus = 40,
open_sound = {filename = '__base__/sound/armor-open.ogg', volume = 1},
close_sound = {filename = '__base__/sound/armor-close.ogg', volume = 1}
}
})
data:extend({{
type = 'recipe',
name = 'power-armor-mk3',
energy_required = 5,
enabled = 'false',
ingredients = {{'power-armor-mk2', 2}},
result = 'power-armor-mk3'
}})
for i=1, 8, 1 do
if (i <= 3) then
for j=2, 8, 1 do
EE(items[i], j)
EI(items[i], j)
ER(items[i], j)
end
elseif (i <= 6) then
for j=3, 8, 1 do
EE(items[i], j)
EI(items[i], j)
ER(items[i], j)
end
elseif (i <= 8) then
EE(items[i], 2)
EI(items[i], 2)
ER(items[i], 2)
for i=1, #items, 1 do
for j=item_min[items[i]], item_max[items[i]], 1 do
EE(items[i], j)
EI(items[i], j)
ER(items[i], j)
end
end
table.insert(data.raw.technology['power-armor-mk2'].effects, {type='unlock-recipe', recipe='power-armor-mk3'})
table.insert(data.raw.technology['night-vision-equipment'].effects, {type='unlock-recipe', recipe='night-vision-mk2-equipment'})

View File

View File

View File

@@ -292,7 +292,6 @@ local recipe_list = {
},
}
for i=1, #recipe_list, 1 do
if data.raw.recipe[recipe_list[i].name] ~= nil then
for j=1, #recipe_multiplier, 1 do
@@ -396,101 +395,10 @@ for i=1, #recipe_list, 1 do
end
end
item.name = item.name .. '-' .. j
item.hide_from_player_crafting = true
item.name = item.name .. '-s' .. j
if item.category == 'crafting' then
item.category = 'scaled-crafting'
elseif item.category == 'basic-crafting' then
item.category = 'scaled-basic-crafting'
elseif item.category == 'advanced-crafting' then
item.category = 'scaled-advanced-crafting'
elseif item.category == 'crafting-with-fluid' then
item.category = 'scaled-crafting-with-fluid'
elseif item.category == 'smelting' then
item.category = 'scaled-smelting'
elseif item.category == 'chemistry' then
item.category = 'scaled-chemistry'
elseif item.category == 'oil-processing' then
item.category = 'scaled-oil-processing'
elseif item.category == 'centrifuging' then
item.category = 'scaled-centrifuging'
end
data:extend({item})
table.insert(data.raw.technology[recipe_list[i].tech].effects, {type='unlock-recipe', recipe=item.name})
end
end
end
data:extend(
{
{
type = 'recipe-category',
name = 'scaled-crafting'
},
{
type = 'recipe-category',
name = 'scaled-basic-crafting'
},
{
type = 'recipe-category',
name = 'scaled-advanced-crafting'
},
{
type = 'recipe-category',
name = 'scaled-crafting-with-fluid'
},
{
type = 'recipe-category',
name = 'scaled-smelting'
},
{
type = 'recipe-category',
name = 'scaled-chemistry'
},
{
type = 'recipe-category',
name = 'scaled-oil-processing'
},
{
type = 'recipe-category',
name = 'scaled-centrifuging'
},
}
)
for _, v in pairs(data.raw['assembling-machine']) do
if v.crafting_categories['crafting'] then
table.insert(v.crafting_categories, 'scaled-crafting')
elseif v.crafting_categories['basic-crafting'] then
table.insert(v.crafting_categories, 'scaled-basic-crafting')
elseif v.crafting_categories['advanced-crafting'] then
table.insert(v.crafting_categories, 'scaled-advanced-crafting')
elseif v.crafting_categories['crafting-with-fluid'] then
table.insert(v.crafting_categories, 'scaled-crafting-with-fluid')
elseif v.crafting_categories['chemistry'] then
table.insert(v.crafting_categories, 'scaled-chemistry')
elseif v.crafting_categories['oil-processing'] then
table.insert(v.crafting_categories, 'scaled-oil-processing')
elseif v.crafting_categories['centrifuging'] then
table.insert(v.crafting_categories, 'scaled-centrifuging')
end
end
for _, v in pairs(data.raw['furnace']) do
table.insert(v.crafting_categories, 'scaled-smelting')
end

View File

@@ -1,6 +1,6 @@
{
"name": "PHI-RS",
"version": "1.0.0",
"version": "1.0.1",
"factorio_version": "1.1",
"date": "2023-04-13",
"title": "Phidias Recipe Scaling",

View File

@@ -1,17 +1,17 @@
[recipe-name]
basic-oil-processing-1=Basic oil processing
basic-oil-processing-2=Basic oil processing
advanced-oil-processing-1=Advanced oil processing
advanced-oil-processing-2=Advanced oil processing
light-oil-cracking-1=Light oil cracking to petroleum gas
light-oil-cracking-2=Light oil cracking to petroleum gas
heavy-oil-cracking-1=Heavy oil cracking to light oil
heavy-oil-cracking-2=Heavy oil cracking to light oil
uranium-processing-1=Uranium processing
uranium-processing-2=Uranium processing
kovarex-enrichment-process-1=Kovarex enrichment process
kovarex-enrichment-process-2=Kovarex enrichment process
nuclear-fuel-reprocessing-1=Nuclear fuel reprocessing
nuclear-fuel-reprocessing-2=Nuclear fuel reprocessing
coal-liquefaction-1=Coal liquefaction
coal-liquefaction-2=Coal liquefaction
basic-oil-processing-s1=Basic oil processing
basic-oil-processing-s2=Basic oil processing
advanced-oil-processing-s1=Advanced oil processing
advanced-oil-processing-s2=Advanced oil processing
light-oil-cracking-s1=Light oil cracking to petroleum gas
light-oil-cracking-s2=Light oil cracking to petroleum gas
heavy-oil-cracking-s1=Heavy oil cracking to light oil
heavy-oil-cracking-s2=Heavy oil cracking to light oil
uranium-processing-s1=Uranium processing
uranium-processing-s2=Uranium processing
kovarex-enrichment-process-s1=Kovarex enrichment process
kovarex-enrichment-process-s2=Kovarex enrichment process
nuclear-fuel-reprocessing-s1=Nuclear fuel reprocessing
nuclear-fuel-reprocessing-s2=Nuclear fuel reprocessing
coal-liquefaction-s1=Coal liquefaction
coal-liquefaction-s2=Coal liquefaction

View File

@@ -1,17 +1,17 @@
[recipe-name]
basic-oil-processing-1=基本的な石油加工
basic-oil-processing-2=基本的な石油加工
advanced-oil-processing-1=発展的な石油加工
advanced-oil-processing-2=発展的な石油加工
light-oil-cracking-1=軽油を石油ガスに分解
light-oil-cracking-2=軽油を石油ガスに分解
heavy-oil-cracking-1=重油を軽油に分解
heavy-oil-cracking-2=重油を軽油に分解
uranium-processing-1=ウラン濃縮処理
uranium-processing-2=ウラン濃縮処理
kovarex-enrichment-process-1=Kovarex濃縮プロセス
kovarex-enrichment-process-2=Kovarex濃縮プロセス
nuclear-fuel-reprocessing-1=核燃料再処理
nuclear-fuel-reprocessing-2=核燃料再処理
coal-liquefaction-1=石炭液化
coal-liquefaction-2=石炭液化
basic-oil-processing-s1=基本的な石油加工
basic-oil-processing-s2=基本的な石油加工
advanced-oil-processing-s1=発展的な石油加工
advanced-oil-processing-s2=発展的な石油加工
light-oil-cracking-s1=軽油を石油ガスに分解
light-oil-cracking-s2=軽油を石油ガスに分解
heavy-oil-cracking-s1=重油を軽油に分解
heavy-oil-cracking-s2=重油を軽油に分解
uranium-processing-s1=ウラン濃縮処理
uranium-processing-s2=ウラン濃縮処理
kovarex-enrichment-process-s1=Kovarex濃縮プロセス
kovarex-enrichment-process-s2=Kovarex濃縮プロセス
nuclear-fuel-reprocessing-s1=核燃料再処理
nuclear-fuel-reprocessing-s2=核燃料再処理
coal-liquefaction-s1=石炭液化
coal-liquefaction-s2=石炭液化

View File

@@ -1,17 +1,17 @@
[recipe-name]
basic-oil-processing-1=基礎石油加工
basic-oil-processing-2=基礎石油加工
advanced-oil-processing-1=高等石油加工
advanced-oil-processing-2=高等石油加工
light-oil-cracking-1=輕油裂解為石油氣
light-oil-cracking-2=輕油裂解為石油氣
heavy-oil-cracking-1=重油裂解為輕油
heavy-oil-cracking-2=重油裂解為輕油
uranium-processing-1=鈾濃縮加工
uranium-processing-2=鈾濃縮加工
kovarex-enrichment-process-1=鈾增殖加工
kovarex-enrichment-process-2=鈾增殖加工
nuclear-fuel-reprocessing-1=核燃料後加工
nuclear-fuel-reprocessing-2=核燃料後加工
coal-liquefaction-1=液化煤
coal-liquefaction-2=液化煤
basic-oil-processing-s1=基礎石油加工
basic-oil-processing-s2=基礎石油加工
advanced-oil-processing-s1=高等石油加工
advanced-oil-processing-s2=高等石油加工
light-oil-cracking-s1=輕油裂解為石油氣
light-oil-cracking-s2=輕油裂解為石油氣
heavy-oil-cracking-s1=重油裂解為輕油
heavy-oil-cracking-s2=重油裂解為輕油
uranium-processing-s1=鈾濃縮加工
uranium-processing-s2=鈾濃縮加工
kovarex-enrichment-process-s1=鈾增殖加工
kovarex-enrichment-process-s2=鈾增殖加工
nuclear-fuel-reprocessing-s1=核燃料後加工
nuclear-fuel-reprocessing-s2=核燃料後加工
coal-liquefaction-s1=液化煤
coal-liquefaction-s2=液化煤

View File

@@ -1,17 +1,17 @@
[recipe-name]
basic-oil-processing-1=基礎石油加工
basic-oil-processing-2=基礎石油加工
advanced-oil-processing-1=高等石油加工
advanced-oil-processing-2=高等石油加工
light-oil-cracking-1=輕油裂解為石油氣
light-oil-cracking-2=輕油裂解為石油氣
heavy-oil-cracking-1=重油裂解為輕油
heavy-oil-cracking-2=重油裂解為輕油
uranium-processing-1=鈾濃縮加工
uranium-processing-2=鈾濃縮加工
kovarex-enrichment-process-1=鈾增殖加工
kovarex-enrichment-process-2=鈾增殖加工
nuclear-fuel-reprocessing-1=核燃料後加工
nuclear-fuel-reprocessing-2=核燃料後加工
coal-liquefaction-1=液化煤
coal-liquefaction-2=液化煤
basic-oil-processing-s1=基礎石油加工
basic-oil-processing-s2=基礎石油加工
advanced-oil-processing-s1=高等石油加工
advanced-oil-processing-s2=高等石油加工
light-oil-cracking-s1=輕油裂解為石油氣
light-oil-cracking-s2=輕油裂解為石油氣
heavy-oil-cracking-s1=重油裂解為輕油
heavy-oil-cracking-s2=重油裂解為輕油
uranium-processing-s1=鈾濃縮加工
uranium-processing-s2=鈾濃縮加工
kovarex-enrichment-process-s1=鈾增殖加工
kovarex-enrichment-process-s2=鈾增殖加工
nuclear-fuel-reprocessing-s1=核燃料後加工
nuclear-fuel-reprocessing-s2=核燃料後加工
coal-liquefaction-s1=液化煤
coal-liquefaction-s2=液化煤

View File

@@ -1,3 +1,10 @@
---------------------------------------------------------------------------------------------------
Version: 1.0.4
Date: 2023-03-17
Added:
- Angel Seafloor pump
---------------------------------------------------------------------------------------------------
Version: 1.0.0
Date: 2023-03-17

View File

@@ -6,3 +6,15 @@ data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_box = {{-0.5,
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'].placeable_position_visualization = nil
if data.raw.item['seafloor-pump'] then
data.raw['offshore-pump']['seafloor-pump'].pumping_speed = 25
data.raw['offshore-pump']['seafloor-pump'].fluid_box.base_area = 5
data.raw['offshore-pump']['seafloor-pump'].fluid_box.base_level = 5
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_test = {'ground-tile', 'water-tile', 'object-layer'}
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'].max_health = 400
end

View File

@@ -1,14 +1,15 @@
{
"name": "PHI-XW",
"version": "1.0.2",
"version": "1.0.4",
"factorio_version": "1.1",
"date": "2023-04-13",
"date": "2023-04-17",
"title": "Phidias Water Pump",
"author": "PHIDIAS0303",
"contributers": "",
"homepage": "",
"description": "Offshore water pump no longer require near water.",
"dependencies": [
"base >= 1.1.0"
"base >= 1.1.0",
"? angelsrefining >= 0.12.0"
]
}