Compare commits

..

2 Commits

Author SHA1 Message Date
ed2354b0fa situation handling
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
2026-02-21 22:33:24 +01:00
3b9b67e2fa Merge pull request 'remove manager postfixes' (#8) from feature-remove-manager-postfixes into master
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #8
2026-02-21 20:36:29 +00:00
8 changed files with 63 additions and 9 deletions

View File

@@ -4,6 +4,7 @@
globals = {
"Util",
"Decision",
"Situation",
"Screen",
"UI",
"Print",

View File

@@ -5,7 +5,10 @@ init/init.minigames.lua
init/init.meters.lua
system/system.util.lua
init/init.windows.lua
situation/situation.manager.lua
situation/situation.drink_coffee.lua
decision/decision.manager.lua
decision/decision.have_a_coffee.lua
decision/decision.go_to_home.lua
decision/decision.go_to_toilet.lua
decision/decision.go_to_walking_to_office.lua

View File

@@ -0,0 +1,8 @@
Decision.register({
id = "have_a_coffee",
label = "Have a Coffee",
handle = function()
Situation.apply("drink_coffee")
end,
condition = function() return true end
})

View File

@@ -12,6 +12,7 @@ Util = {}
Meters = {}
Minigames = {}
Decision = {}
Situation = {}
Screen = {}
Map = {}
UI = {}

View File

@@ -1,17 +1,12 @@
local _screens = {}
function Screen.get_screens_array()
local screens_array = {}
for _, screen_data in pairs(_screens) do
table.insert(screens_array, screen_data)
end
return screens_array
end
function Screen.register(screen_data)
if _screens[screen_data.id] then
trace("Warning: Overwriting screen with id: " .. screen_data.id)
end
if not screen_data.situations then
screen_data.situations = {}
end
_screens[screen_data.id] = screen_data
end

View File

@@ -6,5 +6,9 @@ Screen.register({
"play_rhythm",
"play_ddr",
"go_to_walking_to_home",
}
"have_a_coffee",
},
situations = {
"drink_coffee",
},
})

View File

@@ -0,0 +1,6 @@
Situation.register({
id = "drink_coffee",
handle = function()
Audio.sfx_select()
end,
})

View File

@@ -0,0 +1,36 @@
local _situations = {}
function Situation.register(situation)
if not situation or not situation.id then
PopupWindow.show({"Error: Invalid situation object registered (missing id)!"})
return
end
if not situation.handle then
situation.handle = function() end
end
if _situations[situation.id] then
trace("Warning: Overwriting situation with id: " .. situation.id)
end
_situations[situation.id] = situation
end
function Situation.get(id)
return _situations[id]
end
function Situation.apply(id)
local situation = Situation.get(id)
if not situation then
trace("Error: No situation found with id: " .. id)
return
end
local current_screen_obj = Screen.get_by_id(Context.current_screen)
if current_screen_obj and not current_screen_obj.situations[id] then
trace("Info: Situation " .. id .. " cannot be applied to current screen (id: " .. Context.current_screen .. ").")
return
end
situation.handle()
end