Introduce and use methods for applying UnpreparedUpdates

There are quite a few call sites where the nature of an
UnpreparedUpdates is open-coded.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Use default() for empty UnpreparedUpdates, not None

We are going to make this into a vec![].  Doing this change now will
reduce the textual impact a lot.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Drop use of fehler in PieceTrait definition, for ambassador

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

occult ilks: Provide clone_id and clone_iilk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Introduce OpOutcomeThunk

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Introduce PieceLoadArgs

So that we can add more parameters to PieceTrait::load() without
having to edit everywhere *again*.

In fact it turns out I don't need to do this right now (for currency
and fastsplit) but I think it's worth keeping.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

PieceUpdateOps: Tabular formattint

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Introduce non-Quiet PUO::Insert

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ts: Break out insert_piece function.

We'll reuse this for non-Quiet Insert.  Have it return p for
convenience.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Rename PUO::Insert to InsertQuiet

This doesn't produce a halo, so it's Quiet.  We're going to want one
which *does* produce a halo, so we must make room.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Introduce and use xdata_init

Using get_mut for this seems slightly less careful.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Document what PUO::*Quiet mean

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Document OccultOwningId serialisation and refcount rules

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

fix serde_with_compat attribute syntax

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Switch to Rust 2021

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

PROTOCOL.md: fix a typo

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: Add checks for un-notched to vpid::consistency_check

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

fake rng: Remove an Arc

We don't in fact need this to be Clone, now that ServerConfig isn't.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

at-hidden: Add some more synch, just to complete things

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

at-hidden: Add more test, completing repro of unnotched bug

This test fails without the unnotched piece tracking.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: Fix handling of unnotched (Distinct) pieces

We need to un-occult them.  But we were tracking what to recompute by
looking in occ.notches.  Un-notched pieces aren't there.

Introduce a new HashSet for these.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: Refactor a bit in preparation for unnotched pieces fix

In both of these places, we're going to want to do something if there
is an occultation but notch is None.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: Have active_total_ppieces return usize

The fix for the un-notched pieces bug is going to want to add a
HashMap len to this, and that's usize.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: Introduce Occultation::pieces

This is going to want to return un-notched pieces too.  Fix both sites
where we iterate over the notches.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

at-hidden: Engage fake time feature

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

tests: Enable the fake time feature

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

fake time: Make fields pub that should be

We want this for FakeTimeSpec in a test case.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

fake time: Fix config deserialisation

Option works weirdly, empirically.  This (via a Vec) is what we want.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice: Honour fake time feature

Really we should make this more pervasive, but this is what we need
right now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

fake time: Introduce new feature

Needs a little work still, and not used.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Make ServerConfig not be Clone

We're going to put GlobalClock in it.  It doesn't actually want to be
Clone since it's a singleton.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

tests: at-hidden: wip test

This currently passes, and therefore didn't repro the un-notched piece
bug which I have been trying to repro and fix.  But it's a start.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

logging: In api_piece_op, log the form too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

tests: Increase debug traceing of hidden and updates

I wanted this for debugging the unnotched piece crash.  It seems fine
to keep it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice: Allow loading old savefiles with no desc field

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

apitest: Break out filter_by_desc_glob etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

demo game: Give the dice descriptions

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice: Support specifying the html description in the spec

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice: Refactor describe_html to prep for desc

Break out showing so that we don't have combinatorical description
formats.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

demo game: Make the 2-sided die a disc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Fix many dbgc calls to be trace_dbg instead

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Fix trace_dbg to tolerate call without any value parameters

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Move logging::setup out of main.rs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

logging: Change output formats

Format is like that from flexi_logger but with only the level
coloured.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

currency: Move qty into xdata

When we multigrab, we must split, which involves mutating the value of
the grabbed piece.  So the value must be in xdata, not ipc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

at-otter: Fix a ref to PIA that ought to be PIB.

I think.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

