mirror of
https://github.com/ComfyFactory/ComfyFactorio.git
synced 2025-02-13 13:49:33 +02:00
Merge pull request #447 from ComfyFactory/journey_hotfix2
move restart order to not repeat same world selections
This commit is contained in:
commit
be6ee90c58
@ -792,11 +792,7 @@ local function roll_bonus_goods(journey, trait, amount)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function Public.set_world_selectors(journey)
|
function Public.set_world_selectors(journey)
|
||||||
if journey.restart_from_scenario then
|
|
||||||
Public.restart_server(journey)
|
|
||||||
end
|
|
||||||
local surface = game.surfaces.mothership
|
local surface = game.surfaces.mothership
|
||||||
|
|
||||||
local x = Constants.reroll_selector_area.left_top.x + 3.2
|
local x = Constants.reroll_selector_area.left_top.x + 3.2
|
||||||
journey.reroll_selector.texts = {
|
journey.reroll_selector.texts = {
|
||||||
rendering.draw_text{
|
rendering.draw_text{
|
||||||
@ -979,6 +975,9 @@ function Public.set_world_selectors(journey)
|
|||||||
|
|
||||||
destroy_teleporter(journey, game.surfaces.nauvis, Constants.mothership_teleporter_position)
|
destroy_teleporter(journey, game.surfaces.nauvis, Constants.mothership_teleporter_position)
|
||||||
destroy_teleporter(journey, surface, Constants.mothership_teleporter_position)
|
destroy_teleporter(journey, surface, Constants.mothership_teleporter_position)
|
||||||
|
if journey.restart_from_scenario then
|
||||||
|
Public.restart_server(journey)
|
||||||
|
end
|
||||||
|
|
||||||
Server.to_discord_embed('World ' .. journey.world_number + 1 .. ' selection has started!')
|
Server.to_discord_embed('World ' .. journey.world_number + 1 .. ' selection has started!')
|
||||||
Public.set_minimum_to_vote(journey)
|
Public.set_minimum_to_vote(journey)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user