Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.
C calculatorcalculator-gamescasiochesscrossy-roaddrive-madfx-cg50gamesgeometry-dashgraphing-calculatorndlessnumworksnumworks-appsnumworks-calculatornumworks-gamenumworks-gamestetristi-84-plus-ceti-nspire
Sokoban: every level checked against Microban, pictures and GIFs
Mason363b406a094b565
diff --git a/docs/media/gallery/sokoban.gif b/docs/media/gallery/sokoban.gifnew file mode 100644index 00000000..425afe4cBinary files /dev/null and b/docs/media/gallery/sokoban.gif differdiff --git a/docs/media/sokoban.gif b/docs/media/sokoban.gifnew file mode 100644index 00000000..8abee717Binary files /dev/null and b/docs/media/sokoban.gif differdiff --git a/docs/media/thumb_sokoban.png b/docs/media/thumb_sokoban.pngnew file mode 100644index 00000000..267ef49aBinary files /dev/null and b/docs/media/thumb_sokoban.png differdiff --git a/games/sokoban/Makefile b/games/sokoban/Makefileindex 4d2f3c4d..17d4fb84 100644--- a/games/sokoban/Makefile+++ b/games/sokoban/Makefile@@ -1,7 +1,7 @@# Sokoban — push every box onto a goal, with David W. Skinner's Microban.# make build output/sokoban.nwa# make check link the app like the calculator does (output/sokoban.bin)-# make test every level solved on a computer with its solution (tests/play.c, tests/solutions.txt)+# make test every level checked against Microban and played through on a computer (tests/play.c)# make media the pictures of the README and How to play## tools/levels.py packs levels/microban.txt into output/levels.inc (Python 3; zopfli if installed): all@@ -68,7 +68,7 @@ $(BUILD_DIR):clean:$(Q) rm -rf $(BUILD_DIR) build-# on a computer, with the sanitizers: every level solved, and pictures+# on a computer, with the sanitizers: every level as published, played through, and picturesHOST_FLAGS = -std=gnu11 -O1 -g -Wall -Wextra -Wno-unused-parameter -DPLATFORM_DEVICE=1 -DHOST -I$(BUILD_DIR) \$(shell $(NWLINK) eadk-cflags-simulator) -fsanitize=address,undefined -fno-sanitize-recover=undefinedhost: build/play@@ -78,7 +78,7 @@ build/play: $(SRC) $(LEVELS) tests/play.c $(HEADERS)../../launcher/src/xfont.c ../../launcher/src/inflate.c -lm -o $@@echo "HOST $@"test: build/play- build/play solve tests/solutions.txt+ build/play check levels/microban.txt tests/solutions.txt# the README's and How to play's pictures (tools/media.py)media: build/playpython3 tools/media.pydiff --git a/games/sokoban/README.md b/games/sokoban/README.mdindex 8a5edc5d..361d14dc 100644--- a/games/sokoban/README.md+++ b/games/sokoban/README.md@@ -2,14 +2,15 @@Push every box onto a goal. Hiroyuki Imabayashi's warehouse puzzle on the NumWorks calculator, with David W. Skinner's Microban: 155 levels, from the very first push to The Dungeon.-<img src="docs/shot.png" width="320" alt="Sokoban: the keeper next to a crate, two crates already on their goals, one goal left">+<img src="docs/shot.png" width="320" alt="Sokoban's first level: the keeper in his red cap between a crate on its goal and a crate still to push">-- **Microban's 155 levels**, small ones that each show an idea, the easy ones first. **Sokoban.nwa** has all 155; **inside NumPlay** there's room for the first 60. Both keep the same progress, so a level solved in one is solved in the other.+- **Microban's 155 levels**, small ones that each show an idea, the easy ones first. **Sokoban.nwa** has all 155; **inside NumPlay** there's room for the first 50. Both keep the same progress, so a level solved in one is solved in the other.- **The rules of the original:** the keeper pushes the boxes one at a time and can never pull them, so a box pushed into a corner stays there.-- **Undo** takes back your steps, one at a time, as far as you like; **Restart** puts the level back as it began.+- **Undo** takes back your steps one at a time, hundreds of them; **Restart** puts the level back as it began.- **Moves and pushes** are counted, and the fewest moves you solved each level in are kept.- **The levels**, ten to a row: the ones you solved are green. A level opens while fewer than three before it are still unsolved, so one that blocks you never stops you for good.-- Steps glide from cell to cell, the keeper looks where he goes, and a box turns green on its goal. Big levels shrink to fit the screen.+- **The levels as Microban has them**, wall for wall, down to the decorations of The Dungeon; big ones shrink to fit the screen.+- **The classic look**: brick walls, wooden crates that turn green on their goals, and the warehouse keeper in his red cap, who looks the way he walks. Steps glide from cell to cell.<img src="docs/levels.png" width="320" alt="The level list: the first sixteen levels solved in green, the next three open">@@ -26,8 +27,8 @@ Push every box onto a goal. Hiroyuki Imabayashi's warehouse puzzle on the NumWor**Sokoban** is Hiroyuki Imabayashi's game, first published by Thinking Rabbit in 1982. This version is written in C for NumPlay and drawn from shapes as it goes, with no code or art from any Sokoban.-The levels are **Microban** by **David W. Skinner** (2000), from [his Sokoban page](http://users.bentonrea.com/~sasquatch/sokoban/) as kept on [Scott Lindhurst's Sokoban levels page](http://www.sneezingtiger.com/sokoban/levels.html); they are his, used with credit to him. `levels/microban.txt` holds them as he wrote them. `tools/levels.py` keeps what the keeper can reach (the walls are put back around the floor), and `tools/solve.py` solves every one of them for the tests.+The levels are **Microban** by **David W. Skinner** (2000), from [his Sokoban page](http://users.bentonrea.com/~sasquatch/sokoban/) as kept on [Scott Lindhurst's Sokoban levels page](http://www.sneezingtiger.com/sokoban/levels.html); they are his, used with credit to him. `levels/microban.txt` holds them as he wrote them. `tools/levels.py` packs them for the game, which puts back the walls around the floor itself (only the others are stored), and `make test` checks every one against Microban as published, then plays through the 153 that `tools/solve.py` solves.It comes inside [NumPlay](https://github.com/Mason363/NumPlay), or on its own as `Sokoban.nwa` from the [latest release](https://github.com/Mason363/NumPlay/releases/latest).-Build: `make` (needs `arm-none-eabi-gcc`, Node.js for nwlink and Python 3). `make test` plays every level through on a computer with its solution, then undoes it all.+Build: `make` (needs `arm-none-eabi-gcc`, Node.js for nwlink and Python 3). `make test` checks every level against Microban and plays them through on a computer, then undoes it all.diff --git a/games/sokoban/docs/levels.png b/games/sokoban/docs/levels.pngnew file mode 100644index 00000000..afe409c9Binary files /dev/null and b/games/sokoban/docs/levels.png differdiff --git a/games/sokoban/tests/play.c b/games/sokoban/tests/play.cindex 8728df5a..5e1ebfde 100644--- a/games/sokoban/tests/play.c+++ b/games/sokoban/tests/play.c@@ -1,8 +1,10 @@/* Sokoban on a computer, for tests and pictures (make host, make test).*- * play solve FILE every level played through with its moves (tests/solutions.txt, from- * tools/solve.py): each step must go, each push push, the level must end- * solved; then every step is undone, back to the level as it started+ * play check LEVELS SOLUTIONS+ * every level as the game opens it, against Microban as published+ * (levels/microban.txt): the same walls, goals, boxes and keeper; then played+ * through with its moves, when tools/solve.py found them (tests/solutions.txt),+ * and undone back to the start* play shot L OUT [MOVES] a picture of level L (from 1) after these moves (u r d l), with the* keeper half way through the last one* play hub OUT [SOLVED] a picture of the level select, the first SOLVED levels solved@@ -47,48 +49,96 @@ static int way(char c) {return p ? (int)(p - "urdl") : -1;}-static int solve(const char *file) {- static char text[1 << 18];+static char *slurp(const char *file) {+ static char texts[2][1 << 18];+ static int k;+ char *text = texts[k++ & 1];FILE *f = fopen(file, "r");- size_t n = f ? fread(text, 1, sizeof text - 1, f) : 0;+ size_t n = f ? fread(text, 1, sizeof texts[0] - 1, f) : 0;if (f) fclose(f);text[n] = 0;- int done = 0, bad = 0;- for (char *line = strtok(text, "\n"); line; line = strtok(0, "\n")) {- int l, at;- if (line[0] == '#' || sscanf(line, "%d:%n", &l, &at) < 1) continue;- open_level(l - 1);- uint8_t start[sizeof g];- memcpy(start, g, sizeof g);- int boxes = 0, goals = 0, start_left = left, start_keeper = keeper, problem = 0;- for (int i = 0; i < rows * MAXW; i++) boxes += !!(G[i] & F_BOX), goals += !!(G[i] & F_GOAL);- if (boxes != goals || !boxes || !left || !(G[keeper] & F_FLOOR) || G[keeper] & F_BOX) problem = 1;- for (const char *p = line + at; *p && !problem; p++) {- int d = way(*p), m = moves, q = pushes;- if (d < 0) continue;- step(d);- anim = 0;- if (moves != m + 1 || pushes != q + (*p < 'a')) problem = 2;+ return text;+}++/* The level as the game opened it against Microban as published (its rows, the keeper on both): the+ same walls, goals, boxes and keeper, and floor only where Microban has no wall. */+static const char *differs(char pub[][40], int np) {+ int ky = -1, kx = 0;+ for (int y = 0; y < np; y++)+ for (int x = 0; pub[y][x]; x++)+ if (pub[y][x] == '@' || pub[y][x] == '+') ky = y, kx = x;+ if (ky < 0) return "no keeper in Microban";+ int dy = keeper / MAXW - ky, dx = keeper % MAXW - kx, boxes = 0, goals = 0;+ for (int i = 0; i < rows * MAXW; i++) { /* every cell of the game in Microban */+ int y = i / MAXW - dy, x = i % MAXW - dx, f = G[i];+ char c = y >= 0 && y < np && x >= 0 && x < (int)strlen(pub[y]) ? pub[y][x] : ' ';+ boxes += !!(f & F_BOX), goals += !!(f & F_GOAL);+ if (!!(f & F_WALL) != (c == '#')) return "a wall";+ if (c == '#' || !f) continue;+ if (!(f & F_FLOOR)) return "floor";+ if (!!(f & F_GOAL) != (c == '.' || c == '*' || c == '+') || !!(f & F_BOX) != (c == '$' || c == '*'))+ return "a box or a goal";+ }+ for (int y = 0; y < np; y++) /* and every wall, box and goal of Microban in the game */+ for (int x = 0; pub[y][x]; x++) {+ int gy = y + dy, gx = x + dx, f = gy >= 0 && gy < rows && gx >= 0 && gx < MAXW ? G[gy * MAXW + gx] : 0;+ if ((pub[y][x] == '#' && !(f & F_WALL)) || (strchr(".$*+", pub[y][x]) && !(f & F_FLOOR))) return "missing";}- if (!problem && left) problem = 3;- if (!problem && moves != nh) problem = 4;- while (!problem && nh) undo();- if (!problem && (memcmp(start, g, sizeof g) || left != start_left || keeper != start_keeper || moves || pushes))- problem = 5;- if (problem) {- printf("level %d: %s\n", l,- (const char *[]){"", "not a level", "a step didn't go", "not solved", "steps lost", "undo"}[problem]);- bad++;+ if (boxes != goals || !left || G[keeper] & F_BOX) return "boxes and goals";+ return 0;+}++/* plays a solution through: each step must go and each push push, the level must end solved; then+ every step is undone, back to the level as it began */+static const char *play(const char *m) {+ uint8_t start[sizeof g];+ memcpy(start, g, sizeof g);+ int start_left = left, start_keeper = keeper;+ for (const char *p = m; *p; p++) {+ int d = way(*p), n = moves, q = pushes;+ if (d < 0) continue;+ step(d);+ anim = 0;+ if (moves != n + 1 || pushes != q + (*p < 'a')) return "a step didn't go";+ }+ if (left) return "not solved";+ if (moves != nh) return "steps lost";+ while (nh) undo();+ if (memcmp(start, g, sizeof g) || left != start_left || keeper != start_keeper || moves || pushes) return "undo";+ return 0;+}++static int check(const char *levels_file, const char *solutions_file) {+ static char pub[MAXH + 8][40];+ static const char *solution[ALL_LEVELS + 1];+ char *sol = slurp(solutions_file), *text = slurp(levels_file);+ for (char *line = strtok(sol, "\n"); line; line = strtok(0, "\n")) {+ int l, at;+ if (sscanf(line, "%d:%n", &l, &at) >= 1 && l >= 1 && l <= ALL_LEVELS) solution[l] = line + at;+ }+ int level_n = 0, n = 0, bad = 0, solved = 0;+ for (char *line = text;; ) { /* the levels of microban.txt, an empty line after each */+ char *end = strchr(line, '\n');+ if (end) *end = 0;+ if (line[0] && line[0] != ';') {+ if (n < MAXH + 8) snprintf(pub[n++], sizeof pub[0], "%s", line);+ } else if (!line[0] && n) {+ open_level(level_n);+ const char *why = differs(pub, n);+ if (!why && solution[level_n + 1]) why = play(solution[level_n + 1]), solved += !why;+ if (why) printf("level %d: %s\n", level_n + 1, why), bad++;+ level_n++, n = 0;}- done++;+ if (!end) break;+ line = end + 1;}- printf("%d levels played, %d solved and undone%s\n", done, done - bad, done == LEVELS ? "" : ": some are missing");- return bad || done != LEVELS;+ printf("%d levels as Microban has them; %d played through with their solutions and undone\n", level_n - bad, solved);+ return bad || level_n != LEVELS;}int main(int argc, char **argv) {gfx_buf = strip;- if (argc >= 3 && !strcmp(argv[1], "solve")) return solve(argv[2]);+ if (argc >= 4 && !strcmp(argv[1], "check")) return check(argv[2], argv[3]);if (argc >= 4 && !strcmp(argv[1], "shot")) {open_level(atoi(argv[2]) - 1);const char *m = argc > 4 ? argv[4] : "";@@ -136,6 +186,6 @@ int main(int argc, char **argv) {picture(argv[2]);return 0;}- fprintf(stderr, "play solve FILE | shot L OUT [MOVES] | hub OUT [SOLVED]\n");+ fprintf(stderr, "play check LEVELS SOLUTIONS | shot L OUT [MOVES [PANEL]] | film L DIR MOVES | hub OUT [SOLVED]\n");return 2;}diff --git a/games/sokoban/tests/solutions.txt b/games/sokoban/tests/solutions.txtnew file mode 100644index 00000000..84c6287c--- /dev/null+++ b/games/sokoban/tests/solutions.txt@@ -0,0 +1,154 @@+# tools/solve.py: each level's moves (u r d l walk, U R D L push), for tests/play.c+1: dlUrrrdLullddrUluRuulDrddrruLdlUU+2: rddLruulDuullddR+3: ruuLLLulDrrrrddlUruLLLddllluurRDrdLuuurDD+4: ullDLurrrdLLulllddrrRurrddlUruL+5: LdRuluurrdLulldDrddlluRdrrrruLUddllURuLruulldDrddlluR+6: ulldllllulllddRluurDRllddrUluurrdRulllddrdrUlluurrrdRRRdrrruullDurrddlLLLullulDulldRRRllddrUluurrdRRRlllulldRRRRdrrrruullDurrddlLLruLLLLulldRRRRRdrrruullDurrddlL+7: rruulUruullDllddrRddrruLdllluurUdlddrU+8: llDDDDDDldddrruuLuuuuuuurrdLulDDDDDDlllddrrUddrruuLrddllulluurRllddrrdrruulUdrddlluUruUUUUUluRdddddddldlluurRdrUUUUUU+9: urrDulldRdRluurDrDDlUruLdlUruL+10: rddrruuLLrrddrruuuuurrdddLruuullddDLLddlluuRRddrrUUUUddddlluuRlddrruUUdddlllllluuRRRRRlddrruU+11: ulllddddrrrruLdllluuuurrrdDlDurrdLdLLLrrruulDrdLLruuruullldddllddrUluRdRRRurrdLLLLUllddrUrrruuruullldD+12: uululldRdRluurDrDDrddlluRuuulldRurDDrrrddllUdlluR+13: rDlDDRddlUUrdrruLdlluUUruLddddrruLdlUUUlUdrrDlddrruLdlUUruLruL+14: uullllddrdrUlluurrrrddLLLrrruullDurrddlLdllURRuullD+15: DrdddllUUddrruuLuLLLdlluRRRRDrrddllUU+16: lddrUdrruLLdlUUUruLLLrrdddrUluullulDDDldRuuurrrrDrDullddrUddrruLdlUruLdlUUdrruLuLLLulDDDlddrrULdlUruuurrrrddlUruLLLulDDDDldR+17: dlDurrDulldRddlUUrddrruLUddlUU+18: ruuuulllddrRDrUdddlUruuUdllluuurrrrdLddddlUruuuLulldddrRdrUUdllluuurrdLurrrdL+19: urrDDDlddrUUUUruLLLdRllluRdrrurDllluRdrrDDlddrUUUU+20: urDRlDDlddrUUrrruuLLLLrrrrddlllUdrrruullulldRRRlulllldRRRR+21: dlllUdrUlluurDRddlU+22: drrruulDLdlUrrrdLullddrUluUUluRRdldddrruLdlUUUruLdddrruruuL+23: dlUrruulluRdrddllUdrruululldRddrruuruLLrdddlluuRurDllluRdrrD+24: ullDDDrdLuuuurrdLulDDldRdrruLLullddRRuulD+25: urrdLulluurDldRlddrUrruuLLulD+26: rdddlUrdddlUUlldRurruuulldRDrdLrddlUruuluurDD+27: dlULddlluuuurrrDulllddddrruuLrdrruLuullldDrRllDurrdrUU+28: rDulldRddrruLdlUUluurrdDldRuuulDD+29: ullldRurrdrrddllllllluuRurrdRullldRurrdRullldRurrdRlulldRRlllllddrrrrrrruUUUddddllllllluurrrrrRllllllddrrrrrrruUUruuLDDuuulldRurDrddlDuruulD+30: uluurDlddrdrUruuLLulD+31: RlDururDDrddlluUluR+32: ullDullddrUrurrdLLLddrUluRurrdLululD+33: ulLLdlUrrrrddlLrruullDllddrUluurrrrddlLLruulldDrruL+34: drrrURdlllluurrurDrddllUdlluurRdRdllluRururD+35: lluluuRDrDullddrUruLdddrruLdlUruLuuluurDrDDDuuuluurDDDDlUUruLddddddrruLdlUUUrDulUruLdddddrruLdlUUUruL+36: dllllllluLrdrruLdllllluurDldRRRuLdlluurDldRurrdRlulldRurRdRRuLLLLdRllluurDldRurrdRullldRurrrrdRRuLLLLLLrrrrrrRRdrruLdlLullllldRullldRurrrrrrdrruLLLLLLLLrrrrdRullldRurrdRullldRulllldRRllllluurDldRRRuLdlluurDrrrrdLLurrrrdLurrrdLulldLurrrdLulldLurrrdLLurrrrrrdLLLLL+37: drruulLuLLdRRRlullulldRldRRRRllluurDrrdddrruUUUddddlluuRlddrruUUdllullldRRRRlddrruU+38: llluuurrrdDuurrrrddllLrrrddlllULURRldlL+39: ruuLLLuullddRluurrdDrrrddlUruLLLuullddRRRRurDlllDDllddrrUUUUlluurrDullddrRRRdRUddrruL+40: UdlluRuurrdLDurDuullDD+41: urrrDullDRurrdddlllUluurrdRurDulllldRRRllddrrURdllluuurrDurD+42: rdddLdllluurrRddlUruUruulDDDLddlluuRlddrrrUrUUlDuuurDlddLddlluuRlddrruRdllluurRR+43: dddllLDLdlluRdrdrUlluuRRRRdrUUdlllllddrUluRRRRurDllllddrUluRRRuuurD+44: R+45: luluuurrrdLulldddrdrruLUUruLddddlluRdrUUULrddlluU+46: dlluuRuRDrUdlllddrrUdlluururrdLddlluuluururrrDD+47: rrruuulldRRddlllluuRRRurDDullllddrrrRuuurrdLulDllllddrrrrRRdrruLLLLLLdlluuurrrrDulllldddrrurRlldlluRR+48: rddDLruuullddlddrUrrurDrddllUdrruulLddrUluuuulldlddrUluurrrdddLrdrruLLuuulllddrDuluurDurrdddL+49: ldddRluuurrrddlDDDldRuuulluRluurDDuurrddLddddRluuuuruulldlddRluurDrDDDlddrruLrdrruLdlluuuuulldRurDDD+50: llulDDulldRRurrrrrdddlllllUUluRRldddrrrrruuulldlLrrurrdddllllluUruRdllluRdrruRdllluRdrruRldlluRR+51: rddllulURuLrdddrruuLrddlluluurDllluurDldRR+52: ddLruulDllddrdRdrUUdlluRlluurDldR+53: rUruuLullDRllddRUUdddrruLdlUrrruuLrddlUUddllluurRllddrU+54: drURuRRRdrUUdllllddrUluRRRdrUllllulDrddlluRdrUluRRRRlldlllluRRdrrurrRllldlluRRRRdrrUUdLruruulDulldRDDuuurrdLrdLdlLLLdlluRRRR+55: rdrrrddlUrdddlUUruuLLLulldRRRRurDDDldRRlulUruLLLulldRRRRurDDDldR+56: uulLulldRurDrddllURuulD+57: dddrdrruLLdLUlldRRRulUUruulDDDDldRurrrddlUruLLLdRurDlllluRRR+58: luluurDRDulldRddrruruuLLLrrrddlLUdrruulLdddlU+59: dlllllldddlUruurrrrruullllllllddddRRlluuuurrrrrrrrddllllldRurrrruullllllllddddrrdrUllluuuurrrrrrrrddllllllDurrrrrruullllllllddddrRuurrdRullldRlddrUUdllluuuurrrrrrrrddllldLurrrdLLurrruullllllllddddrruuRRllddrUdllluuuurrrrrrrrddldllLuRRRRuullllllllddddrruuRlddlluuuurrrrrrrrrdDDDrddlluRuuuuulllllllllddddrruurRllddrUruRRRRldllllluRdrrurrrurDlldlllluRRRdllldllluuuurrrrrrrrrddrddlUUddddrUUluuluullllllllddddrruurrrrRdlllldllluuuurrrrrrrrrDDDDrdLuuurDDuuluulllllllllddddrruurrrrrRurDDD+60: urrrrrrdddLLulldRRRllDDrddlUUUddLLdlluRRRllUUluuruurrrrrrddDllulldRddrddlUUdllluuluurDDuuuurrrrrrdddDuuuullllllddddDuuuuurrrrrrddddDuulLulldRRRllDDrddlUlldlluRuuuuuurrrrrrddDDuuuullllllddddddRluuuuuurrrrrrdddllldDrddlUUUddLLdlluRuuuuuurrrrrrdddllulldRRRlldddlLdlluRuuuuuurrrrrrddDuuullllllddddddRRlluuuuuurrrrrrdddlllddrddlUUUddllluuuuuurrrrrrdddllulldRRR+61: lDDlDDrrULdlUruuuruullllldddddrRRdrUUUddlluRdrUdrruLdllllluuuuurrrrrddLLrruullllldddddrrurRUddrruLdllllluuuuurrrrrddLruullllldddddrrrrUU+62: LLLLullDRRldLLrurrRlldllLrruulDLddlluRluRRRRRllllddrUluRRurrddlLullddrUrrruRullldRdllluRdrruRdllluRR+63: llllLLulLLLLLLulldRurDrrrrrrrddlUruLLLLLLLulldRRRddlUruRRRRRurDllllllLulldRRRRRRRRdRUdRRRRRdrruLLLLLL+64: ldlluulUluurrrddLLrruullDurrdLddddrrurrdLLLdlUUUUruulDDuulldRurrddlDDDuuuruulDDDDulUruulldRlldRuurrDDDuulldRurD+65: uuuuLrddddlluuRUrDuuulDulldRurrdddDullddrdrruLuuuuulldRurDDDllddRdrruLLLullddrUruLLrrurrDullddrdrruLLLullddrUluRluRRRUrDuuulldRdrdDulllddrrdrruLuuuluurDlddrddLLrruullldlddrUrrruuluurDDDullllddrrrdrruLLLLdlU+66: DDrrdrddddldLruruuuulullDDrddlUUdddDrddlluRurruruuuululllldlddddrdRluluuuururrDDrddlUUUddddDDlddrruLdlU+67: uurrdDuullddRluurrdrddLruulullddrRdrrddllUlURuuullddR+68: rUdlluuurrrRdrruLLLLLulDDlddrrruUddllluururRRRdrruLdlLullldlddrrruUruLrRdllddllluurDuuRRdrruLLLulDDurrrrdrruLLLLLulD+69: urrrurrrDrrddllUUddrUruLULLLulDrdLLrurrrrddlUruLLLulDrdLrddllluluurDlddrrrruuurruurDDlddrruLdlUruLLLdddlllUUUdddrrruulLrruulDrdddllluluurDrRlluluurDDldRDldRR+70: rdrrrddlUruLLLdRulullddRDDldRurDuluuluurrdrdLurrrdLLululldRDDDldRuuuuRRdrruLLLulDDDDDuuuurrdLulDDD+71: urDDuulllddddddrrrrrrrrrruuuuulllddllldlluRRRRdrUUdlllluuulllddddddrrrrrrrrrruuuuullulldRRlddlllluuullldRRurDDullldddddrrrrrrrrrruuuuuLLulldRddllldlluRRRRdrruLuuRRllddLLLdlluRRRRdrUU+72: llLDlluRdrDDrrddlULLdlluurDldRurDuruuuluRddddrruLdlUUUluurDDDDrdLLdlluurDrruuuuRRdrruLLLLdlluRdrdddllDurruuuluurDDDDrdLLdllddrUluRluurD+73: uulllluurDDrruLrdrruLLdllDurrrddddlllluuRuuluurDDrruLdlluurDldRRurrdddddlllluurUdlddrrrruuuuulldRurDDDDuuuulllldRddlddrrrdrruLLruuuulLulDDurrrddddlLLdlUU+74: lulDDDRRlluurrDRRRurrddlUruLdllllullddrddrruUddlluuRuRRRRurDllllldlddrruUluRRRRlluRRdllldlllldRurrrddllUluRRlddrruUluRRRurD+75: ddlluLuLLdRRdrrruulLrrddlULuLLrrddlUllUUluRRlddrdrruLrdrruLdlllluuurRlldddrruLdlUUlldRuuRRldldRdrruLdlUUluRddrrdrruLLLdlUU+76: rddrddrrrrUUlDuuuurrdLulDDDrUluurrdLulDrddddLLLdlUUluuuuurrddddLdlUrddrrrruulDuruulDDrddLLLdlUUluUUUluRurrdddddLdlUrddrrrruulDrdLLLdlUUluUluuururrdddddLruuuuullddlddrUluururrdddddldlUluuuurRllddrUluRurrDDDuuulldRurDDullddlddrUUUluRRurD+77: ddddrruLdlUUUddrrrrruLrdrruLdlllllluururrrrrDDrdLLLuRdlLLdlluuururrrrrdDrdLuuullllldlluRRRRRllldldddrruuRdrRurrdLLLruruuLLLLLdldddrruurRRlllddlluuururrrrrdDuullllldlluRRRRRllldldddrruurrrrrdLulllldLdlUrrurrdLLurrrrdLLullddlluUUluRRRRlldldddrruLdlUrrurrdLLdlluUUluRRRldldddrruLdlUUUluRR+78: uUrRuullDRurrrdDDuuulllddrRlluurDldRuurrdDuulldllldRddrrrRRRlllllluuuurrrrddDuuulldlldddrrrRRluuuulldRurDDDuulllldddrrrdrruLuuulldRullldRurrrDullldRllddrrdrruLdlluluuurrrrdDuulldllddrdrruRdllluRlluurrRurDD+79: lLLdlluRRluurDDRRRllluurrDullddrRdrrULLLrrrruulDrdLL+80: lddrUdrruLUddlluRdrruulUUUdllluUddrrrddrddlUUUUllluuluurDrrdRRRurDlllDDllluUddrrruurrrDulllddDDrddlUUUUUddddlluRdrUUUllluuluurDrrdRRRdrUdlddrUluullDDllluUddrrrDDrddlUUUUUdllluuluurDrrdRddllluUluRdddrrruuRR+81: luuurrdLDldddrruLUddlUUrUUddlluRUrruullDDDDrddlUUrUdlluR+82: drrruUlUdrruLuLLulldRDDlddrrrruuuulLulDrrrddlUruLLrrddddlllU+83: urruuuuLullDDDDDrrruulUrdddllluuuRRlluurDlddddrddlUUUUUdddrrruuluLuurDrDDDuuulldRurDDuulullldRRurDldRullDDDDrddlUUrrdrruLdllulUUUrrdrDDrdLuuuluuullldRRdrdrdddLruuululuurDrDDDDuuuulldRdrddrdLuuuluurDDullldddrRRUUddlllddrUluRluuurrdrdddLruuuluurDDDDLdRuuuullldddRldR+84: dRluuRDrDDuulldRurruLuullllddddddrrrRlllluuuuuurrrrdddlluRdrrdLddlllluuuuuurrrrdDDDulldRuuruullllddddddrrrrRRdrruLLLLLLLdlUUUUUluurrrrrddrddLDuulldRurDuuuulllllddrddddrrrRRRdrruLLLLLLdlluuuuuluurrrrrddddDuuuuulllllddrUluRRRlldddddddrruLdlUUUUUUluRRlddddddrrrRRRdrruLLLLLLLdlUUUUUUluR+85: luuuurrurrdRullldlluRdrRurrdLurrrdLulldLurrrdLulldLLuRllDurrRRRdrruulDllldlllDDDldRRRRlddrruUlllluuuuurrrrrdLurrrdLulldLurrrdLulldLLulDDDDldRRRlluuuuurrrrrdLLLulldddddrruurrDDLruulldDlluuuuurrdLulDDDDldRddrrrrUUUruLddddlllluuRRDullddrR+86: uRlddrrrUrruullDLDururrddlLdLLdlluuruRuRldldlddrrurrurruululDDulldldDldRuuurRDuurrrddlLdLLrrurruullldDrdLuuurDurrddlLullldDuurrrddlLrruulDrdL+87: luRluurDllluRUUluRRdldddrruLdlUUdrdddrUdrruLLdlUluurrDullddrdrruLuLrddlUruulluUruRRdlllluRRRdrrruulDrdLLLuRdrruulDrdLLullldddrrddllUUUdddrUluuUluRRRRdrruulDrdLullllddddrruLdlUUUluRRRRRurD+88: rrruulDuruulDuruulDrddlDuruulDrddddLLdlluRRRRuuuuuuurrdddddddLdlUrruuuuuuulldddddlDuruulDDuuuuurrrdddddddllUUUUUdddddLLdlluRRRRuuuuuluurrrdddddddLdlUrruuuuuuullldddddDuuuuuurrrdddddddllUUUdddLLdlluRRRuuuuuuurrrdddddddldlUUluuuurUdlddrUUddlddrUluuuuuRRlldddddrUluuuurrurDDDDDDuuuuulllddrUdlddrUUluuRRurDDDDuuulllddrUluRRurDD+89: urrddLruulldDDDDlluuuuRlddddrrrdLuuuurruullDDDuullddddrrrUdllluuuurrddDrdLuuuulllulldRRRRlddddRRuuurruullDllddddrrurUdlddrUUdllluuuurrDDDrdLuuuuurrddLruulldDDDrUluuurrddLddddlUruuuruulldlldddddRluuuuurrurrddldddlLdlUUdrrruulDrdLLdlUrrrdLLuruururuulldDDDrdLL+90: lDurrrrdLdDldllluRdrruruuulldRllDDldRuuuurrrrdLddrdLuuuulldRurDlllddRRRdrruLLLLLuurrrDulllddrrRdrruLLuullldddlluRR+91: ulllddrrUdlluurRdrrrdrrruulDrdLLruLLLuLLdRldlluuRRdrRllulldRRRluR+92: uuullllLLrrddllULURRRRRRllllldlLdlluRRRurrrddllUluRddrruurrrRuurrddLrddlluUllllddlluuRRRRRllllllUluurDDDrdLLdlluRRRurrrddllUluRddrruurrrRddrruuuullDDDDrruuLrddlluUllllddlluuRRRRRRddrddlUruruuLrddldlU+93: lUlluurDurDDrdrDlLddlluuRRddlUruRurUrruullDDrruLdlllulldRRRddlUddlluRdrUrRRDrddlluUruLLrdddrUruruLddlluuluuRRuulDrdLurrrdLulldDDRDrddlluUruLuuurrdLulDDDrdrddlluUUUddddrUruLdlUUrdrruLL+94: rdRRurDDulllulldRDuRRRurrdLdDrddlUlulldlluRuurrRurrdLdDrddlUruLuuLLLrrrddLruulllulldRRRRurDDDrddlUruL+95: rrrDLrrrddLUdddllURllluuRD+96: RRdrruLLLrrdddLLdlluRuuUdddRluuuLLulldRRRRUdRRlluUruLdddrrdrruLLLrrdddLLdlluRRRlluuUUUruulDDDuuulldRurrddldDuuruulDD+97: urrRlllddrRlluurrrRdddddllluUluuurrruurDrRRRRRllllllldllldddrddrruruuuUlllldddrruRldlddrruruUUdlldlluuurrruRRRRRRlllllldllldddrrurruUluRRRRRlldLulldllldddrrurruUluRRRRldllllllddRRRldlddrruruUUUluRRR+98: dlllluuuullLLLuLulldRDRRlluurDrdRRRRurDDDDuuulllllulldRRRRRRurDDullllllDDrddlUUUddlluRdrUlUUluurrdrdrrrrrdDlddRRRllluurDuuulllllulullddrRlluRdrRlluurDrdRRRRurDDDlddRdrruRdllluRRllluurDuuulllllulldRRllddrUluurrdRRRRurDDDlddRRdrrUdlluRllluurDuuulllllulldRRRRRRurDDDlddRUUUUdddddrruLdlUUUUdddrrdrrULLrrruulDrdLdlluuRlddrruruulDlldLdlUUUddrrdrrULrruulDldLLdlUUdrrurrrdLLLLdlU+99: rrdrrrrrddrrrrrrrrrruulDrdLLLLLLLLLdlUUUruulDrdLLrddrrrrrruRRdrruulDrdLLLLLLLLLdlUUdrrrrURRRRdrruulDrdLLLLLulldllluUlLLLLulllddrrUrrrrrrruulDrdLddrrrurrdLLLLdlUUdrrrurUUluRRdrruruulldDrdLLulDDDldllluULLLLLuLLullddrdrrUruLullDurrdLrrdrrrrrruulDrdLddrrrurrdLLLLdlUUULLLLLuulllldddrrrUrrrrrrruulDrdLLLLLLuulldRurDulllldddrrrUdllluuurrdRdRRRRRRlllllluurDldRRRRRlllluulllldRRRurDldRRRRlllldllUluRRRurDldRRR+100: lddrDuluurDrrrDldddrruuLrddlluUrrdLuuullllddrUdlddrUUluuRRRurDDDlUrdrddllUUrrdLuuuLLLulDDDrUluRRRurDDDlUrdrddllUUruuLLrrddrdLuuullLulDDurrrrddlUrdddlUUruuLLLulDrrrrddlUruLLL+101: ruulllldDllddrrUrrUUdrruuuulLuullddRddRRlddrrrruUrruullDllDDullddddrRddrruuLuuL+102: rurrurrrddddLruulDuruulDLrrddlUruulldLurrrdddddlUUruuulldlLdllluurrDrdLLdlUrrurrurrrdddddllluRdrruuuuLLrrddlUruulldLLdlllluurrrDrrurrrdddddlUruuuulldlldLLrurrurrrddddlUruuLLLLddlllluuurrrDrddlluLdlUrrdrruurrrrddlUruLulldldLuulllDurrrdrrurrdLLLdlUddlluUluRdddlUrdrruLdlUlUdrU+103: dlldLUUllddRdrruurruulullDurrdrddlllDurrruululldRDLddrUrruuLLulDrrrddllUUlDrddllluuRRurDlllddrrURuL+104: ulLDDuuLLDlluRRRRurrdLulDrrddllDurruullDurrdddllllUUluRdddrrruruulldDrdLrddlUruuluuLLdlluRRRRddrddlUruruuulldlldddRRlluuurrdDrruuLulDDurrddlDLddrUluUrruullDD+105: rddRdrruLLLuurDllldRuuuulLulldRRRddlUrrruLrRurrdLLDlddrUUddlldlLdlluRRUruulDD+106: ddrdRulluuurrrrrdLLLulldddrrrrUruulldlLurrrrdLullllDurrrrdLLrrddllllldRurrrrDrrddllUUUlldRurUruLddlllldRurrruuulllldDuurrdLulDurrrrdddllldRurruuLLrrddlldllluRdrrurruuulllldDuurrrrdddDrrddllUUUlldRurUruLddldRddrruuLrddlluUllllURRdrrUUruulDDuulllldDuurrdLurrrdLLullDurrrrddDLdlluRdllluRRdrrRuuuulllldDuurrdLulDrrrrdddllllluRdrrrruuullllDurrrrdddddrruuLrddlluU+107: uuuuullDDuurrdddddlllURdrruuuuullddDulDuruulllddRRdrUllluurD+108: rrrrdrrrrrUruuLullDurrdrddldllluRdrruruululldDDuuurrdrddlLrruulDrdLdlLLrrruuuullddDldLLLLrrrruruuurrdddLdLLrruruuullddDrruuLulDrrddllldLLulllllddrrUruLrrrdLLrrrrurrdLLLrurrruullDDldlLLullLruulldlddrdrrUdlluUddrruUrrdLrrrrurrdLLLLulllllddrrUruLrrrdLullddlluuUdddrruuLrddlluluurDuluurDrrDulllddrrRllUdrrddllUUrrRldRRRRRurrdLLLLLLulllddrrUruLrdrruLdlldlluuluuRlddrUdddrruuLrdrruLLddlluluurDuluurDlddrRRdrruLLLLUluurDldDrrruuLLulD+109: ldddrdrdrrdddlluUlURdddrruuuuuuuuuullddlldddrDululldRuruuuurrrrddddddddddlluuuRldddrruuUlluluLulldRdRdRRlluluurDrDrddddrruuuUUdddddlluuuululuuuuurrrrddLLuulldddddrdrddddrruuuuuUUUddddddddlluuuRlululuuuuurrddrrddddDDullululldRdRRlluurDrdRlulldRuuluuuuurrddrrddddDuuuuulluullddRluurrrrDDDDDuuuuullllddrRRluurrdDDDuulllldddrddRR+110: uuuulluurDldddlluRdrrrddlUruLruurrdLulDDlddrUluLUlldRurURuulD+111: DuluurDRllddrUdRUrrdddllUUddrruuLuUUUUruLdddddLDlluRRdrrddllUUrUUUUruLdddddlluRdrUUUUddddlddlUUluRdrruuuuruulLrrddlUdddddlluRdrUUUddllluurDldRdrruuuruulLuLLrrdrrddlUddddlluuRlddrruUUdddlUruuruuuLLdRlLLuRullldRldRuurrddrrurDllluullddRluurrdRdrruLdDDrUUddlDLddrUUUddllluRdrruuruullLuLrdrrrddlUdddlluRdrUUruuLuLLdRululllddrRlluurrrdrdRullulllddrrRurrdDDDlddrUUUUULululllddrrRuulDulldRRRdRlulldRR+112: rrruuuuruuLLLDllluururrDulldRllddrrURdlddrUluurRRurDDDrdLuuullllddrUluRRRurDDDlDDDuuuruullldllluururrDulDDullddrRuurRdrruLLLulldRdRRlluurDrrrdddldddDrddlUruLuuuurrdLuuuulldRullldRlddrUluurrrrDDDlDDDuuuruuullllddrURlluurDrrrdddldddDLrrddlUruLuuuurrdLuuuulldRullldRurrrDDDlDDDuuuruuullldRurrdddldddDrdLLLdlUrrruuuuurrdLuuuulldRurDDDlDDDDrdLuuuuurrdLulDDDDrddlUUUUUddddLLdlluRRRRdrUllllluurrDRlulldRRlddrU+113: rRRdrdRDrUdllddrUluurrdLululuurDrDullddrUruLLLLdlUUUdrdrrrddDrddlUrururuLLullddrUruLLLLrrrrdrddlUruLdlUruLrddddlUUruululDlldlUUrdrrrrddlUruLLLLulllluurururrddLDuruulldldlddrrdRRuLLrrdRRurDrddllUdrruulLLLdlUrrrddrUlulllluLrdrrrrdrruLLLLuLDuuuruulldldRlldlddrUrRllluurDldR+114: dddLdllUdrruuruuruLdddrrdLurrrdLullllddlluUUURRllluurrrDrDDuululllddrddddrruuRlddlluuuurRllddddrruurRllddlluuuuluurDldRRlddddrruLdlUrrurrdLLurrRRdLLullddlluUUUluurrrdrDDuululllddrddddrruuRlddlluuuurRllddddrruurRllddlluuuuluurDldRRlddddrruLdlUrrurrRllldllUUddrrurrdLLdlluRluuUluurrrdrDDuululllddrrRuullDldRRluurrdrDulullddrRlldddrRuRRdLLdlluuuurrurrdLDuulullddddddrruuRuuulullddrRlldddRdrUlluuurrurDD+115: drrUUddlluRdrUdllllUUdRulUluRRRdrRRuullDlllddrdRluluurrrurrddlLulllddrdrdrruUddlluRdrUllluluurrrurrddRulullddRluurrdrdddLLrruuulullddrRllulllddrdrdrruUddlluRdrUllluluurrrurrddLruulldlllddrdrrrUdllluluurrrurrdrDurrdLLululldlllddrdrrrrrU+116: drrrdrruUruulldRlllDurrrdddlluURlddrruUllluRdlLdRurrrddllUlllluRRdrUdrU+117: lllllddrrrdrddlUdlluRUddrruuLuLLLrrrdrdLuullluurrrrrrddddLLdlUrrruuuulllllldddlUdlddrRRuRUdldllluuurruurrrrrrddddlluLuLLLdllddrrrurUruLLrddldllluurrUrrrdrddlUruLdllddrUlllluuuRdlddrrrrrurrruuuulllllllDDldddrrrrruuullLdLUlDurrrrrdrdrruuuulllllllDurrrrrrrddddllululllUddlluRdrUrrrdddlllllUdrrrrruuulllluuRlddrrrrdddlluRUruLLLrrdddrUruLulllUluurDldDrrrrdrdrruuuullllLrrrrrddddllululllllDRurrrrdddlllllUdrrrurruulllluuRlddrrrrddlUruLLLUluurDldDrrrrdrdrruuuullllLLulD+118: rrruuuulululldRdDDDuuuulldRurDDDuuRluurDrDrddlUrdddlldlluRRRRdrUUruLdlUddlllUUUUluurDDDDDuuuurrDLulDDDuurrrDrdddllldlluRRRRuruululllddDuuurrrdrddlUlUdrdddrUUdllldlluRRRlluuuuurrDrDDlUruLulldddddrrRUdllluuuuurrdrdrDulululldddddrrruUrrdLulluuulldddddrrrdrUUdlllluuuuurrdLulDDDDuuurrddrDrddlUruruLddllldlluRRR+119: drddrruruuuulullldDlddrrruuLDDDulluRdrruulDDulluRuurrrdrddddldlLUdrruruuuulullldddrruLrddLddrruruuuulullldDlddRluurrdDlluRuuurrrdrddddldllLrrruruuuululllddddrDuruulDuluurrrdrddddldldlluRdllluRdrruuUruulDDD+120: lluuRRRRRRurDDDuulllllllddrUluRRRRRRurDDrddLLLrrruulullllllddddldRlddrUUUUUluurrrrrrrdrddllldlldLrurrurrruululllllllddrddlddrUrrurruulDrrrruulDuulllllllddrUluRRRRRRurDDrddLLLrrruululllllldddDlddrUUUUdddrruRldlluuuluurrrrrrrdrddlllulDrrrruulDuulllllllddrUluRRRRRRurDDrddLLLrrruulDrdLL+121: lluuUruUlldRddddrrrRlllluuuuurrruulllDurrrddllUlDDDrUUddlDDldRRRRdrrULrdrruLdlluLLLrrrdrruLrruullDurrdddllllulldlUUUUruulldRddddrrrdrrULrrruullDurrdddllluLLLrrrdrruLdllulldlUUUUUluRdddddrrrdrruLLLLdlUUUU+122: lluuuuurrDulldddRDDDDldRRRRRRullllluuuuluuurrdrrdddlULrruullDurDulullddRDDDDDldRRRRRulllluuuuuluurrdrrdddlULrruullDurDllDDDDuuuurrrddlUruLdLruulDlDurrdLulldddrdDldRRRurrrrrddlUruLLLdRlLLulldRRRRuLLrrrrrddlUruLLLdRurrddlUruLdlllllluuuluuRDDDuuuurrdLullddrddDldRRluuuuluurDlddrdddrRRRRRurDllluRRdlllluRdllluRdrruRdllluRlluuluurDDDDrrdrruLrdrruLdllllulldRRRRRRurDllluRdllluRdrruRdllluRR+123: ddlDDuuruulDuruulDulldRullldRurrdRullldRRurrDDDuuLrddlUrdrdddlluURurDDullddrRlddlUUrrRRRuurrddLdlUUUUluRddddllluullDDuuruulDuruulDulldRRurDDDlUrdrdddlluUUdRurDDullddrRRRlluuuluuulldRurDDDldRurDullUruulldRurDDDldddrddlUUUUUUruulldRurDldddddrrrrRuurrddLdlUllllluuurrdDuulldRlddrRRRlllluuuuurDDrDulldddrrrrRUUruLdlUrrrdddLdlUllllluuurrdDuulldRlddrRRRlllluuurrDllddrrrrRUUrrddLdlUrruullluRdrrddllUdrruulLddllllluurrDullddrRRRRuurrddLdlUrruulluuRDrdddllUUddrruuuruL+124: urrDDuulldRurDulllldRdddddrrrrrrrrrruuuuulllddllldlluRRRRlllUdrrrdrruLuurrrdddddlllllllllluuuuuurrdLurrrdLddrrRdrUUdlllluuulldRurDDuulllldRRldddddrrrrrrrrrruuuuuulllldRddllldlluRuuulldldddddrrrrrrrrrruuuuuullldRurrddddddlllllllllluuuuuurrrdddRRRdrUUdlllluuulldRurDDullldddddrrrrrrrrrruuuuuulldRullldRRlddllldlluRRRRdrUU+125: ululDDDuurrddLrrddllULLLLLullddrUrrrrrrdrruuluulldDuurrddLdLLLLLLdlluurDrrrrrrruruulldDrdLLLLLLLulDrrrrruRdrruruulldDrdLLLLLuLD+126: ddlluUddlluURuRlLrrRlldlddrruUddrruuLuLrdrruLdddlllluuuLLDRlDllddrrUUUrurDrRddllUdrruuuRldddrruuLulLrrdrddlluUluLrdrddlluUlldlluRRRRddrruuruLdddlluuRlddrruUrrruL+127: uRRRdrruLuulluurDrdddLLLuluuRRdRlullddldRRRRlluluurrurDrDullllddrdrrdrruLLLLuluurrrrdDuurrdLulllllddDrrrdrruLuUddLLLuluurrdRulllddldRRllddrUruRRdrUlllulldRRRR+128: rrurruulllulldRRRRlllldlluRRurrddLDuruulldldRuurrdLLrrrrurrdLddlldlLuUrurRllulldRRdldddlluRdrU+129: rdRRurDlllulldRRRRlllldlluRRurrddLDuruulldldRuurrdLLrrrrddldlLuUrurrurrddLruulldllulldRdddrrurUdldlluuuRdldddlluRdrU+130: lulluurrDRRRRdrUlllllulldRRRRRRRdrruulDlllllDLddrUUlulldRurRRlddlUrurRRRlllldlluRRRRRdddrrruuLLrruulDrdddllluluurRllddrdrrruuLUllDRurrdddlllUluR+131: ddldRDRddlUUUUUUddRlddrUrrdLullddrUluuuuluRdddddrruLdlUUUUluurrDullddrdddrrruulDrdLdlluuuuluurrdLulDrdddddrruuLrddlUlUUUdddrruLdlU+132: DrrDDllUdrrrruLrdrruLLdllllddrrUdlluurRlluluurDrrDDllUdrruulLulDrrrddRRurrdLulLdllluurrDrdRullullddrRRlllddrrUdlluuuurrdrdLLrddlluUUdrruulLrrdrrrrddlUruLdLLLLrrrruLdlluulldDrrrruLdllluurrDrdLddllUUUdddrruuLrddlluU+133: uurrrrrdddLLulLrrddllUdrrurruLdldlluLUUddrdrrururuullulllldRRldddrdrruLuLrddlUlUUddrruLrdrruLLdllUlldRRRdrruulLddrUluRdllluRdrrrruruullulldRullldRurrdRullldRlDDldRRdrruLuLrddlUlUUUluRRdldddrruLdlUUUruRldlddrrdrruLLdlluuuluRddddrruLdlUU+134: rurrdLLuuuuruRldddddlLdlUUUddrrrrrruUUUruulDDDDDrdLLLuuuluurRllddrdddrruuuuruulDDDDuuullldllLulldRRRRddddlluuUdddrrurrdLLLdlUUUddrrrrrrUUUUruulDDDDDrdLLLrruuuuulllDDldRuullLulldRRRRdrddrdrruuuuulllDldRddldlluuUdddrrurrdLLLdlUUUddrruuuulLulldRRRRdrddrdrruuuuulllDDldddlluuUdddrruuuulLulldRRRRdrDlddrruLdlUrrdrruuuuulllDDulllddddrruUddlluuuurrrdDlddrruLdlU+135: ullDurrddlddRRuuluulllldddrRlluuurrrrddrddllUllluuurrdDuulldddrRuRRRddllUdrruuRRurDDulllddlluluRRRRRdrUlllluulllldRurDDullddrRurrrddllUdrruurrddLLuuluullddRRRRlddrruUllllddRRR+136: rddLLrruullldlllddrrrUrrUruLddlldllluurrurDllluRuurrrrDDuulllldddrruLdllddrrrUrrruuluulllldDldddrrrurrUdlldllluuurrdLulDuruurrrrdDLLLrrrrddlllUdrrruuluulllldDldRuuurrrrddlLLrrruulllldDrrddrrUruLLLLL+137: rrUrruulLDLruulDlDDDrrUdlllldddrruUUrrurruulllldDuurrrrddlldlLLLdlUrrrrruUdrruulLdLrurrdLululDlDDuurrrddldlLLLrrrruUruLdLruulDlDDuurrdddlLrruuLulDrrddlldddlluuuuLLrrddddrruuuLrdddllllluuuluurDrrrDrrdddllllluuUdddrrrrruuullDlUrrrdddllUdrruuurruullDurrddlLLLrrdddllllluuuluurDrRDrrrdddllllluuUluRR+138: rrrdddrRddrruUddlllUrdrruuruLullDLrurrddddllulUdrUllUUUruLddddrrddrruuLLrruullDLrurrddddllulUlUUUdddrdrUlluuulUdrruLLdllluurrDullddrRurrddddrrrruullDurrddlLuLrddlUlUUUruLLrddddrruLdlUUUddrrurrdLLdlluuuLLrrruLdllddlluuRRRRlllluurrDDrruLdllluurrurDlllddrrrrdddrruLdlUUUlllluurrDullddrRRUdlllddrrUdlluurRurRlluurD+139: rDrrrDrdLLrurRRllddrrULrrruulDrdLLdllUluulllDDRluurrrddrRuRldlluulllddrddlUUddlluRdrruulUdrddlUUrRRuullLrrrddlllUlUUUdddrdrrruullLuluUruLLrdddrddlUUUUddrdrrrddRdrrULuLrdLLLLdlUUdrrrrrrrruulDrdLuLrdLuLrddllulllluluurDrrrDRdLLrrdrruuLrddlluluulllDDuurrrddlLrrrdrruulLdllldLUUluurDrrrDrdLuulllDDrddlUUddlluRdrruulUdrddlUUrRRuullLrrrdrrrddllUdrruLLLLruullluluullluurDrdrruLLrdddrdDlUUUUddrddDuurrrddlLrrrruLdllldLUUluurDrrrDrdLuulllDDrddlUUddlluRdrruulUdrddlUUrRRuullLrrrdrrdLLLruulllDDuurrrddlLdLUddlluRdrruurruullluluuluLDlluRurDrdrruLLrdddrdrrrddlllUlUUUdddrdrrruullLddrddlUUrrruullluluUluLulDDurrdLulldddrrUUrrruLdllddlluuRRRRllluurDDrruLrdddrdrrrddlllUlUUUdddrdrrruullLuluUllllddrrUdlluurRddlUluururDrRllDurrdddrddlUUUULulllddrURlluRRdRllddrUluR+140: rddrRuRuRuRurrdLdLdLdLLrrururuulDlDlDldLLulldRuuulllddddrdrrruUUdrrurururrdLdLdLLrruruulDlDldLLulldRurUlulllddddrdrrruUrrururrdLdLLLrrruulDldlLUluuurrdLLLrddrUluurrdLulDrdLrddddllluluuuuRRllddddrdrrruuulldRurDrrurrdLLLLuuuulDlllddddrdrrrUUUlldRulUdrrUdlluRuLrurrdLulDlddrrUdlluururrdLddldRRRurrdLLLLulluuRDuurrdLulDrdddddllluluuuuRRdddRluuullddddrdrrruUULdlUrrdddllluluuuurrRDulllddddrdrrruulluUddrruLuuLLulDDDDuuurrrurrdLLLLulDDDuurrrddrUluurrdLLLLulDDurrrdddlUUruLLulD+141: luurUUddrrddrruLruLLLLLddlluuRRRRluuluurDrrRDDDrddlUUUUUdddLLLuUddLddlluRluRRRRRllllddrUluRRRluuluurDrrrddDrddlUUUUddLLLuUddLdlluRRRRRlluuluurDrrdrdDrddlUUllluUluRRldddrrrddlUruUdLLLLdlluRRRRRdrU+142: lldRuruulDrdrruLdlUdLdlluRRurrdDLddrUUlLulldRururDRddlUruulldldRuurrdLurrrdLullluurD+143: rdrruLuulLrrdddldlluurRlUUrrdDrdLullldlluRuuRRddLruulldDuurrUUUUllluurDuluurDrrdDDDDDDllddrrrruuLrddlllddrrUdlluurRllluurRDullddrddrruuLuullddldRuuurrddLruulldDrrrdrruLuuLLddRluurrdDrdLuuulluuuuuuullDlddRRlluuurrrddDDDDDrrddllUUUUUUUUruLLrdddddddddlluuRlddrruUUUUUllluurDuluurDrrdDDDDDDDullddrRRluurrdD+144: luuluururuulDDrrrdrdrruLdlddldllluuluuluuRRlDrrrrurrDLrDLdddldllluullldRurrddrrddrUUllldllURlURuuUluurDrrrRurrdLddddrddLUllddrUruLrUUUUruulDDDDuurrdLuulLLLLulldRRRRlluurDldlDDDDlluRdrUUddlddrUU+145: dlDurDRddRDrruLLruLddllluLUllddrRlluRRdRRDLddrruLdlUUruRRurrdLLLDlddrUU+147: lllllldddRRuLdlUUluRRRRRRdrrruullDldRullllllddrrrDrddldlluUUrrrddlUruLLLdlUUUluRRRRRRdrdrruuullDlllllldddrruLdlUUluRRRRRdrdrrruuulldLLLLLLrrrrrddrUdrruLLdlUrrruullDurrdddllluRRdrUlluLL+148: lullllddrdrdrrrrUUddrruLrdrruLLrrdrruLLdllllUdrruLrdrruLdlllllllululuurrrrdrRurrdLLLLdlUlullddrdrdrrrrruRdllluRUddllllululuurrdrruLrdrRurrdLLLLulDrrrdddrruLdlUrrdrruLLdlluUddllllululuurRdrruLrdrRurrdLLLLulLdRurDrrdddllllululuuRlddrdrdrrrrrruLdlUUddllllululuurRdrruLrdrRurrdLLLLL+149: RurDDDlddrdDldRuuuluurDRRRRlllluuurrdLulDDldRRRRlllDDDlddrUUUUluRRRddddLruuuulldddlddrUUUUluRR+150: lldlllUUrrDullddlluRdrrRuullDldRuurrdddrUluullddRluurrdRluluurDldlddrRurRRRurrddlUruLdllllldlllllluRRRdrrruUllDldRuurrdrrrrruLdllllddrUluullddRluurrdRluluurDldlddrRurRRRurrddlUlllllddrUluRRRRRdrUlllluRdlldllluururDlldllluurrRdrruulDldddrrU+151: lullURdrUUULuurDDDDDldRRRRurrddlUllllldlUlluuuruRRurDDDllDurruullDDrddrrrrrruLdllllluurDldRRRRRurDllluRRdlllluullulldddrRRRuullDrrdRRRRlllluullulldddrRRRRRRurD+152: lluuUUrrddrrrrrdrdLLLLLLuurruurrrrdrdrddrruuululululllDurrrdrdrdrdddlluulululLrrdrdrddLLululllllddrrrrRRRRllululllllulldddRRRRRRlllluurruuuullllDDrrddrrrrrdrdrruululullLrrrdrdrddllulullllluulluurrrrdDDurrrrdrdrddllulullLuuuullllddrrddddlluuUUrrddddrrrrRRululllLrrrrddllllllluuurrDDurrrrrddllllLL+154: ruuuuuuuuuuuurrrrrrrrrrrrrrrrrrrrrddddddddddllllllllllllllllluuuuuurrrrrrrrrrrrrddlllllllllllddrrrrrrrrrrrrruuuuuulllllllllllllllllddddddddddrrrrrrrrrrrrrrrrrrrrruuuuuuuuuuuuuulllllllllllllllllllllllllddddddddddddDuuuuuuuuuuuuurrrrrrrrrrrrrrrrrrrrrrrrrddddddddddddddllllllllllllllllllllluuuuuuuuuurrrrrrrrrrrrrrrrrddddddllllllllllllluurrrrrrrrrrruulllllllllllllddddddrrrrrrrrrrrrrrrrruuuuuuuuuulllllllllllllllllllllddddddddddddlL+155: uulldRRRRRRRRdrUUUruLLLLLLLLLLLLulDDDrdLLLLLLLLLLLulllddrrUdlluurRluurrdDldRRRRRRRRRRdrUUUluRRRRRRRRRdrUUUUUUruLLLulDDDrdLLLdlUUUruLLLulDDDrdLLLLdlUUUUdrruulLLrddlluUUluRRRRRRRRRRRRRRRRRRRurDDDDDDlddrUUUUUUruLLLLLLLLLLLLLLLLLLLLulDrdLLLLLulldRurDDDDDrddlluRdrUluRRurDDDDrrddllUUUUUUdiff --git a/games/sokoban/tools/media.py b/games/sokoban/tools/media.pyindex c4907950..922aeeae 100644--- a/games/sokoban/tools/media.py+++ b/games/sokoban/tools/media.py@@ -4,7 +4,7 @@docs/shot.png, docs/levels.png a level, and the level select (shot.png is NumPlay's card too)../../docs/media/sokoban.gif levels 2 and 4 solved, for How to play../../docs/media/gallery/sokoban.gif level 9, for the README's gallery- ../../docs/media/thumb_sokoban.png the README's table+ ../../docs/media/thumb_sokoban.png the README's table (level 4 on the way)The moves come from tests/solutions.txt. Python 3 with Pillow."""@@ -53,11 +53,11 @@ def main():subprocess.run(args, check=True, cwd=HERE)Image.open(os.path.join(HERE, args[-1] if name == "shot.png" else args[2])).convert("RGB").save(os.path.join(HERE, "docs", name), optimize=True)- gif(os.path.join(MEDIA, "sokoban.gif"), [film(2), film(4)])- nine = film(9)- gif(os.path.join(MEDIA, "gallery", "sokoban.gif"), [nine])+ four = film(4)+ gif(os.path.join(MEDIA, "sokoban.gif"), [film(2), four])+ gif(os.path.join(MEDIA, "gallery", "sokoban.gif"), [film(9)])thumb = os.path.join(MEDIA, "thumb_sokoban.png")- nine[len(nine) // 2].crop((40, 30, 280, 210)).resize((160, 120), Image.LANCZOS).save(thumb, optimize=True)+ four[len(four) // 3].crop((40, 30, 280, 210)).resize((160, 120), Image.LANCZOS).save(thumb, optimize=True)subprocess.run(["python3", os.path.join(HERE, "..", "..", "tools", "media", "round_corners.py"), thumb], check=True)diff --git a/games/sokoban/tools/solve.py b/games/sokoban/tools/solve.pyindex 2c199794..d3e7f71a 100644--- a/games/sokoban/tools/solve.py+++ b/games/sokoban/tools/solve.py@@ -1,15 +1,16 @@#!/usr/bin/env python3-"""Solves every level as the game gets it (tools/levels.py) and writes tests/solutions.txt: a line a+"""Solves the levels as the game gets them (tools/levels.py) and writes tests/solutions.txt: a line alevel, its moves in the usual letters (u r d l to walk, U R D L to push), for the host test (make test),which plays each one through the game's own rules.The search goes a push at a time, the most promising first: how many pushes the boxes need at least,each to a goal of its own (an assignment of the boxes to the goals), plus a little for the pushes made.Squares a box could never get from to a goal, and boxes frozen together (four cells in a square, all-boxes or walls, one box off its goal), are left out. The solutions aren't the shortest; they only show-every level can be solved as packed.+boxes or walls, one box off its goal), are left out. The solutions aren't the shortest. It solves 153+of the 155 (not 146 and 153, a dozen boxes and more in the open); the host test checks every level+against Microban as published either way.-Usage: solve.py [tests/solutions.txt]+Usage: solve.py [tests/solutions.txt] (the levels not in it yet)"""import heapqimport os@@ -55,7 +56,7 @@ def assignment(cost):return -v[0]-def solve(rows, limit=3000000):+def solve(rows, limit=3000000, weight=3):cells = {(y, x) for y, r in enumerate(rows) for x, c in enumerate(r) if c in "-.$*@+"}at = {(y, x): c for y, r in enumerate(rows) for x, c in enumerate(r)}goals = sorted(p for p in cells if at[p] in ".*+")@@ -128,7 +129,7 @@ def solve(rows, limit=3000000):continueparent[nk] = (key, b, (dy, dx))tie += 1- heapq.heappush(heap, (3 * h + c + 1, c + 1, tie, nk, na))+ heapq.heappush(heap, (weight * h + c + 1, c + 1, tie, nk, na))return None@@ -169,17 +170,30 @@ def moves(key, parent, keeper, boxes, cells):def main():+ """Levels already in the file are kept; the others are solved and the file written after each one."""path = sys.argv[1] if len(sys.argv) > 1 else os.path.join(os.path.dirname(__file__), "..", "tests", "solutions.txt")- only = [int(a) for a in sys.argv[2:]]- lines = ["# tools/solve.py: each level's moves (u r d l walk, U R D L push), for tests/play.c"]+ done = {}+ if os.path.exists(path):+ for line in open(path):+ if line[:1].isdigit():+ n, m = line.split(":", 1)+ done[int(n)] = m.strip()for i, rows in enumerate([levels.pack(r) for r in levels.read()], 1):- if only and i not in only:+ if i in done:+ continue+ s = None+ for weight in (10, 30): # (the greedier, the faster on the big ones)+ s = solve(rows, weight=weight)+ if s:+ break+ if not s: # (146 and 153, with a dozen boxes or more in the open, are too much for it)+ print(f"level {i}: not solved", flush=True)continue- s = solve(rows)- assert s, f"level {i} not solved"print(f"level {i}: {len(s)} moves, {sum(ch.isupper() for ch in s)} pushes", flush=True)- lines.append(f"{i}: {s}")- open(path, "w").write("\n".join(lines) + "\n")+ done[i] = s+ lines = ["# tools/solve.py: each level's moves (u r d l walk, U R D L push), for tests/play.c"]+ lines += [f"{n}: {done[n]}" for n in sorted(done)]+ open(path, "w").write("\n".join(lines) + "\n")if __name__ == "__main__":