chiark / gitweb /
Ian Jackson [Thu, 18 Mar 2021 18:50:51 +0000 (18:50 +0000)]
Various internal errors, quote properly (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 12:59:21 +0000 (12:59 +0000)]
Makefile: Do not use --workspace for DEPLOY build
This makes it try to build a musl cdylib for otter-wasm, which it
can't. There doesn't seem to be a way to exclude this from cargo.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 17 Mar 2021 12:50:10 +0000 (12:50 +0000)]
hidden: Slightly improve the bodge displacement algorithm
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 21:17:16 +0000 (21:17 +0000)]
penultima: Add a hand (for pawn choice at start)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 21:16:35 +0000 (21:16 +0000)]
hidden: ad-hoc bodge to improve view of displaced pices
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 16:06:35 +0000 (16:06 +0000)]
hidden: Fix an argument name to be consistent
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 16:06:07 +0000 (16:06 +0000)]
hidden: reformat arguments
Whitespace change only
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:25:33 +0000 (01:25 +0000)]
hidden: This reorganisation is done now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:25:28 +0000 (01:25 +0000)]
at: Check that we don't leak when we print messages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 15:56:37 +0000 (15:56 +0000)]
hidden: Get rid of now-unused parameters to log_did*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 13:18:46 +0000 (13:18 +0000)]
hidden: Fix descriptions in log messages to not leak
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 13:28:57 +0000 (13:28 +0000)]
hidden: Provide IPiece::show_or_instead
For doing things when we don't have a PieceRenderInstructions - eg
when logging, which must be player-agnostic.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 13:09:15 +0000 (13:09 +0000)]
pcrender: adjust some debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 12:51:55 +0000 (12:51 +0000)]
New IPieceTraitObj: all done
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 12:41:49 +0000 (12:41 +0000)]
New IPieceTraitObj: proof of concept
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 12:37:01 +0000 (12:37 +0000)]
ui_operations: Take IPiece, not some special snowflake
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 12:21:18 +0000 (12:21 +0000)]
otterlib: centralise UNOCC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 11:45:44 +0000 (11:45 +0000)]
hidden: make describe take ShowUnocculted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 12:15:18 +0000 (12:15 +0000)]
hidden: Pass ioccults through
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 12:04:18 +0000 (12:04 +0000)]
hidden: Make describe* be methods on PriOcculted
So we can call them when we only have one of those.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 12:02:31 +0000 (12:02 +0000)]
hidden: Make PieceRenderInstructions deref to PriOcculted
This makes call sites somewhat nicer, especially as we move more
stuff.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 11:58:47 +0000 (11:58 +0000)]
hidden: make .instead be a method on PriOG
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 11:50:29 +0000 (11:50 +0000)]
hidden: make OccKG::pri_occulted generic
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 11:48:19 +0000 (11:48 +0000)]
hidden: make PriOccultedGeneral
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 16 Mar 2021 10:45:25 +0000 (10:45 +0000)]
hidden: Break out OccKG::pri_occulted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 18:43:58 +0000 (18:43 +0000)]
Refactor to make some things into GPiece methods
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 18:42:10 +0000 (18:42 +0000)]
Refactor to introduce GPiece::fully_visible_to_everyone
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 18:35:46 +0000 (18:35 +0000)]
Plumb ShowUnocculted through to nfaces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 16:40:46 +0000 (16:40 +0000)]
Do not leak item name etc. of occulted pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 16:31:40 +0000 (16:31 +0000)]
Do not tolerate ui operations for occulted pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 16:22:37 +0000 (16:22 +0000)]
hidden: Add ShowUnocculted to ui_operations
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 16:20:44 +0000 (16:20 +0000)]
otterlib: Break out unocc_ok
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 16:14:02 +0000 (16:14 +0000)]
hidden: Introduce ShowUnocculted as an svg_piece parameter
The need to provide a vpid served (and still servers) the same
function, but this plumbing work will make prepare the way for doing
the same to other methods.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 16:02:07 +0000 (16:02 +0000)]
hidden: Fix Implemented to be actually non-publicly-constructable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:09:46 +0000 (01:09 +0000)]
occult: Delete a now-gone bug note
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:09:07 +0000 (01:09 +0000)]
occult: Prevent moving occulting pieces (servr)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:08:02 +0000 (01:08 +0000)]
occult: Prevent restacking of occulting pieces (servr)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:04:59 +0000 (01:04 +0000)]
hidden: Recalculate occultations every time on ungrab (note done)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 01:04:26 +0000 (01:04 +0000)]
hidden: Recalculate occultations every time on ungrab
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 20:22:06 +0000 (20:22 +0000)]
wdt-hand: Move a pawn in
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 00:42:54 +0000 (00:42 +0000)]
wdt-hand: Select and deselect hand appropriately
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 15 Mar 2021 00:19:06 +0000 (00:19 +0000)]
hidden: Rewrite remove_occultation to not barf
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 23:39:09 +0000 (23:39 +0000)]
spec: Provide Area::empty
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 23:19:39 +0000 (23:19 +0000)]
cmdlistener: Call remove_occultation when occulter removed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 23:19:13 +0000 (23:19 +0000)]
cmdlistener: Minor reformatting
This will be nice in a moment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 23:17:43 +0000 (23:17 +0000)]
cmdlistener: Allow game insns access to a PrepareUpdatesBuffer
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 23:15:36 +0000 (23:15 +0000)]
cmdlistener: Make a variable for auth_y
nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 23:12:08 +0000 (23:12 +0000)]
cmdlistener: Prepare for an extra return value from execute_game_insn
Currently this is Option<Void>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 22:23:22 +0000 (22:23 +0000)]
cmdlistener: Plumb a ToPermute through to execute_game_insn
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 22:09:47 +0000 (22:09 +0000)]
hidden: Provide PieceOccult::is_active
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 22:01:17 +0000 (22:01 +0000)]
hand: Actually remove the occultation when it's deactivated
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 20:38:44 +0000 (20:38 +0000)]
wdt-hand: Check for lack of conflicts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 21:53:26 +0000 (21:53 +0000)]
js: Actually Record when we get RecordedUnpredictable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 21:52:25 +0000 (21:52 +0000)]
js: Break out piece_recorded_cseq
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 20:44:53 +0000 (20:44 +0000)]
wdt: Fix parameter naming for retrieve_log
This had the wrong sense. v. confusing.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 20:36:11 +0000 (20:36 +0000)]
wdt: Break out find_conflict
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 20:33:25 +0000 (20:33 +0000)]
wdt: Break out retrieve_log
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 20:08:21 +0000 (20:08 +0000)]
at: Sort out hidden test which was a bit of a confusion
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 20:00:36 +0000 (20:00 +0000)]
at: Note that a bug was fixed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 17:04:57 +0000 (17:04 +0000)]
at: Add test case for move while displaced
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:51:10 +0000 (19:51 +0000)]
hidden: Do not report moves to players seeing a Displaced occultation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:50:33 +0000 (19:50 +0000)]
utils: Improve matches_doesnot
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:48:11 +0000 (19:48 +0000)]
utils: Improve matches_doesnot
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:31:50 +0000 (19:31 +0000)]
utils: Improve matches_doesnot
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:24:25 +0000 (19:24 +0000)]
allow map_piece_update_op to return None
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:15:28 +0000 (19:15 +0000)]
pos_zlevel: Move clone into callers
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:12:06 +0000 (19:12 +0000)]
Refactor: Break out pri.map_piece_update_op
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:05:19 +0000 (19:05 +0000)]
Refactor: Move prep_piecestate to be a method on PieceRenderInstructions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 19:02:47 +0000 (19:02 +0000)]
Structure: Break out pcrender.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 18:55:51 +0000 (18:55 +0000)]
Structure: Break out vpid.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 17:03:23 +0000 (17:03 +0000)]
at: Tiny style change
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 17:03:12 +0000 (17:03 +0000)]
at: impl PieceSpecForOp for &mut too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 16:59:06 +0000 (16:59 +0000)]
at: Generalise PuSynch<T>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 16:44:49 +0000 (16:44 +0000)]
at: nest PuSynch a bit more
This makes it more generic.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 16:40:21 +0000 (16:40 +0000)]
at: impl PieceSpecForOp for ()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 16:32:21 +0000 (16:32 +0000)]
at: Remove some unnecessary PuSynch
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 16:30:20 +0000 (16:30 +0000)]
at: New api_piece internal API
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 16:27:02 +0000 (16:27 +0000)]
at: Improve a panic message slightly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 16:20:09 +0000 (16:20 +0000)]
at: Rename api_with_piece_move_synch (to insert missing "with")
This does grab/ungrab so it should be named "_with_"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 11:48:16 +0000 (11:48 +0000)]
at: Undo symlink thing, list only at-otter specially
If we want more, we'll do a portmanteau like for wdt.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 11:45:49 +0000 (11:45 +0000)]
wdt, at: Make wdriver into a portmanteau executable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 10:06:25 +0000 (10:06 +0000)]
hidden tests: Some todos
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 10:05:55 +0000 (10:05 +0000)]
hidden tests: Move out again - track pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Mar 2021 10:04:23 +0000 (10:04 +0000)]
hidden tests: Move out again
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 21:57:20 +0000 (21:57 +0000)]
hidden: Note a bug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:51:39 +0000 (20:51 +0000)]
at-otter hidde: Use api_piece_move_synch in one place
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 22:04:41 +0000 (22:04 +0000)]
hidden: note a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 21:54:10 +0000 (21:54 +0000)]
Plumb to_permute through, rather than making new ones
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 21:44:41 +0000 (21:44 +0000)]
rename to_permute from to_recompute
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 21:42:22 +0000 (21:42 +0000)]
rename ToPermute from ToRecompute
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 21:41:14 +0000 (21:41 +0000)]
api: Create and destroy a ToRecompute
Nothing uses this yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:39:43 +0000 (20:39 +0000)]
at-otter hidden: Introduce api_piece_move_synch
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:37:16 +0000 (20:37 +0000)]
at-otter hidden: Check that things are where we expect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:35:53 +0000 (20:35 +0000)]
at-otter hidden: Update when we move (specific, must generalise)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:27:53 +0000 (20:27 +0000)]
at-otter hidden: Track alice's pieces too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:16:36 +0000 (20:16 +0000)]
at-otter hidden: Do not unfake rng on exit
Anyone test that wants any particular rng behaviour must set it up.
Ad-hoc tests are mucb better when the rng is not faked.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:11:32 +0000 (20:11 +0000)]
abolish two pointless fn inner()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:10:11 +0000 (20:10 +0000)]
hidden: abolish a pointless fn inner()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:08:51 +0000 (20:08 +0000)]
hidden: Bodge layout: make things a bit more obvious
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Mar 2021 20:08:39 +0000 (20:08 +0000)]
at-otter hidden: Note next thing to test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log