forked from cacklingfiend/lignumis
Fix transition to Nauvis with existing saves
This commit is contained in:
parent
fb356e7177
commit
1c527a9a2b
1 changed files with 8 additions and 6 deletions
|
@ -57,7 +57,7 @@ end
|
||||||
|
|
||||||
|
|
||||||
ToNauvis.events[defines.events.on_rocket_launched] = function(event)
|
ToNauvis.events[defines.events.on_rocket_launched] = function(event)
|
||||||
if not event.rocket_silo.name == "provisional-rocket-silo" then return end
|
if event.rocket_silo.name ~= "provisional-rocket-silo" then return end
|
||||||
|
|
||||||
local rocket_entry
|
local rocket_entry
|
||||||
local rocket_entry_index
|
local rocket_entry_index
|
||||||
|
@ -67,7 +67,7 @@ ToNauvis.events[defines.events.on_rocket_launched] = function(event)
|
||||||
if entry.real_silo == event.rocket_silo then
|
if entry.real_silo == event.rocket_silo then
|
||||||
rocket_entry = entry
|
rocket_entry = entry
|
||||||
rocket_entry_index = i
|
rocket_entry_index = i
|
||||||
player = game.get_player(entry.player)
|
player = entry.player and game.get_player(entry.player) or game.players[1]
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -77,11 +77,13 @@ ToNauvis.events[defines.events.on_rocket_launched] = function(event)
|
||||||
init_freeplay()
|
init_freeplay()
|
||||||
|
|
||||||
-- Give the player the content of the rocket
|
-- Give the player the content of the rocket
|
||||||
|
if rocket_entry.rocket_content then
|
||||||
local inventory = player.get_main_inventory()
|
local inventory = player.get_main_inventory()
|
||||||
for _, item in pairs(rocket_entry.rocket_content) do
|
for _, item in pairs(rocket_entry.rocket_content) do
|
||||||
inventory.insert(item)
|
inventory.insert(item)
|
||||||
end
|
end
|
||||||
inventory.sort_and_merge()
|
inventory.sort_and_merge()
|
||||||
|
end
|
||||||
table.remove(storage.rocket_silos, rocket_entry_index)
|
table.remove(storage.rocket_silos, rocket_entry_index)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue