Merge branch 'develop' into feature/ascension_7_8
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
# Conflicts: # impostor.inc # inc/decision/decision.have_a_coffee.lua # inc/decision/decision.sumphore_discussion.lua # inc/screen/screen.mysterious_man.lua # inc/screen/screen.walking_to_home.lua # inc/screen/screen.walking_to_office.lua # inc/window/window.menu.lua
This commit is contained in:
@@ -13,8 +13,14 @@ Decision.register({
|
||||
end
|
||||
local level = Ascension.get_level()
|
||||
|
||||
if level >= 1 and level <= 3 then
|
||||
if level >= 1 and level <= 5 then
|
||||
Discussion.start("sumphore_disc_asc_" .. level, "game")
|
||||
elseif level == 6 then
|
||||
if Context.glitch_conversation_count >= 6 then
|
||||
Discussion.start("sumphore_disc_asc_6", "game")
|
||||
else
|
||||
Discussion.start("sumphore_disc_asc_6_waiting", "game")
|
||||
end
|
||||
elseif level == 7 then
|
||||
local g = math.min(CommuteGlitch.get_level(), 7)
|
||||
Discussion.start("sumphore_disc_cg_" .. g, "game")
|
||||
|
||||
Reference in New Issue
Block a user