Prompted by "do sighted players have a minimap we don't have access to?"
No widget, but two map surfaces were only half exposed: the world map
screen, and the level view itself, which IS the explored-floor map --
rememberedFoV keeps everything ever seen drawn, and a sighted player pans
over it and reads the fog edge at a glance.
The world map dropped the three things the picture carries: what kind of
place each area is (the icon shape), which way it lies, and how long
travelling there takes. The last is the number the decision turns on and
was only ever in the side panel. states/worldmap.lua is now a read() plus
details() rather than probe/render -- necessarily, because render() gets
no state table and the travel time needs the screen's currentAreaId, an
upvalue like options and selectedOption. Travel time is the game's own
getDistanceMessage, the same call the screen makes. The blurb runs to
several sentences, so it goes on = and the settle timer instead of the
focus line.
Two gotchas: options[i].icon is already an image object, so the icon id
string has to come off the model area; and describe.direction only tests
the sign of each delta, which on the map's floating-point coordinates
called almost everything diagonal, hence a 25% deadzone carrying the same
4/3 x-correction the game's own distance maths uses.
New frontier.lua answers "where haven't I been", which nothing did:
surroundings is local, examine is one tile, and the tracker only finds
things it already knows about. A frontier tile is seen, not blocking
movement, with an in-bounds unseen CARDINAL neighbour -- cardinal because
the diagonal test fires on the unseen tile behind every wall corner, so a
lit corridor would report an unexplored way per corner. Clustered
8-connected and reduced to each cluster's nearest member, so a wide
doorway is one way but two openings that both lie north stay two. Reads
only FoV/rememberedFoV and reports only THAT an opening exists, never
what is beyond it -- exactly what the fog edge shows.
Shift+End names the nearest exit without disturbing the tracker
selection. Note for later: level.exits does not exist at runtime, it is
packed as nil and never assigned. The primitive is the game's own
getListByTag("exit"), which already gates on FoV or rememberedFoV, skips
hidden tiles and sorts by distance. Exits were already a tracker
category, so this is a shortcut rather than a new capability.
"remembered" moves from verbose to normal verbosity. tileFacts reads
actors only when a tile is currently VISIBLE, so a remembered tile is
silent about whatever may be standing on it now, and at normal verbosity
that silence was indistinguishable from "nothing there". A safety flag,
not a nicety.
Also adds descriptor.probeNames: a read() descriptor has no probe table,
so menus.selfTest could only report "custom read()" and the version-bump
canary was lost on exactly the screens reaching for the most upvalues.
worldmap and research now declare their game locals and get the same
PROBE BROKEN check.
120 testbed checks, 0 failures. It caught two things review had not. The
world map said "You are currently here." twice, because
getDistanceMessage and getLastVisitedMessage return the same sentence for
the area you are standing in -- fine as two panels on screen, a stutter
in one utterance. And the first frontier check walked a step east and
demanded the numbers change; it failed on a run where nothing was wrong,
the step landing but both openings keeping the same Chebyshev distance.
Replaced with the deterministic property: every reported distance must
equal Chebyshev from the player's current position, nearest first.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
287 lines
9.4 KiB
Lua
287 lines
9.4 KiB
Lua
-- accessibility/init.lua — mod entry point.
|
|
--
|
|
-- This is the ONLY thing the game calls into. main.lua gains exactly one line:
|
|
--
|
|
-- require("accessibility").initialize()
|
|
--
|
|
-- placed after console.prepare() and before the first states.switch(). By that
|
|
-- point templates are preprocessed, keybindings are loaded, states.setup() has
|
|
-- run, and the console canvas exists — everything we patch is ready.
|
|
--
|
|
-- Everything here is wrapped so that a bug in the mod degrades to "no speech"
|
|
-- rather than taking the game down with it.
|
|
|
|
local accessibility = {}
|
|
|
|
local speech = require("accessibility.speech")
|
|
local stateNames = require("accessibility.stateNames")
|
|
local hotkeys = require("accessibility.hotkeys")
|
|
local walltones = require("accessibility.walltones")
|
|
local menus = require("accessibility.menus")
|
|
local testbed = require("accessibility.testbed")
|
|
|
|
local testbedActive = false
|
|
|
|
-- States we ship focus descriptors for. Also the list the self-test walks.
|
|
local describedStates = {
|
|
"main_menu",
|
|
"settings_menu",
|
|
"load_game",
|
|
"new_game",
|
|
"narration",
|
|
"ingame_dialogue",
|
|
"ingame_observe",
|
|
"actions_menu",
|
|
"worldmap",
|
|
"alchemy_table",
|
|
"journal",
|
|
"character",
|
|
"menu_text",
|
|
"ingame_message",
|
|
"menu_message",
|
|
"inventory",
|
|
"craft",
|
|
"refine",
|
|
"trade",
|
|
"config_menu",
|
|
"keybindings_menu",
|
|
"research",
|
|
"ingame_popup",
|
|
}
|
|
|
|
local initialized = false
|
|
|
|
--------------------------------------------------------------------------------
|
|
-- Patch registry
|
|
--
|
|
-- Later phases register their patches here. Each entry is {name, fn}; fn is called
|
|
-- inside a pcall during initialize(), and a failure disables only that patch.
|
|
--------------------------------------------------------------------------------
|
|
|
|
local patches = {}
|
|
|
|
function accessibility.registerPatch(name, fn)
|
|
patches[#patches + 1] = {name = name, fn = fn}
|
|
end
|
|
|
|
local patchResults = {}
|
|
|
|
local function applyPatches()
|
|
for _, patch in ipairs(patches) do
|
|
local ok, err = pcall(patch.fn)
|
|
patchResults[patch.name] = ok and "ok" or tostring(err)
|
|
if not ok then
|
|
print("[accessibility] patch '" .. patch.name .. "' FAILED: " .. tostring(err))
|
|
end
|
|
end
|
|
end
|
|
|
|
-- Startup self-test output. This is the version-bump canary: when the game
|
|
-- updates and something we hook has moved, it shows up here immediately rather
|
|
-- than as silence three screens into a playthrough.
|
|
function accessibility.selfTest()
|
|
print("[accessibility] --- self test ---")
|
|
print("[accessibility] TTS: " .. (speech.isAvailable() and "available"
|
|
or ("UNAVAILABLE (" .. tostring(speech.getFailureReason()) .. ")")))
|
|
if speech.isAvailable() then
|
|
-- Distinguishes "DLL loaded" from "actually reached a screen reader or SAPI".
|
|
print("[accessibility] speech channel: " .. (speech.hasSpeech() and "yes" or "NO — nothing will be audible"))
|
|
end
|
|
for name, result in pairs(patchResults) do
|
|
print("[accessibility] patch " .. name .. ": " .. result)
|
|
end
|
|
|
|
-- Menu focus probes. A renamed local in a future game version surfaces here at
|
|
-- startup rather than as silence mid-playthrough.
|
|
local ok, results = pcall(menus.selfTest, describedStates)
|
|
if ok then
|
|
for _, stateName in ipairs(describedStates) do
|
|
print("[accessibility] menu " .. stateName .. ": " .. tostring(results[stateName]))
|
|
end
|
|
end
|
|
|
|
local lootOk, lootStatus = pcall(require("accessibility.lootoverlay").probeStatus)
|
|
print("[accessibility] loot overlay: " .. (lootOk and tostring(lootStatus) or ("FAILED: " .. tostring(lootStatus))))
|
|
|
|
print("[accessibility] --- end self test ---")
|
|
end
|
|
|
|
--------------------------------------------------------------------------------
|
|
-- Core hooks into states.lua
|
|
--------------------------------------------------------------------------------
|
|
|
|
local function hookStates()
|
|
local states = require("states")
|
|
|
|
-- Screen changes: announce the new screen.
|
|
local realSwitch = states.switch
|
|
states.switch = function(newState, params)
|
|
local result = realSwitch(newState, params)
|
|
|
|
-- After the switch, so the state's open() has already set up its focus --
|
|
-- main_menu, for one, only picks selectedOption inside open().
|
|
pcall(function()
|
|
-- Guard against NESTED switches. open() can itself switch state:
|
|
-- ingame.open() sees world.pendingDialogue and goes straight to
|
|
-- ingame_dialogue. Because we announce after realSwitch returns, the
|
|
-- inner announcement ("Conversation") happens first and the outer one
|
|
-- ("Game") then interrupts and clobbers it. If we are no longer the
|
|
-- current state, the inner switch already announced -- stay quiet.
|
|
if states.getCurrent() ~= newState then
|
|
return
|
|
end
|
|
|
|
local descriptor = menus.loadDescriptor(newState)
|
|
|
|
if descriptor then
|
|
menus.announceScreen(newState)
|
|
if descriptor.onOpen then
|
|
speech.say(descriptor.onOpen, false)
|
|
end
|
|
else
|
|
speech.say(stateNames[newState] or newState, true)
|
|
end
|
|
end)
|
|
|
|
return result
|
|
end
|
|
|
|
-- Per-frame speech flush. main.lua calls states.update(dt) via a table lookup,
|
|
-- so wrapping the field here avoids editing love.update.
|
|
local realUpdate = states.update
|
|
states.update = function(dt)
|
|
local result = realUpdate(dt)
|
|
|
|
-- Poll focus rather than relying on keypress alone.
|
|
--
|
|
-- Focus can move with no key involved: main_menu.mousemoved assigns
|
|
-- selectedOption straight from the cursor position, so wherever the mouse
|
|
-- happens to rest silently overrides the selection -- including at startup,
|
|
-- before the player has touched anything. Polling also closes the race
|
|
-- where a state's open() sets focus after we have already announced.
|
|
--
|
|
-- Cheap: two debug.getupvalue lookups, and only for states we describe.
|
|
pcall(function()
|
|
menus.announceFocusIfChanged(states.getCurrent())
|
|
end)
|
|
|
|
pcall(walltones.update)
|
|
pcall(require("accessibility.viewwatch").update, dt)
|
|
pcall(require("accessibility.status").update)
|
|
pcall(require("accessibility.details").update, dt)
|
|
pcall(require("accessibility.lootoverlay").update)
|
|
pcall(speech.flush)
|
|
if testbedActive then
|
|
pcall(testbed.update, dt)
|
|
end
|
|
return result
|
|
end
|
|
|
|
-- Global hotkey layer. Ours are consumed; everything else falls through to the
|
|
-- game untouched.
|
|
local realKeypressed = states.keypressed
|
|
states.keypressed = function(key, scancode)
|
|
local consumed = false
|
|
local ok, result = pcall(hotkeys.keypressed, key, scancode)
|
|
if ok then
|
|
consumed = result
|
|
end
|
|
|
|
if consumed then
|
|
return
|
|
end
|
|
|
|
pcall(hotkeys.onGameKey)
|
|
|
|
local keyResult = realKeypressed(key, scancode)
|
|
|
|
-- The loot overlay is edge-triggered off a flag the game sets, and in
|
|
-- hold-to-highlight mode a quick tap can set it and clear it again inside
|
|
-- one frame -- the end-of-frame poll would then never see it up. Checking
|
|
-- here, between the game's keypressed and its keyreleased, catches the tap.
|
|
pcall(require("accessibility.lootoverlay").update)
|
|
|
|
-- After the game handler, so we read the focus it just moved to.
|
|
pcall(function()
|
|
menus.announceFocusIfChanged(states.getCurrent())
|
|
end)
|
|
|
|
return keyResult
|
|
end
|
|
|
|
-- Text entry (character naming) arrives via textinput, not keypressed.
|
|
local realTextinput = states.textinput
|
|
states.textinput = function(text)
|
|
local result = realTextinput(text)
|
|
|
|
pcall(function()
|
|
menus.announceFocusIfChanged(states.getCurrent())
|
|
end)
|
|
|
|
return result
|
|
end
|
|
|
|
-- CRITICAL: re-point the love callbacks at our wrappers.
|
|
--
|
|
-- states.setup() runs before us and does:
|
|
-- love[callback] = love[callback] or states[callback]
|
|
-- which captures the function BY VALUE. main.lua defines love.load, update,
|
|
-- mousepressed, mousereleased and quit itself, but NOT keypressed/textinput --
|
|
-- so those were bound to the original states.keypressed at setup time.
|
|
-- Replacing the states table field alone leaves love.keypressed pointing at
|
|
-- the old function and our wrapper never runs.
|
|
--
|
|
-- states.switch and states.update are unaffected because they are looked up on
|
|
-- the table at call time (from state files and from main.lua's love.update).
|
|
love.keypressed = states.keypressed
|
|
love.textinput = states.textinput
|
|
end
|
|
|
|
--------------------------------------------------------------------------------
|
|
-- Entry point
|
|
--------------------------------------------------------------------------------
|
|
|
|
function accessibility.initialize()
|
|
if initialized then
|
|
return
|
|
end
|
|
initialized = true
|
|
|
|
accessibility.registerPatch("console", require("accessibility.patches.console"))
|
|
accessibility.registerPatch("popups", require("accessibility.patches.popups"))
|
|
accessibility.registerPatch("slider", require("accessibility.patches.slider"))
|
|
accessibility.registerPatch("popupstack", require("accessibility.patches.popupstack"))
|
|
accessibility.registerPatch("itemmenu", require("accessibility.patches.itemmenu"))
|
|
accessibility.registerPatch("hotbar", require("accessibility.patches.hotbar").apply)
|
|
|
|
pcall(function()
|
|
require("accessibility.surroundings").registerKeys(hotkeys)
|
|
require("accessibility.tracker").registerKeys(hotkeys)
|
|
require("accessibility.status").registerKeys(hotkeys)
|
|
require("accessibility.viewwatch").registerKeys(hotkeys)
|
|
require("accessibility.details").registerKeys(hotkeys)
|
|
require("accessibility.frontier").registerKeys(hotkeys)
|
|
end)
|
|
|
|
local ok, err = pcall(function()
|
|
speech.initialize()
|
|
walltones.load()
|
|
hookStates()
|
|
applyPatches()
|
|
end)
|
|
|
|
if not ok then
|
|
print("[accessibility] initialisation FAILED, game continues unmodified: " .. tostring(err))
|
|
return
|
|
end
|
|
|
|
accessibility.selfTest()
|
|
|
|
if testbed.isEnabled() then
|
|
testbedActive = true
|
|
testbed.start()
|
|
end
|
|
end
|
|
|
|
return accessibility
|