Merge origin/dev into feature/cities-and-knights

Brings in open trade offers and counter-offers. Cities & Knights gets the same flow for goods: OfferGoods may be open to the table, CounterGoods answers an offer, and AcceptCounter / DismissCounters are shared with the base game. Co-Authored-By: Claude Sonnet 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_016eTor2tpxKb4dXbd8RqnvZ
2026-10-17 14:45:39 +00:00
parent c8368416c4 2d85df0de0
commit f9b793d56e
18 changed files with 898 additions and 101 deletions
@@ -89,7 +89,8 @@ screen's UI state. The legal-move list stays the gate.
 | Seven | **Discard** dialog (forced); then taps a hex to move the robber; a victim dialog appears only if more than one player can be robbed |
 | Main turn | arms **Road / Settlement / City** and taps a highlighted spot; **Buy card**; **Play card**; **Trade**; **End turn** |
 | Road Building | taps highlighted edges, or **Done with roads** |
-| Offered a trade | **Accept / Decline** dialog (forced) |
+| Offered a trade | **Accept / Decline / Counter…** dialog (forced); *Counter…* opens a picker pre-filled with the mirror of the offer |
+| Counter-offers received | **Counter-offers** dialog: *Accept* beside the one to take, or *No deal* |
 | Game over | result dialog |

 Trade offers are free-form (two card multisets), so they are validated with
@@ -165,6 +166,6 @@ Not done yet, in rough priority order:
   it does not say which hexes paid out, so that needs either a diff of two states
   or an engine addition.
 3. Art: terrain textures, resource and harbour icons, a real robber pawn.
-4. Open trade to the whole table and counter-offers (an engine limitation too).
+4. A timer or cancel button on offers (the engine has neither).
 5. A board that shows the *last* move (a faint highlight of what just changed).
 6. Landscape polish on large tablets; the right-hand panel scrolls but is plain.