currency: Abolish min_unit

We can instead just rely on the players to Not Do That, or to tell
each other off.  It's easy to recover from, too: just move money until
the amounts are right.

This also avoids any question of what to do if people try to combine
banknotes with the same currency but different min_qty.  (GCD?)

Suggested-by: Gareth Taylor
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Multigrab: Provide in initial load

This was broken by the special refactoring.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Multigrab: allow to multigrab occulters

I don't expect any pieces to exist that can both be active occulter,
and multigrab.  But if it does it should probably do the thing, rather
than mysteriously not work.  And this simplifies the code.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

JS: Add a comment about PieceInfo vs SessionPieceLoadJson

I made a bug due to not realising this needed to be updated too.

Maybe at some point the common bits should be combined, at least on
the Rust side.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Currency: Declare to be multigrab

We don't actually implement the PieceTrait method, so that just
returns Inapplicable.  Ie, after this you can try to multiselect a
banknote but you get
  Problem manipulating piece: UI operation not valid in the curret piece state
in the log.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

JS: Implement multigrab

Check the multigrab boolean, and if appropriate make a single
multigrab API call rather than trying to grab multiple pieces.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Plumbing for "multigrab" piece API call

We can now pass this through to a piece.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Elide angle in game save file, when it's just North

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Elide some fields from save game state where we can

This saves writing out the field names as well as just the vslues.

We would like to do this for the updates sent to the client, but that
would really depend on the JS nullable coalesce operator "??" which is
not available the version of typescript I'm using, nor our ES
compatibility target.  Newer typescript would do a polyfill but that
maybe wouldn't be super-fast?  So postpone that.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Fix type of PreparedPieceState.held in the JS

I was comparing the JS and Rust versions, and spotted this
discrepancy.

In fact it is assigned to internal fields and variables which are all
nullable, so there is no other code change needed.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Provide is_default() function

We're going to use this to elide some fields from the game save state.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Provide and plumb multigtab piece property from Rust to JS

Currently nothing sets this (on the Rust side) nor uses it (on the JS
side).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

script: Add a missing comma in a type definition

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Add "p" argument to mouse_clicked_one

Almost the callers have it and the one that doesn't (mouse_find_clicked)
is about to need it in another of its branches.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Move special rendering instructions to PieceSpecialProperties

This gets rid of an ipc method (meaning we get rid of one method call
during piece rendering) and is also more principled, than a call which
might conceivably give different answers at different times.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Add special field to SpecLoaded

This is currently empty.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

split PieceSpecLoaded

We are goint to want to add a field to only the non-inert version, so
this generic is not applicable any more.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

api: Introduce and use ApiPieceOpArgs::pri

We're going to have a new call site, too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

api: Replace open-coded calculation with call to fully_visible

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ui: Disable pointer events on text in dice and currency

Otherwise you can end up with bits of the displayed text (currency
value, or die face) selected.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ui: Break out HTML_TEXT_LABEL_ELEM_START from clock.rs

We actually need this in other places too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

currency: Tweaks to rendering

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

currency: Add one to the demo game

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

currency: Initial skeleton

Can render, but no special behaviours.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ui: Improve a comment and make it a doc comment

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Fix another HTML syntax error

Define the type of `otherwise`, to be an Html variant.  And pass
HtmlStr values.  Otherwise the HTML gets re-escaped, leading to a
xyntax error.

An effect of this is that the hollow diamond is actually hollow now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Fix an HTML syntax error

Nothing seemed to be reporting this.  I found it while looking for
another bug, which I'm about to fix now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

impl Default for &HtmlStr

We'll use this in a moment.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

script.ts: Fix a uk spelling of "mitre"

CSS wants "miter".  This was producing a message on the JS console.

I have a feeling some of the code here existed to work around not
being able to get mitre to work properly.  but I CBA to look into that
now.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ui.rs: Bring another constants together here

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ui.rs: Bring a number of constants etc. together here

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Move 0.35 magic value for font y adjustment into a Rust constant

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

