fixes
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed

This commit is contained in:
mr.one
2026-04-29 20:45:03 +02:00
parent 3356d837c2
commit 92a217c389
19 changed files with 156 additions and 90 deletions

View File

@@ -2,7 +2,7 @@ Decision.register({
id = "do_work",
label = "Do Work",
condition = function()
return (not CommuteGlitch.is_active()) or (CommuteGlitch.is_active() and CommuteGlitch.get_level() <= 7)
return (not CommuteGlitch.is_active()) or (CommuteGlitch.is_active() and CommuteGlitch.get_level() <= 4)
end,
handle = function()
Meter.hide()

View File

@@ -2,7 +2,9 @@ Decision.register({
id = "eating_fast_food",
label = "Eat Fast Food",
condition = function()
return Context.fast_food_eaten_today < 3
return
(not CommuteGlitch.is_active() and Context.fast_food_eaten_today < 3) or
(CommuteGlitch.is_active() and CommuteGlitch.get_level() <= 4)
end,
handle = function()
Context.fast_food_approaching = true

View File

@@ -7,7 +7,7 @@ Decision.register({
end
if CommuteGlitch.is_active() then
local g = CommuteGlitch.get_level()
if g >= 4 and g <= 5 then return false end
if g >= 4 and g <= 6 then return false end
if g >= 7 then
return Context.talked_to_norman_echo and Context.talked_to_true_sumphore
end
@@ -19,7 +19,7 @@ Decision.register({
Util.go_to_screen_by_id("home")
return
end
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
if CommuteGlitch.is_max() then
Context.should_ascend = true
CommuteGlitch.reset()
Meter.hide()

View File

@@ -2,7 +2,7 @@ Decision.register({
id = "go_to_office",
label = "Go to Office",
condition = function()
return not (CommuteGlitch.is_active() and CommuteGlitch.get_level() == 6)
return not (CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 6)
end,
handle = function()
if CommuteGlitch.is_active() then

View File

@@ -1,6 +1,12 @@
Decision.register({
id = "go_to_walking_to_home",
label = "Walk home",
condition= function ()
return
(not CommuteGlitch.is_active()) or
(CommuteGlitch.is_active() and CommuteGlitch.get_level() ~= 7) or
(CommuteGlitch.is_active() and CommuteGlitch.get_level() == 7 and Context.talked_to_norman_echo)
end,
handle = function()
Util.go_to_screen_by_id("walking_to_home")
end,

View File

@@ -2,7 +2,7 @@ Decision.register({
id = "have_a_coffee",
label = "Have a Coffee",
condition = function()
return Ascension.get_level() < 8
return Ascension.get_level() < 8 and not CommuteGlitch.is_max()
end,
handle = function()
local level = Ascension.get_level()
@@ -22,11 +22,7 @@ Decision.register({
disc_id = "coworker_disc" .. suffix
elseif level == 7 then
local g = CommuteGlitch.get_level()
if g >= 7 then
disc_id = "coworker_disc_cg_7"
else
disc_id = "coworker_disc_cg_" .. math.max(3, math.min(g, 6))
end
disc_id = "coworker_disc_cg_" .. g
end
Discussion.start(disc_id, "game")
end,

View File

@@ -3,6 +3,9 @@ Decision.register({
label = function()
return "Talk to ????"
end,
condition = function()
return (CommuteGlitch.is_max())
end,
handle = function()
Discussion.start("norman_truth", "game")
end,