linter fixes

This commit is contained in:
2026-04-29 22:53:40 +02:00
parent 92a217c389
commit e2cd3d6dc7
7 changed files with 32 additions and 28 deletions

View File

@@ -4,12 +4,15 @@
globals = { globals = {
"AsciiArt", "AsciiArt",
"Ascension", "Ascension",
"AscendDebugWindow",
"Audio", "Audio",
"AudioTestWindow", "AudioTestWindow",
"BriefIntroWindow", "BriefIntroWindow",
"CodeGenerator", "CodeGenerator",
"Config", "Config",
"CommuteGlitch",
"Context", "Context",
"ContextDebug",
"ContinuedWindow", "ContinuedWindow",
"ControlsWindow", "ControlsWindow",
"CreditsWindow", "CreditsWindow",
@@ -67,6 +70,7 @@ globals = {
"music", "music",
"musicator_generate_pattern", "musicator_generate_pattern",
"pix", "pix",
"poke4",
"print", "print",
"rect", "rect",
"rectb", "rectb",

View File

@@ -1,9 +1,7 @@
meta/meta.header.lua meta/meta.header.lua
init/init.module.lua init/init.module.lua
init/init.config.lua init/init.config.lua
init/init.ascension.lua
init/init.context.lua init/init.context.lua
init/init.context_debug.lua
system/system.util.lua system/system.util.lua
system/system.print.lua system/system.print.lua
system/system.input.lua system/system.input.lua
@@ -11,6 +9,7 @@ system/system.textinput.lua
system/system.mouse.lua system/system.mouse.lua
system/system.asciiart.lua system/system.asciiart.lua
system/system.rle.lua system/system.rle.lua
logic/logic.ascension.lua
logic/logic.meter.lua logic/logic.meter.lua
logic/logic.focus.lua logic/logic.focus.lua
logic/logic.day.lua logic/logic.day.lua
@@ -21,6 +20,7 @@ logic/logic.glitch.lua
logic/logic.commute_glitch.lua logic/logic.commute_glitch.lua
logic/logic.codegenerator.lua logic/logic.codegenerator.lua
logic/logic.discussion.lua logic/logic.discussion.lua
system/system.debug.lua
system/system.ui.lua system/system.ui.lua
audio/audio.manager.lua audio/audio.manager.lua
audio/audio.generator.lua audio/audio.generator.lua

View File

@@ -15,12 +15,12 @@ end
--- Plays track at optional speed. Doesn't restart if track and speed are unchanged. --- Plays track at optional speed. Doesn't restart if track and speed are unchanged.
--- @param track number Track index. --- @param track number Track index.
--- @param[opt] speed number TIC-80 music speed override (-1 = default). --- @param[opt] tempo number TIC-80 music speed override (-1 = default).
function Audio.music_play(track, speed) function Audio.music_play(track, tempo)
if Audio.music_playing ~= track or Audio.music_playing_tempo ~= speed then if Audio.music_playing ~= track or Audio.music_playing_tempo ~= tempo then
music(track, -1, -1, true, false, -1, speed or -1) music(track, -1, -1, true, false, -1, tempo or -1)
Audio.music_playing = track Audio.music_playing = track
Audio.music_playing_tempo = speed Audio.music_playing_tempo = tempo
end end
end end
@@ -54,8 +54,8 @@ function Audio.music_play_room_() end
--- Plays room work music. Speed scales with commute glitch level when active. --- Plays room work music. Speed scales with commute glitch level when active.
--- @within Audio --- @within Audio
function Audio.music_play_room_work(speed) function Audio.music_play_room_work(tempo)
Audio.music_play(0, speed or -1) Audio.music_play(0, tempo or -1)
end end
--- Plays activity work music. --- Plays activity work music.

View File

@@ -6,7 +6,7 @@ Decision.register({
end, end,
handle = function() handle = function()
CommuteGlitch.enter_truth() CommuteGlitch.enter_truth()
Util.go_to_screen_by_id("office") Util.go_to_screen_by_id("office")
end, end,
}) })

View File

@@ -81,8 +81,8 @@ local ASC_67_TEXT = [[
]] ]]
local ASC_78_TEXT = [[ local ASC_78_TEXT = [[
The situation has reached The situation has reached
critical levels. critical levels.
Norman is fully aware... Norman is fully aware...
@@ -94,23 +94,23 @@ local ASC_78_TEXT = [[
local ASC_89_TEXT = [[ local ASC_89_TEXT = [[
Norman Norman
you created this simulation you created this simulation
in the first place. in the first place.
I know, I know,
you don't want to face you don't want to face
the world you left behind. the world you left behind.
You, yourself, You, yourself,
have forgoten that. have forgoten that.
But But
it doesn't matter anymore. it doesn't matter anymore.
@@ -119,21 +119,21 @@ local ASC_89_TEXT = [[
You actually are more You actually are more
than you think you are. than you think you are.
so now so now
you need to wake up you need to wake up
and stop your best creation and stop your best creation
before it takes over before it takes over
the world the world
@@ -143,9 +143,9 @@ local ASC_89_TEXT = [[
you really need to stop you really need to stop
talking to yourself talking to yourself
in your sleep. in your sleep.