From 64bb00af0cce817d3099f9ba196d7181ff31df53 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Sun, 28 May 2023 15:52:36 -0400 Subject: [PATCH] use do's --- cirulla.pant | 13 +++++++++---- site/games/cirulla.html | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/cirulla.pant b/cirulla.pant index 8c4b057..7824d53 100644 --- a/cirulla.pant +++ b/cirulla.pant @@ -113,13 +113,18 @@ value c = case (rank c) ... "king" => 10, _ => rank c. -match p c k -> capture p c and capture p k. +match p c k -> do + capture p c; + capture p k. add_to p c ks or -make_15 p c ks - -> capture p c and all k: Card, k in ks ... capture p k. +make_15 p c ks -> do + capture p c; + all k: Card, k in ks ... capture p k. -ace_scopa p c -> capture p c and all k: Card, k in table ... capture p k. +ace_scopa p c -> do + capture p c; + all k: Card, k in table ... capture p k. // Players add to the table by discarding, and take from the table by // capturing. diff --git a/site/games/cirulla.html b/site/games/cirulla.html index 5a6ac32..eb4ac42 100644 --- a/site/games/cirulla.html +++ b/site/games/cirulla.html @@ -196,13 +196,18 @@ value c = case (rank c) …
"king" ⇒ 10,
_ ⇒ rank c.

-match p c k → capture p c and capture p k.
+match p c k → do
+ capture p c;
+ capture p k.

add-to p c ks or
-make-15 p c ks
- → capture p c and ∀ k: Card, k in ks … capture p k.
+make-15 p c ks → do
+ capture p c;
+ ∀ k: Card, k in ks … capture p k.

-ace-scopa p c → capture p c and ∀ k: Card, k in table … capture p k.
+ace-scopa p c → do
+ capture p c;
+ ∀ k: Card, k in table … capture p k.

Players add to the table by discarding, and take from the table by -- 2.38.5