Skip to content

Commit 355cd24

Browse files
authored
Merge pull request #155 from edderiofer/tiles-docs
Fixed bugs/inconsistencies regarding spritesheet and tiles.md.
2 parents 8d5d3bc + 7d594fa commit 355cd24

File tree

9 files changed

+15
-9
lines changed

9 files changed

+15
-9
lines changed

assets/css/app.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,7 @@ div.tile.\31 \37 t { --tile-color: var(--galaxy-color); --tile-index: 150; }
11581158
div.tile.\31 \38 t { --tile-color: var(--galaxy-color); --tile-index: 151; }
11591159
div.tile.\31 \39 t { --tile-color: var(--galaxy-color); --tile-index: 152; }
11601160
div.tile.\31 \31 \30 t { --tile-color: var(--galaxy-color); --tile-index: 153; }
1161+
div.tile.\31 \30 z { --tile-color: var(--galaxy-color); --tile-index: 154; }
11611162
div.tile.\31 \31 z { --tile-color: var(--galaxy-color); --tile-index: 155; }
11621163
div.tile.\31 \32 z { --tile-color: var(--galaxy-color); --tile-index: 156; }
11631164
div.tile.\31 \33 z { --tile-color: var(--galaxy-color); --tile-index: 157; }

documentation/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ There are a couple of visual effects you can give to a tile by giving it attribu
478478
- `"sideways"`: Flips the tile sideways.
479479
- `"transparent"`: Makes the tile look transparent. This transparency is visible to other players, but the identity of the tile is still hidden (it will just look like a transparent blank tile). Combine this with `"revealed"` to get Washizu tiles.
480480

