From b29611fe2c629d8d951d969875a57132df055bdd Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Tue, 24 Apr 2018 19:03:33 -0400 Subject: [PATCH] puzzles: update help text, make generation and testing cleaner This includes an upstream change to the Galaxies help text. `genhelp.sh' no longer leaves temporary files sitting around, and the self-test feature of lz4tiny.c works again. Change-Id: I787f4cb3c258baade31638d6be18f95b7aa0705e --- apps/plugins/puzzles/genhelp.sh | 3 + apps/plugins/puzzles/help.h | 7 +- apps/plugins/puzzles/help/blackbox.c | 2 +- apps/plugins/puzzles/help/bridges.c | 2 +- apps/plugins/puzzles/help/cube.c | 2 +- apps/plugins/puzzles/help/dominosa.c | 2 +- apps/plugins/puzzles/help/fifteen.c | 2 +- apps/plugins/puzzles/help/filling.c | 2 +- apps/plugins/puzzles/help/flip.c | 2 +- apps/plugins/puzzles/help/flood.c | 2 +- apps/plugins/puzzles/help/galaxies.c | 351 ++++++++++++++------------- apps/plugins/puzzles/help/guess.c | 2 +- apps/plugins/puzzles/help/inertia.c | 2 +- apps/plugins/puzzles/help/keen.c | 2 +- apps/plugins/puzzles/help/lightup.c | 2 +- apps/plugins/puzzles/help/loopy.c | 2 +- apps/plugins/puzzles/help/magnets.c | 2 +- apps/plugins/puzzles/help/map.c | 2 +- apps/plugins/puzzles/help/mines.c | 2 +- apps/plugins/puzzles/help/net.c | 2 +- apps/plugins/puzzles/help/netslide.c | 2 +- apps/plugins/puzzles/help/palisade.c | 2 +- apps/plugins/puzzles/help/pattern.c | 2 +- apps/plugins/puzzles/help/pearl.c | 2 +- apps/plugins/puzzles/help/pegs.c | 2 +- apps/plugins/puzzles/help/range.c | 2 +- apps/plugins/puzzles/help/rect.c | 2 +- apps/plugins/puzzles/help/samegame.c | 2 +- apps/plugins/puzzles/help/signpost.c | 2 +- apps/plugins/puzzles/help/singles.c | 2 +- apps/plugins/puzzles/help/sixteen.c | 2 +- apps/plugins/puzzles/help/slant.c | 2 +- apps/plugins/puzzles/help/solo.c | 2 +- apps/plugins/puzzles/help/tents.c | 2 +- apps/plugins/puzzles/help/towers.c | 2 +- apps/plugins/puzzles/help/tracks.c | 2 +- apps/plugins/puzzles/help/twiddle.c | 2 +- apps/plugins/puzzles/help/undead.c | 2 +- apps/plugins/puzzles/help/unequal.c | 2 +- apps/plugins/puzzles/help/unruly.c | 2 +- apps/plugins/puzzles/help/untangle.c | 2 +- apps/plugins/puzzles/lz4tiny.c | 10 +- 42 files changed, 238 insertions(+), 209 deletions(-) diff --git a/apps/plugins/puzzles/genhelp.sh b/apps/plugins/puzzles/genhelp.sh index 007cdafd21..d6c4cc3e94 100755 --- a/apps/plugins/puzzles/genhelp.sh +++ b/apps/plugins/puzzles/genhelp.sh @@ -89,3 +89,6 @@ done # generate quick help from gamedesc.txt cat src/gamedesc.txt | awk -F ":" '{print "const char quick_help_text[] = \""$5"\";" >> "help/"$1".c" }' + +rm puzzles.txt +rm compress diff --git a/apps/plugins/puzzles/help.h b/apps/plugins/puzzles/help.h index a5839904f5..e9cac9b337 100644 --- a/apps/plugins/puzzles/help.h +++ b/apps/plugins/puzzles/help.h @@ -4,8 +4,11 @@ /* defined in help/ */ extern const char help_text[]; -#ifdef ROCKBOX +#if defined(ROCKBOX) || defined(LZ4TINY) extern const char quick_help_text[]; -extern struct style_text help_text_style[]; extern const unsigned short help_text_len, quick_help_text_len, help_text_words; #endif + +#if defined(ROCKBOX) +extern struct style_text help_text_style[]; +#endif diff --git a/apps/plugins/puzzles/help/blackbox.c b/apps/plugins/puzzles/help/blackbox.c index a211ecbe92..f67ee28e62 100644 --- a/apps/plugins/puzzles/help/blackbox.c +++ b/apps/plugins/puzzles/help/blackbox.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/bridges.c b/apps/plugins/puzzles/help/bridges.c index 2fc7c90a4f..97fc5c6ab0 100644 --- a/apps/plugins/puzzles/help/bridges.c +++ b/apps/plugins/puzzles/help/bridges.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/cube.c b/apps/plugins/puzzles/help/cube.c index 32fa8166c1..3d9137afe0 100644 --- a/apps/plugins/puzzles/help/cube.c +++ b/apps/plugins/puzzles/help/cube.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/dominosa.c b/apps/plugins/puzzles/help/dominosa.c index becc209a3a..b2994d79da 100644 --- a/apps/plugins/puzzles/help/dominosa.c +++ b/apps/plugins/puzzles/help/dominosa.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/fifteen.c b/apps/plugins/puzzles/help/fifteen.c index f1bee5be8f..72856d1061 100644 --- a/apps/plugins/puzzles/help/fifteen.c +++ b/apps/plugins/puzzles/help/fifteen.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/filling.c b/apps/plugins/puzzles/help/filling.c index d876ed29e2..bf40041cff 100644 --- a/apps/plugins/puzzles/help/filling.c +++ b/apps/plugins/puzzles/help/filling.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/flip.c b/apps/plugins/puzzles/help/flip.c index 2c11fc4692..06606d97b2 100644 --- a/apps/plugins/puzzles/help/flip.c +++ b/apps/plugins/puzzles/help/flip.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/flood.c b/apps/plugins/puzzles/help/flood.c index 6841e50453..25a95cb394 100644 --- a/apps/plugins/puzzles/help/flood.c +++ b/apps/plugins/puzzles/help/flood.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/galaxies.c b/apps/plugins/puzzles/help/galaxies.c index b6d836d065..68a59e6339 100644 --- a/apps/plugins/puzzles/help/galaxies.c +++ b/apps/plugins/puzzles/help/galaxies.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ @@ -6,15 +6,15 @@ struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, - { 94, TEXT_CENTER | C_RED }, - { 402, TEXT_CENTER | C_RED }, - { 419, TEXT_UNDERLINE }, - { 420, TEXT_UNDERLINE }, - { 430, TEXT_UNDERLINE }, + { 132, TEXT_CENTER | C_RED }, + { 444, TEXT_CENTER | C_RED }, + { 461, TEXT_UNDERLINE }, + { 462, TEXT_UNDERLINE }, + { 472, TEXT_UNDERLINE }, LAST_STYLE_ITEM }; -/* orig 2509 comp 1728 ratio 0.688721 level 11 saved 781 */ +/* orig 2754 comp 1877 ratio 0.681554 level 11 saved 877 */ const char help_text[] = { 0xf0, 0x41, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20, 0x32, 0x38, 0x3a, 0x20, 0x47, 0x61, 0x6c, 0x61, 0x78, 0x69, @@ -24,173 +24,188 @@ const char help_text[] = { 0x72, 0x69, 0x64, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f, 0x66, 0x00, 0x64, 0x6f, 0x74, -0x73, 0x2e, 0x39, 0x00, 0xf2, 0x11, 0x72, 0x00, 0x61, 0x69, -0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x64, 0x72, -0x61, 0x77, 0x00, 0x65, 0x64, 0x67, 0x65, 0x73, 0x00, 0x61, -0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x74, 0x68, 0x65, 0x46, 0x00, -0xf0, 0x03, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x00, 0x77, 0x68, -0x69, 0x63, 0x68, 0x00, 0x64, 0x69, 0x76, 0x69, 0x64, 0x65, -0x1c, 0x00, 0x04, 0x6e, 0x00, 0xf3, 0x19, 0x6c, 0x65, 0x00, -0x69, 0x6e, 0x74, 0x6f, 0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, -0x6e, 0x73, 0x00, 0x69, 0x6e, 0x00, 0x73, 0x75, 0x63, 0x68, -0x00, 0x61, 0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61, -0x74, 0x00, 0x65, 0x76, 0x65, 0x72, 0x79, 0x21, 0x00, 0x00, -0x6e, 0x00, 0xf5, 0x16, 0x31, 0x38, 0x30, 0x2d, 0x64, 0x65, -0x67, 0x72, 0x65, 0x65, 0x00, 0x72, 0x6f, 0x74, 0x61, 0x74, -0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x79, -0x6d, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x2c, 0x00, 0x61, -0x6e, 0xbe, 0x00, 0xd0, 0x73, 0x00, 0x65, 0x78, 0x61, 0x63, -0x74, 0x6c, 0x79, 0x00, 0x6f, 0x6e, 0x65, 0xbc, 0x00, 0x02, -0x8b, 0x00, 0x00, 0x49, 0x00, 0xf4, 0x09, 0x6c, 0x6f, 0x63, -0x61, 0x74, 0x65, 0x64, 0x00, 0x61, 0x74, 0x00, 0x69, 0x74, -0x73, 0x00, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x65, 0x00, 0x6f, -0x66, 0x4a, 0x00, 0xf0, 0x04, 0x79, 0x2e, 0x00, 0x00, 0x00, -0x54, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, -0x65, 0x00, 0x77, 0x61, 0xa1, 0x00, 0x30, 0x76, 0x65, 0x6e, -0x36, 0x00, 0xf1, 0x06, 0x62, 0x79, 0x00, 0x4e, 0x69, 0x6b, +0x73, 0x2e, 0x39, 0x00, 0xf4, 0x0a, 0x72, 0x00, 0x61, 0x69, +0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x61, +0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x74, 0x68, +0x65, 0x4b, 0x00, 0x70, 0x6c, 0x65, 0x00, 0x69, 0x6e, 0x74, +0x6f, 0x49, 0x00, 0xe0, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, +0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x47, 0x00, +0xf3, 0x12, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, +0x00, 0x69, 0x6e, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x61, +0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, +0x65, 0x76, 0x65, 0x72, 0x79, 0x2d, 0x00, 0x00, 0x61, 0x00, +0xf0, 0x00, 0x31, 0x38, 0x30, 0x2d, 0x64, 0x65, 0x67, 0x72, +0x65, 0x65, 0x00, 0x72, 0x6f, 0x74, 0x61, 0x68, 0x00, 0xf5, +0x03, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x79, 0x6d, 0x6d, +0x65, 0x74, 0x72, 0x69, 0x63, 0x2c, 0x00, 0x61, 0x6e, 0xb1, +0x00, 0xd0, 0x73, 0x00, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, +0x79, 0x00, 0x6f, 0x6e, 0x65, 0xaf, 0x00, 0x60, 0x00, 0x77, +0x68, 0x69, 0x63, 0x68, 0x49, 0x00, 0x40, 0x6c, 0x6f, 0x63, +0x61, 0x88, 0x00, 0xd0, 0x61, 0x74, 0x00, 0x69, 0x74, 0x73, +0x00, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x65, 0x8e, 0x00, 0x03, +0x4a, 0x00, 0xf0, 0x00, 0x79, 0x2e, 0x00, 0x00, 0x00, 0x54, +0x6f, 0x00, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x00, 0x79, 0xe4, +0x00, 0x40, 0x73, 0x6f, 0x6c, 0x75, 0x71, 0x00, 0x10, 0x2c, +0x0f, 0x00, 0xf0, 0x02, 0x00, 0x64, 0x72, 0x61, 0x77, 0x00, +0x6c, 0x69, 0x6e, 0x65, 0x73, 0x00, 0x61, 0x6c, 0x6f, 0x6e, +0x67, 0xef, 0x00, 0x02, 0x2e, 0x01, 0x41, 0x65, 0x64, 0x67, +0x65, 0x0b, 0x01, 0x41, 0x6d, 0x61, 0x72, 0x6b, 0x17, 0x00, +0x90, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x69, 0x65, +0xf0, 0x00, 0x00, 0x12, 0x00, 0x04, 0xff, 0x00, 0xc0, 0x2e, +0x00, 0x54, 0x68, 0x65, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, +0x65, 0x96, 0x00, 0xc1, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, +0x74, 0x65, 0x00, 0x77, 0x68, 0x65, 0x41, 0x01, 0x01, 0x44, +0x00, 0x23, 0x65, 0x64, 0x69, 0x00, 0x26, 0x6f, 0x6e, 0x66, +0x00, 0xc0, 0x61, 0x72, 0x65, 0x00, 0x70, 0x72, 0x65, 0x63, +0x69, 0x73, 0x65, 0x6c, 0x2d, 0x01, 0x32, 0x6f, 0x73, 0x65, +0x33, 0x01, 0xc4, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, +0x65, 0x00, 0x74, 0x77, 0x6f, 0x5c, 0x01, 0x30, 0x00, 0x62, +0x65, 0xa4, 0x00, 0x30, 0x69, 0x6e, 0x67, 0x98, 0x00, 0x94, +0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x87, +0x00, 0x01, 0xec, 0x00, 0x34, 0x68, 0x69, 0x73, 0x8a, 0x00, +0x90, 0x77, 0x61, 0x73, 0x00, 0x69, 0x6e, 0x76, 0x65, 0x6e, +0x22, 0x01, 0xf1, 0x06, 0x62, 0x79, 0x00, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x31, 0x33, 0x5d, 0x2c, 0x00, -0x75, 0x6e, 0x64, 0x65, 0x72, 0xdb, 0x00, 0x80, 0x6e, 0x61, -0x6d, 0x65, 0x00, 0x60, 0x54, 0x65, 0x80, 0x00, 0x70, 0x00, -0x53, 0x68, 0x6f, 0x77, 0x27, 0x3b, 0x61, 0x00, 0x01, 0x18, -0x00, 0x00, 0x78, 0x00, 0xf0, 0x00, 0x63, 0x6f, 0x6d, 0x6d, -0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x74, 0x72, 0x61, 0x6e, 0x73, -0x6c, 0x84, 0x00, 0x02, 0x05, 0x01, 0xf4, 0x04, 0x45, 0x6e, -0x67, 0x6c, 0x69, 0x73, 0x68, 0x00, 0x61, 0x73, 0x00, 0x60, -0x53, 0x70, 0x69, 0x72, 0x61, 0x6c, 0x00, 0xac, 0x01, 0x45, -0x27, 0x2e, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x89, 0x00, 0x01, -0xe0, 0x00, 0x70, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, -0x81, 0x01, 0x21, 0x74, 0x68, 0x5a, 0x00, 0x40, 0x6c, 0x6c, -0x65, 0x63, 0x12, 0x01, 0x00, 0x9f, 0x00, 0xb0, 0x4a, 0x61, -0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76, 0x65, 0xcb, -0x00, 0x01, 0xa8, 0x00, 0xd1, 0x00, 0x68, 0x74, 0x74, 0x70, -0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0xbf, 0x00, -0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, -0x2f, 0xe6, 0x00, 0xf6, 0x10, 0x73, 0x2f, 0x61, 0x73, 0x74, -0x72, 0x6f, 0x6e, 0x6f, 0x6d, 0x69, 0x63, 0x61, 0x6c, 0x5f, -0x73, 0x68, 0x6f, 0x77, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, -0x00, 0x00, 0x32, 0x38, 0x2e, 0x31, 0x3e, 0x02, 0x01, 0x81, -0x00, 0x21, 0x6f, 0x6c, 0x47, 0x02, 0xf6, 0x02, 0x4c, 0x65, -0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x00, 0x6f, -0x6e, 0x00, 0x61, 0x6e, 0x79, 0xfc, 0x01, 0x05, 0x1e, 0x02, -0x21, 0x61, 0x6e, 0x21, 0x02, 0x30, 0x00, 0x69, 0x66, 0x26, -0x01, 0x10, 0x72, 0x0b, 0x01, 0x31, 0x6e, 0x27, 0x74, 0x97, -0x01, 0xc1, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x2c, -0x00, 0x6f, 0x72, 0x00, 0x0d, 0x02, 0x79, 0x6d, 0x6f, 0x76, -0x65, 0x00, 0x6f, 0x6e, 0x2d, 0x00, 0xf0, 0x01, 0x2e, 0x00, -0x57, 0x68, 0x65, 0x6e, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x63, -0x72, 0x65, 0x61, 0x74, 0xb4, 0x02, 0x54, 0x76, 0x61, 0x6c, -0x69, 0x64, 0x1c, 0x02, 0x46, 0x28, 0x6f, 0x6e, 0x65, 0xde, -0x01, 0x7f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64, 0x2c, 0x08, -0x02, 0x06, 0x1a, 0x2c, 0x4c, 0x02, 0x06, 0x3f, 0x02, 0x61, -0x00, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x7c, 0x02, 0x00, 0x28, -0x00, 0x0b, 0x4e, 0x02, 0x50, 0x6e, 0x6f, 0x00, 0x65, 0x78, -0xb9, 0x01, 0x43, 0x65, 0x6f, 0x75, 0x73, 0xf2, 0x02, 0x30, -0x69, 0x6e, 0x73, 0xd7, 0x02, 0xf1, 0x08, 0x69, 0x74, 0x29, +0x75, 0x6e, 0x64, 0x65, 0x72, 0x88, 0x00, 0x80, 0x6e, 0x61, +0x6d, 0x65, 0x00, 0x60, 0x54, 0x65, 0x6c, 0x01, 0x70, 0x00, +0x53, 0x68, 0x6f, 0x77, 0x27, 0x3b, 0x4d, 0x01, 0x00, 0x18, +0x00, 0x04, 0xce, 0x00, 0x30, 0x6d, 0x6f, 0x6e, 0x9e, 0x00, +0x50, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x70, 0x01, 0x02, 0x07, +0x02, 0xf4, 0x04, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, +0x00, 0x61, 0x73, 0x00, 0x60, 0x53, 0x70, 0x69, 0x72, 0x61, +0x6c, 0x00, 0x8b, 0x02, 0x45, 0x27, 0x2e, 0x00, 0x00, 0x0d, +0x00, 0x00, 0x89, 0x00, 0x01, 0xcc, 0x01, 0x70, 0x72, 0x69, +0x62, 0x75, 0x74, 0x65, 0x64, 0xbd, 0x00, 0x21, 0x74, 0x68, +0x5a, 0x00, 0x40, 0x6c, 0x6c, 0x65, 0x63, 0x8d, 0x01, 0x00, +0x9f, 0x00, 0xb0, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, +0x61, 0x72, 0x76, 0x65, 0xb7, 0x01, 0x01, 0xa8, 0x00, 0xd1, +0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, +0x77, 0x2e, 0x6e, 0xbf, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, +0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, 0xe6, 0x00, 0xf6, 0x10, +0x73, 0x2f, 0x61, 0x73, 0x74, 0x72, 0x6f, 0x6e, 0x6f, 0x6d, +0x69, 0x63, 0x61, 0x6c, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x2e, +0x68, 0x74, 0x6d, 0x6c, 0x00, 0x00, 0x00, 0x32, 0x38, 0x2e, +0x31, 0x1d, 0x03, 0x01, 0x81, 0x00, 0x21, 0x6f, 0x6c, 0x26, +0x03, 0xa0, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, +0x63, 0x6b, 0x8d, 0x01, 0x30, 0x61, 0x6e, 0x79, 0x8d, 0x01, +0x02, 0x9f, 0x01, 0x32, 0x00, 0x74, 0x6f, 0x15, 0x02, 0x21, +0x61, 0x6e, 0x03, 0x02, 0x21, 0x00, 0x69, 0xeb, 0x01, 0x10, +0x72, 0x0b, 0x01, 0x31, 0x6e, 0x27, 0x74, 0x83, 0x02, 0xb0, +0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x2c, 0x00, 0x6f, +0x72, 0x2f, 0x00, 0x99, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, +0x00, 0x6f, 0x6e, 0x2d, 0x00, 0x61, 0x2e, 0x00, 0x57, 0x68, +0x65, 0x6e, 0x65, 0x02, 0x50, 0x63, 0x72, 0x65, 0x61, 0x74, +0x93, 0x03, 0x54, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x08, 0x03, +0x46, 0x28, 0x6f, 0x6e, 0x65, 0xca, 0x02, 0x7f, 0x63, 0x6c, +0x6f, 0x73, 0x65, 0x64, 0x2c, 0xf4, 0x02, 0x06, 0x1a, 0x2c, +0x38, 0x03, 0x06, 0x2b, 0x03, 0x61, 0x00, 0x61, 0x62, 0x6f, +0x75, 0x74, 0x35, 0x02, 0x00, 0x28, 0x00, 0x0b, 0x3a, 0x03, +0x50, 0x6e, 0x6f, 0x00, 0x65, 0x78, 0xb9, 0x01, 0x43, 0x65, +0x6f, 0x75, 0x73, 0xd4, 0x02, 0x71, 0x62, 0x65, 0x74, 0x77, +0x65, 0x65, 0x6e, 0x5a, 0x02, 0x21, 0x6f, 0x66, 0xec, 0x01, +0x34, 0x6f, 0x77, 0x6e, 0x65, 0x02, 0xf1, 0x07, 0x29, 0x2c, 0x00, 0x69, 0x74, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x62, 0x65, 0x00, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, -0x63, 0x02, 0x80, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, -0x63, 0xaa, 0x02, 0x69, 0x3b, 0x00, 0x73, 0x6f, 0x00, 0x79, -0x40, 0x03, 0x02, 0x84, 0x03, 0x20, 0x74, 0x68, 0xc0, 0x00, -0x22, 0x6f, 0x6c, 0x3a, 0x03, 0x09, 0x41, 0x00, 0x22, 0x69, -0x6e, 0x91, 0x00, 0x21, 0x77, 0x61, 0xcb, 0x01, 0x30, 0x44, -0x75, 0x72, 0x97, 0x03, 0x81, 0x73, 0x6f, 0x6c, 0x76, 0x69, -0x6e, 0x67, 0x2c, 0x15, 0x01, 0x10, 0x6d, 0x2b, 0x00, 0x52, -0x00, 0x6b, 0x6e, 0x6f, 0x77, 0x2b, 0x00, 0x86, 0x61, 0x00, -0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0xd1, 0x03, 0x90, 0x73, -0x71, 0x75, 0x61, 0x72, 0x65, 0x00, 0x62, 0x65, 0xa2, 0x03, +0x65, 0x03, 0x80, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, +0x63, 0xac, 0x03, 0x69, 0x3b, 0x00, 0x73, 0x6f, 0x00, 0x79, +0x35, 0x04, 0x02, 0x79, 0x04, 0x20, 0x74, 0x68, 0xd6, 0x00, +0x22, 0x6f, 0x6c, 0xe1, 0x02, 0x09, 0x41, 0x00, 0x22, 0x69, +0x6e, 0xa7, 0x00, 0x21, 0x77, 0x61, 0xe1, 0x01, 0x60, 0x44, +0x75, 0x72, 0x69, 0x6e, 0x67, 0x91, 0x03, 0x42, 0x76, 0x69, +0x6e, 0x67, 0x90, 0x03, 0x10, 0x6d, 0x2b, 0x00, 0x52, 0x00, +0x6b, 0x6e, 0x6f, 0x77, 0x2b, 0x00, 0x12, 0x61, 0x8a, 0x04, +0x15, 0x63, 0xc6, 0x04, 0x03, 0xa7, 0x00, 0x03, 0x0b, 0x03, 0x01, 0x77, 0x00, 0xa2, 0x61, 0x00, 0x73, 0x70, 0x65, 0x63, -0x69, 0x66, 0x69, 0x63, 0xeb, 0x00, 0x70, 0x62, 0x75, 0x74, -0x00, 0x6e, 0x6f, 0x74, 0xbf, 0x00, 0x22, 0x73, 0x75, 0x0d, -0x03, 0x41, 0x77, 0x68, 0x65, 0x72, 0x9b, 0x00, 0x03, 0xed, -0x00, 0x20, 0x67, 0x6f, 0x11, 0x01, 0x03, 0x68, 0x01, 0x10, -0x6f, 0x9d, 0x01, 0x02, 0x58, 0x00, 0x00, 0xfa, 0x03, 0x20, -0x72, 0x65, 0x29, 0x01, 0x35, 0x6e, 0x65, 0x63, 0x95, 0x02, -0x01, 0x6b, 0x01, 0x91, 0x2e, 0x00, 0x49, 0x6e, 0x00, 0x6f, -0x72, 0x64, 0x65, 0xde, 0x01, 0x41, 0x6d, 0x61, 0x72, 0x6b, -0xaf, 0x02, 0x03, 0x07, 0x01, 0x30, 0x00, 0x64, 0x6f, 0x08, -0x02, 0x72, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x74, 0x2c, 0xe0, -0x01, 0x76, 0x61, 0x6e, 0x00, 0x72, 0x69, 0x67, 0x68, 0x54, -0x02, 0x04, 0x4b, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x4f, 0x02, -0x22, 0x67, 0x2c, 0x82, 0x00, 0x01, 0x6e, 0x01, 0x05, 0x10, -0x02, 0x71, 0x6e, 0x00, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x63, -0x00, 0x81, 0x65, 0x72, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, -0xbf, 0x04, 0x16, 0x74, 0x8b, 0x00, 0x41, 0x44, 0x72, 0x6f, +0x69, 0x66, 0x69, 0x63, 0x01, 0x01, 0x70, 0x62, 0x75, 0x74, +0x00, 0x6e, 0x6f, 0x74, 0xbf, 0x00, 0x21, 0x73, 0x75, 0x0f, +0x04, 0x00, 0x89, 0x03, 0x11, 0x72, 0x9b, 0x00, 0x03, 0x03, +0x01, 0x20, 0x67, 0x6f, 0x27, 0x01, 0x03, 0x7e, 0x01, 0x10, +0x6f, 0xb3, 0x01, 0x04, 0xff, 0x00, 0x00, 0x92, 0x03, 0x03, +0xe1, 0x04, 0x05, 0xab, 0x02, 0x01, 0x81, 0x01, 0xa7, 0x2e, +0x00, 0x49, 0x6e, 0x00, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x15, +0x04, 0x23, 0x69, 0x73, 0x07, 0x01, 0x30, 0x00, 0x64, 0x6f, +0x1e, 0x02, 0x72, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x74, 0x2c, +0xf6, 0x01, 0x76, 0x61, 0x6e, 0x00, 0x72, 0x69, 0x67, 0x68, +0x6a, 0x02, 0x04, 0x4b, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x65, +0x02, 0x22, 0x67, 0x2c, 0x82, 0x00, 0x01, 0x6e, 0x01, 0x05, +0x26, 0x02, 0x72, 0x6e, 0x00, 0x61, 0x72, 0x72, 0x6f, 0x77, +0x34, 0x04, 0x71, 0x72, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, +0xb4, 0x05, 0x16, 0x74, 0x8b, 0x00, 0x41, 0x44, 0x72, 0x6f, 0x70, 0x21, 0x01, 0x00, 0x54, 0x01, 0x14, 0x61, 0x14, 0x01, 0x22, 0x6f, 0x66, 0x92, 0x01, 0x60, 0x63, 0x68, 0x6f, 0x69, -0x63, 0x65, 0x66, 0x00, 0x04, 0xcb, 0x01, 0x00, 0x8e, 0x02, -0x30, 0x69, 0x6e, 0x64, 0x1f, 0x00, 0x04, 0xc6, 0x04, 0x10, -0x6f, 0x31, 0x04, 0x91, 0x27, 0x73, 0x00, 0x61, 0x73, 0x73, -0x6f, 0x63, 0x69, 0xc0, 0x03, 0x73, 0x77, 0x69, 0x74, 0x68, -0x2e, 0x00, 0x59, 0xbc, 0x00, 0x4c, 0x61, 0x6c, 0x73, 0x6f, -0xc1, 0x00, 0x40, 0x65, 0x78, 0x69, 0x73, 0x8d, 0x00, 0x02, -0xa3, 0x00, 0x01, 0x7e, 0x01, 0x40, 0x70, 0x69, 0x63, 0x6b, -0x99, 0x00, 0x41, 0x6d, 0x00, 0x75, 0x70, 0x73, 0x00, 0x00, -0xf7, 0x02, 0x01, 0x11, 0x00, 0x01, 0x0a, 0x03, 0x20, 0x64, -0x65, 0x89, 0x03, 0x11, 0x79, 0x11, 0x00, 0x00, 0xd0, 0x03, -0x82, 0x64, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x11, -0x00, 0x34, 0x6f, 0x66, 0x66, 0x96, 0x01, 0x00, 0xbf, 0x00, -0x05, 0x71, 0x05, 0xa1, 0x2e, 0x00, 0x28, 0x41, 0x6c, 0x73, -0x6f, 0x2c, 0x00, 0x69, 0xd3, 0x00, 0x30, 0x27, 0x72, 0x65, -0xd2, 0x01, 0x01, 0xcf, 0x01, 0x06, 0xc0, 0x00, 0x06, 0x2b, -0x01, 0x27, 0x69, 0x73, 0x27, 0x01, 0x06, 0x7f, 0x01, 0x02, -0x9c, 0x00, 0x28, 0x69, 0x74, 0x9a, 0x00, 0x00, 0x0f, 0x00, -0x62, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0xc7, 0x01, 0x11, -0x6b, 0x12, 0x00, 0xa3, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x65, -0x72, 0x2e, 0x00, 0x49, 0x30, 0x01, 0x60, 0x73, 0x77, 0x69, -0x76, 0x65, 0x6c, 0x09, 0x02, 0x40, 0x73, 0x74, 0x61, 0x6e, -0x72, 0x03, 0x20, 0x61, 0x73, 0x57, 0x00, 0x01, 0xb7, 0x01, -0x40, 0x00, 0x69, 0x74, 0x2c, 0x3e, 0x00, 0x41, 0x73, 0x74, -0x61, 0x79, 0x79, 0x00, 0x06, 0x81, 0x05, 0x00, 0xaf, 0x02, -0x31, 0x65, 0x6e, 0x74, 0xa6, 0x01, 0x3a, 0x29, 0x00, 0x00, -0x4d, 0x01, 0x22, 0x75, 0x73, 0x84, 0x02, 0xa0, 0x63, 0x75, -0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x42, 0x01, -0x01, 0x97, 0x00, 0x03, 0x94, 0x00, 0x05, 0x01, 0x01, 0x06, -0x8f, 0x02, 0x13, 0x6e, 0x7e, 0x06, 0xa3, 0x2e, 0x00, 0x50, -0x72, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x7b, 0x06, 0x40, -0x74, 0x75, 0x72, 0x6e, 0x44, 0x00, 0x20, 0x00, 0x77, 0x52, -0x04, 0x66, 0x6f, 0x76, 0x65, 0x72, 0x00, 0x61, 0xb2, 0x04, -0x01, 0xc7, 0x00, 0x02, 0xb4, 0x04, 0x22, 0x6f, 0x72, 0xe0, -0x00, 0x32, 0x00, 0x69, 0x74, 0xed, 0x03, 0x40, 0x2c, 0x00, -0x61, 0x73, 0x21, 0x04, 0x2f, 0x76, 0x65, 0x55, 0x00, 0x13, -0x22, 0x64, 0x6f, 0x16, 0x01, 0x02, 0x50, 0x01, 0x25, 0x75, -0x70, 0x79, 0x01, 0x01, 0x06, 0x01, 0x22, 0x62, 0x65, 0xd5, -0x01, 0x22, 0x65, 0x64, 0x39, 0x06, 0x8b, 0x65, 0x78, 0x74, -0x00, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x00, 0x01, 0xa5, 0x01, -0x00, 0x6d, 0x00, 0x31, 0x65, 0x64, 0x3b, 0x3a, 0x03, 0x06, -0x18, 0x01, 0x20, 0x62, 0x65, 0x1b, 0x01, 0x14, 0x64, 0x0c, -0x01, 0x0c, 0x66, 0x02, 0x03, 0x1c, 0x01, 0x12, 0x2c, 0x53, -0x05, 0x05, 0x3c, 0x02, 0x0e, 0x4d, 0x02, 0x12, 0x6e, 0xac, -0x00, 0x00, 0xf1, 0x00, 0x21, 0x61, 0x6e, 0xd6, 0x03, 0x02, -0x42, 0x00, 0x30, 0x2e, 0x00, 0x00, 0x50, 0x02, 0x11, 0x6c, -0x92, 0x00, 0x11, 0x61, 0x5b, 0x06, 0x10, 0x73, 0x99, 0x02, -0x42, 0x63, 0x72, 0x69, 0x62, 0x97, 0x04, 0x13, 0x73, 0x71, -0x06, 0x30, 0x32, 0x2e, 0x31, 0x01, 0x04, 0x02, 0x97, 0x00, -0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, -0x2e, 0x29, 0x38, 0x06, 0x16, 0x32, 0x38, 0x06, 0xb1, 0x70, -0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20, -0x60, 0x07, 0x45, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x01, -0x45, 0x04, 0x06, 0x3f, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, -0x6d, 0x7c, 0x00, 0xe0, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, -0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x72, 0x00, -0x04, 0x16, 0x04, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, -0x00, 0x6d, 0x65, 0x6e, 0x75, 0xae, 0x00, 0x91, 0x57, 0x69, -0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x0f, 0x05, 0x50, -0x00, 0x00, 0x53, 0x69, 0x7a, 0x20, 0x03, 0x02, 0xdf, 0x01, -0x24, 0x69, 0x6e, 0x1e, 0x02, 0x01, 0x46, 0x05, 0x30, 0x69, -0x66, 0x66, 0x20, 0x05, 0x63, 0x74, 0x79, 0x00, 0x00, 0x00, -0x43, 0xcf, 0x06, 0x02, 0x2a, 0x04, 0x05, 0x1a, 0x00, 0x05, -0x5b, 0x03, 0x40, 0x65, 0x6e, 0x65, 0x72, 0xeb, 0x03, 0x03, -0x0d, 0x08, 0x57, 0x2e, 0x00, 0x4d, 0x6f, 0x72, 0x29, 0x00, -0x13, 0x00, 0x3e, 0x07, 0xb1, 0x00, 0x72, 0x65, 0x71, 0x75, -0x69, 0x72, 0x65, 0x00, 0x6d, 0x6f, 0x0e, 0x05, 0xa2, 0x6d, -0x70, 0x6c, 0x65, 0x78, 0x00, 0x64, 0x65, 0x64, 0x75, 0x3d, -0x01, 0x01, 0x4f, 0x06, 0x02, 0xb8, 0x00, 0x80, 0x55, 0x6e, -0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0xe9, 0x00, 0x18, 0x27, -0x73, 0x00, 0x20, 0x6c, 0x65, 0x41, 0x03, 0x35, 0x6d, 0x61, -0x79, 0x4d, 0x00, 0xe0, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, -0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x00, +0x63, 0x65, 0x66, 0x00, 0x04, 0xcb, 0x01, 0x00, 0xa4, 0x02, +0x30, 0x69, 0x6e, 0x64, 0x1f, 0x00, 0x03, 0x73, 0x00, 0x20, +0x64, 0x6f, 0x33, 0x05, 0x91, 0x27, 0x73, 0x00, 0x61, 0x73, +0x73, 0x6f, 0x63, 0x69, 0xd6, 0x03, 0x73, 0x77, 0x69, 0x74, +0x68, 0x2e, 0x00, 0x59, 0xbc, 0x00, 0x4c, 0x61, 0x6c, 0x73, +0x6f, 0xc1, 0x00, 0x40, 0x65, 0x78, 0x69, 0x73, 0x8d, 0x00, +0x02, 0xa3, 0x00, 0x02, 0x2a, 0x06, 0x21, 0x69, 0x63, 0x1f, +0x05, 0x41, 0x6d, 0x00, 0x75, 0x70, 0x73, 0x00, 0x00, 0x0d, +0x03, 0x01, 0x11, 0x00, 0x01, 0x20, 0x03, 0x20, 0x64, 0x65, +0x9f, 0x03, 0x11, 0x79, 0x11, 0x00, 0x00, 0xe6, 0x03, 0x82, +0x64, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x11, 0x00, +0x34, 0x6f, 0x66, 0x66, 0x96, 0x01, 0x00, 0xbf, 0x00, 0x05, +0x18, 0x05, 0xa1, 0x2e, 0x00, 0x28, 0x41, 0x6c, 0x73, 0x6f, +0x2c, 0x00, 0x69, 0xd3, 0x00, 0x30, 0x27, 0x72, 0x65, 0xd2, +0x01, 0x01, 0xcf, 0x01, 0x06, 0xc0, 0x00, 0x06, 0x2b, 0x01, +0x27, 0x69, 0x73, 0x27, 0x01, 0x06, 0x7f, 0x01, 0x02, 0x9c, +0x00, 0x28, 0x69, 0x74, 0x9a, 0x00, 0x00, 0x0f, 0x00, 0x20, +0x61, 0x72, 0xca, 0x05, 0x02, 0xc7, 0x01, 0x11, 0x6b, 0x12, +0x00, 0xa3, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x65, 0x72, 0x2e, +0x00, 0x49, 0x30, 0x01, 0x60, 0x73, 0x77, 0x69, 0x76, 0x65, +0x6c, 0x09, 0x02, 0x40, 0x73, 0x74, 0x61, 0x6e, 0x88, 0x03, +0x24, 0x61, 0x73, 0x31, 0x06, 0x50, 0x67, 0x00, 0x69, 0x74, +0x2c, 0x3e, 0x00, 0x41, 0x73, 0x74, 0x61, 0x79, 0x79, 0x00, +0x07, 0x83, 0x06, 0x20, 0x70, 0x61, 0x93, 0x05, 0x01, 0xa6, +0x01, 0x3a, 0x29, 0x00, 0x00, 0x4d, 0x01, 0x22, 0x75, 0x73, +0x84, 0x02, 0xa0, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, +0x6b, 0x65, 0x79, 0x42, 0x01, 0x01, 0x97, 0x00, 0x03, 0x94, +0x00, 0x05, 0x01, 0x01, 0x06, 0x8f, 0x02, 0x13, 0x6e, 0x37, +0x06, 0xa3, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0x69, +0x6e, 0x67, 0x7b, 0x06, 0x40, 0x74, 0x75, 0x72, 0x6e, 0x44, +0x00, 0x02, 0x66, 0x06, 0x66, 0x6f, 0x76, 0x65, 0x72, 0x00, +0x61, 0xc8, 0x04, 0x01, 0xc7, 0x00, 0x02, 0xca, 0x04, 0x22, +0x6f, 0x72, 0xe0, 0x00, 0x32, 0x00, 0x69, 0x74, 0x03, 0x04, +0x40, 0x2c, 0x00, 0x61, 0x73, 0x37, 0x04, 0x2f, 0x76, 0x65, +0x55, 0x00, 0x13, 0x22, 0x64, 0x6f, 0x16, 0x01, 0x02, 0x50, +0x01, 0x25, 0x75, 0x70, 0x79, 0x01, 0x01, 0x06, 0x01, 0x22, +0x62, 0x65, 0xd5, 0x01, 0x22, 0x65, 0x64, 0x4f, 0x06, 0x8b, +0x65, 0x78, 0x74, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x00, +0x01, 0xa5, 0x01, 0x00, 0x6d, 0x00, 0x31, 0x65, 0x64, 0x3b, +0x3a, 0x03, 0x06, 0x18, 0x01, 0x20, 0x62, 0x65, 0x1b, 0x01, +0x14, 0x64, 0x0c, 0x01, 0x0c, 0x66, 0x02, 0x03, 0x1c, 0x01, +0x12, 0x2c, 0x69, 0x05, 0x05, 0x3c, 0x02, 0x0e, 0x4d, 0x02, +0x12, 0x6e, 0xac, 0x00, 0x00, 0xf1, 0x00, 0x21, 0x61, 0x6e, +0xd6, 0x03, 0x02, 0x42, 0x00, 0x30, 0x2e, 0x00, 0x00, 0x50, +0x02, 0x11, 0x6c, 0x92, 0x00, 0x11, 0x61, 0x71, 0x06, 0x10, +0x73, 0x99, 0x02, 0x42, 0x63, 0x72, 0x69, 0x62, 0x97, 0x04, +0x13, 0x73, 0x87, 0x06, 0x30, 0x32, 0x2e, 0x31, 0x01, 0x04, +0x02, 0x97, 0x00, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, +0x62, 0x6c, 0x65, 0x2e, 0x29, 0x4e, 0x06, 0x16, 0x32, 0x4e, +0x06, 0x00, 0x9d, 0x07, 0x50, 0x6d, 0x65, 0x74, 0x65, 0x72, +0x50, 0x06, 0x00, 0xff, 0x07, 0x35, 0x73, 0x65, 0x00, 0x14, +0x00, 0x01, 0x45, 0x04, 0x06, 0x3f, 0x00, 0x51, 0x00, 0x66, +0x72, 0x6f, 0x6d, 0x7c, 0x00, 0xe0, 0x60, 0x43, 0x75, 0x73, +0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, +0x72, 0x00, 0x04, 0x16, 0x04, 0xb0, 0x60, 0x54, 0x79, 0x70, +0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xae, 0x00, 0x91, +0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x0f, +0x05, 0x50, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x20, 0x03, 0x02, +0xdf, 0x01, 0x15, 0x69, 0xac, 0x05, 0x01, 0x46, 0x05, 0x30, +0x69, 0x66, 0x66, 0x20, 0x05, 0x63, 0x74, 0x79, 0x00, 0x00, +0x00, 0x43, 0xe5, 0x06, 0x02, 0x2a, 0x04, 0x05, 0x1a, 0x00, +0x05, 0x5b, 0x03, 0x40, 0x65, 0x6e, 0x65, 0x72, 0xeb, 0x03, +0x03, 0x23, 0x08, 0x57, 0x2e, 0x00, 0x4d, 0x6f, 0x72, 0x29, +0x00, 0x13, 0x00, 0x54, 0x07, 0xd3, 0x00, 0x72, 0x65, 0x71, +0x75, 0x69, 0x72, 0x65, 0x00, 0x6d, 0x6f, 0x72, 0x65, 0xcf, +0x08, 0x62, 0x78, 0x00, 0x64, 0x65, 0x64, 0x75, 0x3d, 0x01, +0x01, 0x65, 0x06, 0x02, 0xb8, 0x00, 0x80, 0x55, 0x6e, 0x72, +0x65, 0x61, 0x73, 0x6f, 0x6e, 0xe9, 0x00, 0x18, 0x27, 0x73, +0x00, 0x20, 0x6c, 0x65, 0x41, 0x03, 0x35, 0x6d, 0x61, 0x79, +0x4d, 0x00, 0xe0, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61, +0x63, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x00, }; -const unsigned short help_text_len = 2509; -const unsigned short help_text_words = 455; +const unsigned short help_text_len = 2754; +const unsigned short help_text_words = 497; const char quick_help_text[] = "Divide the grid into rotationally symmetric regions each centred on a dot."; diff --git a/apps/plugins/puzzles/help/guess.c b/apps/plugins/puzzles/help/guess.c index dbeb34c2a6..63ada73bca 100644 --- a/apps/plugins/puzzles/help/guess.c +++ b/apps/plugins/puzzles/help/guess.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/inertia.c b/apps/plugins/puzzles/help/inertia.c index 486a5ac546..b537fbf5d0 100644 --- a/apps/plugins/puzzles/help/inertia.c +++ b/apps/plugins/puzzles/help/inertia.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/keen.c b/apps/plugins/puzzles/help/keen.c index 5ed75b3d62..5628338343 100644 --- a/apps/plugins/puzzles/help/keen.c +++ b/apps/plugins/puzzles/help/keen.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/lightup.c b/apps/plugins/puzzles/help/lightup.c index c588a6b5d0..127c78d885 100644 --- a/apps/plugins/puzzles/help/lightup.c +++ b/apps/plugins/puzzles/help/lightup.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/loopy.c b/apps/plugins/puzzles/help/loopy.c index a9d20ed008..1c6e420fd3 100644 --- a/apps/plugins/puzzles/help/loopy.c +++ b/apps/plugins/puzzles/help/loopy.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/magnets.c b/apps/plugins/puzzles/help/magnets.c index 7e679f3e5d..eed84c78b6 100644 --- a/apps/plugins/puzzles/help/magnets.c +++ b/apps/plugins/puzzles/help/magnets.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/map.c b/apps/plugins/puzzles/help/map.c index 676272ea2e..931ffeb05f 100644 --- a/apps/plugins/puzzles/help/map.c +++ b/apps/plugins/puzzles/help/map.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/mines.c b/apps/plugins/puzzles/help/mines.c index 689c483111..ad20406b3a 100644 --- a/apps/plugins/puzzles/help/mines.c +++ b/apps/plugins/puzzles/help/mines.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/net.c b/apps/plugins/puzzles/help/net.c index a27fd65c17..504de3fca5 100644 --- a/apps/plugins/puzzles/help/net.c +++ b/apps/plugins/puzzles/help/net.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/netslide.c b/apps/plugins/puzzles/help/netslide.c index 259e434d5f..be2a6d7aa6 100644 --- a/apps/plugins/puzzles/help/netslide.c +++ b/apps/plugins/puzzles/help/netslide.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/palisade.c b/apps/plugins/puzzles/help/palisade.c index 2034c7ce79..3b0e897828 100644 --- a/apps/plugins/puzzles/help/palisade.c +++ b/apps/plugins/puzzles/help/palisade.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/pattern.c b/apps/plugins/puzzles/help/pattern.c index c0e5fc306a..f977e03860 100644 --- a/apps/plugins/puzzles/help/pattern.c +++ b/apps/plugins/puzzles/help/pattern.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/pearl.c b/apps/plugins/puzzles/help/pearl.c index 84dec04e71..162b8a44a4 100644 --- a/apps/plugins/puzzles/help/pearl.c +++ b/apps/plugins/puzzles/help/pearl.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/pegs.c b/apps/plugins/puzzles/help/pegs.c index b07fb0ac47..0877c3a5c2 100644 --- a/apps/plugins/puzzles/help/pegs.c +++ b/apps/plugins/puzzles/help/pegs.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/range.c b/apps/plugins/puzzles/help/range.c index d8b6bf4d3b..64e4f59042 100644 --- a/apps/plugins/puzzles/help/range.c +++ b/apps/plugins/puzzles/help/range.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/rect.c b/apps/plugins/puzzles/help/rect.c index 579ff29626..8ce9af4a73 100644 --- a/apps/plugins/puzzles/help/rect.c +++ b/apps/plugins/puzzles/help/rect.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/samegame.c b/apps/plugins/puzzles/help/samegame.c index be7c0ae2fe..067dea0cec 100644 --- a/apps/plugins/puzzles/help/samegame.c +++ b/apps/plugins/puzzles/help/samegame.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/signpost.c b/apps/plugins/puzzles/help/signpost.c index f12c526346..fd496dab24 100644 --- a/apps/plugins/puzzles/help/signpost.c +++ b/apps/plugins/puzzles/help/signpost.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/singles.c b/apps/plugins/puzzles/help/singles.c index d6d88e9864..66978cd67d 100644 --- a/apps/plugins/puzzles/help/singles.c +++ b/apps/plugins/puzzles/help/singles.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/sixteen.c b/apps/plugins/puzzles/help/sixteen.c index c1cbee5807..8e3dfdba2a 100644 --- a/apps/plugins/puzzles/help/sixteen.c +++ b/apps/plugins/puzzles/help/sixteen.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/slant.c b/apps/plugins/puzzles/help/slant.c index 3c46d46f51..f905458aeb 100644 --- a/apps/plugins/puzzles/help/slant.c +++ b/apps/plugins/puzzles/help/slant.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/solo.c b/apps/plugins/puzzles/help/solo.c index 94f4c260bf..f2ba9c7848 100644 --- a/apps/plugins/puzzles/help/solo.c +++ b/apps/plugins/puzzles/help/solo.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/tents.c b/apps/plugins/puzzles/help/tents.c index 6ab7968db2..9ff68a3c24 100644 --- a/apps/plugins/puzzles/help/tents.c +++ b/apps/plugins/puzzles/help/tents.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/towers.c b/apps/plugins/puzzles/help/towers.c index 534ec8a15b..f56ac822ef 100644 --- a/apps/plugins/puzzles/help/towers.c +++ b/apps/plugins/puzzles/help/towers.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/tracks.c b/apps/plugins/puzzles/help/tracks.c index eafeeea6f5..b46bd86f9e 100644 --- a/apps/plugins/puzzles/help/tracks.c +++ b/apps/plugins/puzzles/help/tracks.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/twiddle.c b/apps/plugins/puzzles/help/twiddle.c index 300a69dc54..6666746226 100644 --- a/apps/plugins/puzzles/help/twiddle.c +++ b/apps/plugins/puzzles/help/twiddle.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/undead.c b/apps/plugins/puzzles/help/undead.c index 91a347dcbe..48c26380ea 100644 --- a/apps/plugins/puzzles/help/undead.c +++ b/apps/plugins/puzzles/help/undead.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/unequal.c b/apps/plugins/puzzles/help/unequal.c index 52b2a1c8e1..723b55967e 100644 --- a/apps/plugins/puzzles/help/unequal.c +++ b/apps/plugins/puzzles/help/unequal.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/unruly.c b/apps/plugins/puzzles/help/unruly.c index 31e88165ae..19c1815991 100644 --- a/apps/plugins/puzzles/help/unruly.c +++ b/apps/plugins/puzzles/help/unruly.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/help/untangle.c b/apps/plugins/puzzles/help/untangle.c index 4a90fa863e..193629778f 100644 --- a/apps/plugins/puzzles/help/untangle.c +++ b/apps/plugins/puzzles/help/untangle.c @@ -1,4 +1,4 @@ -/* auto-generated on Apr 19 2018 by genhelp.sh */ +/* auto-generated on Apr 24 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ diff --git a/apps/plugins/puzzles/lz4tiny.c b/apps/plugins/puzzles/lz4tiny.c index 8244ede1cc..8badbbb72c 100644 --- a/apps/plugins/puzzles/lz4tiny.c +++ b/apps/plugins/puzzles/lz4tiny.c @@ -188,6 +188,8 @@ void LZ4_decompress_tiny(const char* const source, char* const dest, int outputS /* testing code */ #ifndef ROCKBOX +#define LZ4TINY + #include "help.h" #include #include @@ -195,7 +197,13 @@ int main() { char *buf = malloc(help_text_len); LZ4_decompress_tiny(help_text, buf, help_text_len); - puts(buf); + int col = 0; + for(int i = 0; i < help_text_len; ++i) + { + char c = buf[i]; + printf("%c", (col++, !c ? (col >= 80 ? (col = 0, '\n') : ' ') : c)); + } + puts(""); free(buf); } #endif