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,6 +13,7 @@ Decision.register({
|
||||
modes_for_ascension_levels[1] = "only_special"
|
||||
modes_for_ascension_levels[2] = "only_left"
|
||||
modes_for_ascension_levels[3] = "only_nothing"
|
||||
modes_for_ascension_levels[4] = "normal"
|
||||
|
||||
MinigameDDRWindow.start("game", "generated", {
|
||||
on_win = function(game_context)
|
||||
@@ -22,8 +23,6 @@ Decision.register({
|
||||
Context.should_ascend = true
|
||||
elseif (game_context.special_mode_condition and Context.ascension.level == 3) then
|
||||
Context.should_ascend = true
|
||||
elseif (game_context.special_mode_condition and Context.ascension.level == 4) then
|
||||
Context.should_ascend = true
|
||||
end
|
||||
|
||||
Meter.show()
|
||||
@@ -31,7 +30,7 @@ Decision.register({
|
||||
Window.set_current("game")
|
||||
Context.have_done_work_today = true
|
||||
end,
|
||||
special_mode = modes_for_ascension_levels[Ascension.get_level()]
|
||||
special_mode = modes_for_ascension_levels[Ascension.get_level()] or "normal"
|
||||
})
|
||||
end,
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user