chiark / gitweb /
Ian Jackson [Fri, 2 Apr 2021 22:00:39 +0000 (23:00 +0100)]
movehist: Show on reload
Move the data from Session to DataLoad where it should have been all
alone, and actually use it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:54:40 +0000 (22:54 +0100)]
movehist: Abbreviate many names
Now this is a module, this is nicer.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:43:24 +0000 (21:43 +0100)]
movehist: Actually display in JS
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:41:52 +0000 (22:41 +0100)]
movehist: Provide move len in update
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:24:33 +0000 (22:24 +0100)]
movehist: Send updates only on "significant" changes
Currently this is just movement.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 23:04:01 +0000 (00:04 +0100)]
js: Do not unconditionally set gen_update_hook
When we reload, can bust the tests, as the hook gets overwritten.
I think.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:47:28 +0000 (21:47 +0100)]
movehist: Provide marker element
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:34:21 +0000 (21:34 +0100)]
movehist: Rework a bit and provide more to JS
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:53:46 +0000 (20:53 +0100)]
movehist: Move LENS etc. to otter, out of base
We're going to send this as literals, not via wasm.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:51:41 +0000 (20:51 +0100)]
movehist: Plumb lens through to js
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 20:43:02 +0000 (21:43 +0100)]
js: piece_xy: Make it return Pos
Just tidying up.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:41:38 +0000 (22:41 +0100)]
geometry: Provide len
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:16:24 +0000 (22:16 +0100)]
geometry: Promote len2
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 21:15:57 +0000 (22:15 +0100)]
geometry: Promote PosPromote to a trait
And provide for f64
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:36:01 +0000 (20:36 +0100)]
movehist: script: wip record
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:32:08 +0000 (20:32 +0100)]
script: Introduce CompassAngle alias
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:27:30 +0000 (20:27 +0100)]
script: Add a note about MovementRecord
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:19:31 +0000 (20:19 +0100)]
movehist: Send out in Session
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:03:05 +0000 (20:03 +0100)]
movehist: Move into its own module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 16:54:20 +0000 (17:54 +0100)]
updates: Move PUE_P alias into prelude
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 11:38:26 +0000 (12:38 +0100)]
movehost: Send updates.
Just a stub to receive them, right now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 16:22:55 +0000 (17:22 +0100)]
Provide insert() and remove() on SparseSecondaryEntry
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 19:14:56 +0000 (20:14 +0100)]
want: Let variants be paths
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 16:56:08 +0000 (17:56 +0100)]
if_let: Let variants be paths
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:38:21 +0000 (16:38 +0100)]
want: Delete obsolete commented-out code
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:35:32 +0000 (16:35 +0100)]
OldNew: Make it Serialize and Deserialize
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:33:39 +0000 (16:33 +0100)]
want: further tidying and nice-ifying
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:57:46 +0000 (13:57 +0100)]
want: Use new arrangements in hidden
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:57:20 +0000 (13:57 +0100)]
want: Provide wants!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:56:47 +0000 (13:56 +0100)]
want: Remove some clutter from invocations
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:55:01 +0000 (13:55 +0100)]
want: Fix extra debug case
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:43:10 +0000 (13:43 +0100)]
want: Use a few more times
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:41:29 +0000 (13:41 +0100)]
want: Provide new facilities and use them in one place
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:39:56 +0000 (13:39 +0100)]
InternalLogicError: Provide new() and tolerate()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 12:39:40 +0000 (13:39 +0100)]
if_let: Slight formatting adjustment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 10:34:37 +0000 (11:34 +0100)]
Use Void, not ad-hoc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 10:33:00 +0000 (11:33 +0100)]
Use Void, not our own
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 11:59:53 +0000 (12:59 +0100)]
introduce if_let!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 11:40:02 +0000 (12:40 +0100)]
updates: Provide facehint in PreparedUpdateEntry
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 11:02:31 +0000 (12:02 +0100)]
gamestate: Fix a style nit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:15:35 +0000 (16:15 +0100)]
wdt-hand: Add a missing synch
Experimentally, pausing otter to simulate losing the race gives us a
conflict error. This is kind of expected.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 15:10:47 +0000 (16:10 +0100)]
apitest: Provide OtterPauseable etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 2 Apr 2021 14:58:30 +0000 (15:58 +0100)]
apitest: Move OtterPaused from wdt-simple
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:57:47 +0000 (11:57 +0100)]
html, SvgAttrs: Change type of SvgAttrs
Amazingly this seems to *save* 2k of wasm code.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:52:29 +0000 (11:52 +0100)]
html: Move to otter-base
No uses yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:29:51 +0000 (11:29 +0100)]
cmd updates: Centralise St::flush.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:05:38 +0000 (11:05 +0100)]
cmd updates: Shuffle some variables
For neatness and clarity.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 10:04:42 +0000 (11:04 +0100)]
cmd updates: Refactor AddPieces handling
This makes it more like the other places in its local variable names.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 16:16:21 +0000 (17:16 +0100)]
script: Implement messages.SetTableColour
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 15:15:45 +0000 (16:15 +0100)]
script: Implement messages.SetTableSize
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 00:00:48 +0000 (01:00 +0100)]
script: Implement pieceops.Insert
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 23:28:04 +0000 (00:28 +0100)]
script: Do not assert that the piece exists
For Insert it does not.
We don't notice this, because we cast all the actual handler
functions.
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 23:24:54 +0000 (00:24 +0100)]
script: Handle piece deletion
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 17:26:08 +0000 (18:26 +0100)]
script: Fix a (silent) JS error
When the api queue is empty this would spew a harmless error into the
log.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:46:20 +0000 (19:46 +0100)]
cmd updates: Restart updates when insert follows delete (properly)
We do this prospectively, when we see AddPieces but before it has been
processed. This means execute_for_game has special knowledge of
particular commands - oh well.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:50:49 +0000 (19:50 +0100)]
cmd updates: Introduce St (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 1 Apr 2021 09:58:52 +0000 (10:58 +0100)]
Revert "cmd updates: Improve arguments to accumulate"
This is no longer needed, then.
This reverts commit
b2ea5402ca1d60dc2d2249b021e7134ae2acd935.
Ian Jackson [Wed, 31 Mar 2021 18:36:59 +0000 (19:36 +0100)]
Revert "cmd updates: Restart updates when insert follows delete"
This is not sufficient - it happens just too late.
This reverts commit
0dd82eda76f4750e39ca18b586c7f7a1cf8ed9c7.
Ian Jackson [Wed, 31 Mar 2021 18:14:13 +0000 (19:14 +0100)]
cmd updates: Restart updates when insert follows delete
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:14:04 +0000 (19:14 +0100)]
cmd updates: Improve arguments to accumulate
We'll need this in a moment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 17:21:49 +0000 (18:21 +0100)]
cmd updates: In UpdateHandlerBulk, use a HashMap not a SlotMap
Otherwise if a slot gets reused, this can go wrong.
It is easier to do this than think about whether the separation of
inserts from deletes would be sufficient.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 17:08:42 +0000 (18:08 +0100)]
cmd updates: Refactor to make it clearer we don't drop uh
No actual functional change. I suspected a bug here but this wasn't it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 16:51:34 +0000 (17:51 +0100)]
cmd updates: Add some tracing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 16:34:00 +0000 (17:34 +0100)]
cmd updates: Do not restart PreparedUpdates if no actual xupdates
In pravtice, the Delete command would otherwise always restart the
PreparedUpdates and this would defeat the Bulk update and make a game
reset very slow.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 15:02:30 +0000 (16:02 +0100)]
wasm: Provide main window attributes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 11:00:51 +0000 (12:00 +0100)]
table size html attrs: Centralise html attr formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 10:53:44 +0000 (11:53 +0100)]
table size html attrs: Split out into base
We are going to want these for dynamic reset.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 14:59:46 +0000 (15:59 +0100)]
cargo: Move `extend` dependency to otter-base
We're going to want this there soon.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:23:53 +0000 (19:23 +0100)]
specs: Make `pieces` default
So you can have an empty table, if you want.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:23:47 +0000 (19:23 +0100)]
spec: Make table size and colour defaulted in serde
This way `reset` works properly, always resetting the colour to the
default.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 18:22:01 +0000 (19:22 +0100)]
spec: Rename `implementation` module to `imp`
For brevity.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 22:37:45 +0000 (23:37 +0100)]
ReportViaResponse: Provide and use From<IE>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 31 Mar 2021 19:26:04 +0000 (20:26 +0100)]
html: Fix hjoin
Practical effect is to fix the formatting of the Links table.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:28:31 +0000 (21:28 +0100)]
penultima: Fiddle with player labels
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:25:08 +0000 (21:25 +0100)]
penultima: Add player labels to game spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:25:02 +0000 (21:25 +0100)]
PlayerLabel: fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 23:03:18 +0000 (00:03 +0100)]
wdriver: Increase some debug re gen update
There seems to be some intermittent failure here. Try to get more
info.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 23:00:47 +0000 (00:00 +0100)]
apitest/run1: Fix logfile names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:10:17 +0000 (21:10 +0100)]
PlayerLabel: wip provide
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 20:06:01 +0000 (21:06 +0100)]
hand generalisation: wip use Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 19:49:04 +0000 (20:49 +0100)]
hand generalisation: wip use Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 19:44:53 +0000 (20:44 +0100)]
hand generalisation: wip use Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 19:41:47 +0000 (20:41 +0100)]
hand generalisation: wip use Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 19:04:55 +0000 (20:04 +0100)]
hand generalisation: Introduce Sort
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 09:35:43 +0000 (10:35 +0100)]
clock: Show expired player nick in correct colour
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 09:34:52 +0000 (10:34 +0100)]
Revert "clock: Refactor Show"
We don't actually need this to fix the expired clock nick text,
just to actually put the text colour in!
This reverts commit
b2ddd5e4b16d497623813ffc9e3e4b84baa3565b.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 09:30:59 +0000 (10:30 +0100)]
clock: Refactor Show
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 01:37:34 +0000 (02:37 +0100)]
Use new Html everywhere
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 30 Mar 2021 01:36:35 +0000 (02:36 +0100)]
New Html handling - introduce file
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 21:42:57 +0000 (22:42 +0100)]
item names: Launder OccultIlk too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 21:25:54 +0000 (22:25 +0100)]
item names: Launder properly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 20:48:36 +0000 (21:48 +0100)]
cargo: Add trailing newlines back plus a guard comment
Somehow I seem to keep stripping these and it is annoying. Maybe this
will help make it noticeable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 20:46:14 +0000 (21:46 +0100)]
script: Record a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 20:37:16 +0000 (21:37 +0100)]
shapelib: Make the colour a ColourSpec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 20:34:46 +0000 (21:34 +0100)]
Make UnsupportedColourSpec its own type
We're going to want it for LibraryLoadError too.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 19:44:35 +0000 (20:44 +0100)]
PieceLabel: Properly run through the colour checker
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 29 Mar 2021 00:44:46 +0000 (01:44 +0100)]
pass player nick to client
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 27 Mar 2021 11:39:14 +0000 (11:39 +0000)]
otter cli: list-accounts: Use Display not Debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 27 Mar 2021 11:40:38 +0000 (11:40 +0000)]
otter cli: Provide ListAccounts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 19:54:39 +0000 (19:54 +0000)]
Fix description of ListGames
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log