serde_with_compat: Add some docs, since this is confusing

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

cargo: Document private items by default

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

serde_with_compat: Move to utils.rs where it belongs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden cleanups: Introduce load_lilk

This more-centralises the interpretation of LOI and IOI variants.

Also add some commentary and rename create_coalesce.  It doesn't
always create.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ilk mixing: Support non-mixing pieces

Allow us to handle an pieces which are occultable but which don't
participate in shuffling and displacement.

I. Introduce IOccultIlk enum.  The old approach is the variant Mix.
This allows us to introduce a new approach Distinct.

II. Make Notch optional in Passive Replace the unconditional
OccultIlkOwningId in IPiece with a new enum IOccultIlk, and the
OccultIlkName in the return value from PieceSpec::load with a new enum
LOccultIlk.

III. Immediately use the new approach for dice, dropping all handling
of ilks.  (Combining this into this commit avoids writing a bunch of
daft code that will be deleted right away.)

Consequences and ancillary changes:

 * We need a new compatibility arrangement so we can load old
   savefiles.  This is a bit fiddly and involves some macro
   trickery (which we will be moved to another file in due course).

 * OccultIlks gets two new methods from_iilk and dispose_iilk for
   handling IOccultIlk, rather than merely OccultIlkName.
   (We're going to move creation in here too, shortly.)

 * All existing pieces other than dice are still mixed by ilk.
   Allowing this not to be the case ia a question for the future.

 * Rename Passive.notch to Passive.permute_notch, for clarity
   of its purpose.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: style: Use if_let macro a couple more times

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: style: Unwrap a binding

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ilks: Make ilk available earlier in passive calculation

The only functional effect is that some broken states now no longer
get occultated.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ilks: Refactoring of passive computation

Use if_chain instead of the outer if let.  This is good because we're
going to want to add another condition.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

ilk mixing: piece_pri: Hoist pri_occulted call

We are going to want to add a new branch to these conditionals, and
the new branch doesn't want this functionality.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: style: Make get take &I and remove some pointles borrow calls

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice test: demo game: Add a 2nd demo die

This lets us test occult mixing.  Which in fact is not desirable.  But
keep this to let us test it while we work on the problem, and
afterwards.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice test: demo game: Add a demo die with occultation label

This lets us test how they occult.  It turns out, not particularly
well...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice: Support occultation by label, for all 1-faced images

Right now we mix dice of all ilks.  This is wrong.  Dice shouldn't mix
at all.  We're going to do that RSN.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

hidden: Add another consistency check for pieces<->notches

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice: Break out occ_label

We are going to want to call this for situations where we have an
OccultSpec but not an occultable image.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice: Reorganise occultation handling

I was trying to support ilks properly.  This code is in fact going to
be considerably simplified.

But it will still make sense to split the interpretation of the spec
from the assembly of the Arc<dyn InertPieceImage> for the occulted
view.  That will make it possible for the spec interpretation to
provide an occulted view in more situations.

In fact it appears that these plans are going to be postponed and not
done right now, but I'm keeping this refactoring.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dice: Break out OccultSpec (breaking change)

Earlier I wrote: We want to add an ilk here.

But this is no longer going to be true, because we are getting rid of
ilk mixing for dice.  Nevertheless, this change is going in a roughly
good direction in spec API terms since it will allow us to add other
things to occult.

Notably, if we allow composition of a die image from a base and faces,
or if we allow specifying an occulted face image separately from the
face images.

And `occult_label` is just a bad pattern.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

demo table: Move die

We're going to add another die

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Reduce proposed stability promise re management protocol

This will allow us not to worry about errors, which are otherwise
awkward.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dbgc: Remove a call in clock.rs

This looks like leftovers.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

dbgc: Replace many calls in hidden.rs with trace_dbg

This looks like leftovers.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>