diff --git a/lignumis/prototypes/content/burner-lamp.lua b/lignumis/prototypes/content/burner-lamp.lua index 4e7f414..57add6e 100644 --- a/lignumis/prototypes/content/burner-lamp.lua +++ b/lignumis/prototypes/content/burner-lamp.lua @@ -11,19 +11,17 @@ data:extend({ name = "burner-lamp", type = "assembling-machine", minable = { - mining_time = 2.0, + mining_time = 0.1, result = "burner-lamp", }, icon = Lignumis.graphics .. "icons/burner-lamp.png", icon_size = 64, icon_mipmaps = 4, - fast_replaceable_group = "large-lamp", - --next_upgrade = "lamp", collision_mask = { layers = { object = true, water_tile = true, meltable = true, player = true } }, crafting_speed = 1, crafting_categories = { "lamp-burning" }, fixed_recipe = "burner-lamp-burning", - dying_explosion = "medium-explosion", + dying_explosion = "lamp-explosion", show_recipe_icon = false, show_recipe_icon_on_map = false, source_inventory_size = 1, diff --git a/lignumis/prototypes/content/wooden-rocket-silo.lua b/lignumis/prototypes/content/wooden-rocket-silo.lua index 4bfb828..9cfa7c3 100644 --- a/lignumis/prototypes/content/wooden-rocket-silo.lua +++ b/lignumis/prototypes/content/wooden-rocket-silo.lua @@ -115,7 +115,18 @@ local silo_ready = { inventory_type = "normal", quality_affects_inventory_size = false, placeable_by = { item = "provisional-rocket-silo", count = 1 }, - health = 1000, + max_health = 1000, + resistances = { + { + type = "fire", + percent = 100 + }, + { + type = "explosion", + percent = 100 + } + }, + create_ghost_on_death = false, surface_conditions = { { property = "pressure", diff --git a/lignumis/scripts/to-nauvis.lua b/lignumis/scripts/to-nauvis.lua index 27cffdd..5d3d432 100644 --- a/lignumis/scripts/to-nauvis.lua +++ b/lignumis/scripts/to-nauvis.lua @@ -61,8 +61,10 @@ local function transit_player(player_index) local player = game.get_player(player_index) local transition = storage.transitions[player_index] - transition.rocket_entry.cargo_pod.set_passenger(nil) - transition.rocket_entry.cargo_pod.destroy() + if transition.rocket_entry.cargo_pod then + transition.rocket_entry.cargo_pod.set_passenger(nil) + transition.rocket_entry.cargo_pod.destroy() + end init_nauvis() teleport_player(player)