first part of overhaul towards 1.0

This commit is contained in:
Paul 2021-08-30 01:12:28 +02:00
parent cc3bbdd1bf
commit 8459cd9a34
111 changed files with 3689 additions and 335 deletions

View file

@ -0,0 +1,177 @@
--local functions
local function config(name)
return settings.startup['fi_compound_machine_'..name].value
end
local function sprite(name)
return '__248k__/ressources/fission/fi_compound_machine/fi_compound_machine_'..name
end
--item
data:extend({
{
name = 'fi_compound_machine_item',
type = 'item',
icon = sprite('icon.png'),
icon_size = 64,
place_result = 'fi_compound_machine_entity',
stack_size = 20,
subgroup = 'fi_item_subgroup_c',
order = 'a-b',
},
})
--entity
data:extend({
--prototype
{
name = 'fi_compound_machine_entity',
type = 'assembling-machine',
icon = sprite('icon.png'),
icon_size = 64,
flags = {"player-creation","placeable-neutral"},
max_health = 300,
corpse = 'big-remnants',
collision_box = {{-3.4,-3.4},{3.4,3.4}},
selection_box = {{-3.5,-3.5},{3.5,3.5}},
map_color = {r=0, g=0, b=1, a=1},
minable = {
mining_time = 1,
result = 'fi_compound_machine_item',
},
crafting_categories = {'fi_compound_machine_category'},
crafting_speed = 1,
--fixed_recipe = 'el_water_pressure_recipe',
energy_source = {
type = 'electric',
usage_priority = 'secondary-input',
},
allowed_effects = {"speed", "consumption", "productivity", "pollution"},
module_specification = {
module_info_icon_shift = {
0,
0.8
},
module_slots = 2
},
energy_usage = '400kW',
fluid_boxes = {
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {0, -4}},
},
production_type = "input"
},
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {-4, 0}}
},
production_type = "input"
},
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {4, 0}},
--{type = "output", position = {2, -2.5}}
},
production_type = "input"
},
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {0, 4}},
},
production_type = "input"
},
},
--animation
animation = {
north = {
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 3,
frame_count = 3,
animation_speed = 0.5,
shift = {0,-0.1}
},
east = {
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 3,
--lines_per_file = 3,
frame_count = 3,
animation_speed = 0.5,
shift = {0,-0.1}
},
south = {
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 3,
frame_count = 3,
animation_speed = 0.5,
shift = {0,-0.1}
},
west = {
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 3,
frame_count = 3,
animation_speed = 0.5,
shift = {0,-0.1}
},
},
working_sound =
{
sound = {filename = "__base__/sound/chemical-plant-3.ogg" },
apparent_volume = 0.3,
},
},
})
--{
-- production_type = "input",
--pipe_picture = assembler2pipepictures(),
--pipe_covers = pipecoverspictures(),
-- base_area = 10,
-- base_level = -1,
-- pipe_connections = {
-- { type="input", position = {-2, -2,5} },
-- { type="input", position = {2, -2.5} },
-- },
-- },
-- {
-- production_type = "output",
--pipe_picture = assembler2pipepictures(),
--pipe_covers = pipecoverspictures(),
-- base_area = 10,
-- base_level = 1,
-- pipe_connections = {{ type="output", position = {2, 2.5} }},
-- },
-- off_when_no_fluid_recipe = true

View file

