chiark / gitweb /
Ian Jackson [Fri, 26 Mar 2021 19:03:25 +0000 (19:03 +0000)]
otter cli: Drop a rogue dbg!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 00:47:58 +0000 (00:47 +0000)]
apitest: try resetting the game after hidden_hand
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 18:51:05 +0000 (18:51 +0000)]
cmdlistener: DeletePiece: Do not delete the ipc right away eitheer
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 18:50:53 +0000 (18:50 +0000)]
cmdlistener: Add a trace dbg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 18:19:01 +0000 (18:19 +0000)]
hidden: enforce via types that Scrambled is the only view
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 26 Mar 2021 00:47:43 +0000 (00:47 +0000)]
apitest: Provide --specs-dir argument to otter(1) when we run it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 20:17:55 +0000 (20:17 +0000)]
mao: badgers: Make them have backs (pfah, again!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 20:13:31 +0000 (20:13 +0000)]
Makefile: make deploy: Do not push random odd branches
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 19:23:55 +0000 (19:23 +0000)]
piece aliases: Use new alias machiner
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 19:04:03 +0000 (19:04 +0000)]
piece aliases: tolerate missing alias for shapelib backs
We might be running in an environment where the alias is not defined.
Eg, otterlib.
This is a bit nasty really, since it means that broken game specs,
where some of the cards are busted, don't get spotted.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:46:41 +0000 (18:46 +0000)]
piece aliases: Define the new aliases, according to the game spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:44:05 +0000 (18:44 +0000)]
commands etc.: Delete old aliases when resetting the game
* Make ListPieces return the aliases too (changing its ABI)
* Make list_pieces return the aliases too, so we make sure we
don't miss any
* Actually delete old aliases in the game reset in otter(1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:34:09 +0000 (18:34 +0000)]
piece aliases: Commands for defining/deleting them
Nothing generates these commands yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 19:16:50 +0000 (19:16 +0000)]
piece aliases: Provide the Alias PieceSpec
You can't use this because nothing every populates the aliaes array.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:25:11 +0000 (18:25 +0000)]
PieceSpec: make count fallible
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:21:15 +0000 (18:21 +0000)]
piece aliases: Pass about everywhere, esp. to PieceSpec methods
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 18:13:03 +0000 (18:13 +0000)]
piece aliases: Add to Instance
Nothing populates this or looks at it. We just save and restore it.
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 17:18:39 +0000 (17:18 +0000)]
global: Unpack InstanceSaveAccesses with nicer syntax
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 17:16:41 +0000 (17:16 +0000)]
instance save: Make various things non-optional
We recently totally broke savefile compatibility anyway.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 17:01:15 +0000 (17:01 +0000)]
library: add a maroon card back
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:52:17 +0000 (16:52 +0000)]
selection display: Totally redo, solid is now normal self
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:43:29 +0000 (16:43 +0000)]
script: Show pieces with solid line when over occulted, even moved
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:41:18 +0000 (16:41 +0000)]
script: Show pieces with solid line when over occulted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:38:21 +0000 (16:38 +0000)]
script: Do not constantly redisplay_ancillaries when moving (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 16:38:13 +0000 (16:38 +0000)]
script: break out piece_xy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 14:57:40 +0000 (14:57 +0000)]
script: Track occregions
Nothing uses this yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 14:57:13 +0000 (14:57 +0000)]
wasm: RegionList: Have methods return a `changed` bool
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 14:57:00 +0000 (14:57 +0000)]
geometry: ipl Ord and Eq for Rect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 13:08:46 +0000 (13:08 +0000)]
Rect[Shape]: rename from Rectangle and from Square
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 12:43:16 +0000 (12:43 +0000)]
geometry: Rename Region::Rectangle to Rect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 12:31:38 +0000 (12:31 +0000)]
occregion: json-encode it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 12:00:03 +0000 (12:00 +0000)]
geometry: Massive overhaul of types and fields
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:10:15 +0000 (11:10 +0000)]
geometry: Some code motion
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:09:17 +0000 (11:09 +0000)]
rename Area to Rect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:06:00 +0000 (11:06 +0000)]
rename Region to RegionC, in line with PosC and AreaC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:01:18 +0000 (11:01 +0000)]
occregion: Send to client (but this is wrong, it should be json string)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 10:56:11 +0000 (10:56 +0000)]
Refactor PieceOccult to provide active_occ
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 01:43:59 +0000 (01:43 +0000)]
Provide distinction betwene Region and Area
The latter will always be rectangle.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 11:02:48 +0000 (11:02 +0000)]
wasm: Provide RegionList
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 01:16:00 +0000 (01:16 +0000)]
serde_json: Move dependency to base, so it's common
wasm is about to want it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 01:13:09 +0000 (01:13 +0000)]
geometry: Relax Ord to PartialOrd
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:37:51 +0000 (00:37 +0000)]
wasm: Sections
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:36:02 +0000 (00:36 +0000)]
provide otter_base::Region
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:59:34 +0000 (23:59 +0000)]
move geometry to base
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:00:54 +0000 (00:00 +0000)]
base: Introduce a prelude module here
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:57:08 +0000 (23:57 +0000)]
geometry: Move to new module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:40:07 +0000 (23:40 +0000)]
deck: When Enabled, stack neatly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 20:30:29 +0000 (20:30 +0000)]
deck: Do update count
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 20:29:51 +0000 (20:29 +0000)]
Provide for occultation_notify_hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:56:16 +0000 (19:56 +0000)]
updates: Allow ToRecompute to return UnpreparedUpdates
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:31:18 +0000 (19:31 +0000)]
updates: Provide PrepareUpdatesBuffer::spontaneous_image
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:25:52 +0000 (19:25 +0000)]
deck count: Rename ToPermute
We are going to use this to plant our hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:15:06 +0000 (19:15 +0000)]
hidden: Provide no-op consistency_check in not(debug_assertions)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:09:39 +0000 (19:09 +0000)]
Makefile: Provide more check targets
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:45:34 +0000 (18:45 +0000)]
deck: Provide counting mode for play pile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:40:51 +0000 (18:40 +0000)]
hidden: Provide active_views, more useful
This is not dangerous because we only give out non-mut reference.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:31:24 +0000 (18:31 +0000)]
deck: Refactor, ready for counting instead, make things fallible
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:24:40 +0000 (18:24 +0000)]
deck: Refactor, ready for counting instead, fix current_face
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:18:25 +0000 (18:18 +0000)]
mao: Add labels to decks
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:18:47 +0000 (18:18 +0000)]
deck: Add label facility, giving piece count when enabled
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:40:36 +0000 (17:40 +0000)]
hidden: Provide total ppiece count
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:37:55 +0000 (17:37 +0000)]
deck: Refactor, ready for counting instead
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:07:31 +0000 (17:07 +0000)]
deck: Refactor State
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:02:26 +0000 (17:02 +0000)]
deck: plumb goccults through to enabled
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 16:51:37 +0000 (16:51 +0000)]
hidden: Provide active_nondefault_views
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:00:40 +0000 (17:00 +0000)]
plumb goccults through to describe_html
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 16:00:28 +0000 (16:00 +0000)]
mao: Use outside labels
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:58:56 +0000 (15:58 +0000)]
labels: Support on outside too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:50:38 +0000 (15:50 +0000)]
labels: wip generalisation - break out method
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:39:44 +0000 (15:39 +0000)]
labels: wip generalisation - rename
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:36:35 +0000 (15:36 +0000)]
mao: Use the chequered edged ones for mao
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:36:18 +0000 (15:36 +0000)]
cards: add another back
The stripy ones are really awful when they overlap.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 13:37:07 +0000 (13:37 +0000)]
hidden: New displacement algorithm, improved
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 13:23:34 +0000 (13:23 +0000)]
hidden: New displacement algorithm
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:52:47 +0000 (12:52 +0000)]
hidden: Make fallible and fallback
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:52:29 +0000 (12:52 +0000)]
Pos, Area: Provide Mean and middle for T=i32
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:38:06 +0000 (12:38 +0000)]
Pos, Area: Provide Mean and middle
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:29:39 +0000 (12:29 +0000)]
hidden: Rename a local variable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:29:03 +0000 (12:29 +0000)]
hidden: Track ppiece_use_size
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:20:02 +0000 (12:20 +0000)]
hidden: Provide ipc throughout
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:15:40 +0000 (12:15 +0000)]
hidden: Rewrap arguments less madly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:11:18 +0000 (12:11 +0000)]
vpid: Provide is_empty
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:10:26 +0000 (12:10 +0000)]
vpid: Track how many pieces are in an occultation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:01:16 +0000 (12:01 +0000)]
hidden recalc actually do: Provide occ not just notches from closure
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:45:44 +0000 (11:45 +0000)]
hidden placement: Refactor to make a place to put things
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:33:09 +0000 (11:33 +0000)]
mao: Move badgers to bottom of initial deck layout
This is prettier.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:32:24 +0000 (11:32 +0000)]
mao: Change badger composition
Now 3 badgers per deck, as is common.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:30:00 +0000 (02:30 +0000)]
mao: Add another badger
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:20:33 +0000 (02:20 +0000)]
library: Add another badger
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:15:51 +0000 (02:15 +0000)]
mao: Add some jokers
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:10:13 +0000 (02:10 +0000)]
cards: Add jokers by David Bellot
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:08:09 +0000 (02:08 +0000)]
wikimedia: Licence PD-author|* is fine
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:07:36 +0000 (02:07 +0000)]
media-scraper: Tolerate * at the end of "licences" entries
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:42:24 +0000 (23:42 +0000)]
mao: Add text positions explicitly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:42:17 +0000 (23:42 +0000)]
hand: text, fix position
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:37:25 +0000 (23:37 +0000)]
hand: text seems to work in tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:12:39 +0000 (23:12 +0000)]
hand: wip text
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:53:01 +0000 (22:53 +0000)]
hand: Move owned to where we can reuse it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:48:52 +0000 (22:48 +0000)]
hidden: recalculate_occultation_general: tidy argument order
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:45:11 +0000 (22:45 +0000)]
hidden: recalculate_occultation_general: tidy argument formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log