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:
@@ -4,9 +4,19 @@ Decision.register({
|
||||
handle = function()
|
||||
local level = Ascension.get_level()
|
||||
local disc_id = "coworker_disc_0"
|
||||
if level >= 1 and level <= 3 then
|
||||
if level >= 1 and level <= 5 then
|
||||
local suffix = Context.have_done_work_today and ("_asc_" .. level) or ("_" .. level)
|
||||
disc_id = "coworker_disc" .. suffix
|
||||
elseif level == 6 then
|
||||
if not Context.glitch_conversation_done_today and Context.glitch_conversation_count < 6 then
|
||||
Context.glitch_conversation_done_today = true
|
||||
Context.glitch_conversation_count = Context.glitch_conversation_count + 1
|
||||
Glitch.show()
|
||||
Discussion.start("coworker_disc_asc_6_" .. Context.glitch_conversation_count, "game")
|
||||
return
|
||||
end
|
||||
local suffix = Context.have_done_work_today and ("_asc_5") or ("_5")
|
||||
disc_id = "coworker_disc" .. suffix
|
||||
elseif level == 7 then
|
||||
local g = CommuteGlitch.get_level()
|
||||
if g >= 7 then
|
||||
@@ -17,4 +27,4 @@ Decision.register({
|
||||
end
|
||||
Discussion.start(disc_id, "game")
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user