Merge pull request #4 from PreLeyZero/dev

graphics and balance changes
This commit is contained in:
PreLeyZero 2021-10-12 21:11:48 +02:00 committed by GitHub
commit f0605dc903
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 237 additions and 228 deletions

View file

@ -1,6 +1,23 @@
---------------------------------------------------------------------------------------------------
Version: 0.9.3
Date: 12.10.2021
Changes:
- added new graphics for a lot of machines
- changed size of fusion reactors to make them rotable, previous reactors will drop on the ground
- nerferd output of neodymium, gold and titanium
- casting and smelting now allow 248k productivity modules
- increased module slots in crystal grower, reduced energy crystal grow time to 10s
- buffed bug zapper damage to 10k
---------------------------------------------------------------------------------------------------
Version: 0.9.2
Date: 4.9.2021
Features:
- added option to make landfill using dirty water
- added option to vent dirty water
- added recipe to produce steel
---------------------------------------------------------------------------------------------------
Version: 0.9.1
Date: 13.7.2021
Date: 03.9.2021
Changes:
- removed fluid must flow dependency
- removed god-forsaken extractor inserter dependency

View file

@ -1,6 +1,6 @@
{
"name": "248k",
"version": "0.9.1",
"version": "0.9.3",
"title": "248k Mod",
"author": "PreLeyZero",
"factorio_version": "1.1",

10
migrations/248k-0.9.3.lua Normal file
View file

@ -0,0 +1,10 @@
for _, v in pairs(game.surfaces) do
for _, _v in pairs(v.find_entities_filtered{name = "fu_stelar_reactor_entity"}) do
_v.surface.spill_item_stack(_v.position, {name="fu_stelar_reactor_item"})
_v.mine()
end
for _, _v in pairs(v.find_entities_filtered{name = "fu_tokamak_reactor_entity"}) do
_v.surface.spill_item_stack(_v.position, {name="fu_tokamak_reactor_item"})
_v.mine()
end
end

View file

@ -147,6 +147,10 @@ data:extend({
type = 'unlock-recipe',
recipe = 'el_cast_pure_iron_recipe',
},
{
type = 'unlock-recipe',
recipe = 'el_cast_pure_steel_recipe',
},
{
type = 'unlock-recipe',
recipe = 'el_cast_pure_copper_recipe',
@ -309,6 +313,14 @@ data:extend({
type = 'unlock-recipe',
recipe = 'el_lithium_ore_recipe',
},
{
type = 'unlock-recipe',
recipe = 'el_dirty_water_vent_recipe',
},
{
type = 'unlock-recipe',
recipe = 'el_dirty_water_landfill_recipe',
},
},
unit = {
count = '30',

View file

@ -300,7 +300,7 @@ data:extend({
{type="item", name="el_energy_crystal_item", amount=2},
},
result_count = 1,
energy_required = 30,
energy_required = 10,
always_show_made_in = true
},
--el_energy_crystal_fuel
@ -1042,6 +1042,22 @@ data:extend({
always_show_made_in = true,
allow_decomposition = false
},
{
name = 'el_cast_pure_steel_recipe',
type = 'recipe',
enabled = 'false',
category = 'el_caster_category',
ingredients = {
{type="fluid", name="el_arc_pure_iron", amount=500},
},
results = {
{type="item", name="steel-plate", amount=1},
},
energy_required = 0.5,
order = 'a-b',
always_show_made_in = true,
allow_decomposition = false
},
{
name = 'el_arc_pure_copper_recipe',
type = 'recipe',
@ -1133,6 +1149,36 @@ data:extend({
energy_required = 1,
order = 'a-b',
},
{
name = 'el_dirty_water_vent_recipe',
type = 'recipe',
enabled = 'false',
subgroup = 'el_item_subgroup_a',
category = 'crafting-with-fluid',
ingredients = {
{type="fluid", name="el_dirty_water", amount=100},
},
results = {
{type="fluid", name="water", amount=100},
},
energy_required = 0.2,
order = 'a-b',
},
{
name = 'el_dirty_water_landfill_recipe',
type = 'recipe',
enabled = 'false',
subgroup = 'el_item_subgroup_a',
category = 'crafting-with-fluid',
ingredients = {
{type="fluid", name="el_dirty_water", amount=10000},
},
results = {
{type="item", name="landfill", amount=1},
},
energy_required = 1,
order = 'a-b',
},

View file

@ -47,7 +47,7 @@ data:extend({
type = 'electric',
usage_priority = 'secondary-input',
},
allowed_effects = {"speed", "consumption", "pollution"},
allowed_effects = {"speed", "productivity", "consumption", "pollution"},
module_specification = {
module_info_icon_shift = {
0,
@ -109,44 +109,31 @@ data:extend({
},
--animation
animation = {
north = {
filename = sprite('entity_animation.png'),
filename = sprite('entity_base.png'),
size = {512,512},
scale = 0.54,
line_length = 1,
--lines_per_file = 2,
frame_count = 1,
--animation_speed = 0.2,
shift = {0,-0.1}
},
working_visualisations = {
{
animation =
{
filename = sprite('entity_overlay.png'),
size = {512,512},
scale = 0.54,
line_length = 3,
lines_per_file = 1,
frame_count = 3,
animation_speed = 0.5,
animation_speed = 0.2,
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" },

View file

@ -48,7 +48,7 @@ data:extend({
type = 'electric',
usage_priority = 'secondary-input',
},
allowed_effects = {"speed", "consumption", "pollution"},
allowed_effects = {"speed", "productivity", "consumption", "pollution"},
module_specification = {
module_info_icon_shift = {
0,

View file

@ -54,7 +54,7 @@ data:extend({
0,
0.8
},
module_slots = 2
module_slots = 4
},
energy_usage = '200kW',
fluid_boxes = {

View file

@ -1053,12 +1053,12 @@ data:extend({
category = 'crafting-with-fluid',
main_product = 'fi_materials_pure_neodym',
ingredients = {
{type="fluid", name="fi_dirty_water", amount=50},
{type="fluid", name="fi_dirty_water", amount=200},
},
results = {
{type="fluid", name="water", amount=50},
{type="fluid", name="water", amount=200},
--{type="item", name="fi_materials_pure_gold", amount=2},
{type="item", name="fi_materials_pure_neodym", amount=6},
{type="item", name="fi_materials_pure_neodym", amount=1},
--{type="item", name="fi_materials_pure_titan", amount=2},
},
energy_required = 0.2,
@ -1071,11 +1071,11 @@ data:extend({
category = 'crafting-with-fluid',
main_product = 'fi_materials_pure_gold',
ingredients = {
{type="fluid", name="fi_dirty_water", amount=50},
{type="fluid", name="fi_dirty_water", amount=200},
},
results = {
{type="fluid", name="water", amount=50},
{type="item", name="fi_materials_pure_gold", amount=4},
{type="fluid", name="water", amount=200},
{type="item", name="fi_materials_pure_gold", amount=2},
--{type="item", name="fi_materials_pure_neodym", amount=4},
--{type="item", name="fi_materials_pure_titan", amount=2},
},
@ -1089,13 +1089,13 @@ data:extend({
category = 'crafting-with-fluid',
main_product = 'fi_materials_pure_titan',
ingredients = {
{type="fluid", name="fi_dirty_water", amount=50},
{type="fluid", name="fi_dirty_water", amount=200},
},
results = {
{type="fluid", name="water", amount=50},
{type="fluid", name="water", amount=200},
--{type="item", name="fi_materials_pure_gold", amount=2},
--{type="item", name="fi_materials_pure_neodym", amount=4},
{type="item", name="fi_materials_pure_titan", amount=6},
{type="item", name="fi_materials_pure_titan", amount=1},
},
energy_required = 0.2,
order = 'a-b',

View file

@ -10,6 +10,21 @@ end
local limitation_list = {
'el_train_fuel_diesel_recipe',
'el_grow_energy_crystal_recipe',
'el_cast_pure_iron_recipe',
'el_cast_pure_steel_recipe',
'el_cast_pure_copper_recipe',
'el_cast_pure_aluminum_recipe',
'fi_cast_neodym_recipe',
'fi_cast_glass_recipe',
'fi_cast_gold_recipe',
'fi_cast_titan_recipe',
'el_arc_pure_iron_recipe',
'el_arc_pure_copper_recipe',
'el_arc_pure_aluminum_recipe',
'fi_arc_glass_recipe',
'fi_arc_pure_gold_recipe',
'fi_arc_pure_titan_recipe',
'fi_arc_pure_neodym_recipe',
'fi_compound_material_recipe',
'fi_materials_industrial_steel_recipe',
'fi_GFK_recipe',

View file

@ -102,42 +102,29 @@ data:extend({
},
--animation
animation = {
north = {
filename = sprite('entity_animation.png'),
filename = sprite('entity_base.png'),
size = {512,512},
scale = 0.54,
line_length = 1,
--lines_per_file = 2,
frame_count = 1,
--animation_speed = 0.2,
shift = {0,-0.1}
},
working_visualisations = {
{
animation =
{
filename = sprite('entity_overlay.png'),
size = {512,512},
scale = 0.54,
line_length = 3,
lines_per_file = 1,
frame_count = 3,
animation_speed = 0.2,
shift = {0,-0.1}
},
east = {
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 3,
frame_count = 3,
animation_speed = 0.2,
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.2,
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.2,
shift = {0,-0.1}
},
}
}
},
working_sound =
{

View file

@ -102,7 +102,19 @@ data:extend({
},
--animation
animation = {
north = {
filename = sprite('entity_base.png'),
size = {512,512},
scale = 0.54,
line_length = 1,
--lines_per_file = 2,
frame_count = 1,
--animation_speed = 0.2,
shift = {0,-0.1}
},
working_visualisations = {
{
animation =
{
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
@ -111,37 +123,8 @@ data:extend({
frame_count = 4,
animation_speed = 0.2,
shift = {0,-0.1}
},
east = {
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 2,
lines_per_file = 2,
frame_count = 4,
animation_speed = 0.2,
shift = {0,-0.1}
},
south = {
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 2,
lines_per_file = 2,
frame_count = 4,
animation_speed = 0.2,
shift = {0,-0.1}
},
west = {
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 2,
lines_per_file = 2,
frame_count = 4,
animation_speed = 0.2,
shift = {0,-0.1}
},
}
}
},
working_sound =
{

View file

@ -12,7 +12,7 @@ data:extend({
{
name = 'fu_stelar_reactor_item',
type = 'item',
icon = sprite('stelar_item.png'),
icon = sprite('stelar_entity_icon.png'),
icon_size = 64,
place_result = 'fu_stelar_reactor_entity',
stack_size = 20,
@ -22,7 +22,7 @@ data:extend({
{
name = 'fu_tokamak_reactor_item',
type = 'item',
icon = sprite('tokamak_item.png'),
icon = sprite('tokamak_entity_icon.png'),
icon_size = 64,
place_result = 'fu_tokamak_reactor_entity',
stack_size = 20,
@ -39,11 +39,11 @@ data:extend({
type = 'assembling-machine',
icon = sprite('stelar_entity_icon.png'),
icon_size = 64,
flags = {"player-creation","placeable-neutral","not-rotatable"},
flags = {"player-creation","placeable-neutral"},
max_health = 1500,
corpse = 'big-remnants',
collision_box = {{-5.8,-3.8},{5.8,5.8}},
selection_box = {{-6,-4},{6,6}},
collision_box = {{-6.25,-6.25},{6.25,6.25}},
selection_box = {{-6.5,-6.5},{6.5,6.5}},
map_color = {r=0, g=0, b=1, a=1},
minable = {
mining_time = 1,
@ -67,7 +67,7 @@ data:extend({
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {-1.5, -4.5}},
{type = "input", position = {-1, -7}},
},
production_type = "input"
},
@ -78,7 +78,7 @@ data:extend({
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {1.5, -4.5}}
{type = "input", position = {1, -7}}
},
production_type = "input"
},
@ -89,7 +89,7 @@ data:extend({
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {0.5, -4.5}}
{type = "input", position = {3, -7}}
},
production_type = "input"
},
@ -100,53 +100,36 @@ data:extend({
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "output", position = {-0.5, -4.5}}
{type = "output", position = {-3, -7}}
},
production_type = "output"
},
},
--animation
animation = {
north = {
filename = sprite('stelar_entity_animation.png'),
filename = sprite('stelar_entity_base.png'),
size = {512*2,512*2},
scale = 0.4,
scale = 0.56,
line_length = 1,
--lines_per_file = 2,
frame_count = 1,
--animation_speed = 0.2,
shift = {2.4,-1.5}
},
working_visualisations = {
{
animation =
{
filename = sprite('stelar_entity_overlay.png'),
size = {512*2,512*2},
scale = 0.56,
line_length = 3,
lines_per_file = 3,
frame_count = 9,
animation_speed = 0.5,
shift = {0,0.4},
},
east = {
filename = sprite('stelar_entity_animation.png'),
size = {512*2,512*2},
scale = 0.4,
line_length = 3,
lines_per_file = 3,
frame_count = 9,
animation_speed = 0.5,
shift = {0,0.4},
},
south = {
filename = sprite('stelar_entity_animation.png'),
size = {512*2,512*2},
scale = 0.4,
line_length = 3,
lines_per_file = 3,
frame_count = 9,
animation_speed = 0.5,
shift = {0,0.4},
},
west = {
filename = sprite('stelar_entity_animation.png'),
size = {512*2,512*2},
scale = 0.4,
line_length = 3,
lines_per_file = 3,
frame_count = 9,
animation_speed = 0.5,
shift = {0,0.4},
},
animation_speed = 0.3,
shift = {2.4,-1.5}
}
}
},
working_sound = {
@ -159,11 +142,11 @@ data:extend({
type = 'assembling-machine',
icon = sprite('tokamak_entity_icon.png'),
icon_size = 64,
flags = {"player-creation","placeable-neutral","not-rotatable"},
flags = {"player-creation","placeable-neutral"},
max_health = 1500,
corpse = 'big-remnants',
collision_box = {{-5.8,-3.8},{5.8,5.8}},
selection_box = {{-6,-4},{6,6}},
collision_box = {{-6.2,-6.2},{6.2,6.2}},
selection_box = {{-6.5,-6.5},{6.5,6.5}},
map_color = {r=0, g=0, b=1, a=1},
minable = {
mining_time = 1,
@ -187,7 +170,7 @@ data:extend({
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {-1.5, -4.5}},
{type = "input", position = {-1, -7}},
},
production_type = "input"
},
@ -198,7 +181,7 @@ data:extend({
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {1.5, -4.5}}
{type = "input", position = {1, -7}}
},
production_type = "input"
},
@ -209,7 +192,7 @@ data:extend({
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input", position = {0.5, -4.5}}
{type = "input", position = {3, -7}}
},
production_type = "input"
},
@ -220,53 +203,20 @@ data:extend({
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "output", position = {-0.5, -4.5}}
{type = "output", position = {-3, -7}}
},
production_type = "output"
},
},
--animation
animation = {
north = {
filename = sprite('tokamak_entity_animation.png'),
size = {512*3,512*2},
scale = 0.37,
size = {512*2,512*2},
scale = 0.56,
line_length = 3,
lines_per_file = 3,
frame_count = 9,
animation_speed = 0.5,
shift = {2.34,0.3},
},
east = {
filename = sprite('tokamak_entity_animation.png'),
size = {512*3,512*2},
scale = 0.37,
line_length = 3,
lines_per_file = 3,
frame_count = 9,
animation_speed = 0.5,
shift = {2.34,0.3},
},
south = {
filename = sprite('tokamak_entity_animation.png'),
size = {512*3,512*2},
scale = 0.37,
line_length = 3,
lines_per_file = 3,
frame_count = 9,
animation_speed = 0.5,
shift = {2.34,0.3},
},
west = {
filename = sprite('tokamak_entity_animation.png'),
size = {512*3,512*2},
scale = 0.37,
line_length = 3,
lines_per_file = 3,
frame_count = 9,
animation_speed = 0.5,
shift = {2.34,0.3},
},
animation_speed = 0.3,
shift = {2.4,-1.5}
},
working_sound = {

View file

@ -32,6 +32,7 @@ data:extend({
width = 512*2,
height = 512*2,
scale = 0.4,
shift = {0,0.5}
},
inventory_size = 80,
flags = {"player-creation","placeable-neutral","not-rotatable"},
@ -68,7 +69,8 @@ data:extend({
scale = 0.4,
line_length = 4,
frame_count = 4,
animation_speed = 0.5
animation_speed = 0.5,
shift = {0,0.5}
},
continuous_animation = true
}

View file

@ -310,7 +310,7 @@ data:extend({
{
type = "projectile",
ammo_category = "electric",
damage_modifier = 100,
damage_modifier = 1000,
cooldown = 100,
projectile_center = {0, 0},
projectile_creation_distance = 0.6,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 KiB

After

Width:  |  Height:  |  Size: 434 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 983 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 497 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 2 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 397 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,012 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 MiB

After

Width:  |  Height:  |  Size: 8.2 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 964 KiB

After

Width:  |  Height:  |  Size: 939 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Before After
Before After

View file

@ -26,7 +26,7 @@ end
function gr_white_hole_recipe_generator()
local items = data.raw.item
for i,v in pairs(items) do
if data.raw.item[i].stack_size > 1 then
if tonumber(data.raw.item[i].stack_size) > 1 then
gr_make_white_hole_recipe(data.raw.item[i].name)
end
end