481-
For custom akadora (transparent tiles whose names are prefixed with `4`, see [tiles.md](tiles.md#akaaokintransparent)) the following attributes define the color of the tile:
481+
For custom akadora (transparent tiles whose names are prefixed with `4` or `5`, see [tiles.md](tiles.md#akaaokintransparent)) the following attributes define the color of the tile:
482482

483483
- `"_red"`: same as akadora
484484
- `"_blue"`: same as aodora

documentation/documentation_json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ There are a couple of visual effects you can give to a tile by giving it attribu
466466
- `"sideways"`: Flips the tile sideways.
467467
- `"transparent"`: Makes the tile look transparent. This transparency is visible to other players, but the identity of the tile is still hidden (it will just look like a transparent blank tile). Combine this with `"revealed"` to get Washizu tiles.
468468

469-
For custom akadora (transparent tiles whose names are prefixed with `4`, see [tiles.md](tiles.md#akaaokintransparent)) the following attributes define the color of the tile:
469+
For custom akadora (transparent tiles whose names are prefixed with `4` or `5`, see [tiles.md](tiles.md#akaaokintransparent)) the following attributes define the color of the tile:
470470

471471
- `"_red"`: same as akadora
472472
- `"_blue"`: same as aodora

documentation/guide_to_tiles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ These are used in [Galaxy Mahjong](galaxy.md). Numbered blue tiles may be used a
7676

7777
## Aka/Ao/Kin/Transparent
7878

79-
Many of the above natural tiles, now as red, dark-blue, and gold variants (for extra parlour riichi rules). Transparent tiles, starting with `4`, are also included, to allow for setting tiles as any colour you like.
79+
Many of the above natural tiles, now as red, dark-blue, and gold variants (for extra parlour riichi rules). Transparent tiles, starting with `4`, are also included, to allow for setting tiles as any colour you like (see [`documentation.md`](https://github.com/edderiofer/riichi_advanced/blob/tiles-docs/documentation/documentation.md#visual-effects-via-attributes)). These also have dotted variations, starting with `5` instead.
8080

8181

8282

documentation/reference-aka.png

105 KB
Loading

documentation/reference-galaxy.png

216 KB
Loading

documentation/reference-jokers.png

94.6 KB
Loading

documentation/tiles.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Tile reference
22

3-
This document is a reference for all of the tiles currently supported in the tileset. See [`guide_to_tiles.md`](guide_to_tiles.md) for how these tiles (particularly the jokers) are used in various rulesets.
3+
This document is a reference for all of the tiles currently supported in the tileset. See [`guide_to_tiles.md`](guide_to_tiles.md) for how these tiles (particularly the jokers) are used in various rulesets. These tiles are based off of @FluffyStuff's [riichi-mahjong-tiles](https://github.com/FluffyStuff/riichi-mahjong-tiles). The various jokers use the [Hanyi Senty Tang](https://sentyfont.com/sentytang.htm) font.
44

55
## Standard tiles
66

@@ -57,7 +57,7 @@ This document is a reference for all of the tiles currently supported in the til
5757
- `11p`, `12p`, `13p`, `14p`, `15p`, `16p`, `17p`, `18p`, `19p`, `110p`
5858
- `11s`, `12s`, `13s`, `14s`, `15s`, `16s`, `17s`, `18s`, `19s`, `110s`
5959
- `11t`, `12t`, `13t`, `14t`, `15t`, `16t`, `17t`, `18t`, `19t`, `110t`
60-
- (n/a), `11z`, `12z`, `13z`, `14z`, `15z`, `16z`, `17z`, `18z`, `100s`
60+
- `10z`, `11z`, `12z`, `13z`, `14z`, `15z`, `16z`, `17z`, `18z`, `100s`
6161

6262
## Aka/Ao/Kin/Transparent
6363

@@ -67,19 +67,24 @@ This document is a reference for all of the tiles currently supported in the til
6767
- `01p`, `02p`, `03p`, `04p`, `05m`, `06p`, `07p`, `08p`, `09p`, `010p`
6868
- `01s`, `02s`, `03s`, `04s`, `05m`, `06s`, `07s`, `08s`, `09s`, `010s`
6969
- `01t`, `02t`, `03t`, `04t`, `05t`, `06t`, `07t`, `08t`, `09t`, `010t`
70-
- `01z`, `02z`, `03z`, `04z`, `05z`, `06z`, `07z`, `00z`, `08z`, `000s`
70+
- `00z`, `01z`, `02z`, `03z`, `04z`, `05z`, `06z`, `07z`, `08z`, `000s`
7171
- `21m`, `22m`, `23m`, `24m`, `25m`, `26m`, `27m`, `28m`, `29m`, `210m`
7272
- `21p`, `22p`, `23p`, `24p`, `25p`, `26p`, `27p`, `28p`, `29p`, `210p`
7373
- `21s`, `22s`, `23s`, `24s`, `25s`, `26s`, `27s`, `28s`, `29s`, `210s`
7474
- `21t`, `22t`, `23t`, `24t`, `25t`, `26t`, `27t`, `28t`, `29t`, `210t`
75-
- `21z`, `22z`, `23z`, `24z`, `25z`, `26z`, `27z`, `20z`, `28z`, `200s`
75+
- `20z`, `21z`, `22z`, `23z`, `24z`, `25z`, `26z`, `27z`, `28z`, `200s`
7676
- `31m`, `32m`, `33m`, `34m`, `35m`, `36m`, `37m`, `38m`, `39m`, `310m`
7777
- `31p`, `32p`, `33p`, `34p`, `35p`, `36p`, `37p`, `38p`, `39p`, `310p`
7878
- `31s`, `32s`, `33s`, `34s`, `35s`, `36s`, `37s`, `38s`, `39s`, `310s`
7979
- `31t`, `32t`, `33t`, `34t`, `35t`, `36t`, `37t`, `38t`, `39t`, `310t`
80-
- `31z`, `32z`, `33z`, `34z`, `35z`, `36z`, `37z`, `30z`, `38z`, `300s`
80+
- `30z`, `31z`, `32z`, `33z`, `34z`, `35z`, `36z`, `37z`, `38z`, `300s`
8181
- `41m`, `42m`, `43m`, `44m`, `45m`, `46m`, `47m`, `48m`, `49m`, `410m`
8282
- `41p`, `42p`, `43p`, `44p`, `45p`, `46p`, `47p`, `48p`, `49p`, `410p`
8383
- `41s`, `42s`, `43s`, `44s`, `45s`, `46s`, `47s`, `48s`, `49s`, `410s`
8484
- `41t`, `42t`, `43t`, `44t`, `45t`, `46t`, `47t`, `48t`, `49t`, `410t`
85-
- `41z`, `42z`, `43z`, `44z`, `45z`, `46z`, `47z`, `40z`, `48z`, `400s`
85+
- `40z`, `41z`, `42z`, `43z`, `44z`, `45z`, `46z`, `47z`, `48z`, `400s`
86+
- `51m`, `52m`, `53m`, `54m`, `55m`, `56m`, `57m`, `58m`, `59m`, `510m`
87+
- `51p`, `52p`, `53p`, `54p`, `55p`, `56p`, `57p`, `58p`, `59p`, `510p`
88+
- `51s`, `52s`, `53s`, `54s`, `55s`, `56s`, `57s`, `58s`, `59s`, `510s`
89+
- `51t`, `52t`, `53t`, `54t`, `55t`, `56t`, `57t`, `58t`, `59t`, `510t`
90+
- `50z`, `51z`, `52z`, `53z`, `54z`, `55z`, `56z`, `57z`, `58z`, `500s`

priv/static/images/tiles.png

1.18 KB
Loading

0 commit comments

Comments
 (0)