@ -54,4 +54,31 @@ data:extend({
subgroup = 'fi_item_subgroup_a-b',
order = 'a-f',
},
{
name = 'fi_crushed_glass_item',
type = 'item',
icon = sprite('glass_item.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_a-b',
order = 'a-f',
},
{
name = 'fi_crushed_stone_item',
type = 'item',
icon = sprite('stone_item.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_a-b',
order = 'a-f',
},
{
name = 'fi_crushed_uranium_item',
type = 'item',
icon = sprite('uranium_item.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_a-b',
order = 'a-f',
},
})

View file

@ -0,0 +1,105 @@
--local functions
local function config(name)
return settings.startup['fi_fiberer_'..name].value
end
local function sprite(name)
return '__248k__/ressources/fission/fi_fiberer/fi_fiberer_'..name
end
--item
data:extend({
{
name = 'fi_fiberer_item',
type = 'item',
icon = sprite('icon.png'),
icon_size = 64,
place_result = 'fi_fiberer_entity',
stack_size = 20,
subgroup = 'fi_item_subgroup_c',
order = 'a-a',
},
})
--entity
data:extend({
--prototype
{
name = 'fi_fiberer_entity',
type = 'assembling-machine',
icon = sprite('icon.png'),
icon_size = 64,
flags = {"player-creation","placeable-neutral"},
max_health = 300,
corpse = 'big-remnants',
collision_box = {{-1.4,-1.4},{1.4,1.4}},
selection_box = {{-1.5,-1.5},{1.5,1.5}},
map_color = {r=0, g=0, b=1, a=1},
minable = {
mining_time = 1,
result = 'fi_fiberer_item',
},
crafting_categories = {'fi_fiberer_category'},
crafting_speed = 3.5,
energy_source = {
type = 'electric',
usage_priority = 'secondary-input',
--input_flow_limit = '4MW',
},
energy_usage = '1MW',
allowed_effects = {"speed", "productivity", "consumption", "pollution"},
module_specification = {
module_info_icon_shift = {
0,
0.8
},
module_slots = 2
},
--animation
animation = {
north = {
filename = sprite('entity_animation.png'),
size = {480,448},
scale = 0.2,
line_length = 3,
lines_per_file = 3,
frame_count = 4,
animation_speed = 0.5,
},
east = {
filename = sprite('entity_animation.png'),
size = {480,448},
scale = 0.2,
line_length = 3,
lines_per_file = 3,
frame_count = 4,
animation_speed = 0.5,
},
south = {
filename = sprite('entity_animation.png'),
size = {480,448},
scale = 0.2,
line_length = 3,
lines_per_file = 3,
frame_count = 4,
animation_speed = 0.5,
},
west = {
filename = sprite('entity_animation.png'),
size = {480,448},
scale = 0.2,
line_length = 3,
lines_per_file = 3,
frame_count = 4,
animation_speed = 0.5,
},
},
working_sound = {
sound = { filename = '__base__/sound/nuclear-reactor-1.ogg'},
idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
apparent_volume = 0.7,
},
},
})

View file

@ -27,6 +27,113 @@ data:extend({
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_natural_fiber',
type = 'item',
icon = sprite('natural_fiber.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_glass_fiber',
type = 'item',
icon = sprite('glass_fiber.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_glass',
type = 'item',
icon = sprite('glass.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_flourite',
type = 'item',
icon = sprite('flourite.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_pure_gold',
type = 'item',
icon = sprite('pure_gold.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_pure_titan',
type = 'item',
icon = sprite('pure_titan.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_pure_neodym',
type = 'item',
icon = sprite('pure_neodym.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_gold',
type = 'item',
icon = sprite('gold.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_neodym',
type = 'item',
icon = sprite('neodym.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_titan',
type = 'item',
icon = sprite('titan.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_a-c',
order = 'a-a',
},
{
name = 'fi_materials_NFK',
type = 'item',
icon = sprite('NFK.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_b',
order = 'a-a',
},
{
name = 'fi_materials_GFK',
type = 'item',
icon = sprite('GFK.png'),
icon_size = 64,
stack_size = 50,
subgroup = 'fi_item_subgroup_b',
order = 'a-a',
},
})

View file

@ -8,18 +8,16 @@ local function sprite(name)
end
local limitation_list = {
'el_aluminum_ore_recipe',
'el_aluminum_item_recipe',
'el_lithium_ore_recipe',
'el_lithium_item_recipe',
'el_train_fuel_diesel_recipe',
'el_energy_crystal_recipe',
'el_grow_energy_crystal_recipe',
'fi_compound_material_recipe',
'fi_materials_industrial_steel_recipe',
'fu_lead_ore_recipe',
'fi_base_crystal_recipe',
'fi_catalyst_crystal_recipe',
'fi_energy_crystal_recipe'
'fi_energy_crystal_recipe',
'fi_glass_fiber_recipe',
'fi_natural_fiber_recipe'
}
--item