chiark / gitweb /
Ian Jackson [Sun, 14 Feb 2021 23:05:20 +0000 (23:05 +0000)]
Drop unused argparse dependency from daemon
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 23:04:23 +0000 (23:04 +0000)]
Centralise anyhow
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 23:02:22 +0000 (23:02 +0000)]
Cannot centralise serde_with
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 22:51:42 +0000 (22:51 +0000)]
Cannot centralise serde
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 22:49:16 +0000 (22:49 +0000)]
Cannot centralise thiserror
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 22:47:13 +0000 (22:47 +0000)]
Centralise if_chain
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 22:43:38 +0000 (22:43 +0000)]
Document why fehler not centralised
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 22:39:49 +0000 (22:39 +0000)]
Centralise derive_more
This proves that the new scheme works
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 22:29:41 +0000 (22:29 +0000)]
Reorganose dependencies: wip, arrayvec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 22:25:56 +0000 (22:25 +0000)]
Rename zcoord crate to otter-base
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 21:07:41 +0000 (21:07 +0000)]
dependency reorganisation: Move anyhow
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 21:02:42 +0000 (21:02 +0000)]
Rename otter::imports to otter::prelude
imports is going to be just the dependencies
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 19:30:46 +0000 (19:30 +0000)]
wdt: Type alias for GameSpec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 19:29:28 +0000 (19:29 +0000)]
wdt: UsualSetup, note about why separate Ctx
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 19:28:34 +0000 (19:28 +0000)]
wdt-altergame: Refactor to use UsualSetup
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 19:19:41 +0000 (19:19 +0000)]
wdt: Refactor UsualSetup
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 18:32:00 +0000 (18:32 +0000)]
script: Drop wrong `gen` in TransmitUpdateEntry::Recorded
This isn't there in the Rust code. It clears our gen, but the general
message loop puts it back, which is why we didn't notice.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 18:21:46 +0000 (18:21 +0000)]
reanme js PreparedPieceState
This should have the same name in both places.
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 00:00:09 +0000 (00:00 +0000)]
hand: Fixes to track claiming and unclaiming
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 23:53:20 +0000 (23:53 +0000)]
hand: Fixes to track claiming and unclaiming
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 23:44:23 +0000 (23:44 +0000)]
hand: Track claiming and unclaiming
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 22:59:48 +0000 (22:59 +0000)]
Piece internal API overhaul: pass PieceState, fallible
Magic pieces are going to need to look at their state to decide how
to format themselves, and that is fallible.
Make formatting methods on PieceState fallible. They return
InternalError. Pass these methods &PieceState.
Textually extremely intrusive, but no functional change with existing
actually-infallible call sites.
We provide infallible versions of the describe_html functions, which
return a placeholder if there is an error. This is because typically
at their call sites, returning an error is very inconvenient. Eg, it
happens after a game update has actually occurred.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 22:33:40 +0000 (22:33 +0000)]
api: make log_did_to_piece public
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 23:08:38 +0000 (23:08 +0000)]
hidden: Refactor describe_occulter
* Do not rely on shadowing of variables - very fragile
* Break out `bad`
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 16:02:35 +0000 (16:02 +0000)]
xdata: fix downcasting to actually work
Urgh, this involved a lot of flail before I found (i) downcast-rs
(ii) the conditional lifetime bug.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 22:09:23 +0000 (22:09 +0000)]
xdata: minor refactor nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 22:07:17 +0000 (22:07 +0000)]
provide immutable xdata affordances
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 22:02:54 +0000 (22:02 +0000)]
pass PieceState to [add_]ui_operations
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 15:59:58 +0000 (15:59 +0000)]
script.ts: Avoid triggering on ctrl keys (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 11:37:41 +0000 (11:37 +0000)]
add downcast-rs dependency
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 14 Feb 2021 11:32:16 +0000 (11:32 +0000)]
cargo update
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 21:49:51 +0000 (21:49 +0000)]
Provide xdata affordances
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 21:40:32 +0000 (21:40 +0000)]
Provide PieceState xdata
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 20:27:43 +0000 (20:27 +0000)]
make dasharray return Html
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 19:04:44 +0000 (19:04 +0000)]
Make a dasharray generator that takes a PlayerId
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 19:04:50 +0000 (19:04 +0000)]
Provide GPlayers as a type
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 18:52:54 +0000 (18:52 +0000)]
pieces: Provide stroke_attrs_hook nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 12:58:38 +0000 (12:58 +0000)]
pieces: break out svg_piece_raw, nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 12:56:22 +0000 (12:56 +0000)]
abolish confusing SE type aliases
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 11:25:56 +0000 (11:25 +0000)]
pieces: Tidy up a name ref, nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 20:06:03 +0000 (20:06 +0000)]
hand: wip piece implementation
Doesn't do very much yet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 02:04:03 +0000 (02:04 +0000)]
pieces: Make SimplePieceSpec suitable for deserialize
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 11:20:09 +0000 (11:20 +0000)]
Change SimplePieceSpec::load_raw
This gives the Common back now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 12:46:16 +0000 (12:46 +0000)]
Makefile: provide new clena-for-retest target
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 12:34:23 +0000 (12:34 +0000)]
slotmap: Actually use our branch everywhere
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 11:05:30 +0000 (11:05 +0000)]
Revert "SimpleShape: Move itemname out of common"
Actually we need to reuse Disc and Square as they are, so we must
do this by hand somehow.
This reverts commit
878aeb46778ef76feea9bc51d0691f37074fcabb.
Ian Jackson [Sat, 13 Feb 2021 11:02:37 +0000 (11:02 +0000)]
SimpleShape: Move itemname out of common
We want Hand not to have an itemname field.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 01:45:55 +0000 (01:45 +0000)]
SimpleShape: Make INVISIBLE_EDGE_SENSITIVE a const
nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 01:44:24 +0000 (01:44 +0000)]
SimpleShape: Allow specifying edge width
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 01:28:19 +0000 (01:28 +0000)]
SimpleShape: svg_piece: Refator to use more write!
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 01:22:01 +0000 (01:22 +0000)]
SimpleShape: svg_piece: Introduce f local
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 01:13:07 +0000 (01:13 +0000)]
simple pieces: edge, make clickable have minimum width
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 01:06:09 +0000 (01:06 +0000)]
simple pieces: support edges, fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 23:09:13 +0000 (23:09 +0000)]
simple pieces: support edges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 23:41:06 +0000 (23:41 +0000)]
break out SimpleShape
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 23:26:37 +0000 (23:26 +0000)]
simplify SimplePieceSpec etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 22:57:40 +0000 (22:57 +0000)]
make FaceColourSpecs a type in specs
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 19:13:35 +0000 (19:13 +0000)]
Refactor to introduce SimplePieceSpec
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 13 Feb 2021 00:06:33 +0000 (00:06 +0000)]
config: Drop spurious dbg! logging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 21:18:08 +0000 (21:18 +0000)]
fix "make check"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 01:23:38 +0000 (01:23 +0000)]
use log_did_to_piece_whoby in ungrab nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 01:22:50 +0000 (01:22 +0000)]
provide log_did_to_piece_whoby, nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 01:24:39 +0000 (01:24 +0000)]
call recalculate_occultation in ungrab
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 01:17:11 +0000 (01:17 +0000)]
hidden: Make recaulculate_occultation take just plain vanilla
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 01:16:25 +0000 (01:16 +0000)]
api.rs: Provide ipieces as part of ApiOpArgs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 01:01:25 +0000 (01:01 +0000)]
hidden: Provide recalculate_occultation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 00:54:46 +0000 (00:54 +0000)]
hidden: Provide Occultation::in_region()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 00:54:29 +0000 (00:54 +0000)]
hidden: Add some missing impls
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 00:53:56 +0000 (00:53 +0000)]
hidden: Use Area
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 00:53:25 +0000 (00:53 +0000)]
Area: implement .contains()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 00:52:45 +0000 (00:52 +0000)]
hidden: Fix type of PUO::PerPlayer
This is keyed by PlayerId, ie a SecondaryMap
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 00:45:52 +0000 (00:45 +0000)]
utils: Provide OldNew
Will be used by new hidden ocde.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Feb 2021 19:17:56 +0000 (19:17 +0000)]
updates: Change type aliases POU and PUOs
Now we have aliases for both the singular and plural types
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Feb 2021 19:07:44 +0000 (19:07 +0000)]
hidden: Move Visible into a variant of OccultationKind
All these Options are very confusing. This gets rid of an extension
trait too.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:08:52 +0000 (23:08 +0000)]
hidden: Occultation data structures
Nothing really updates or uses these yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 01:57:37 +0000 (01:57 +0000)]
Area: impl Eq
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:09:24 +0000 (23:09 +0000)]
provide Area type
We are going to want this for occultations. This doesn't really do
anything yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 12 Feb 2021 00:42:43 +0000 (00:42 +0000)]
hidden: per-player id map: Fix to not use _ that way
This means "may be unused", not "internal", in Rust.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Feb 2021 00:07:12 +0000 (00:07 +0000)]
rework InternalLogicError
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Feb 2021 00:03:01 +0000 (00:03 +0000)]
add backtrace dependency
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 01:19:35 +0000 (01:19 +0000)]
visible slotmap keys: Break out impl_for_slotmap_key
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 01:13:18 +0000 (01:13 +0000)]
visible slotmap keys: handle null specially
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:51:06 +0000 (00:51 +0000)]
Delete some obsolete commented-out code
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:41:40 +0000 (00:41 +0000)]
style: MGR and MGI type aliases, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:36:12 +0000 (00:36 +0000)]
style: Make commands::* not global, type aliases, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:23:03 +0000 (00:23 +0000)]
style: Centralise many type aliases
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:12:20 +0000 (00:12 +0000)]
style: Remove space before : in zcoord/
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:11:23 +0000 (00:11 +0000)]
style: Remove space before : in wdriver*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:09:48 +0000 (00:09 +0000)]
style: Remove space before :, etc., in src/*.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:03:57 +0000 (00:03 +0000)]
style: Remove space before : in src/bin/
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Feb 2021 00:02:46 +0000 (00:02 +0000)]
style: Remove space before : in daemon/
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:07:21 +0000 (23:07 +0000)]
hidden: Provide stub PieceOccult
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:35:21 +0000 (23:35 +0000)]
hidden: Add some dividers to the file, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:07:32 +0000 (23:07 +0000)]
hidden: Document the convention about last face
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:06:37 +0000 (23:06 +0000)]
movement: Prevent players moving things that they haven't grasped
Also, a todo.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
squash! movement: Prevent players moving things that they haven't grasped
Ian Jackson [Sun, 31 Jan 2021 23:06:14 +0000 (23:06 +0000)]
hidden: a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:05:48 +0000 (23:05 +0000)]
hidden: docs: Small note
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:47:41 +0000 (23:47 +0000)]
move our default() into zcoord::misc and use it everywhere
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 23:44:49 +0000 (23:44 +0000)]
use our default() alias everywhere we can
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Jan 2021 22:43:36 +0000 (22:43 +0000)]
hidden: Abolish Lens
This is never used for anything and can be simply deleted now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log