From 1749b98042a01bfe00f802cd5737fb136f3675b9 Mon Sep 17 00:00:00 2001
From: Conway
Date: Sun, 19 Nov 2023 18:59:01 +0800
Subject: [PATCH 01/53] Create /guide/
---
guide/index.cmd | 19 +++++++++++++++++++
guide/index.html | 45 +++++++++++++++++++++++++++++++++++++++++++++
sitemap.txt | 1 +
3 files changed, 65 insertions(+)
create mode 100644 guide/index.cmd
create mode 100644 guide/index.html
diff --git a/guide/index.cmd b/guide/index.cmd
new file mode 100644
index 0000000..950be55
--- /dev/null
+++ b/guide/index.cmd
@@ -0,0 +1,19 @@
+< /res/common.cmdr
+
+OrdinaryDictionaryReplacement: #.boilerplate-properties-override
+- queue_position: BEFORE #boilerplate-properties
+* %title --> Guide
+* %date-modified --> 2023-11-19
+
+%%%
+
+
+# Guide
+
+--
+This reference guide is based on Hong Kong gameplay.
+--
+--
+There is no such thing as an offical version of mahjong.
+The game should be played according to player consensus.
+--
diff --git a/guide/index.html b/guide/index.html
new file mode 100644
index 0000000..b30dbac
--- /dev/null
+++ b/guide/index.html
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+Guide | Perth Mahjong Society
+
+
+
+Guide
+
+This reference guide is based on Hong Kong gameplay.
+
+
+There is no such thing as an offical version of mahjong.
+The game should be played according to player consensus.
+
+
+
+
diff --git a/sitemap.txt b/sitemap.txt
index ccf692b..dab5d1b 100644
--- a/sitemap.txt
+++ b/sitemap.txt
@@ -1,3 +1,4 @@
https://perthmahjongsoc.github.io/
https://perthmahjongsoc.github.io/about/
+https://perthmahjongsoc.github.io/guide/
https://perthmahjongsoc.github.io/scores/
From 21dfc8105afc7a632bd50e4b1769deada6df9e4d Mon Sep 17 00:00:00 2001
From: Conway
Date: Sun, 19 Nov 2023 21:34:25 +0800
Subject: [PATCH 02/53] Add Guide planned headings
---
guide/index.cmd | 22 +++++++++++++++++++++-
guide/index.html | 11 ++++++++++-
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index 950be55..3014086 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -11,9 +11,29 @@ OrdinaryDictionaryReplacement: #.boilerplate-properties-override
# Guide
--
-This reference guide is based on Hong Kong gameplay.
+This (incomprehensive) reference guide is based on Hong Kong gameplay.
--
--
There is no such thing as an offical version of mahjong.
The game should be played according to player consensus.
--
+
+
+##{#concepts} Concepts
+
+###{#suits} Suits
+
+###{#melds} Melds
+
+###{#meld-actions} Meld actions
+
+###{#position} Positions
+
+
+##{#winning} Winning
+
+###{#regular} Regular hands
+
+###{#special} Special hands
+
+###{#bonuses} Bonuses
diff --git a/guide/index.html b/guide/index.html
index b30dbac..ad8cb4c 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -31,12 +31,21 @@
Guide
-This reference guide is based on Hong Kong gameplay.
+This (incomprehensive) reference guide is based on Hong Kong gameplay.
There is no such thing as an offical version of mahjong.
The game should be played according to player consensus.
+ Concepts
+ Suits
+ Melds
+ Meld actions
+ Positions
+ Winning
+ Regular hands
+ Special hands
+ Bonuses
Source: guide/index.cmd
.
Last modified: 2023-11-19 .
From 36c1026b4cb559d0d56fe79c67f17cc55d56bc56 Mon Sep 17 00:00:00 2001
From: Conway
Date: Sun, 19 Nov 2023 22:21:37 +0800
Subject: [PATCH 03/53] Add Tiles section text
---
guide/index.cmd | 50 +++++++++++++++++++++++++++++-
guide/index.html | 79 +++++++++++++++++++++++++++++++++++++++++++++++-
res/common.cmdr | 72 +++++++++++++++++++++++++++++++++++++++++++
res/mahjong.css | 4 +++
4 files changed, 203 insertions(+), 2 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index 3014086..74e8fa2 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -21,7 +21,55 @@ The game should be played according to player consensus.
##{#concepts} Concepts
-###{#suits} Suits
+###{#tiles} Tiles
+
+#### Numbered suits
+
+======
+- 筒子 _t(')ung~tsz'_ = Tubes [circles, balls]
+ ====
+ - [one through nine]
+ ====
+
+- 索子 _sok~tsz'_ = Rods [bamboos, sticks]
+ ====
+ - [one through nine]
+ ====
+
+- 萬子 _m(a/)n~tsz'_ = Myriads [characters]
+ ====
+ - [one through nine]
+ ====
+======
+
+#### Unnumbered suits
+
+======
+- 番子 _f(a/)n~tsz'_ = Honours
+ ====
+ - 四風/四喜 = Four Winds / Four Joys [directions]
+ ==
+ - 東 = East
+ - 南 = South
+ - 西 = West
+ - 北 = North
+ ==
+
+ - 三元 = Three Duxes [dragons]
+ ==
+ - 紅中 = Red-Centre [red]
+ - 發財 = Prosper-Wealth [green]
+ - 白板 = White-Board [white]
+ ==
+
+ - 花 = Flowers
+ ==
+ - 四花 = Four Flora
+ - 四季 = Four Seasons
+ ==
+ ====
+======
+
###{#melds} Melds
diff --git a/guide/index.html b/guide/index.html
index ad8cb4c..61eede6 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -38,7 +38,84 @@ Guide
The game should be played according to player consensus.
Concepts
- Suits
+ Tiles
+Numbered suits
+
+
+筒子 tʻung tsz' = Tubes [circles, balls]
+
+
+[one through nine]
+
+
+
+
+索子 sok tsz' = Rods [bamboos, sticks]
+
+
+[one through nine]
+
+
+
+
+萬子 mán tsz' = Myriads [characters]
+
+
+[one through nine]
+
+
+
+
+Unnumbered suits
+
+
+番子 fán tsz' = Honours
+
+
+四風/四喜 = Four Winds / Four Joys [directions]
+
+
+東 = East
+
+
+南 = South
+
+
+西 = West
+
+
+北 = North
+
+
+
+
+三元 = Three Duxes [dragons]
+
+
+紅中 = Red-Centre [red]
+
+
+發財 = Prosper-Wealth [green]
+
+
+白板 = White-Board [white]
+
+
+
+
+花 = Flowers
+
+
+四花 = Four Flora
+
+
+四季 = Four Seasons
+
+
+
+
+
+
Melds
Meld actions
Positions
diff --git a/res/common.cmdr b/res/common.cmdr
index cb59451..efd6d6d 100644
--- a/res/common.cmdr
+++ b/res/common.cmdr
@@ -49,3 +49,75 @@ RegexDictionaryReplacement: #.heading-permalinks
)
-->
\g []{.permalink aria-label=Permalink}(#\g)
+
+
+OrdinaryDictionaryReplacement: #.syntax.diacritics
+- queue_position: BEFORE #backslash-escapes
+#
+# U+00C1 LATIN CAPITAL LETTER A WITH ACUTE
+* (A/) --> Á
+#
+# U+00C9 LATIN CAPITAL LETTER E WITH ACUTE
+* (E/) --> É
+#
+# U+00CD LATIN CAPITAL LETTER I WITH ACUTE
+* (I/) --> Í
+#
+# U+00D2 LATIN CAPITAL LETTER O WITH GRAVE
+* (O\) --> Ò
+#
+# U+00DA LATIN CAPITAL LETTER U WITH ACUTE
+* (U/) --> Ú
+#
+# U+00DC LATIN CAPITAL LETTER U WITH DIAERESIS
+* (U") --> Ü
+#
+# U+00E1 LATIN SMALL LETTER A WITH ACUTE
+* (a/) --> á
+#
+# U+00E9 LATIN SMALL LETTER E WITH ACUTE
+* (e/) --> é
+#
+# U+00ED LATIN SMALL LETTER I WITH ACUTE
+* (i/) --> í
+#
+# U+00F2 LATIN SMALL LETTER O WITH GRAVE
+* (o\) --> ò
+#
+# U+00F3 LATIN SMALL LETTER O WITH ACUTE
+* (o/) --> ó
+#
+# U+00F9 LATIN SMALL LETTER U WITH GRAVE
+* (u\) --> ù
+#
+# U+00FA LATIN SMALL LETTER U WITH ACUTE
+* (u/) --> ú
+#
+# U+00FC LATIN SMALL LETTER U WITH DIAERESIS
+* (u") --> ü
+
+
+OrdinaryDictionaryReplacement: #.syntax.typography
+- queue_position: BEFORE #escape-idle-html
+#
+# U+00A0 NO-BREAK SPACE ( )
+* ~ --> " "
+#
+# U+2014 EM DASH
+* --- --> —
+#
+# U+2013 EN DASH
+* -- --> –
+#
+# U+2026 HORIZONTAL ELLIPSIS
+* ... --> …
+#
+# U+02BB MODIFIER LETTER TURNED COMMA
+* (') --> ʻ
+
+
+RegexDictionaryReplacement: #.syntax.chinese-lang
+- queue_position: BEFORE #escape-idle-html
+* (?P [꜀-꜇]? [⺀-〿㇀-㇣㐀-鿼豈-龎!-⦆𠀀-𱍊]+ [꜀-꜇]? )
+ -->
+ \g
diff --git a/res/mahjong.css b/res/mahjong.css
index 54c47e2..01a3cb5 100644
--- a/res/mahjong.css
+++ b/res/mahjong.css
@@ -89,6 +89,10 @@ th, td {
padding: 0.4em;
}
+ul ul {
+ margin-bottom: 1em;
+}
+
.permalink {
background-image: url(permalink.svg);
From c3af5d54cc1d94e608a9a125b74a8ada7c78416c Mon Sep 17 00:00:00 2001
From: Conway
Date: Sun, 19 Nov 2023 23:07:18 +0800
Subject: [PATCH 04/53] Write Melds text
---
guide/index.cmd | 33 ++++++++++++++++++++++++++++++++-
guide/index.html | 42 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index 74e8fa2..7616c8c 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -21,6 +21,7 @@ The game should be played according to player consensus.
##{#concepts} Concepts
+
###{#tiles} Tiles
#### Numbered suits
@@ -73,7 +74,37 @@ The game should be played according to player consensus.
###{#melds} Melds
-###{#meld-actions} Meld actions
+====
+- 順子 = Sequence, i.e. three consecutive tiles of the same numbered suit.
+ ==
+ - When completed by revealing after a discard from the previous player,
+ this is called 上 _sh(e/)ung_ (going up, or onboarding).
+ ==
+
+- 刻子 = Triplet, i.e. three of the same tile
+ ==
+ - When completed by revealing after a discard from another player,
+ this is called 碰 _p(')ung_ (bumping).
+ ==
+
+- 槓子 = Quadruplet, i.e. four of the same tile
+ ==
+ - When completed by revealing a completely concealed set of four,
+ this is called 暗槓 _am~kong_ (concealed _kong_).
+ --
+ A concealed _kong_ cannot be robbed for a win,
+ except when the win is a 十三幺 (Thirteen Youngests).
+ --
+
+ - When completed by revealing after a discard from another player,
+ or by appending to an existing 碰 _p(')ung_,
+ this is called 明槓 _ming~kong_ (transparent _kong_).
+ --
+ A transparent _kong_ can be robbed for a win.
+ --
+ ==
+====
+
###{#position} Positions
diff --git a/guide/index.html b/guide/index.html
index 61eede6..e5d63fe 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -117,7 +117,47 @@ Unnumbered suits
Melds
- Meld actions
+
+
+順子 = Sequence, i.e. three consecutive tiles of the same numbered suit.
+
+
+When completed by revealing after a discard from the previous player,
+this is called 上 shéung (going up, or onboarding).
+
+
+
+
+刻子 = Triplet, i.e. three of the same tile
+
+
+When completed by revealing after a discard from another player,
+this is called 碰 pʻung (bumping).
+
+
+
+
+槓子 = Quadruplet, i.e. four of the same tile
+
+
+When completed by revealing a completely concealed set of four,
+this is called 暗槓 am kong (concealed kong ).
+
+A concealed kong cannot be robbed for a win,
+except when the win is a 十三幺 (Thirteen Youngests).
+
+
+
+When completed by revealing after a discard from another player,
+or by appending to an existing 碰 pʻung ,
+this is called 明槓 ming kong (transparent kong ).
+
+A transparent kong can be robbed for a win.
+
+
+
+
+
Positions
Winning
Regular hands
From 4171409dd58b4a35d0065b7c30ab38ab9e7edbd3 Mon Sep 17 00:00:00 2001
From: Conway
Date: Sun, 19 Nov 2023 23:16:50 +0800
Subject: [PATCH 05/53] Write Regular hands lead
---
guide/index.cmd | 24 +++++++++++++++++-------
guide/index.html | 16 +++++++++++-----
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index 7616c8c..7532e20 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -75,19 +75,19 @@ The game should be played according to player consensus.
###{#melds} Melds
====
-- 順子 = Sequence, i.e. three consecutive tiles of the same numbered suit.
+- 順子 = Sequence: three consecutive tiles of the same numbered suit.
==
- When completed by revealing after a discard from the previous player,
this is called 上 _sh(e/)ung_ (going up, or onboarding).
==
-- 刻子 = Triplet, i.e. three of the same tile
+- 刻子 = Triplet: three of the same tile
==
- When completed by revealing after a discard from another player,
this is called 碰 _p(')ung_ (bumping).
==
-- 槓子 = Quadruplet, i.e. four of the same tile
+- 槓子 = Quadruplet: four of the same tile
==
- When completed by revealing a completely concealed set of four,
this is called 暗槓 _am~kong_ (concealed _kong_).
@@ -106,13 +106,23 @@ The game should be played according to player consensus.
====
-###{#position} Positions
-
-
##{#winning} Winning
###{#regular} Regular hands
-###{#special} Special hands
+--
+Regular winning hands consist of four [melds] plus a pair called 眼 (eyes).
+By itself, such a win is worth zero 番 _f(a/)n_ (points).
+To meet the conventional threshold of three 番 _f(a/)n_ for a win,
+you need to go for one of the patterns below, go for an [irregular hand],
+or rely on [bonuses].
+--
+
+###{#irregular} Irregular hands
###{#bonuses} Bonuses
+
+
+[melds]: #melds
+[irregular hand]: #irregular
+[bonuses]: #bonuses
diff --git a/guide/index.html b/guide/index.html
index e5d63fe..7591edd 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -119,7 +119,7 @@ Unnumbered suits
Melds
-順子 = Sequence, i.e. three consecutive tiles of the same numbered suit.
+順子 = Sequence: three consecutive tiles of the same numbered suit.
When completed by revealing after a discard from the previous player,
@@ -128,7 +128,7 @@ Mel
-刻子 = Triplet, i.e. three of the same tile
+刻子 = Triplet: three of the same tile
When completed by revealing after a discard from another player,
@@ -137,7 +137,7 @@ Mel
-槓子 = Quadruplet, i.e. four of the same tile
+槓子 = Quadruplet: four of the same tile
When completed by revealing a completely concealed set of four,
@@ -158,10 +158,16 @@ Mel
- Positions
Winning
Regular hands
- Special hands
+
+Regular winning hands consist of four melds plus a pair called 眼 (eyes).
+By itself, such a win is worth zero 番 fán (points).
+To meet the conventional threshold of three 番 fán for a win,
+you need to go for one of the patterns below, go for an irregular hand ,
+or rely on bonuses .
+
+ Irregular hands
Bonuses
Source: guide/index.cmd
.
From b24f149b05b7148d305dff32c8b39b08291abf25 Mon Sep 17 00:00:00 2001
From: Conway
Date: Mon, 20 Nov 2023 00:21:16 +0800
Subject: [PATCH 06/53] Write Winning text
---
guide/index.cmd | 103 +++++++++++++++++++++++++++++++++++---
guide/index.html | 125 ++++++++++++++++++++++++++++++++++++++++++++---
res/mahjong.css | 2 +-
3 files changed, 217 insertions(+), 13 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index 7532e20..6e3111e 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -93,7 +93,7 @@ The game should be played according to player consensus.
this is called 暗槓 _am~kong_ (concealed _kong_).
--
A concealed _kong_ cannot be robbed for a win,
- except when the win is a 十三幺 (Thirteen Youngests).
+ except when the win is a 十三幺 (Thirteen Littles).
--
- When completed by revealing after a discard from another player,
@@ -108,20 +108,111 @@ The game should be played according to player consensus.
##{#winning} Winning
+--
+The conventional threshold for a hand to be winning is a minimum of
+three~_f(a/)n_ (番, or points).
+--
+
###{#regular} Regular hands
--
-Regular winning hands consist of four [melds] plus a pair called 眼 (eyes).
-By itself, such a win is worth zero 番 _f(a/)n_ (points).
-To meet the conventional threshold of three 番 _f(a/)n_ for a win,
-you need to go for one of the patterns below, go for an [irregular hand],
-or rely on [bonuses].
+Regular winning hands consist of
+__four [melds] plus a pair__ (眼 _ng(a/)n_ = eyes).
+By itself, such a win is worth zero~_f(a/)n_.
+To raise the number of _f(a/)n_, you need to
+go for one of the patterns below or an [irregular hand],
+and/or rely on [bonuses].
--
+====
+- (+1) 平糊 = Level Win:
+ all melds are sequences
+
+- (+3) 對對糊 = All-Matches Win:
+ all melds are triplets or quadruplets
+
+- (+3) 混一色 = Mixed-One-Suit:
+ all tiles are one numbered suit, plus honours
+
+- (+5) 小三元 = Lesser Three Duxes:
+ (triplet or quadruplet) melds in two of the three dragons,
+ plus eyes in the remaining dragon
+
+- (+6) 小四喜 = Lesser Four Joys:
+ (triplet or quadruplet) melds in three of the four winds,
+ plus eyes in the remaining wind
+
+- (+7) 清一色 = Pure-One-Suit:
+ all tiles are one numbered suit (no honours except flowers)
+
+- (+8) 大三元 = Greater Three Duxes:
+ (triplet or quadruplet) melds in all three dragons
+
+- (13 = Maximum) 大四喜 = Greater Four Joys:
+ (triplet or quadruplet) melds in all four winds
+====
+
###{#irregular} Irregular hands
+====
+- (+4) 七對 = Seven Pairs (OPTIONAL):
+ seven distinct pairs
+
+- (13 = Maximum) 十三幺 = Thirteen Littles:
+ one & nine of each numbered suit,
+ plus each of the four winds,
+ plus each of the three dragons,
+ plus a duplicate
+====
+
###{#bonuses} Bonuses
+====
+- (+1) 門風 = Gate Wind:
+ a (triplet or quadruplet) meld in a wind tile matching the player's position
+ (not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys)
+
+- (+1) 圈風 = Round Wind:
+ a (triplet or quadruplet) meld in a wind tile matching prevailing table wind
+ (not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys)
+
+- (+1) [Dragon Meld]:
+ a (triplet or quadruplet) meld in a dragon tile
+ (not counted for 小三元/大三元 = Lesser Three Duxes / Greater Three Duxes)
+
+- (+1) 槓 = _Kong_ (OPTIONAL):
+ a quadruplet meld
+
+- (+1) 自摸 = Self-Drawn:
+ winning tile is drawn from the wall, not discarded
+
+- (+1) 無花 = Without Flowers:
+ no flowers (only if the game is played with flowers)
+
+- (+1) 正花 = Correct Flower:
+ a flower matching the player's position
+
+- (+1) 門前清 = Gate-Front Clear:
+ no revealed melds prior to win
+
+- (+1) 搶槓 = Robbed _kong_:
+ winning tile is revealed when completing a transparent _kong_
+ (or even a concealed _kong_ if the win is 十三幺 (Thirteen Littles))
+
+- (+1) 槓上自摸 = Self-Drawn Atop _Kong_:
+ winning tile is drawn as the compensating tile after a _kong_
+ (accumulates with consecutive _kong_s)
+
+- (+1) 海底撈月 = Sea-Bottom Scooped Moon:
+ winning tile is drawn as the final tile of the wall
+
+- (13 = Maximum) 天糊 = Heavenly Win:
+ dealer wins with initial hand
+
+- (13 = Maximum) 地糊 = Earthly Win:
+ non-dealer wins on dealer's first discard
+====
+
[melds]: #melds
[irregular hand]: #irregular
diff --git a/guide/index.html b/guide/index.html
index 7591edd..c604a5f 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -144,7 +144,7 @@ Mel
this is called 暗槓 am kong (concealed kong ).
A concealed kong cannot be robbed for a win,
-except when the win is a 十三幺 (Thirteen Youngests).
+except when the win is a 十三幺 (Thirteen Littles).
@@ -159,16 +159,129 @@ Mel
Winning
+
+The conventional threshold for a hand to be winning is a minimum of
+three fán (番 , or points).
+
Regular hands
-Regular winning hands consist of four melds plus a pair called 眼 (eyes).
-By itself, such a win is worth zero 番 fán (points).
-To meet the conventional threshold of three 番 fán for a win,
-you need to go for one of the patterns below, go for an irregular hand ,
-or rely on bonuses .
+Regular winning hands consist of
+four melds plus a pair (眼 ngán = eyes).
+By itself, such a win is worth zero fán .
+To raise the number of fán , you need to
+go for one of the patterns below or an irregular hand ,
+and/or rely on bonuses .
+
+
+(+1) 平糊 = Level Win:
+all melds are sequences
+
+
+(+3) 對對糊 = All-Matches Win:
+all melds are triplets or quadruplets
+
+
+(+3) 混一色 = Mixed-One-Suit:
+all tiles are one numbered suit, plus honours
+
+
+(+5) 小三元 = Lesser Three Duxes:
+(triplet or quadruplet) melds in two of the three dragons,
+plus eyes in the remaining dragon
+
+
+(+6) 小四喜 = Lesser Four Joys:
+(triplet or quadruplet) melds in three of the four winds,
+plus eyes in the remaining wind
+
+
+(+7) 清一色 = Pure-One-Suit:
+all tiles are one numbered suit (no honours except flowers)
+
+
+(+8) 大三元 = Greater Three Duxes:
+(triplet or quadruplet) melds in all three dragons
+
+
+(13 = Maximum) 大四喜 = Greater Four Joys:
+(triplet or quadruplet) melds in all four winds
+
+
Irregular hands
+
+
+(+4) 七對 = Seven Pairs (OPTIONAL):
+seven distinct pairs
+
+
+(13 = Maximum) 十三幺 = Thirteen Littles:
+one & nine of each numbered suit,
+plus each of the four winds,
+plus each of the three dragons,
+plus a duplicate
+
+
Bonuses
+
+
+(+1) 門風 = Gate Wind:
+a (triplet or quadruplet) meld in a wind tile matching the player's position
+(not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys)
+
+
+(+1) 圈風 = Round Wind:
+a (triplet or quadruplet) meld in a wind tile matching prevailing table wind
+(not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys)
+
+
+(+1) [Dragon Meld]:
+a (triplet or quadruplet) meld in a dragon tile
+(not counted for 小三元/大三元 = Lesser Three Duxes / Greater Three Duxes)
+
+
+(+1) 槓 = Kong (OPTIONAL):
+a quadruplet meld
+
+
+(+1) 自摸 = Self-Drawn:
+winning tile is drawn from the wall, not discarded
+
+
+(+1) 無花 = Without Flowers:
+no flowers (only if the game is played with flowers)
+
+
+(+1) 正花 = Correct Flower:
+a flower matching the player's position
+
+
+(+1) 門前清 = Gate-Front Clear:
+no revealed melds prior to win
+
+
+(+1) 搶槓 = Robbed kong :
+winning tile is revealed when completing a transparent kong
+(or even a concealed kong if the win is 十三幺 (Thirteen Littles))
+
+
+(+1) 槓上自摸 = Self-Drawn Atop Kong :
+winning tile is drawn as the compensating tile after a kong
+(accumulates with consecutive kong s)
+
+
+(+1) 海底撈月 = Sea-Bottom Scooped Moon:
+winning tile is drawn as the final tile of the wall
+
+
+(13 = Maximum) 天糊 = Heavenly Win:
+dealer wins with initial hand
+
+
+(13 = Maximum) 地糊 = Earthly Win:
+non-dealer wins on dealer's first discard
+
+
Source: guide/index.cmd
.
Last modified: 2023-11-19 .
diff --git a/res/mahjong.css b/res/mahjong.css
index 01a3cb5..ab1d364 100644
--- a/res/mahjong.css
+++ b/res/mahjong.css
@@ -90,7 +90,7 @@ th, td {
}
ul ul {
- margin-bottom: 1em;
+ margin: 0.5em 0;
}
From 6838b132606dbd95115de1bc792c1c3f3bc1a953 Mon Sep 17 00:00:00 2001
From: Conway
Date: Mon, 20 Nov 2023 00:46:25 +0800
Subject: [PATCH 07/53] Cleanup guide (1/2)
---
guide/index.cmd | 131 +++++++++++++++++++++++++++++++----------------
guide/index.html | 129 +++++++++++++++++++++++++++++++++-------------
res/mahjong.css | 2 +-
3 files changed, 182 insertions(+), 80 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index 6e3111e..4e115f5 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -27,17 +27,17 @@ The game should be played according to player consensus.
#### Numbered suits
======
-- 筒子 _t(')ung~tsz'_ = Tubes [circles, balls]
+- 筒子 = __Tubes__ [circles, balls]
====
- [one through nine]
====
-- 索子 _sok~tsz'_ = Rods [bamboos, sticks]
+- 索子 = __Rods__ [bamboos, sticks]
====
- [one through nine]
====
-- 萬子 _m(a/)n~tsz'_ = Myriads [characters]
+- 萬子 = __Myriads__ [characters, ten-thousands]
====
- [one through nine]
====
@@ -46,9 +46,9 @@ The game should be played according to player consensus.
#### Unnumbered suits
======
-- 番子 _f(a/)n~tsz'_ = Honours
+- 番子 = __Honours__
====
- - 四風/四喜 = Four Winds / Four Joys [directions]
+ - 四風/四喜 = __Four Winds / Four Joys__ [directions]
==
- 東 = East
- 南 = South
@@ -56,17 +56,30 @@ The game should be played according to player consensus.
- 北 = North
==
- - 三元 = Three Duxes [dragons]
+ - 三元 = __Three Duxes__ [dragons]
==
- 紅中 = Red-Centre [red]
- 發財 = Prosper-Wealth [green]
- 白板 = White-Board [white]
==
+ ====
+
+- 花 = __Flowers__ (OPTIONAL)
+ ====
+ - 四花 = Four Flora
+ ==
+ - 梅 = Plum
+ - 蘭 = Orchid
+ - 菊 = Chrysanthemum
+ - 竹 = Bamboo
+ ==
- - 花 = Flowers
+ - 四季 = Four Seasons
==
- - 四花 = Four Flora
- - 四季 = Four Seasons
+ - 春 = Spring
+ - 夏 = Summer
+ - 秋 = Autumn
+ - 冬 = Winter
==
====
======
@@ -75,22 +88,31 @@ The game should be played according to player consensus.
###{#melds} Melds
====
-- 順子 = Sequence: three consecutive tiles of the same numbered suit.
+- 順子 = __Sequence__
+ --
+ Three consecutive tiles of the same numbered suit.
+ --
==
- When completed by revealing after a discard from the previous player,
- this is called 上 _sh(e/)ung_ (going up, or onboarding).
+ this is called 上 __|_sh(e/)ung___ (going up, or onboarding).
==
-- 刻子 = Triplet: three of the same tile
+- 刻子 = __Triplet__
+ --
+ Three of the same tile.
+ --
==
- When completed by revealing after a discard from another player,
- this is called 碰 _p(')ung_ (bumping).
+ this is called 碰 __|_p(')ung___ (bumping).
==
-- 槓子 = Quadruplet: four of the same tile
+- 槓子 = __Quadruplet__
+ --
+ Four of the same tile, called a __|_kong___.
+ --
==
- When completed by revealing a completely concealed set of four,
- this is called 暗槓 _am~kong_ (concealed _kong_).
+ this is called 暗槓 __|_am~kong___ (concealed _kong_).
--
A concealed _kong_ cannot be robbed for a win,
except when the win is a 十三幺 (Thirteen Littles).
@@ -98,7 +120,7 @@ The game should be played according to player consensus.
- When completed by revealing after a discard from another player,
or by appending to an existing 碰 _p(')ung_,
- this is called 明槓 _ming~kong_ (transparent _kong_).
+ this is called 明槓 __|_ming~kong___ (transparent _kong_).
--
A transparent _kong_ can be robbed for a win.
--
@@ -109,15 +131,15 @@ The game should be played according to player consensus.
##{#winning} Winning
--
-The conventional threshold for a hand to be winning is a minimum of
-three~_f(a/)n_ (番, or points).
+The conventional threshold for a hand to be winning is a
+__minimum of three~|_f(a/)n___ (番, or points).
--
###{#regular} Regular hands
--
Regular winning hands consist of
-__four [melds] plus a pair__ (眼 _ng(a/)n_ = eyes).
+__four [melds] plus a pair__ called 眼 _ng(a/)n_ (__eyes__).
By itself, such a win is worth zero~_f(a/)n_.
To raise the number of _f(a/)n_, you need to
go for one of the patterns below or an [irregular hand],
@@ -125,31 +147,52 @@ and/or rely on [bonuses].
--
====
-- (+1) 平糊 = Level Win:
- all melds are sequences
-
-- (+3) 對對糊 = All-Matches Win:
- all melds are triplets or quadruplets
-
-- (+3) 混一色 = Mixed-One-Suit:
- all tiles are one numbered suit, plus honours
-
-- (+5) 小三元 = Lesser Three Duxes:
- (triplet or quadruplet) melds in two of the three dragons,
- plus eyes in the remaining dragon
-
-- (+6) 小四喜 = Lesser Four Joys:
- (triplet or quadruplet) melds in three of the four winds,
- plus eyes in the remaining wind
-
-- (+7) 清一色 = Pure-One-Suit:
- all tiles are one numbered suit (no honours except flowers)
-
-- (+8) 大三元 = Greater Three Duxes:
- (triplet or quadruplet) melds in all three dragons
-
-- (13 = Maximum) 大四喜 = Greater Four Joys:
- (triplet or quadruplet) melds in all four winds
+- (0) 雞糊 = __Chicken Win__
+ --
+ The default pattern: four melds plus a pair.
+ --
+
+- (+1) 平糊 = __Common Win__
+ --
+ All melds are sequences.
+ --
+
+- (+3) 對對糊 = __All-Matches Win__
+ --
+ All melds are triplets or quadruplets.
+ --
+
+- (+3) 混一色 = __Mixed-One-Suit__
+ --
+ All tiles are one numbered suit, plus honours.
+ --
+
+- (+5) 小三元 = __Lesser Three Duxes__
+ --
+ (Triplet or quadruplet) melds in two of the three dragons,
+ plus eyes in the remaining dragon.
+ --
+
+- (+6) 小四喜 = __Lesser Four Joys__
+ --
+ (Triplet or quadruplet) melds in three of the four winds,
+ plus eyes in the remaining wind.
+ --
+
+- (+7) 清一色 = __Pure-One-Suit__
+ --
+ All tiles are one numbered suit.
+ --
+
+- (+8) 大三元 = __Greater Three Duxes__
+ --
+ (Triplet or quadruplet) melds in all three dragons.
+ --
+
+- (13 = Maximum) 大四喜 = __Greater Four Joys__
+ --
+ (Triplet or quadruplet) melds in all four winds.
+ --
====
###{#irregular} Irregular hands
diff --git a/guide/index.html b/guide/index.html
index c604a5f..423d5da 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -42,7 +42,7 @@ Til
Numbered suits
-筒子 tʻung tsz' = Tubes [circles, balls]
+筒子 = Tubes [circles, balls]
[one through nine]
@@ -50,7 +50,7 @@ Numbered suits
-索子 sok tsz' = Rods [bamboos, sticks]
+索子 = Rods [bamboos, sticks]
[one through nine]
@@ -58,7 +58,7 @@ Numbered suits
-萬子 mán tsz' = Myriads [characters]
+萬子 = Myriads [characters, ten-thousands]
[one through nine]
@@ -69,10 +69,10 @@ Numbered suits
Unnumbered suits
-番子 fán tsz' = Honours
+番子 = Honours
-四風/四喜 = Four Winds / Four Joys [directions]
+四風/四喜 = Four Winds / Four Joys [directions]
東 = East
@@ -89,7 +89,7 @@ Unnumbered suits
-三元 = Three Duxes [dragons]
+三元 = Three Duxes [dragons]
紅中 = Red-Centre [red]
@@ -102,14 +102,42 @@ Unnumbered suits
+
+
-花 = Flowers
+花 = Flowers (OPTIONAL)
四花 = Four Flora
+
+
+梅 = Plum
+
+
+蘭 = Orchid
+
+
+菊 = Chrysanthemum
+
+
+竹 = Bamboo
+
+
四季 = Four Seasons
+
+
+春 = Spring
+
+
+夏 = Summer
+
+
+秋 = Autumn
+
+
+冬 = Winter
@@ -119,29 +147,38 @@ Unnumbered suits
Melds
-順子 = Sequence: three consecutive tiles of the same numbered suit.
+順子 = Sequence
+
+Three consecutive tiles of the same numbered suit.
+
When completed by revealing after a discard from the previous player,
-this is called 上 shéung (going up, or onboarding).
+this is called 上 shéung (going up, or onboarding).
-刻子 = Triplet: three of the same tile
+刻子 = Triplet
+
+Three of the same tile.
+
When completed by revealing after a discard from another player,
-this is called 碰 pʻung (bumping).
+this is called 碰 pʻung (bumping).
-槓子 = Quadruplet: four of the same tile
+槓子 = Quadruplet
+
+Four of the same tile, called a kong .
+
When completed by revealing a completely concealed set of four,
-this is called 暗槓 am kong (concealed kong ).
+this is called 暗槓 am kong (concealed kong ).
A concealed kong cannot be robbed for a win,
except when the win is a 十三幺 (Thirteen Littles).
@@ -150,7 +187,7 @@
Mel
When completed by revealing after a discard from another player,
or by appending to an existing 碰 pʻung ,
-this is called 明槓 ming kong (transparent kong ).
+this is called 明槓 ming kong (transparent kong ).
A transparent kong can be robbed for a win.
@@ -160,13 +197,13 @@ Mel
Winning
-The conventional threshold for a hand to be winning is a minimum of
-three fán (番 , or points).
+The conventional threshold for a hand to be winning is a
+minimum of three fán (番 , or points).
Regular hands
Regular winning hands consist of
-four melds plus a pair (眼 ngán = eyes).
+four melds plus a pair called 眼 ngán (eyes ).
By itself, such a win is worth zero fán .
To raise the number of fán , you need to
go for one of the patterns below or an irregular hand ,
@@ -174,38 +211,60 @@
-(+1) 平糊 = Level Win:
-all melds are sequences
+(0) 雞糊 = Chicken Win
+
+The default pattern: four melds plus a pair.
+
-(+3) 對對糊 = All-Matches Win:
-all melds are triplets or quadruplets
+(+1) 平糊 = Common Win
+
+All melds are sequences.
+
-(+3) 混一色 = Mixed-One-Suit:
-all tiles are one numbered suit, plus honours
+(+3) 對對糊 = All-Matches Win
+
+All melds are triplets or quadruplets.
+
-(+5) 小三元 = Lesser Three Duxes:
-(triplet or quadruplet) melds in two of the three dragons,
-plus eyes in the remaining dragon
+(+3) 混一色 = Mixed-One-Suit
+
+All tiles are one numbered suit, plus honours.
+
-(+6) 小四喜 = Lesser Four Joys:
-(triplet or quadruplet) melds in three of the four winds,
-plus eyes in the remaining wind
+(+5) 小三元 = Lesser Three Duxes
+
+(Triplet or quadruplet) melds in two of the three dragons,
+plus eyes in the remaining dragon.
+
-(+7) 清一色 = Pure-One-Suit:
-all tiles are one numbered suit (no honours except flowers)
+(+6) 小四喜 = Lesser Four Joys
+
+(Triplet or quadruplet) melds in three of the four winds,
+plus eyes in the remaining wind.
+
-(+8) 大三元 = Greater Three Duxes:
-(triplet or quadruplet) melds in all three dragons
+(+7) 清一色 = Pure-One-Suit
+
+All tiles are one numbered suit.
+
-(13 = Maximum) 大四喜 = Greater Four Joys:
-(triplet or quadruplet) melds in all four winds
+(+8) 大三元 = Greater Three Duxes
+
+(Triplet or quadruplet) melds in all three dragons.
+
+
+
+(13 = Maximum) 大四喜 = Greater Four Joys
+
+(Triplet or quadruplet) melds in all four winds.
+
Irregular hands
diff --git a/res/mahjong.css b/res/mahjong.css
index ab1d364..25b997e 100644
--- a/res/mahjong.css
+++ b/res/mahjong.css
@@ -90,7 +90,7 @@ th, td {
}
ul ul {
- margin: 0.5em 0;
+ margin: 0.5em 0 1em;
}
From 656f42a9e369035b4d421b09de93f5e8e6595745 Mon Sep 17 00:00:00 2001
From: Conway
Date: Mon, 20 Nov 2023 00:56:13 +0800
Subject: [PATCH 08/53] Cleanup guide (2/2)
---
guide/index.cmd | 115 ++++++++++++++++++++++++++++++-----------------
guide/index.html | 106 ++++++++++++++++++++++++++++---------------
res/mahjong.css | 3 ++
3 files changed, 147 insertions(+), 77 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index 4e115f5..b67bf86 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -108,7 +108,7 @@ The game should be played according to player consensus.
- 槓子 = __Quadruplet__
--
- Four of the same tile, called a __|_kong___.
+ Four of the same tile, called a 槓 __|_kong___.
--
==
- When completed by revealing a completely concealed set of four,
@@ -135,6 +135,7 @@ The conventional threshold for a hand to be winning is a
__minimum of three~|_f(a/)n___ (番, or points).
--
+
###{#regular} Regular hands
--
@@ -195,65 +196,99 @@ and/or rely on [bonuses].
--
====
+
###{#irregular} Irregular hands
====
-- (+4) 七對 = Seven Pairs (OPTIONAL):
- seven distinct pairs
-
-- (13 = Maximum) 十三幺 = Thirteen Littles:
- one & nine of each numbered suit,
- plus each of the four winds,
- plus each of the three dragons,
- plus a duplicate
+- (+4) 七對 = __Seven Pairs__ (OPTIONAL)
+ --
+ Seven distinct pairs.
+ --
+
+- (13 = Maximum) 十三幺 = __Thirteen Littles__
+ --
+ One & nine of each numbered suit,
+ plus each of the four winds,
+ plus each of the three dragons,
+ plus a duplicate.
+ --
====
+
###{#bonuses} Bonuses
====
-- (+1) 門風 = Gate Wind:
- a (triplet or quadruplet) meld in a wind tile matching the player's position
- (not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys)
+- (+1) 門風 = __Gate Wind__ [seat wind]
+ --
+ A (triplet or quadruplet) meld in a wind tile matching the player's position
+ (not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys).
+ --
-- (+1) 圈風 = Round Wind:
- a (triplet or quadruplet) meld in a wind tile matching prevailing table wind
- (not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys)
+- (+1) 圈風 = __Round Wind__ [table wind]
+ --
+ A (triplet or quadruplet) meld in a wind tile matching prevailing table wind
+ (not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys).
+ --
-- (+1) [Dragon Meld]:
- a (triplet or quadruplet) meld in a dragon tile
- (not counted for 小三元/大三元 = Lesser Three Duxes / Greater Three Duxes)
+- (+1) [dragon meld]
+ --
+ A (triplet or quadruplet) meld in a dragon tile
+ (not counted for 小三元/大三元 = Lesser Three Duxes / Greater Three Duxes).
+ --
-- (+1) 槓 = _Kong_ (OPTIONAL):
- a quadruplet meld
+- (+1) 槓 = __|_Kong___ (OPTIONAL)
+ --
+ A quadruplet meld.
+ (Omitting this bonus may lead to more strategic play,
+ in the form of refusing a _kong_ to keep an in-hand triple concealed.)
+ --
-- (+1) 自摸 = Self-Drawn:
- winning tile is drawn from the wall, not discarded
+- (+1) 自摸 = __Self-Drawn__
+ --
+ Winning tile is drawn from the wall, not discarded.
+ --
-- (+1) 無花 = Without Flowers:
- no flowers (only if the game is played with flowers)
+- (+1) 無花 = __Without Flowers__
+ --
+ No flowers (in games played with flowers).
+ --
-- (+1) 正花 = Correct Flower:
- a flower matching the player's position
+- (+1) 正花 = __Correct Flower__
+ --
+ A flower matching the player's position (in games played with flowers).
+ --
-- (+1) 門前清 = Gate-Front Clear:
- no revealed melds prior to win
+- (+1) 門前清 = __Gate-Front Clear__
+ --
+ No revealed melds prior to win.
+ --
-- (+1) 搶槓 = Robbed _kong_:
- winning tile is revealed when completing a transparent _kong_
- (or even a concealed _kong_ if the win is 十三幺 (Thirteen Littles))
+- (+1) 搶槓 = __Robbed _Kong___
+ --
+ Winning tile is revealed when completing a transparent _kong_
+ (or even a concealed _kong_ if the win is 十三幺 (Thirteen Littles)).
+ --
-- (+1) 槓上自摸 = Self-Drawn Atop _Kong_:
- winning tile is drawn as the compensating tile after a _kong_
- (accumulates with consecutive _kong_s)
+- (+1) 槓上自摸 = __Self-Drawn Atop _Kong___
+ --
+ Winning tile is drawn as the compensating tile after a _kong_
+ (accumulates with consecutive _kong_s).
+ --
-- (+1) 海底撈月 = Sea-Bottom Scooped Moon:
- winning tile is drawn as the final tile of the wall
+- (+1) 海底撈月 = __Sea-Bottom Scooped Moon__
+ --
+ Winning tile is drawn as the final tile of the wall.
+ --
-- (13 = Maximum) 天糊 = Heavenly Win:
- dealer wins with initial hand
+- (13 = Maximum) 天糊 = __Heavenly Win__
+ --
+ Dealer wins with initial hand.
+ --
-- (13 = Maximum) 地糊 = Earthly Win:
- non-dealer wins on dealer's first discard
+- (13 = Maximum) 地糊 = __Earthly Win__
+ --
+ Non-dealer wins on dealer's first discard.
+ --
====
diff --git a/guide/index.html b/guide/index.html
index 423d5da..d92acd9 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -173,7 +173,7 @@ Mel
槓子 = Quadruplet
-Four of the same tile, called a kong .
+Four of the same tile, called a 槓 kong .
@@ -270,75 +270,107 @@ Irregular hands
-(+4) 七對 = Seven Pairs (OPTIONAL):
-seven distinct pairs
+(+4) 七對 = Seven Pairs (OPTIONAL)
+
+Seven distinct pairs.
+
-(13 = Maximum) 十三幺 = Thirteen Littles:
-one & nine of each numbered suit,
+(13 = Maximum) 十三幺 = Thirteen Littles
+
+One & nine of each numbered suit,
plus each of the four winds,
plus each of the three dragons,
-plus a duplicate
+plus a duplicate.
+
Bonuses
-(+1) 門風 = Gate Wind:
-a (triplet or quadruplet) meld in a wind tile matching the player's position
-(not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys)
+(+1) 門風 = Gate Wind [seat wind]
+
+A (triplet or quadruplet) meld in a wind tile matching the player's position
+(not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys).
+
-(+1) 圈風 = Round Wind:
-a (triplet or quadruplet) meld in a wind tile matching prevailing table wind
-(not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys)
+(+1) 圈風 = Round Wind [table wind]
+
+A (triplet or quadruplet) meld in a wind tile matching prevailing table wind
+(not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys).
+
-(+1) [Dragon Meld]:
-a (triplet or quadruplet) meld in a dragon tile
-(not counted for 小三元/大三元 = Lesser Three Duxes / Greater Three Duxes)
+(+1) [dragon meld]
+
+A (triplet or quadruplet) meld in a dragon tile
+(not counted for 小三元/大三元 = Lesser Three Duxes / Greater Three Duxes).
+
-(+1) 槓 = Kong (OPTIONAL):
-a quadruplet meld
+(+1) 槓 = Kong (OPTIONAL)
+
+A quadruplet meld.
+(Omitting this bonus may lead to more strategic play,
+in the form of refusing a kong to keep an in-hand triple concealed.)
+
-(+1) 自摸 = Self-Drawn:
-winning tile is drawn from the wall, not discarded
+(+1) 自摸 = Self-Drawn
+
+Winning tile is drawn from the wall, not discarded.
+
-(+1) 無花 = Without Flowers:
-no flowers (only if the game is played with flowers)
+(+1) 無花 = Without Flowers
+
+No flowers (in games played with flowers).
+
-(+1) 正花 = Correct Flower:
-a flower matching the player's position
+(+1) 正花 = Correct Flower
+
+A flower matching the player's position (in games played with flowers).
+
-(+1) 門前清 = Gate-Front Clear:
-no revealed melds prior to win
+(+1) 門前清 = Gate-Front Clear
+
+No revealed melds prior to win.
+
-(+1) 搶槓 = Robbed kong :
-winning tile is revealed when completing a transparent kong
-(or even a concealed kong if the win is 十三幺 (Thirteen Littles))
+(+1) 搶槓 = Robbed Kong
+
+Winning tile is revealed when completing a transparent kong
+(or even a concealed kong if the win is 十三幺 (Thirteen Littles)).
+
-(+1) 槓上自摸 = Self-Drawn Atop Kong :
-winning tile is drawn as the compensating tile after a kong
-(accumulates with consecutive kong s)
+(+1) 槓上自摸 = Self-Drawn Atop Kong
+
+Winning tile is drawn as the compensating tile after a kong
+(accumulates with consecutive kong s).
+
-(+1) 海底撈月 = Sea-Bottom Scooped Moon:
-winning tile is drawn as the final tile of the wall
+(+1) 海底撈月 = Sea-Bottom Scooped Moon
+
+Winning tile is drawn as the final tile of the wall.
+
-(13 = Maximum) 天糊 = Heavenly Win:
-dealer wins with initial hand
+(13 = Maximum) 天糊 = Heavenly Win
+
+Dealer wins with initial hand.
+
-(13 = Maximum) 地糊 = Earthly Win:
-non-dealer wins on dealer's first discard
+(13 = Maximum) 地糊 = Earthly Win
+
+Non-dealer wins on dealer's first discard.
+
diff --git a/res/mahjong.css b/res/mahjong.css
index 25b997e..1cd7df8 100644
--- a/res/mahjong.css
+++ b/res/mahjong.css
@@ -89,6 +89,9 @@ th, td {
padding: 0.4em;
}
+ul p {
+ margin-top: 0.3em;
+}
ul ul {
margin: 0.5em 0 1em;
}
From 503fbe59168276c63298f15420cf30211be43e92 Mon Sep 17 00:00:00 2001
From: Conway
Date: Mon, 20 Nov 2023 00:57:19 +0800
Subject: [PATCH 09/53] Add Guide link to header (and reorder)
---
404.html | 5 ++++-
about/index.html | 5 ++++-
guide/index.html | 5 ++++-
index.html | 5 ++++-
res/common.cmdr | 3 ++-
scores/index.html | 5 ++++-
6 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/404.html b/404.html
index df113c3..b9cc9d0 100644
--- a/404.html
+++ b/404.html
@@ -21,11 +21,14 @@
Home
-About
+Guide
Scores
+
+About
+
diff --git a/about/index.html b/about/index.html
index 1eef4a3..ba0d679 100644
--- a/about/index.html
+++ b/about/index.html
@@ -21,11 +21,14 @@
Home
-About
+Guide
Scores
+
+About
+
diff --git a/guide/index.html b/guide/index.html
index d92acd9..932b1fc 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -21,11 +21,14 @@
Home
-About
+Guide
Scores
+
+About
+
diff --git a/index.html b/index.html
index 0a5d536..a14535f 100644
--- a/index.html
+++ b/index.html
@@ -21,11 +21,14 @@
Home
-About
+Guide
Scores
+
+About
+
diff --git a/res/common.cmdr b/res/common.cmdr
index efd6d6d..3c64759 100644
--- a/res/common.cmdr
+++ b/res/common.cmdr
@@ -20,8 +20,9 @@ RegexDictionaryReplacement: #.common.header-nav
==
- [Home](/)
- - [About](/about/)
+ - [Guide](/guide/)
- [Scores](/scores/)
+ - [About](/about/)
==
diff --git a/scores/index.html b/scores/index.html
index c72b9dc..4aba732 100644
--- a/scores/index.html
+++ b/scores/index.html
@@ -21,11 +21,14 @@
Home
-About
+Guide
Scores
+
+About
+
From 68948cab9d3a5f964d64701dcbbaf9f8038e9d7c Mon Sep 17 00:00:00 2001
From: Conway
Date: Mon, 20 Nov 2023 00:59:58 +0800
Subject: [PATCH 10/53] Move 'Not counted' etc. outside parentheticals
---
guide/index.cmd | 12 ++++++------
guide/index.html | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index b67bf86..9708d7a 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -220,20 +220,20 @@ and/or rely on [bonuses].
====
- (+1) 門風 = __Gate Wind__ [seat wind]
--
- A (triplet or quadruplet) meld in a wind tile matching the player's position
- (not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys).
+ A (triplet or quadruplet) meld in a wind tile matching the player's position.
+ Not counted for 小四喜/大四喜 (Lesser Three Joys / Greater Three Joys).
--
- (+1) 圈風 = __Round Wind__ [table wind]
--
- A (triplet or quadruplet) meld in a wind tile matching prevailing table wind
- (not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys).
+ A (triplet or quadruplet) meld in a wind tile matching prevailing table wind.
+ Not counted for 小四喜/大四喜 (Lesser Three Joys / Greater Three Joys).
--
- (+1) [dragon meld]
--
- A (triplet or quadruplet) meld in a dragon tile
- (not counted for 小三元/大三元 = Lesser Three Duxes / Greater Three Duxes).
+ A (triplet or quadruplet) meld in a dragon tile.
+ Not counted for 小三元/大三元 (Lesser Three Duxes / Greater Three Duxes).
--
- (+1) 槓 = __|_Kong___ (OPTIONAL)
diff --git a/guide/index.html b/guide/index.html
index 932b1fc..172aee5 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -293,22 +293,22 @@
(+1) 門風 = Gate Wind [seat wind]
-A (triplet or quadruplet) meld in a wind tile matching the player's position
-(not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys).
+A (triplet or quadruplet) meld in a wind tile matching the player's position.
+Not counted for 小四喜/大四喜 (Lesser Three Joys / Greater Three Joys).
(+1) 圈風 = Round Wind [table wind]
-A (triplet or quadruplet) meld in a wind tile matching prevailing table wind
-(not counted for 小四喜/大四喜 = Lesser Three Joys / Greater Three Joys).
+A (triplet or quadruplet) meld in a wind tile matching prevailing table wind.
+Not counted for 小四喜/大四喜 (Lesser Three Joys / Greater Three Joys).
(+1) [dragon meld]
-A (triplet or quadruplet) meld in a dragon tile
-(not counted for 小三元/大三元 = Lesser Three Duxes / Greater Three Duxes).
+A (triplet or quadruplet) meld in a dragon tile.
+Not counted for 小三元/大三元 (Lesser Three Duxes / Greater Three Duxes).
From 3b16b000085c65c14c30ed6e076b508e289bf505 Mon Sep 17 00:00:00 2001
From: Conway
Date: Mon, 20 Nov 2023 20:52:36 +0800
Subject: [PATCH 11/53] Add unconverted CMD mahjong tile syntax to Guide
---
guide/index.cmd | 38 +++++++++++++++++++-------------------
guide/index.html | 38 +++++++++++++++++++-------------------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/guide/index.cmd b/guide/index.cmd
index 9708d7a..16148ba 100644
--- a/guide/index.cmd
+++ b/guide/index.cmd
@@ -3,7 +3,7 @@
OrdinaryDictionaryReplacement: #.boilerplate-properties-override
- queue_position: BEFORE #boilerplate-properties
* %title --> Guide
-* %date-modified --> 2023-11-19
+* %date-modified --> 2023-11-20
%%%
@@ -29,17 +29,17 @@ The game should be played according to player consensus.
======
- 筒子 = __Tubes__ [circles, balls]
====
- - [one through nine]
+ - [1t][2t][3t][4t][5t][6t][7t][8t][9t] = [one through nine]
====
- 索子 = __Rods__ [bamboos, sticks]
====
- - [one through nine]
+ - [1s][2s][3s][4s][5s][6s][7s][8s][9s] = [one through nine]
====
- 萬子 = __Myriads__ [characters, ten-thousands]
====
- - [one through nine]
+ - [1m][2m][3m][4m][5m][6m][7m][8m][9m] = [one through nine]
====
======
@@ -50,17 +50,17 @@ The game should be played according to player consensus.
====
- 四風/四喜 = __Four Winds / Four Joys__ [directions]
==
- - 東 = East
- - 南 = South
- - 西 = West
- - 北 = North
+ - [tf] 東 = East
+ - [nf] 南 = South
+ - [sf] 西 = West
+ - [pf] 北 = North
==
- 三元 = __Three Duxes__ [dragons]
==
- - 紅中 = Red-Centre [red]
- - 發財 = Prosper-Wealth [green]
- - 白板 = White-Board [white]
+ - [hc] 紅中 = Red-Centre [red]
+ - [ft] 發財 = Prosper-Wealth [green]
+ - [pp] 白板 = White-Board [white]
==
====
@@ -68,18 +68,18 @@ The game should be played according to player consensus.
====
- 四花 = Four Flora
==
- - 梅 = Plum
- - 蘭 = Orchid
- - 菊 = Chrysanthemum
- - 竹 = Bamboo
+ - [1f] 梅 = Plum
+ - [2f] 蘭 = Orchid
+ - [3f] 菊 = Chrysanthemum
+ - [4f] 竹 = Bamboo
==
- 四季 = Four Seasons
==
- - 春 = Spring
- - 夏 = Summer
- - 秋 = Autumn
- - 冬 = Winter
+ - [1k] 春 = Spring
+ - [2k] 夏 = Summer
+ - [3k] 秋 = Autumn
+ - [4k] 冬 = Winter
==
====
======
diff --git a/guide/index.html b/guide/index.html
index 172aee5..6b4cad7 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -48,7 +48,7 @@ Numbered suits
筒子 = Tubes [circles, balls]
-[one through nine]
+[1t][2t][3t][4t][5t][6t][7t][8t][9t] = [one through nine]
@@ -56,7 +56,7 @@ Numbered suits
索子 = Rods [bamboos, sticks]
-[one through nine]
+[1s][2s][3s][4s][5s][6s][7s][8s][9s] = [one through nine]
@@ -64,7 +64,7 @@ Numbered suits
萬子 = Myriads [characters, ten-thousands]
-[one through nine]
+[1m][2m][3m][4m][5m][6m][7m][8m][9m] = [one through nine]
@@ -78,16 +78,16 @@ Unnumbered suits
四風/四喜 = Four Winds / Four Joys [directions]
-東 = East
+[tf] 東 = East
-南 = South
+[nf] 南 = South
-西 = West
+[sf] 西 = West
-北 = North
+[pf] 北 = North
@@ -95,13 +95,13 @@ Unnumbered suits
三元 = Three Duxes [dragons]
-紅中 = Red-Centre [red]
+[hc] 紅中 = Red-Centre [red]
-發財 = Prosper-Wealth [green]
+[ft] 發財 = Prosper-Wealth [green]
-白板 = White-Board [white]
+[pp] 白板 = White-Board [white]
@@ -114,16 +114,16 @@ Unnumbered suits
四花 = Four Flora
-梅 = Plum
+[1f] 梅 = Plum
-蘭 = Orchid
+[2f] 蘭 = Orchid
-菊 = Chrysanthemum
+[3f] 菊 = Chrysanthemum
-竹 = Bamboo
+[4f] 竹 = Bamboo
@@ -131,16 +131,16 @@ Unnumbered suits
四季 = Four Seasons
-春 = Spring
+[1k] 春 = Spring
-夏 = Summer
+[2k] 夏 = Summer
-秋 = Autumn
+[3k] 秋 = Autumn
-冬 = Winter
+[4k] 冬 = Winter
@@ -378,7 +378,7 @@
Source: guide/index.cmd
.
-Last modified: 2023-11-19 .
+Last modified: 2023-11-20 .