diff --git a/bk_sprites.lua b/bk_sprites.lua index 983699e..0a13c3e 100644 --- a/bk_sprites.lua +++ b/bk_sprites.lua @@ -8,8 +8,8 @@ data:extend( type = "sprite", name = "bk_sprite_1", filename = sprite('1.png'), - width = 1117, - height = 948, + width = 1245, + height = 1122, scale = 0.5 }, { @@ -48,8 +48,8 @@ data:extend( type = "sprite", name = "bk_sprite_6", filename = sprite('6.png'), - width = 1190, - height = 1020, + width = 1080, + height = 1080, scale = 0.7 }, { diff --git a/changelog.txt b/changelog.txt index 5af07ae..4303867 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.5 +Date: 2.4.2022 + Features: + - redone star engine graphics, aswell as decreased star engine size, current star engines will drop to ground +--------------------------------------------------------------------------------------------------- Version: 1.0.4 Date: 30.3.2022 Features: diff --git a/migrations/248k-1.0.5.lua b/migrations/248k-1.0.5.lua new file mode 100644 index 0000000..d55f19e --- /dev/null +++ b/migrations/248k-1.0.5.lua @@ -0,0 +1,36 @@ +if settings.startup['overhaul_mode'].value == false then + game.print("You are currently playing 248k on standalone Mode.", {r=0.5, g=0, b=0.5}) + game.print("If you wish to play 248k as an overhaul mod with tech and item integration, especially in Krastorio2 turn on the mod setting", {r=0.5, g=0, b=0.5}) +elseif settings.startup['overhaul_mode'].value == true then + game.print("You are currently playing 248k on overhaul Mode.", {r=0.5, g=0, b=0.5}) + game.print("If you wish to play 248k as an standalone mod without tech and item integration turn off the mod setting", {r=0.5, g=0, b=0.5}) +end + +for _, force in pairs(game.forces) do + force.reset_recipes() + force.reset_technologies() + force.reset_technology_effects() +end + +for _, v in pairs(game.surfaces) do + for _, _v in pairs(v.find_entities_filtered{name = "fu_star_engine_core_entity"}) do + _v.surface.spill_item_stack(_v.position, {name="fu_star_engine_core_item"}) + _v.mine() + end + for _, _v in pairs(v.find_entities_filtered{name = "fu_star_engine_cooler_up_entity"}) do + _v.surface.spill_item_stack(_v.position, {name="fu_star_engine_cooler_up_item"}) + _v.mine() + end + for _, _v in pairs(v.find_entities_filtered{name = "fu_star_engine_cooler_entity"}) do + _v.surface.spill_item_stack(_v.position, {name="fu_star_engine_cooler_item"}) + _v.mine() + end + for _, _v in pairs(v.find_entities_filtered{name = "fu_star_engine_heater_left_entity"}) do + _v.surface.spill_item_stack(_v.position, {name="fu_star_engine_heater_left_item"}) + _v.mine() + end + for _, _v in pairs(v.find_entities_filtered{name = "fu_star_engine_heater_entity"}) do + _v.surface.spill_item_stack(_v.position, {name="fu_star_engine_heater_item"}) + _v.mine() + end +end \ No newline at end of file diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index 03caa08..7be1dcb 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -117,10 +117,10 @@ data:extend({ enabled = 'false', category = 'crafting', ingredients = { - {'iron-gear-wheel',40}, - {'pipe',40}, + {'iron-gear-wheel',20}, + {'pipe',15}, {'el_materials_ALK',10}, - {'electronic-circuit',15} + {'electronic-circuit',10} }, result = 'el_pressurizer_item', result_count = 1, diff --git a/prototypes/electronic/el_arc_furnace.lua b/prototypes/electronic/el_arc_furnace.lua index 4e1382f..356c48f 100644 --- a/prototypes/electronic/el_arc_furnace.lua +++ b/prototypes/electronic/el_arc_furnace.lua @@ -137,7 +137,7 @@ data:extend({ working_sound = { sound = {filename = "__base__/sound/chemical-plant-3.ogg" }, - apparent_volume = 0.3, + apparent_volume = 0.1, }, }, }) diff --git a/prototypes/electronic/el_caster.lua b/prototypes/electronic/el_caster.lua index 90fb68d..de1de0c 100644 --- a/prototypes/electronic/el_caster.lua +++ b/prototypes/electronic/el_caster.lua @@ -154,7 +154,7 @@ data:extend({ working_sound = { sound = {filename = "__base__/sound/chemical-plant-3.ogg" }, - apparent_volume = 0.3, + apparent_volume = 0.1, }, }, }) diff --git a/prototypes/electronic/el_grower.lua b/prototypes/electronic/el_grower.lua index 1e3f3c9..41eaf73 100644 --- a/prototypes/electronic/el_grower.lua +++ b/prototypes/electronic/el_grower.lua @@ -146,7 +146,7 @@ data:extend({ working_sound = { sound = {filename = "__base__/sound/chemical-plant-3.ogg" }, - apparent_volume = 0.3, + apparent_volume = 0.1, }, }, }) \ No newline at end of file diff --git a/prototypes/electronic/el_pressurizer.lua b/prototypes/electronic/el_pressurizer.lua index a0ee52e..1775c53 100644 --- a/prototypes/electronic/el_pressurizer.lua +++ b/prototypes/electronic/el_pressurizer.lua @@ -139,7 +139,7 @@ data:extend({ working_sound = { sound = {filename = "__base__/sound/chemical-plant-3.ogg" }, - apparent_volume = 0.3, + apparent_volume = 0.1, }, }, }) diff --git a/prototypes/electronic/el_purifier.lua b/prototypes/electronic/el_purifier.lua index 8554523..c0f597a 100644 --- a/prototypes/electronic/el_purifier.lua +++ b/prototypes/electronic/el_purifier.lua @@ -150,7 +150,7 @@ data:extend({ working_sound = { sound = {filename = "__base__/sound/chemical-plant-3.ogg" }, - apparent_volume = 0.3, + apparent_volume = 0.1, }, }, }) diff --git a/prototypes/electronic/el_water_generator.lua b/prototypes/electronic/el_water_generator.lua index 1d2b07d..b352cf6 100644 --- a/prototypes/electronic/el_water_generator.lua +++ b/prototypes/electronic/el_water_generator.lua @@ -88,7 +88,7 @@ data:extend({ }, working_sound = { sound = { filename ='__base__/sound/pipe.ogg'}, - apparent_volume = 0.7, + apparent_volume = 0.3, }, }, }) diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua index 5dd8c0d..9333753 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua @@ -103,7 +103,7 @@ data:extend({ }, --animation animation = { - north = { + filename = sprite('entity_animation.png'), size = {480,500}, scale = 0.27, diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua index f035e22..867c52c 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua @@ -12,7 +12,7 @@ data:extend({ { name = 'fu_star_engine_cooler_item', type = 'item', - icon = sprite('item.png'), + icon = sprite('icon.png'), icon_size = 64, place_result = 'fu_star_engine_cooler_entity', stack_size = 1, @@ -28,13 +28,13 @@ data:extend({ { name = 'fu_star_engine_cooler_entity', type = 'assembling-machine', - icon = sprite('entity_icon.png'), + icon = sprite('icon.png'), icon_size = 64, flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-6.5,-10.5},{6.5,10.5}}, - selection_box = {{-6.5,-10.5},{6.5,10.5}}, + collision_box = {{-6.5,-9},{6.5,9}}, + selection_box = {{-6.5,-9},{6.5,9}}, map_color = {r=0, g=0, b=1, a=1}, minable = { mining_time = 1, @@ -57,7 +57,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {-4, -11}} + {type = "input", position = {-2, -9.5}} }, production_type = "input" }, @@ -68,7 +68,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {4, -11}} + {type = "input", position = {2, -9.5}} }, production_type = "input" }, @@ -79,7 +79,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {0, 11}}, + {type = "output", position = {0, 9.5}}, }, production_type = "output" }, @@ -90,7 +90,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {-2, 11}}, + {type = "output", position = {-2, 9.5}}, }, production_type = "output" }, @@ -101,7 +101,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {2, 11}}, + {type = "output", position = {2, 9.5}}, }, production_type = "output" }, @@ -112,7 +112,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {-4, 11}}, + {type = "output", position = {-4, 9.5}}, }, production_type = "output" }, @@ -123,47 +123,36 @@ data:extend({ pipe_connections = { - {type = "output", position = {4, 11}}, + {type = "output", position = {4, 9.5}}, }, production_type = "output" }, }, --animation animation = { - north = { - filename = sprite('entity_animation_1.png'), - size = {600*2,512*2}, - scale = 0.8, - shift = {5.5,0.5}, - line_length = 1, - lines_per_file = 1, - frame_count = 1, - animation_speed = 0.3, - }, - east = { - filename = sprite('entity_animation.png'), - size = {480,500}, - scale = 0.27, - line_length = 1, - frame_count = 1, - animation_speed = 0.5, - }, - south = { - filename = sprite('entity_animation.png'), - size = {480,500}, - scale = 0.27, - line_length = 1, - frame_count = 1, - animation_speed = 0.5, - }, - west = { - filename = sprite('entity_animation.png'), - size = {480,500}, - scale = 0.27, - line_length = 1, - frame_count = 1, - animation_speed = 0.5, - }, + filename = sprite('base.png'), + size = {1080, 1080}, + scale = 0.58, + shift = {0,-0.35}, + line_length = 1, + lines_per_file = 1, + frame_count = 1, + animation_speed = 1, + }, + working_visualisations = { + { + animation = + { + filename = sprite('animation.png'), + size = {1080, 1080}, + scale = 0.58, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.3, + shift = {0,-0.35} + } + } }, working_sound = { diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua index 2456917..d61ca73 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua @@ -12,7 +12,7 @@ data:extend({ { name = 'fu_star_engine_cooler_up_item', type = 'item', - icon = sprite('item.png'), + icon = sprite('icon.png'), icon_size = 64, place_result = 'fu_star_engine_cooler_up_entity', stack_size = 1, @@ -28,13 +28,13 @@ data:extend({ { name = 'fu_star_engine_cooler_up_entity', type = 'assembling-machine', - icon = sprite('entity_icon.png'), + icon = sprite('icon.png'), icon_size = 64, flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-6.5,-10.5},{6.5,10.5}}, - selection_box = {{-6.5,-10.5},{6.5,10.5}}, + collision_box = {{-6.5,-9},{6.5,9}}, + selection_box = {{-6.5,-9},{6.5,9}}, map_color = {r=0, g=0, b=1, a=1}, minable = { mining_time = 1, @@ -57,7 +57,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {-4, 11}} + {type = "input", position = {-2, 9.5}} }, production_type = "input" }, @@ -68,7 +68,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {4, 11}} + {type = "input", position = {2, 9.5}} }, production_type = "input" }, @@ -79,7 +79,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {0, -11}}, + {type = "output", position = {0, -9.5}}, }, production_type = "output" }, @@ -90,7 +90,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {-2, -11}}, + {type = "output", position = {-2, -9.5}}, }, production_type = "output" }, @@ -101,7 +101,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {2, -11}}, + {type = "output", position = {2, -9.5}}, }, production_type = "output" }, @@ -112,7 +112,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {-4, -11}}, + {type = "output", position = {-4, -9.5}}, }, production_type = "output" }, @@ -123,7 +123,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {4, -11}}, + {type = "output", position = {4, -9.5}}, }, production_type = "output" }, @@ -132,40 +132,29 @@ data:extend({ }, --animation animation = { - north = { - filename = sprite('entity_animation_1.png'), - size = {600*2,512*2}, - scale = 0.8, - shift = {5.5,-0.5}, - line_length = 1, - lines_per_file = 1, - frame_count = 1, - animation_speed = 0.3, - }, - east = { - filename = sprite('entity_animation.png'), - size = {480,500}, - scale = 0.27, - line_length = 1, - frame_count = 1, - animation_speed = 0.5, - }, - south = { - filename = sprite('entity_animation.png'), - size = {480,500}, - scale = 0.27, - line_length = 1, - frame_count = 1, - animation_speed = 0.5, - }, - west = { - filename = sprite('entity_animation.png'), - size = {480,500}, - scale = 0.27, - line_length = 1, - frame_count = 1, - animation_speed = 0.5, - }, + filename = sprite('base.png'), + size = {1080, 1080}, + scale = 0.58, + shift = {0,0}, + line_length = 1, + lines_per_file = 1, + frame_count = 1, + animation_speed = 1, + }, + working_visualisations = { + { + animation = + { + filename = sprite('animation.png'), + size = {1080, 1080}, + scale = 0.58, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.3, + shift = {0,0} + } + } }, working_sound = { diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua index eb0ce18..197c379 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua @@ -12,7 +12,7 @@ data:extend({ { name = 'fu_star_engine_core_item', type = 'item', - icon = sprite('item.png'), + icon = sprite('icon.png'), icon_size = 64, place_result = 'fu_star_engine_core_entity', stack_size = 1, @@ -28,7 +28,7 @@ data:extend({ { name = 'fu_star_engine_core_entity', type = 'assembling-machine', - icon = sprite('entity_icon.png'), + icon = sprite('icon.png'), icon_size = 64, flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, @@ -58,7 +58,7 @@ data:extend({ base_level = -1, pipe_connections = { - {type = "input", position = {-9, -1}} + {type = "input", position = {-9, 3}} }, production_type = "input" }, @@ -68,7 +68,7 @@ data:extend({ base_level = -1, pipe_connections = { - {type = "input", position = {-9, 4}} + {type = "input", position = {-9, 1}} }, production_type = "input" }, @@ -79,7 +79,7 @@ data:extend({ base_level = -1, pipe_connections = { - {type = "input", position = {9, -1}} + {type = "input", position = {9, 3}} }, production_type = "input" }, @@ -89,7 +89,7 @@ data:extend({ base_level = -1, pipe_connections = { - {type = "input", position = {9, 4}} + {type = "input", position = {9, 1}} }, production_type = "input" }, @@ -101,7 +101,7 @@ data:extend({ base_level = 1, pipe_connections = { - {type = "output", position = {-4, -5}}, + {type = "output", position = {-2, -5}}, }, production_type = "output" }, @@ -111,7 +111,7 @@ data:extend({ base_level = 1, pipe_connections = { - {type = "output", position = {4, -5}}, + {type = "output", position = {2, -5}}, }, production_type = "output" }, @@ -122,7 +122,7 @@ data:extend({ base_level = 1, pipe_connections = { - {type = "output", position = {-4, 9}}, + {type = "output", position = {-2, 9}}, }, production_type = "output" }, @@ -132,50 +132,36 @@ data:extend({ base_level = 1, pipe_connections = { - {type = "output", position = {4, 9}}, + {type = "output", position = {2, 9}}, }, production_type = "output" }, }, --animation animation = { - north = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.6, - shift = {2,0}, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, - east = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.5, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.5, - }, - south = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.5, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.5, - }, - west = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.5, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.5, - }, + filename = sprite('base.png'), + size = {1080, 1080}, + scale = 0.52, + shift = {0,2.6}, + line_length = 1, + lines_per_file = 1, + frame_count = 1, + animation_speed = 1, + }, + working_visualisations = { + { + animation = + { + filename = sprite('animation.png'), + size = {1080, 1080}, + scale = 0.52, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.3, + shift = {0,2.6} + } + } }, working_sound = { diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua index 8c386b7..bd8399d 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua @@ -12,7 +12,7 @@ data:extend({ { name = 'fu_star_engine_heater_item', type = 'item', - icon = sprite('item.png'), + icon = sprite('icon.png'), icon_size = 64, place_result = 'fu_star_engine_heater_entity', stack_size = 1, @@ -28,13 +28,13 @@ data:extend({ { name = 'fu_star_engine_heater_entity', type = 'assembling-machine', - icon = sprite('entity_icon.png'), + icon = sprite('icon.png'), icon_size = 64, flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-15,-6.5},{11,6.5}}, - selection_box = {{-15,-6.5},{11,6.5}}, + collision_box = {{-10.5,-4.5}, {8.5,4.5}}, + selection_box = {{-10.5,-4.5}, {8.5,4.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { mining_time = 1, @@ -57,7 +57,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {11.5, 0}} + {type = "input", position = {9, 0}} }, production_type = "input" }, @@ -68,7 +68,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {11.5, 3}} + {type = "input", position = {9, 2}} }, production_type = "input" }, @@ -79,7 +79,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {11.5, -3}} + {type = "input", position = {9, -2}} }, production_type = "input" }, @@ -90,7 +90,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {-15.5, -2}}, + {type = "output", position = {-11, -1}}, }, production_type = "output" }, @@ -101,7 +101,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {-15.5, 3}}, + {type = "output", position = {-11, 1}}, }, production_type = "output" }, @@ -110,43 +110,29 @@ data:extend({ }, --animation animation = { - north = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.8, - shift = {0.3,-0.2}, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, - east = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.1, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, - south = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.1, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, - west = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.1, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, + filename = sprite('base.png'), + size = {1080, 1080}, + scale = 0.58, + shift = {-1.0, 0.2}, + line_length = 1, + lines_per_file = 1, + frame_count = 1, + animation_speed = 1, + }, + working_visualisations = { + { + animation = + { + filename = sprite('animation.png'), + size = {1080, 1080}, + scale = 0.58, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.3, + shift = {-1.0, 0.2} + } + } }, working_sound = { diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua index dc1845a..dd4db88 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua @@ -12,7 +12,7 @@ data:extend({ { name = 'fu_star_engine_heater_left_item', type = 'item', - icon = sprite('item.png'), + icon = sprite('icon.png'), icon_size = 64, place_result = 'fu_star_engine_heater_left_entity', stack_size = 1, @@ -28,13 +28,13 @@ data:extend({ { name = 'fu_star_engine_heater_left_entity', type = 'assembling-machine', - icon = sprite('entity_icon.png'), + icon = sprite('icon.png'), icon_size = 64, flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-15,-6.5},{11,6.5}}, - selection_box = {{-15,-6.5},{11,6.5}}, + collision_box = {{-8.5,-4.5},{10.5,4.5}}, + selection_box = {{-8.5,-4.5},{10.5,4.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { mining_time = 1, @@ -57,7 +57,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {-15.5, 0}} + {type = "input", position = {-9, 0}} }, production_type = "input" }, @@ -68,7 +68,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {-15.5, 3}} + {type = "input", position = {-9, 2}} }, production_type = "input" }, @@ -79,7 +79,7 @@ data:extend({ pipe_connections = { - {type = "input", position = {-15.5, -3}} + {type = "input", position = {-9, -2}} }, production_type = "input" }, @@ -90,7 +90,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {11.5, -2}}, + {type = "output", position = {11, -1}}, }, production_type = "output" }, @@ -101,7 +101,7 @@ data:extend({ pipe_connections = { - {type = "output", position = {11.5, 3}}, + {type = "output", position = {11, 1}}, }, production_type = "output" }, @@ -110,43 +110,29 @@ data:extend({ }, --animation animation = { - north = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.8, - shift = {0.3-5+0.1,-0.2}, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, - east = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.1, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, - south = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.1, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, - west = { - filename = sprite('entity_animation.png'), - size = {600*2,512*2}, - scale = 0.1, - line_length = 3, - lines_per_file = 3, - frame_count = 9, - animation_speed = 0.3, - }, + filename = sprite('base.png'), + size = {1080, 1080}, + scale = 0.58, + shift = {0.75, 0.6}, + line_length = 1, + lines_per_file = 1, + frame_count = 1, + animation_speed = 1, + }, + working_visualisations = { + { + animation = + { + filename = sprite('animation.png'), + size = {1080, 1080}, + scale = 0.58, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.3, + shift = {0.75, 0.6} + } + } }, working_sound = { diff --git a/ressources/booktorio/bk_sprite_1.png b/ressources/booktorio/bk_sprite_1.png index 09cc9b4..e135473 100644 Binary files a/ressources/booktorio/bk_sprite_1.png and b/ressources/booktorio/bk_sprite_1.png differ diff --git a/ressources/booktorio/bk_sprite_6.png b/ressources/booktorio/bk_sprite_6.png index b87143e..58c399f 100644 Binary files a/ressources/booktorio/bk_sprite_6.png and b/ressources/booktorio/bk_sprite_6.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_animation.png new file mode 100644 index 0000000..722cc86 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_animation.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_base.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_base.png new file mode 100644 index 0000000..ce14780 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_base.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_animation.png deleted file mode 100644 index 2447789..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_animation.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_animation_1.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_animation_1.png deleted file mode 100644 index 7998996..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_animation_1.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_icon.png deleted file mode 100644 index 5bdaf00..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_entity_icon.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_icon.png new file mode 100644 index 0000000..9778fd7 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_icon.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_item.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_item.png deleted file mode 100644 index 5bdaf00..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_item.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_animation.png new file mode 100644 index 0000000..e2c5295 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_animation.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_base.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_base.png new file mode 100644 index 0000000..20c07d4 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_base.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_animation.png deleted file mode 100644 index 2447789..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_animation.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_animation_1.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_animation_1.png deleted file mode 100644 index ef4107f..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_animation_1.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_icon.png deleted file mode 100644 index 22c508f..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_entity_icon.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_icon.png new file mode 100644 index 0000000..c094586 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_icon.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_item.png b/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_item.png deleted file mode 100644 index 22c508f..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_item.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_animation.png new file mode 100644 index 0000000..67c9535 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_animation.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_base.png b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_base.png new file mode 100644 index 0000000..e409c33 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_base.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_entity_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_entity_animation.png deleted file mode 100644 index 9d4fab7..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_entity_animation.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_entity_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_entity_icon.png deleted file mode 100644 index 541e793..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_entity_icon.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_icon.png new file mode 100644 index 0000000..808f816 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_icon.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_item.png b/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_item.png deleted file mode 100644 index 541e793..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_item.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_animation.png new file mode 100644 index 0000000..a82f624 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_animation.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_base.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_base.png new file mode 100644 index 0000000..e0d9569 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_base.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_entity_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_entity_animation.png deleted file mode 100644 index f6f7c81..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_entity_animation.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_entity_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_entity_icon.png deleted file mode 100644 index c1f4ecf..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_entity_icon.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_icon.png new file mode 100644 index 0000000..c407c65 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_icon.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_item.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_item.png deleted file mode 100644 index c1f4ecf..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_item.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_animation.png new file mode 100644 index 0000000..5532bb2 Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_animation.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_base.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_base.png new file mode 100644 index 0000000..5c70c1e Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_base.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_entity_animation.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_entity_animation.png deleted file mode 100644 index e0f3ce6..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_entity_animation.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_entity_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_entity_icon.png deleted file mode 100644 index ef844f5..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_entity_icon.png and /dev/null differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_icon.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_icon.png new file mode 100644 index 0000000..5fe4bdf Binary files /dev/null and b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_icon.png differ diff --git a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_item.png b/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_item.png deleted file mode 100644 index ef844f5..0000000 Binary files a/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_item.png and /dev/null differ diff --git a/ressources/techs/fu_star_engine_tech.png b/ressources/techs/fu_star_engine_tech.png index e7dcfa7..4e4d03f 100644 Binary files a/ressources/techs/fu_star_engine_tech.png and b/ressources/techs/fu_star_engine_tech.png differ diff --git a/scripts/informatron/inf_sprites.lua b/scripts/informatron/inf_sprites.lua index de5647f..21c3e3e 100644 --- a/scripts/informatron/inf_sprites.lua +++ b/scripts/informatron/inf_sprites.lua @@ -2,12 +2,12 @@ local function sprite(name) return '__248k__/ressources/booktorio/bk_sprite_'..name end -- style_name, filename, width, height -- style_name MUST be a completely unique name -informatron_make_image("inf_248k_image_1", sprite('1.png'), 1117, 948) +informatron_make_image("inf_248k_image_1", sprite('1.png'), 1245, 1122) informatron_make_image("inf_248k_image_2", sprite('2.png'), 1044, 826) informatron_make_image("inf_248k_image_3", sprite('3.png'), 988, 696) informatron_make_image("inf_248k_image_4", '__248k__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png', 512*2, 512*2) informatron_make_image("inf_248k_image_5", '__248k__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png', 512, 512) -informatron_make_image("inf_248k_image_6", sprite('6.png'), 1190, 1020) +informatron_make_image("inf_248k_image_6", sprite('6.png'), 1080, 1080) informatron_make_image("inf_248k_image_7", sprite('7.png'), 1292, 627) informatron_make_image("inf_248k_image_8", sprite('8.PNG'), 493, 124) diff --git a/scripts/overhaul.lua b/scripts/overhaul.lua index 88d7515..44a717c 100644 --- a/scripts/overhaul.lua +++ b/scripts/overhaul.lua @@ -122,6 +122,8 @@ tech_table = { {"chemical-science-pack", "el_grower_tech"}, {"engine", "el_ALK_tech"}, {"oil-processing", "el_ALK_tech"}, + {"el_lithium_tech", "battery"}, + {"el_ki_tech", "circuit-network"}, {"electric-energy-distribution-1", "el_ALK_tech"}, {"el_energy_tech", "solar-energy"}, {"stack-inserter", "el_grower_tech"},