diff --git a/changelog.txt b/changelog.txt index 6b0c2fe..55b6f5e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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 diff --git a/info.json b/info.json index 03e2beb..a7e9869 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "248k", - "version": "0.9.1", + "version": "0.9.3", "title": "248k Mod", "author": "PreLeyZero", "factorio_version": "1.1", diff --git a/migrations/248k-0.9.3.lua b/migrations/248k-0.9.3.lua new file mode 100644 index 0000000..5bcdf0c --- /dev/null +++ b/migrations/248k-0.9.3.lua @@ -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 \ No newline at end of file diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index 720e521..f6f6278 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -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', diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index 1d9ebe7..c0f1f40 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -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', + }, diff --git a/prototypes/electronic/el_arc_furnace.lua b/prototypes/electronic/el_arc_furnace.lua index b9ec303..4e1382f 100644 --- a/prototypes/electronic/el_arc_furnace.lua +++ b/prototypes/electronic/el_arc_furnace.lua @@ -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'), - 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} - }, + 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} + } + } + }, + working_sound = { sound = {filename = "__base__/sound/chemical-plant-3.ogg" }, diff --git a/prototypes/electronic/el_caster.lua b/prototypes/electronic/el_caster.lua index c04eae9..90fb68d 100644 --- a/prototypes/electronic/el_caster.lua +++ b/prototypes/electronic/el_caster.lua @@ -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, diff --git a/prototypes/electronic/el_grower.lua b/prototypes/electronic/el_grower.lua index 80ada17..1e3f3c9 100644 --- a/prototypes/electronic/el_grower.lua +++ b/prototypes/electronic/el_grower.lua @@ -54,7 +54,7 @@ data:extend({ 0, 0.8 }, - module_slots = 2 + module_slots = 4 }, energy_usage = '200kW', fluid_boxes = { diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index 507043f..4a79d76 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -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', diff --git a/prototypes/fission/fi_modules.lua b/prototypes/fission/fi_modules.lua index f398502..d10da3e 100644 --- a/prototypes/fission/fi_modules.lua +++ b/prototypes/fission/fi_modules.lua @@ -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', diff --git a/prototypes/fusion/fu_laser.lua b/prototypes/fusion/fu_laser.lua index fdd7545..74af0ec 100644 --- a/prototypes/fusion/fu_laser.lua +++ b/prototypes/fusion/fu_laser.lua @@ -102,42 +102,29 @@ data:extend({ }, --animation animation = { - north = { - 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} - }, - 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} - }, + 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} + } + } }, working_sound = { diff --git a/prototypes/fusion/fu_plasma.lua b/prototypes/fusion/fu_plasma.lua index 8f27dfd..e1d90e8 100644 --- a/prototypes/fusion/fu_plasma.lua +++ b/prototypes/fusion/fu_plasma.lua @@ -102,46 +102,29 @@ data:extend({ }, --animation animation = { - north = { - 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} - }, - 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} - }, + 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, + line_length = 2, + lines_per_file = 2, + frame_count = 4, + animation_speed = 0.2, + shift = {0,-0.1} + } + } }, working_sound = { diff --git a/prototypes/fusion/fu_reactor.lua b/prototypes/fusion/fu_reactor.lua index 5c007b0..cd018be 100644 --- a/prototypes/fusion/fu_reactor.lua +++ b/prototypes/fusion/fu_reactor.lua @@ -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'), - 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}, - }, - 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}, - }, + filename = sprite('stelar_entity_base.png'), + size = {512*2,512*2}, + 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.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, - 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}, - }, + filename = sprite('tokamak_entity_animation.png'), + size = {512*2,512*2}, + scale = 0.56, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.3, + shift = {2.4,-1.5} }, working_sound = { diff --git a/prototypes/gravitation/gr_black_hole.lua b/prototypes/gravitation/gr_black_hole.lua index 899e6f2..f105d17 100644 --- a/prototypes/gravitation/gr_black_hole.lua +++ b/prototypes/gravitation/gr_black_hole.lua @@ -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 } diff --git a/prototypes/gravitation/gr_materials.lua b/prototypes/gravitation/gr_materials.lua index 00878bf..3cf5cf4 100644 --- a/prototypes/gravitation/gr_materials.lua +++ b/prototypes/gravitation/gr_materials.lua @@ -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, diff --git a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_animation.png b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_animation.png deleted file mode 100644 index 6bccba5..0000000 Binary files a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_animation.png and /dev/null differ diff --git a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_base.png b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_base.png new file mode 100644 index 0000000..0c7bc22 Binary files /dev/null and b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_base.png differ diff --git a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_overlay.png b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_overlay.png new file mode 100644 index 0000000..4b769cc Binary files /dev/null and b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_overlay.png differ diff --git a/ressources/electronic/el_caster/el_caster_entity_animation.png b/ressources/electronic/el_caster/el_caster_entity_animation.png index bc5d7d1..a27aa0f 100644 Binary files a/ressources/electronic/el_caster/el_caster_entity_animation.png and b/ressources/electronic/el_caster/el_caster_entity_animation.png differ diff --git a/ressources/electronic/el_purifier/el_purifier_entity_animation.png b/ressources/electronic/el_purifier/el_purifier_entity_animation.png index 23d02e2..60e3d20 100644 Binary files a/ressources/electronic/el_purifier/el_purifier_entity_animation.png and b/ressources/electronic/el_purifier/el_purifier_entity_animation.png differ diff --git a/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png index e160180..4690af9 100644 Binary files a/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png and b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png differ diff --git a/ressources/fusion/fu_laser/fu_laser_entity_animation.png b/ressources/fusion/fu_laser/fu_laser_entity_animation.png deleted file mode 100644 index 75c7d96..0000000 Binary files a/ressources/fusion/fu_laser/fu_laser_entity_animation.png and /dev/null differ diff --git a/ressources/fusion/fu_laser/fu_laser_entity_base.png b/ressources/fusion/fu_laser/fu_laser_entity_base.png new file mode 100644 index 0000000..498e343 Binary files /dev/null and b/ressources/fusion/fu_laser/fu_laser_entity_base.png differ diff --git a/ressources/fusion/fu_laser/fu_laser_entity_overlay.png b/ressources/fusion/fu_laser/fu_laser_entity_overlay.png new file mode 100644 index 0000000..8d78a89 Binary files /dev/null and b/ressources/fusion/fu_laser/fu_laser_entity_overlay.png differ diff --git a/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png b/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png index bed9edd..2c2d2dc 100644 Binary files a/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png and b/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png differ diff --git a/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png b/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png index b866045..b90de3a 100644 Binary files a/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png and b/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png differ diff --git a/ressources/fusion/fu_plasma/fu_plasma_entity_base.png b/ressources/fusion/fu_plasma/fu_plasma_entity_base.png new file mode 100644 index 0000000..32db0d1 Binary files /dev/null and b/ressources/fusion/fu_plasma/fu_plasma_entity_base.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_animation.png b/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_animation.png deleted file mode 100644 index 249ceba..0000000 Binary files a/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_animation.png and /dev/null differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_base.png b/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_base.png new file mode 100644 index 0000000..8adbfd6 Binary files /dev/null and b/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_base.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_icon.png b/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_icon.png index 704edc9..3b13efa 100644 Binary files a/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_icon.png and b/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_icon.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_icon_1.png b/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_icon_1.png deleted file mode 100644 index a41914a..0000000 Binary files a/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_icon_1.png and /dev/null differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_overlay.png b/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_overlay.png new file mode 100644 index 0000000..dd190b8 Binary files /dev/null and b/ressources/fusion/fu_reactor/fu_reactor_stelar_entity_overlay.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_stelar_item.png b/ressources/fusion/fu_reactor/fu_reactor_stelar_item.png deleted file mode 100644 index 704edc9..0000000 Binary files a/ressources/fusion/fu_reactor/fu_reactor_stelar_item.png and /dev/null differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation.png b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation.png index 9410698..c210521d 100644 Binary files a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation.png and b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation_horizontal.png b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation_horizontal.png deleted file mode 100644 index ad1aaee..0000000 Binary files a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation_horizontal.png and /dev/null differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation_vertikal.png b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation_vertikal.png deleted file mode 100644 index 8875b69..0000000 Binary files a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation_vertikal.png and /dev/null differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_icon.png b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_icon.png index fd213ea..5256ac7 100644 Binary files a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_icon.png and b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_icon.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_tokamak_item.png b/ressources/fusion/fu_reactor/fu_reactor_tokamak_item.png deleted file mode 100644 index fd213ea..0000000 Binary files a/ressources/fusion/fu_reactor/fu_reactor_tokamak_item.png and /dev/null differ diff --git a/ressources/gravitation/gr_black_hole/gr_black_hole_base_animation.png b/ressources/gravitation/gr_black_hole/gr_black_hole_base_animation.png index 3cfedfd..731e136 100644 Binary files a/ressources/gravitation/gr_black_hole/gr_black_hole_base_animation.png and b/ressources/gravitation/gr_black_hole/gr_black_hole_base_animation.png differ diff --git a/ressources/gravitation/gr_black_hole/gr_black_hole_working_animation.png b/ressources/gravitation/gr_black_hole/gr_black_hole_working_animation.png index 0a8c903..10be884 100644 Binary files a/ressources/gravitation/gr_black_hole/gr_black_hole_working_animation.png and b/ressources/gravitation/gr_black_hole/gr_black_hole_working_animation.png differ diff --git a/ressources/techs/fu_reactor_tech.png b/ressources/techs/fu_reactor_tech.png index d75c137..0576f2d 100644 Binary files a/ressources/techs/fu_reactor_tech.png and b/ressources/techs/fu_reactor_tech.png differ diff --git a/ressources/techs/fu_tokamak_tech.png b/ressources/techs/fu_tokamak_tech.png index 4ea876f..d3a4bad 100644 Binary files a/ressources/techs/fu_tokamak_tech.png and b/ressources/techs/fu_tokamak_tech.png differ diff --git a/scripts/gravitation/gr_make_white_hole_recipes.lua b/scripts/gravitation/gr_make_white_hole_recipes.lua index 64d61c9..1c31a06 100644 --- a/scripts/gravitation/gr_make_white_hole_recipes.lua +++ b/scripts/gravitation/gr_make_white_hole_recipes.lua @@ -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