Skip to content

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.

Subway Surfers: signals over the tracks, the drawn logo gone

Mason363678b6a50a606
diff --git a/games/subway/src/assets.c b/games/subway/src/assets.c
index 972b8b2e..c5c9d643 100644
--- a/games/subway/src/assets.c
+++ b/games/subway/src/assets.c
@@ -4200,432 +4200,3 @@ static const Glyph font_small_o2_glyphs[95] = {
const Font font_small = {32, 95, 11, 3, font_small_glyphs, font_small_data,
{font_small_o1_glyphs, font_small_o2_glyphs}, {font_small_o1_data, font_small_o2_data}};
-#define LOGO_W 196
-#define LOGO_H 102
-const uint16_t logo_w = 196, logo_h = 102;
-const uint16_t logo_pal[16] = {0xEFBC, 0xC75F, 0xFEEA, 0xFE46, 0xD6B4, 0xF5A5, 0xB489, 0x298B, 0x112B, 0x110B, 0x08AB, 0x08A9, 0x0866, 0x0845, 0x0000, 0x0000};
-const uint16_t logo_rows[103] = {
- 0,2,4,12,40,84,134,206,288,374,486,606,724,864,1000,1146,
- 1318,1456,1602,1762,1930,2090,2252,2420,2590,2758,2910,3076,3218,3350,3496,3618,
- 3746,3878,4022,4162,4308,4450,4590,4720,4860,5018,5170,5316,5472,5636,5792,5950,
- 6122,6282,6440,6582,6724,6856,6990,7126,7256,7388,7540,7688,7844,8006,8166,8344,
- 8502,8682,8848,9018,9190,9356,9540,9702,9876,10034,10192,10374,10546,10716,10874,11050,
- 11212,11366,11528,11672,11810,11942,12064,12186,12308,12442,12574,12688,12794,12906,13002,13070,
- 13122,13166,13186,13212,13228,13230,13232,
-};
-const uint8_t logo_runs[13232] = {
- 196,0,196,0,170,0,2,25,3,41,21,0,162,0,1,40,1,73,1,105,1,121,1,153,1,169,1,185,1,201,1,217,
- 3,233,1,232,1,105,20,0,146,0,1,27,1,40,1,56,1,73,1,88,1,104,1,121,1,152,2,169,1,152,1,137,
- 1,57,1,0,1,89,1,200,1,249,10,248,1,249,1,248,1,137,20,0,140,0,1,25,1,24,1,41,1,89,1,152,
- 1,185,1,217,1,233,10,248,1,233,1,104,1,249,1,248,1,249,1,248,1,249,3,251,1,250,2,249,1,250,2,249,
- 1,248,1,153,20,0,129,0,1,25,2,56,1,89,1,104,1,121,1,153,1,168,1,185,1,201,1,216,1,217,2,233,
- 5,248,1,249,1,250,5,251,1,249,1,248,2,249,1,233,2,249,1,248,1,251,2,247,1,246,2,244,3,241,1,246,
- 1,251,1,248,1,185,1,77,1,76,1,44,17,0,112,0,1,27,1,40,1,57,1,72,1,88,1,105,1,137,1,152,
- 1,169,1,185,1,200,1,169,1,0,1,72,1,168,1,200,1,217,1,233,11,248,5,249,1,251,1,249,4,247,2,246,
- 2,247,1,249,1,248,3,249,1,248,1,250,1,247,8,240,1,247,1,251,1,248,1,233,1,189,1,204,1,156,17,0,
- 102,0,1,26,1,41,1,56,2,73,1,57,1,0,1,89,1,152,1,185,1,217,11,248,1,41,1,169,3,248,2,249,
- 1,250,7,251,1,250,3,249,1,248,1,249,1,247,1,244,1,241,8,240,1,247,1,251,1,248,1,249,1,248,1,249,
- 1,247,8,240,1,241,1,248,1,249,1,248,1,233,1,172,1,188,1,156,17,0,89,0,1,25,1,40,1,56,1,57,
- 1,56,1,24,1,0,1,88,1,121,1,169,1,185,1,201,1,217,1,232,1,233,4,248,1,105,1,233,4,248,1,249,
- 6,251,2,249,1,248,1,56,1,185,1,248,2,249,1,248,3,247,2,246,3,244,2,241,1,247,1,250,1,248,3,249,
- 1,241,9,240,1,241,1,250,1,248,1,249,1,248,1,251,1,247,8,240,1,244,1,251,2,248,1,233,1,172,1,188,
- 1,172,1,29,16,0,80,0,1,25,1,73,1,89,1,121,1,136,1,152,1,185,1,200,1,216,1,233,1,232,2,249,
- 1,248,1,217,1,137,5,248,6,249,1,248,1,185,1,233,2,249,1,251,1,249,3,247,2,246,1,244,1,246,1,247,
- 1,249,1,248,1,105,1,217,1,248,1,250,1,247,11,240,1,244,1,251,1,248,1,249,1,248,1,251,1,247,10,240,
- 1,247,1,251,2,248,1,251,1,244,8,240,1,247,1,250,2,248,1,219,1,173,1,188,1,172,1,28,16,0,69,0,
- 1,25,1,40,1,57,1,73,3,89,1,72,1,41,2,0,1,217,8,248,2,249,2,248,2,249,1,233,3,249,2,251,
- 1,248,3,247,3,249,1,233,1,249,1,248,1,249,1,246,1,241,7,240,1,247,1,251,1,248,1,219,1,249,1,248,
- 1,251,1,246,11,240,1,241,1,248,3,249,1,248,1,251,1,246,9,240,1,244,1,251,1,248,1,249,1,247,8,240,
- 1,244,1,251,1,248,2,249,1,188,1,173,1,188,1,172,1,45,16,0,58,0,1,24,1,40,1,57,1,72,1,104,
- 1,121,1,136,1,152,1,185,1,200,1,216,1,233,1,232,6,248,1,249,1,201,1,121,1,217,1,248,1,249,1,250,
- 3,251,2,249,2,248,2,249,1,248,4,249,1,248,1,246,1,244,1,241,3,240,1,247,1,251,1,248,4,249,1,241,
- 8,240,1,247,1,250,1,248,1,233,1,249,1,248,1,251,1,244,12,240,1,247,1,251,1,248,3,249,1,248,1,241,
- 9,240,1,247,1,249,1,251,1,247,8,240,1,247,1,251,2,248,1,235,1,173,1,188,1,172,1,188,1,60,16,0,
- 47,0,2,25,1,41,1,56,1,73,1,89,1,121,1,137,1,153,1,168,1,217,1,233,1,249,9,248,6,249,2,248,
- 1,249,2,248,1,249,1,248,1,249,1,247,1,246,2,244,5,241,1,247,1,250,1,248,1,249,1,248,1,251,1,247,
- 6,240,1,241,1,250,1,248,3,249,1,248,1,241,8,240,1,247,1,249,1,248,4,249,1,241,12,240,1,244,1,251,
- 1,248,2,249,1,248,1,251,1,247,9,240,1,244,1,250,1,251,1,244,8,240,1,247,2,249,1,248,1,203,1,173,
- 2,188,1,172,1,44,16,0,36,0,1,25,1,41,1,57,2,73,1,88,1,89,1,57,1,89,1,152,1,185,1,217,
- 1,233,1,249,9,248,1,249,1,250,6,251,2,249,1,248,4,247,1,249,2,251,2,248,2,249,1,248,1,251,1,244,
- 8,240,1,244,1,251,1,248,1,249,1,248,1,251,1,247,7,240,1,247,1,249,2,248,1,249,1,247,1,241,8,240,
- 1,247,1,249,1,248,1,249,1,248,1,249,1,247,1,241,13,240,1,247,1,249,1,248,2,249,1,248,1,251,1,244,
- 9,240,1,247,1,249,1,241,7,240,1,244,1,251,2,248,1,233,3,172,1,188,1,124,17,0,18,0,1,24,1,40,
- 1,57,1,72,1,104,1,121,3,137,1,121,1,89,1,57,1,72,1,120,1,153,1,169,1,185,1,217,1,232,1,233,
- 5,248,1,249,5,248,1,249,1,250,4,251,1,250,4,249,3,247,1,246,3,244,2,241,5,240,1,241,1,244,1,247,
- 1,250,1,249,1,248,1,249,1,248,1,251,1,246,8,240,1,241,1,250,1,248,1,249,1,248,1,251,1,244,7,240,
- 1,246,1,251,2,248,1,249,1,247,1,241,7,240,1,241,1,248,3,249,1,248,1,250,1,247,14,240,1,247,1,251,
- 1,248,2,249,1,248,1,249,1,247,9,240,1,246,1,247,8,240,1,247,1,250,2,248,1,219,1,173,1,188,1,172,
- 1,188,1,76,17,0,13,0,1,24,1,89,1,153,1,201,1,217,1,232,10,248,1,249,6,248,11,249,1,251,1,249,
- 7,247,1,249,1,248,1,249,1,247,17,240,1,244,1,247,1,249,2,248,1,250,1,247,9,240,1,247,1,249,2,248,
- 1,251,1,244,7,240,1,241,1,250,2,248,1,249,1,247,8,240,1,241,1,250,1,248,2,249,1,248,1,251,1,247,
- 14,240,1,244,1,251,1,248,3,249,1,248,1,251,1,247,8,240,1,241,1,244,5,240,1,241,1,240,1,241,1,249,
- 1,248,2,249,1,188,1,173,1,172,1,188,1,156,18,0,12,0,1,104,1,216,5,248,1,249,1,250,4,251,1,250,
- 1,249,2,248,4,249,2,251,1,249,5,247,6,249,1,244,1,241,7,240,1,247,2,249,1,247,18,240,1,241,1,247,
- 1,249,1,248,1,249,1,248,9,240,1,247,1,250,1,248,2,249,1,241,8,240,1,247,1,249,1,248,1,249,1,247,
- 8,240,1,244,1,251,1,248,2,249,1,248,1,251,1,246,15,240,1,247,1,249,1,248,3,249,1,248,1,251,1,241,
- 1,240,1,241,2,240,4,241,1,240,6,241,1,240,1,247,1,251,2,248,1,233,1,173,1,188,1,172,1,188,1,93,
- 18,0,10,0,1,24,1,169,2,248,1,249,1,248,1,249,1,251,1,249,8,247,1,250,1,251,2,248,1,249,1,247,
- 1,246,1,244,1,241,5,240,1,247,1,250,1,248,2,249,1,248,9,240,1,247,1,249,1,248,1,249,1,241,18,240,
- 1,244,1,251,2,248,1,250,1,244,8,240,1,247,1,251,1,248,1,249,1,247,9,240,1,246,1,251,1,248,1,250,
- 1,247,8,240,1,244,1,251,1,248,2,249,1,248,1,251,1,244,6,240,2,241,5,240,1,241,1,240,1,247,1,251,
- 1,248,3,249,1,248,1,250,1,247,1,240,15,241,1,247,2,249,1,248,1,203,1,173,1,188,1,172,1,188,1,45,
- 18,0,10,0,1,169,1,248,1,249,1,248,1,249,1,251,1,247,1,246,1,241,8,240,1,244,1,247,1,249,1,248,
- 1,251,1,244,8,240,1,247,1,251,1,248,1,249,1,248,1,249,1,241,8,240,1,247,1,250,1,248,1,249,1,241,
- 19,240,1,247,1,249,1,248,1,251,1,246,8,240,1,244,1,251,1,248,1,250,1,247,9,240,1,241,1,249,1,248,
- 1,250,1,247,8,240,1,246,1,251,1,248,4,249,1,241,4,240,1,241,1,240,1,247,1,241,1,240,5,241,1,240,
- 1,241,1,250,1,248,1,249,1,233,2,249,1,248,1,251,1,244,1,240,12,241,1,240,1,244,1,251,2,248,1,233,
- 1,188,2,172,1,188,1,140,19,0,9,0,1,121,1,248,1,249,1,248,2,249,1,246,13,240,1,247,1,249,1,251,
- 1,244,8,240,1,246,1,251,1,248,1,249,1,248,1,250,1,241,8,240,1,247,1,251,1,248,1,251,1,244,19,240,
- 1,247,1,251,1,248,1,251,1,247,8,240,1,241,1,249,1,248,1,251,1,247,10,240,1,247,1,249,1,250,1,247,
- 6,240,1,241,1,240,1,246,1,251,1,248,1,249,1,248,1,249,1,247,1,241,1,240,4,241,1,240,1,247,1,246,
- 1,240,7,241,1,247,1,249,1,248,1,233,1,235,1,248,2,249,1,248,14,241,1,247,1,251,2,248,1,219,1,173,
- 1,188,1,172,1,188,1,77,19,0,8,0,1,24,1,233,3,249,1,248,1,244,14,240,1,247,1,249,1,251,1,246,
- 8,240,1,244,1,251,1,248,1,249,1,248,1,251,1,244,8,240,1,247,1,251,1,248,1,251,1,244,8,240,2,241,
- 9,240,1,246,1,251,1,248,1,249,1,247,1,241,7,240,1,241,1,247,1,249,1,251,1,246,8,240,1,241,1,240,
- 1,246,1,251,1,250,1,247,1,240,6,241,1,240,1,247,1,251,1,248,1,249,1,248,1,250,1,247,7,241,1,249,
- 1,247,1,240,6,241,1,240,1,247,1,251,1,248,1,249,1,203,2,249,1,248,1,251,1,247,13,241,4,249,1,188,
- 1,173,1,172,1,188,1,172,1,28,19,0,8,0,1,105,1,248,1,249,1,248,1,251,1,244,15,240,1,247,1,249,
- 1,251,1,247,8,240,1,244,1,251,1,248,1,249,1,248,1,251,1,244,8,240,1,246,1,251,1,248,1,251,1,244,
- 7,240,1,246,1,251,1,249,1,247,1,241,7,240,1,244,1,251,2,248,1,251,1,244,8,240,1,247,1,249,1,251,
- 1,244,1,240,8,241,1,240,1,241,1,249,1,251,1,247,1,240,7,241,1,247,1,251,1,248,1,249,1,248,1,251,
- 1,247,1,240,6,241,1,249,1,248,9,241,2,249,1,248,1,219,1,203,1,248,1,249,1,248,1,251,1,244,11,241,
- 1,247,1,251,2,248,1,233,1,173,1,188,1,172,1,188,1,108,20,0,8,0,1,153,2,248,1,251,1,247,15,240,
- 1,241,1,250,1,248,1,251,1,247,8,240,1,244,1,251,1,248,1,249,1,248,1,251,1,246,8,240,1,244,1,251,
- 1,248,1,251,1,246,7,240,1,244,1,251,1,248,1,251,1,247,7,240,1,246,1,251,2,248,1,251,1,246,1,240,
- 6,241,1,240,1,247,1,251,1,249,1,241,1,240,10,241,1,247,1,251,1,247,1,240,7,241,1,247,1,250,1,248,
- 1,249,1,248,1,251,1,246,1,240,5,241,1,244,1,250,1,251,1,244,8,241,1,247,1,250,1,248,1,249,1,188,
- 1,233,2,248,1,249,1,247,11,241,1,247,2,249,1,248,1,203,1,173,1,188,1,172,1,188,1,44,20,0,8,0,
- 1,185,1,248,2,249,1,241,15,240,1,246,1,251,1,248,1,251,1,247,8,240,1,241,1,249,1,248,1,249,1,248,
- 1,251,1,247,8,240,1,244,1,251,1,248,1,251,1,247,7,240,1,244,1,251,1,248,1,249,1,247,3,240,3,241,
- 1,240,1,247,1,251,2,248,1,251,1,247,1,240,6,241,1,240,1,244,1,251,1,247,11,241,1,240,1,246,1,251,
- 1,247,1,240,7,241,1,247,1,249,1,248,1,249,1,248,1,251,1,244,6,241,1,246,1,251,1,250,1,247,8,241,
- 1,246,1,251,2,248,1,203,1,188,2,249,1,248,1,251,1,247,9,241,1,244,1,251,1,248,2,249,1,188,2,172,
- 1,188,1,140,21,0,8,0,1,185,1,248,1,251,1,247,16,240,1,247,1,250,1,248,1,250,1,247,8,240,1,241,
- 3,249,1,248,1,251,1,247,8,240,1,244,1,251,1,248,1,251,1,247,1,240,1,241,1,240,3,241,1,240,1,241,
- 1,249,1,248,1,251,1,247,1,240,4,241,1,240,1,241,1,248,2,249,1,248,1,249,1,247,9,241,1,251,1,247,
- 13,241,1,251,1,246,1,240,7,241,1,248,5,249,7,241,1,247,1,251,1,249,1,248,9,241,2,249,1,248,1,233,
- 1,173,1,219,1,248,3,249,9,241,1,244,1,251,2,248,1,219,1,173,1,188,1,172,1,188,1,77,21,0,8,0,
- 1,152,1,248,1,251,1,246,9,240,1,246,3,247,1,246,2,241,1,250,2,248,1,249,1,247,8,240,1,241,1,247,
- 1,249,2,248,1,251,1,247,5,240,2,241,1,240,1,241,1,249,1,248,1,250,1,247,1,240,5,241,1,240,1,241,
- 1,251,1,249,1,247,6,241,1,240,1,247,1,251,1,248,2,249,1,248,1,250,9,241,1,248,1,247,13,241,1,247,
- 1,246,8,241,3,249,1,248,1,249,1,247,7,241,1,247,1,251,2,248,1,244,8,241,1,247,1,250,1,248,1,249,
- 1,188,1,172,1,233,2,248,1,251,1,244,8,241,1,244,1,251,1,248,1,249,1,188,1,173,1,172,1,188,1,172,
- 1,28,21,0,8,0,1,136,1,248,1,251,1,246,8,240,1,244,1,252,2,249,2,251,1,249,1,247,2,249,1,248,
- 1,249,1,248,1,241,8,240,1,247,1,249,2,248,1,250,1,247,1,240,6,241,1,240,1,241,1,249,1,248,1,249,
- 1,247,8,241,1,244,8,241,1,244,1,250,1,248,3,249,1,248,1,251,1,246,8,241,2,247,13,241,1,247,1,246,
- 8,241,1,250,1,248,1,249,1,248,1,250,1,247,20,241,1,246,1,251,2,248,1,203,1,173,1,171,2,248,1,251,
- 1,246,9,241,1,249,1,248,1,233,3,172,1,188,1,124,22,0,8,0,1,121,1,248,1,251,1,246,8,240,1,241,
- 1,247,1,251,1,249,2,248,2,249,1,248,4,249,1,241,1,240,7,241,1,247,1,250,2,248,1,249,1,247,9,241,
- 1,248,2,249,1,247,17,241,1,248,1,251,2,248,2,249,1,248,1,251,1,247,8,241,1,247,1,246,14,241,1,244,
- 7,241,1,244,1,251,1,248,1,249,1,248,1,251,1,247,21,241,1,248,1,249,1,248,1,233,1,189,1,141,1,169,
- 1,248,1,251,1,247,9,241,1,249,1,248,1,233,3,172,1,188,1,44,22,0,8,0,1,104,1,248,1,251,1,247,
- 1,240,1,241,5,240,1,241,1,240,1,241,1,246,1,247,1,250,1,251,1,249,1,248,3,249,1,248,1,249,1,241,
- 1,240,6,241,1,240,1,247,1,251,2,248,1,249,1,248,9,241,1,247,2,249,1,248,18,241,1,247,1,251,1,249,
- 1,248,1,249,1,248,1,249,1,247,8,241,2,244,6,241,1,244,15,241,1,244,1,251,1,248,1,249,1,248,1,251,
- 1,246,21,241,1,247,1,251,1,248,1,249,1,188,1,157,1,105,1,248,1,251,1,247,9,241,1,248,2,249,1,188,
- 1,172,1,188,1,140,23,0,8,0,1,72,1,248,1,250,1,247,10,241,1,240,2,241,1,247,1,249,1,251,2,248,
- 1,249,1,248,1,251,1,244,1,240,6,241,1,240,1,247,1,251,1,248,3,249,9,241,1,247,1,249,1,248,1,249,
- 19,241,1,244,4,249,1,248,1,249,16,241,1,247,15,241,1,246,1,251,1,248,1,249,1,248,1,251,1,244,21,241,
- 1,244,1,251,2,248,1,219,1,173,1,155,1,248,1,251,1,247,9,241,1,247,2,249,1,188,1,172,1,188,1,92,
- 23,0,8,0,1,57,1,248,2,249,1,241,1,240,11,241,1,240,1,241,1,247,1,251,1,249,2,248,1,251,1,244,
- 1,240,6,241,1,240,1,247,1,251,1,248,1,249,1,248,1,249,9,241,1,247,1,251,1,248,1,251,20,241,1,244,
- 1,251,1,248,1,249,1,248,1,251,1,246,15,241,1,249,1,244,14,241,1,247,1,251,1,248,3,249,23,241,1,248,
- 1,249,1,248,1,233,1,173,1,188,1,248,1,249,1,247,9,241,1,247,1,249,1,248,1,188,1,173,1,188,1,45,
- 23,0,8,0,1,40,1,249,1,248,1,251,1,246,1,240,14,241,1,244,2,249,1,248,1,251,1,246,8,241,1,246,
- 1,251,1,248,1,249,1,248,1,251,1,244,8,241,1,247,1,251,1,248,1,251,1,244,7,241,1,244,2,247,1,246,
- 9,241,1,247,1,249,2,248,1,251,1,247,15,241,1,251,1,247,14,241,1,247,1,251,2,248,1,249,1,247,8,241,
- 1,246,5,247,9,241,1,247,1,251,1,248,1,249,2,188,2,249,1,247,9,241,1,247,1,251,1,248,1,203,1,173,
- 1,188,1,60,23,0,8,0,1,25,1,217,1,248,1,249,1,248,15,241,1,240,1,244,1,250,1,248,1,251,1,247,
- 8,241,1,244,1,251,1,248,1,249,1,248,1,251,1,244,8,241,1,247,1,251,1,248,1,251,1,244,7,241,1,247,
- 1,251,1,249,1,251,1,246,8,241,1,246,1,251,2,248,1,249,1,247,14,241,1,244,1,251,1,247,14,241,1,247,
- 1,251,2,248,1,251,1,247,7,241,1,247,4,251,1,249,1,251,1,247,8,241,1,244,1,251,2,248,1,219,1,173,
- 2,249,1,248,9,241,1,247,1,251,1,248,1,203,1,173,1,188,1,77,23,0,9,0,1,169,2,248,1,251,1,247,
- 16,241,1,247,2,251,1,247,8,241,1,244,1,251,1,248,1,249,1,248,1,251,1,244,8,241,1,246,1,251,1,248,
- 1,251,1,246,7,241,1,244,1,251,1,248,1,249,1,247,9,241,1,250,1,248,1,249,1,248,1,249,14,241,1,247,
- 1,251,1,250,1,244,13,241,1,247,1,249,2,248,1,251,1,247,7,241,1,247,1,249,4,248,1,249,1,247,9,241,
- 1,247,1,249,1,248,1,217,1,173,1,233,1,248,1,249,9,241,1,247,1,251,1,248,1,203,1,173,1,188,1,92,
- 23,0,9,0,1,88,1,248,1,249,1,248,1,251,1,247,16,241,1,248,1,251,1,247,9,241,1,249,1,248,1,249,
- 1,248,1,251,1,247,8,241,1,244,1,251,1,248,1,251,1,247,7,241,1,244,1,251,1,248,1,250,1,247,9,241,
- 3,249,1,248,1,251,1,244,13,241,1,247,1,249,1,251,1,247,13,241,1,247,1,249,2,248,1,251,1,246,7,241,
- 1,247,1,249,1,248,1,233,1,219,2,248,1,251,1,244,8,241,1,247,1,251,1,248,1,233,1,173,1,233,1,248,
- 1,249,9,241,1,247,1,249,1,248,1,219,1,173,1,188,1,108,23,0,10,0,1,217,1,248,1,249,1,248,1,251,
- 1,247,1,246,14,241,1,247,1,251,1,247,9,241,1,249,3,248,1,251,1,247,8,241,1,244,1,251,1,248,1,251,
- 1,247,7,241,1,244,1,251,1,250,1,251,1,244,9,241,1,247,1,249,2,248,1,251,1,247,13,241,1,247,2,249,
- 1,248,13,241,1,248,1,249,2,248,1,251,8,241,2,249,1,248,1,203,1,188,2,248,1,251,1,247,9,241,1,251,
- 1,248,1,233,1,173,1,235,1,248,1,249,1,247,1,246,3,244,3,247,3,249,1,248,1,219,1,173,1,188,1,124,
- 23,0,9,0,1,57,3,249,2,248,1,249,1,251,2,247,12,241,1,247,1,251,1,247,9,241,1,248,1,251,2,249,
- 1,251,1,246,8,241,1,244,1,251,1,248,1,251,1,247,8,241,2,247,1,244,10,241,1,248,1,249,2,248,1,249,
- 1,247,13,241,2,249,1,248,1,251,1,244,12,241,2,249,1,248,2,249,8,241,1,250,2,248,1,203,1,173,1,233,
- 1,248,1,249,1,248,7,241,1,244,1,247,1,249,1,248,1,233,1,173,1,219,1,248,2,249,6,251,2,249,1,248,
- 1,249,1,248,1,219,1,173,1,188,1,124,23,0,9,0,1,153,1,248,1,249,1,248,1,250,1,251,1,249,1,248,
- 1,249,1,251,1,249,1,247,10,241,1,246,1,251,1,247,10,241,4,247,9,241,1,244,1,251,1,248,1,249,1,247,
- 21,241,1,249,1,248,4,249,13,241,1,251,2,248,1,251,1,247,12,241,1,249,2,248,1,249,1,247,7,241,1,247,
- 1,251,2,248,1,203,1,173,1,219,1,248,2,249,1,248,4,247,1,248,1,249,2,251,3,249,1,172,1,219,11,248,
- 1,249,1,233,1,219,1,188,1,172,1,188,1,140,23,0,9,0,1,201,2,248,1,251,1,246,1,247,1,249,1,251,
- 1,249,2,248,1,251,1,247,9,241,1,246,1,251,1,249,23,241,1,247,1,251,1,248,1,249,1,247,20,241,1,247,
- 1,251,1,248,2,249,1,248,1,251,1,244,11,241,1,246,1,251,1,248,2,249,1,248,11,241,1,247,1,250,2,248,
- 1,249,1,247,4,244,3,247,1,249,1,248,2,249,1,188,1,173,1,188,2,249,1,248,1,249,1,250,2,251,2,249,
- 5,248,1,249,2,188,1,233,2,217,2,233,3,219,3,203,2,188,1,173,2,172,1,188,1,156,23,0,8,0,1,25,
- 1,233,1,248,1,249,1,247,3,241,2,247,3,251,1,247,9,241,1,247,2,251,1,246,22,241,1,247,1,250,1,248,
- 1,249,1,248,20,241,1,248,1,249,1,248,2,249,1,248,1,251,1,247,11,241,1,247,1,251,1,248,1,249,1,248,
- 1,249,1,247,6,241,1,244,2,247,1,248,1,251,1,248,4,249,6,251,1,249,1,248,1,249,1,248,1,249,1,188,
- 1,172,1,173,1,233,7,248,2,249,2,233,1,219,1,203,2,188,1,173,1,189,1,45,1,77,1,188,7,173,2,172,
- 3,173,1,189,1,156,1,27,1,24,1,40,1,57,1,73,3,89,1,73,1,57,1,25,12,0,8,0,1,40,1,233,
- 1,248,1,251,1,247,5,241,3,244,10,241,1,247,1,251,1,249,1,247,22,241,1,249,1,248,3,249,19,241,1,247,
- 1,249,2,248,1,233,1,235,1,248,1,249,1,247,10,241,1,247,5,249,1,248,1,250,1,249,1,248,1,247,1,248,
- 2,249,3,251,1,249,1,248,1,249,2,248,1,249,9,248,1,249,1,233,1,203,1,173,1,172,1,189,1,140,1,88,
- 1,155,1,219,3,203,4,188,4,173,2,172,1,188,2,45,1,188,5,172,1,188,1,172,1,173,1,188,1,203,2,219,
- 2,233,1,217,1,233,7,248,1,249,1,233,1,184,1,105,10,0,8,0,1,25,1,233,1,248,1,251,1,244,18,241,
- 1,247,1,249,1,248,1,251,1,246,20,241,1,247,1,250,1,248,1,249,1,248,1,249,17,241,1,244,1,247,1,250,
- 1,248,1,249,1,248,1,219,1,203,1,248,2,249,2,247,1,244,1,246,4,247,1,248,1,249,1,251,3,249,1,248,
- 2,249,1,248,4,249,7,248,1,249,1,235,5,233,1,235,2,219,3,203,1,188,1,172,1,173,1,188,1,172,1,188,
- 1,108,1,0,1,30,13,173,1,172,1,204,1,76,1,28,6,188,1,173,1,188,1,219,1,249,6,248,7,249,5,248,
- 1,105,9,0,9,0,1,217,1,248,1,250,19,241,1,251,2,248,2,249,19,241,1,247,1,251,1,248,2,249,1,248,
- 1,251,1,244,14,241,1,244,1,247,2,249,1,248,1,249,1,248,1,233,2,188,3,249,7,251,2,249,4,248,1,249,
- 1,235,2,249,4,248,1,249,2,233,1,235,2,219,1,203,2,188,2,173,3,188,1,172,7,173,2,172,2,173,1,189,
- 1,77,2,0,1,125,1,189,2,172,3,188,5,203,2,188,1,173,1,61,1,0,1,76,2,108,1,124,1,108,1,77,
- 1,187,1,249,1,248,1,249,1,248,1,249,3,250,1,249,5,247,1,248,1,249,2,250,2,249,1,248,1,136,9,0,
- 9,0,1,200,1,248,1,249,18,241,1,247,1,251,1,248,1,249,1,248,1,249,1,248,1,244,16,241,1,247,1,251,
- 1,248,2,249,2,248,1,251,1,247,6,241,2,244,5,247,1,249,2,251,3,249,1,248,1,233,1,188,1,173,1,188,
- 1,249,11,248,1,249,2,233,1,219,1,188,1,173,2,188,1,203,1,187,3,188,2,172,6,173,2,172,7,173,1,172,
- 3,188,1,172,3,188,1,203,2,121,1,136,1,185,1,235,2,233,2,249,6,248,2,249,1,201,1,121,1,25,5,0,
- 1,136,1,248,2,249,1,248,1,250,1,249,1,247,2,246,1,245,5,243,2,245,1,246,1,247,2,249,1,248,1,185,
- 1,45,8,0,9,0,1,185,1,248,1,251,1,244,16,241,1,244,1,251,1,248,3,249,1,248,1,249,1,251,1,247,
- 13,241,1,244,1,247,1,251,1,248,3,249,1,233,1,248,2,249,2,247,1,248,2,249,7,251,2,249,4,248,1,249,
- 1,219,1,188,1,173,1,188,1,173,1,203,1,217,1,201,2,233,3,219,2,203,4,188,3,173,1,188,1,172,11,173,
- 2,172,4,188,2,203,3,219,3,233,1,249,2,233,2,249,9,248,7,249,5,248,1,232,1,105,3,0,1,137,1,248,
- 3,249,1,250,1,247,1,246,1,243,2,242,8,243,2,242,1,246,1,250,1,248,1,235,1,173,1,156,1,61,6,0,
- 9,0,1,152,1,248,1,251,1,247,15,241,1,244,5,249,1,248,1,249,2,248,1,251,1,248,1,247,1,244,7,241,
- 1,244,2,247,1,251,1,249,1,248,1,249,2,248,2,203,1,248,1,249,1,248,4,249,9,248,1,249,2,233,1,219,
- 1,203,1,188,1,173,1,172,1,188,2,172,1,189,1,141,1,29,1,172,15,173,2,172,3,188,3,203,3,219,3,233,
- 1,249,10,248,1,249,3,248,1,249,8,250,1,249,1,248,4,247,1,248,1,249,2,250,1,249,1,248,1,249,2,248,
- 1,121,1,0,1,72,1,248,4,249,1,246,15,243,1,245,1,249,1,248,1,233,1,172,1,188,1,156,6,0,9,0,
- 1,137,2,248,1,251,1,247,13,241,1,247,2,249,1,248,1,249,1,248,1,203,1,219,1,248,2,249,1,248,1,249,
- 2,251,1,248,5,247,1,248,2,251,1,249,4,248,1,233,1,203,1,173,1,188,1,249,4,248,1,249,3,233,3,219,
- 2,203,4,188,3,173,1,172,1,188,3,172,1,188,1,173,1,30,1,0,1,125,1,189,3,173,1,172,4,188,3,203,
- 2,219,3,233,3,249,8,248,2,249,9,250,6,249,3,247,4,246,2,245,6,243,1,245,1,246,1,247,1,248,1,250,
- 1,248,2,249,1,248,1,89,1,185,1,248,1,249,1,248,1,250,1,246,1,242,14,243,1,242,1,246,1,250,1,248,
- 1,233,1,172,1,188,1,156,6,0,9,0,1,121,1,248,1,249,1,248,1,251,1,248,1,247,8,241,1,244,1,247,
- 1,248,1,251,3,249,1,248,1,219,2,173,1,219,1,249,5,248,2,249,2,251,3,249,5,248,1,233,1,219,1,188,
- 1,173,1,188,1,173,1,188,2,203,4,188,1,172,8,173,2,172,3,188,3,172,2,188,1,172,1,91,1,72,1,88,
- 1,155,3,219,3,233,1,249,10,248,4,249,6,250,1,249,1,248,4,247,6,246,1,247,2,249,1,248,1,250,1,246,
- 7,242,11,243,1,245,1,247,1,250,1,248,5,249,1,248,1,250,1,246,1,242,8,243,8,242,1,246,1,250,1,248,
- 1,249,2,188,1,172,1,29,5,0,9,0,1,41,1,249,1,248,1,249,1,248,1,249,1,251,1,249,1,248,5,247,
- 1,249,2,251,1,249,1,248,1,249,2,248,1,219,1,173,1,172,1,188,1,173,1,188,1,219,1,233,1,249,8,248,
- 1,249,2,233,1,235,1,219,1,203,1,188,1,173,1,172,4,188,1,189,1,109,12,173,3,172,4,173,2,188,1,141,
- 1,171,1,232,9,248,3,249,8,250,4,249,2,247,5,246,1,245,4,243,5,242,1,243,1,242,1,246,1,250,1,248,
- 2,249,1,245,19,243,1,242,1,246,1,250,1,248,3,249,1,248,1,250,1,247,18,242,1,246,1,250,1,248,1,249,
- 1,188,2,172,1,44,5,0,10,0,1,89,1,232,1,248,1,249,2,248,7,249,6,248,1,233,1,203,1,173,3,172,
- 1,188,2,173,2,188,6,203,3,188,2,172,10,173,1,61,1,0,1,173,4,188,3,203,3,219,5,233,2,219,1,171,
- 1,92,1,45,1,0,1,120,1,248,2,249,6,250,1,249,1,248,5,247,4,246,1,245,1,247,1,250,1,248,1,250,
- 1,246,5,242,13,243,1,246,1,250,1,248,2,249,1,245,16,243,5,242,1,246,1,250,1,248,2,249,1,248,1,250,
- 1,246,18,242,1,247,1,250,1,248,1,249,1,188,1,172,1,188,1,44,5,0,11,0,1,41,1,153,2,249,7,248,
- 1,249,3,233,1,219,1,203,1,188,2,173,3,188,1,172,1,204,1,92,1,44,1,172,1,188,11,173,5,188,3,203,
- 1,219,1,185,1,152,1,185,2,233,2,249,15,248,1,200,1,104,1,0,1,105,1,248,2,249,1,247,5,246,1,245,
- 4,243,5,242,1,243,1,242,1,246,1,250,1,248,1,250,1,246,18,243,1,246,1,250,2,248,1,250,1,246,1,242,
- 3,243,18,242,1,247,1,249,1,248,2,249,1,247,18,242,1,246,1,250,1,249,1,248,1,233,1,173,1,172,1,188,
- 1,61,5,0,13,0,2,188,5,203,4,188,1,172,4,173,2,188,1,172,2,173,1,189,1,125,3,0,1,109,3,173,
- 1,172,1,188,2,203,2,219,3,233,3,249,10,248,2,249,11,250,1,249,2,248,1,249,2,248,1,153,1,88,1,248,
- 1,250,1,247,6,242,12,243,1,246,1,250,1,248,1,250,1,246,17,243,1,242,1,245,2,249,1,248,1,250,1,246,
- 22,242,1,246,1,250,2,248,1,250,1,247,11,242,1,246,1,247,3,246,2,242,1,246,1,250,2,248,1,219,1,173,
- 1,172,1,188,1,76,5,0,13,0,1,109,1,189,11,173,1,172,3,173,1,172,3,188,1,171,1,88,1,121,1,136,
- 2,152,1,201,1,219,1,203,1,233,1,249,6,248,10,249,2,250,2,249,1,248,4,247,7,246,2,247,2,250,1,248,
- 2,249,1,248,1,217,1,248,1,250,1,247,18,243,1,245,1,249,1,248,1,250,1,246,1,242,4,243,13,242,1,245,
- 1,248,1,249,1,248,1,250,1,246,23,242,2,249,1,248,1,250,1,247,10,242,1,247,5,250,1,248,2,247,2,249,
- 1,248,1,203,1,173,1,172,1,188,1,77,5,0,13,0,1,25,1,124,2,188,3,203,4,219,1,203,2,188,1,203,
- 1,219,2,233,2,249,11,248,3,249,4,250,1,249,2,248,1,247,1,248,1,250,2,249,1,248,1,249,1,247,2,246,
- 1,245,4,243,8,242,2,243,1,246,1,247,1,250,1,249,1,248,1,249,2,248,1,250,1,247,17,243,1,242,1,245,
- 2,248,1,250,1,247,19,242,1,248,1,249,1,248,1,250,1,246,23,242,1,247,1,249,1,248,1,250,1,247,10,242,
- 1,249,1,250,4,248,1,249,1,250,4,249,1,188,2,172,1,188,1,60,5,0,9,0,1,56,1,121,1,169,1,200,
- 1,217,1,232,1,249,9,248,2,249,5,248,1,249,7,250,6,249,1,248,1,247,3,246,1,245,4,243,1,246,1,250,
- 1,248,1,249,1,247,1,243,1,242,18,243,1,246,2,249,1,248,3,249,1,247,6,243,13,242,1,247,1,249,1,250,
- 1,247,19,242,2,249,1,248,1,250,1,247,9,242,3,246,11,242,1,247,1,250,1,248,1,250,1,247,10,242,1,246,
- 1,247,2,250,1,249,3,248,2,249,1,248,1,219,1,173,2,188,1,172,1,28,5,0,7,0,1,73,1,185,5,248,
- 2,249,6,250,2,249,1,248,5,249,1,250,1,249,4,247,3,246,1,247,6,249,1,246,4,242,4,243,1,242,1,246,
- 1,250,1,248,1,249,1,247,20,243,1,242,1,246,5,249,1,248,1,243,18,242,1,247,2,249,1,247,16,242,2,246,
- 1,247,1,250,2,248,1,250,1,247,9,242,1,249,2,250,1,248,1,246,9,242,1,247,1,250,1,248,1,249,1,247,
- 12,242,1,246,2,247,1,250,1,249,1,248,2,249,1,248,1,233,1,188,1,173,1,188,1,140,6,0,6,0,1,136,
- 2,248,1,249,1,248,1,249,2,250,1,248,8,247,1,249,1,250,4,249,1,247,1,246,1,245,3,243,4,242,1,243,
- 1,247,1,250,1,248,3,249,1,245,9,243,1,246,1,250,1,248,1,249,1,247,11,243,11,242,1,246,1,250,1,248,
- 3,249,19,242,1,247,2,249,1,247,9,242,1,246,4,247,1,248,2,249,2,250,2,249,1,248,1,250,1,247,9,242,
- 1,247,1,249,1,248,1,250,1,247,9,242,1,247,1,250,1,248,2,249,1,245,1,242,12,243,1,245,1,246,1,247,
- 1,250,1,249,1,248,1,249,1,248,1,249,1,188,1,189,1,108,6,0,5,0,1,169,1,248,2,249,1,248,1,250,
- 1,248,1,247,1,246,1,245,3,243,1,242,4,243,1,245,1,246,1,247,1,249,1,248,1,250,1,247,1,242,9,243,
- 1,247,1,250,1,248,1,249,1,248,1,250,1,246,9,243,1,245,4,249,1,245,22,242,1,247,1,249,2,248,1,250,
- 1,246,15,242,3,246,3,249,1,248,9,242,1,246,3,250,4,249,5,248,1,250,1,247,9,242,1,247,1,250,1,248,
- 1,249,1,247,5,242,4,243,1,247,1,250,2,248,1,250,1,246,16,243,1,246,1,248,1,250,1,248,1,249,1,248,
- 1,233,1,188,1,45,6,0,4,0,1,153,1,248,1,249,1,248,1,249,1,250,1,247,1,245,2,242,10,243,1,242,
- 1,246,1,249,1,248,1,250,1,247,10,243,1,247,1,250,1,248,1,249,1,248,1,250,1,246,1,242,1,243,7,242,
- 1,245,1,248,1,249,1,248,1,249,1,246,22,242,1,246,1,250,2,248,1,250,1,246,9,242,5,247,2,249,2,250,
- 4,249,9,242,1,246,1,250,5,248,2,249,1,248,1,233,1,219,2,249,1,247,7,242,1,243,1,242,1,247,1,250,
- 1,248,1,249,1,247,9,243,1,247,2,249,1,248,1,250,1,247,17,243,1,245,1,247,1,250,1,248,1,249,1,248,
- 1,187,7,0,3,0,1,73,1,248,1,249,1,248,2,249,1,246,1,242,14,243,1,245,1,248,2,249,1,247,7,243,
- 1,242,1,243,1,242,1,246,1,250,1,248,1,249,1,248,1,250,1,246,10,242,1,247,1,249,1,248,1,250,1,246,
- 22,242,1,246,1,250,2,248,1,250,1,246,9,242,3,250,4,249,5,248,1,250,1,246,8,242,1,246,1,249,1,248,
- 6,249,1,248,1,235,1,173,1,233,1,249,1,248,1,245,8,243,1,247,1,250,1,247,1,250,1,247,8,243,1,246,
- 1,250,1,248,2,249,1,248,1,250,1,246,1,243,1,245,13,243,1,245,1,243,1,245,1,247,1,250,2,248,1,233,
- 1,125,1,29,5,0,3,0,1,185,1,248,2,249,1,250,1,246,15,243,1,242,1,245,3,249,1,247,10,242,1,246,
- 1,250,1,248,1,249,1,248,1,250,1,246,10,242,1,247,1,250,1,248,1,250,1,246,23,242,1,248,1,249,1,248,
- 1,250,1,246,9,242,1,247,1,249,1,248,5,249,1,248,2,233,1,248,1,250,1,246,8,242,1,246,2,250,2,249,
- 2,247,1,248,1,249,1,248,1,233,1,172,1,233,1,248,1,249,1,245,8,243,1,246,2,250,1,247,1,245,8,243,
- 1,246,1,250,1,248,4,249,1,247,1,245,1,243,1,245,13,243,1,245,1,243,1,245,1,247,1,249,1,248,1,249,
- 1,204,1,125,5,0,2,0,1,41,2,249,1,248,1,250,1,246,1,242,6,243,10,242,1,246,1,250,1,248,2,249,
- 10,242,1,246,1,250,1,248,1,249,1,248,1,250,1,247,10,242,1,247,1,250,1,248,1,250,1,246,8,242,1,246,
- 3,247,1,246,10,242,1,247,1,249,1,248,1,250,1,246,9,242,1,247,1,249,5,248,1,249,1,248,2,219,1,248,
- 1,250,1,246,8,243,1,245,2,246,3,245,1,243,1,246,1,250,1,248,1,249,1,172,1,233,1,248,1,250,1,246,
- 8,243,1,246,1,247,1,246,1,245,8,243,1,245,1,247,5,249,1,248,1,250,1,247,1,245,2,243,1,245,4,243,
- 2,245,1,243,6,245,1,243,1,246,1,250,1,248,1,249,1,188,1,189,1,76,4,0,2,0,1,89,2,248,1,250,
- 1,247,18,242,1,246,1,250,1,248,2,249,1,246,9,242,1,246,1,250,1,248,1,249,1,248,1,250,1,247,10,242,
- 1,247,1,250,1,248,1,250,1,246,8,242,1,246,1,250,2,249,1,250,1,246,9,242,1,247,1,249,1,248,1,250,
- 1,247,7,242,1,243,1,242,1,247,6,250,1,249,1,248,1,233,1,219,1,248,1,250,1,246,15,243,1,245,1,247,
- 2,249,1,188,1,219,1,248,1,250,1,246,20,243,1,247,1,250,2,248,1,233,1,219,1,248,1,249,1,248,1,250,
- 1,248,1,246,3,243,14,245,1,247,1,249,1,248,1,203,1,189,1,156,4,0,2,0,1,120,2,248,1,250,1,246,
- 18,242,1,247,1,250,2,248,1,250,1,246,9,242,1,246,3,249,1,248,1,250,1,247,10,242,1,247,1,250,1,248,
- 1,250,1,247,9,242,1,248,1,249,1,248,1,250,1,247,8,242,1,243,1,247,1,249,1,248,1,250,1,247,9,243,
- 1,246,2,247,3,246,1,247,1,250,1,248,1,233,1,203,1,248,1,250,1,246,16,243,1,247,1,250,1,248,1,188,
- 1,219,1,248,1,250,1,246,1,243,1,245,7,243,3,245,3,243,3,245,1,243,1,246,1,250,1,248,1,249,1,248,
- 1,219,1,188,1,248,2,249,1,248,1,249,1,250,1,247,1,246,1,245,2,243,11,245,1,243,1,247,1,250,1,248,
- 1,203,1,173,1,188,1,45,3,0,2,0,1,121,1,248,1,249,1,248,18,242,1,244,3,249,1,248,1,250,1,246,
- 10,242,3,249,1,248,1,249,1,247,10,242,1,246,1,250,1,248,1,250,1,247,8,242,1,243,1,247,1,249,1,248,
- 1,250,1,247,1,242,7,243,1,245,1,248,1,249,1,248,1,250,1,247,15,243,1,245,1,249,1,248,1,233,1,203,
- 1,248,1,250,1,247,16,243,1,247,1,250,1,248,1,188,1,219,1,248,1,250,1,246,1,243,1,245,2,243,1,245,
- 2,243,10,245,1,243,1,245,5,249,1,188,1,233,1,248,2,249,3,248,2,250,1,247,2,246,1,243,10,245,1,243,
- 1,246,1,250,1,248,1,203,1,173,1,188,1,77,3,0,2,0,1,105,1,248,1,250,1,247,10,242,1,244,4,247,
- 2,246,1,242,1,246,1,250,1,248,1,249,1,248,1,250,1,246,10,242,1,248,4,249,1,247,10,242,1,246,1,250,
- 1,248,1,250,1,247,1,242,8,243,1,247,1,249,1,248,1,250,1,247,8,243,1,246,1,250,1,248,2,249,1,247,
- 13,243,1,245,1,243,1,245,1,247,2,249,1,203,1,248,1,250,1,247,14,243,1,245,1,243,1,247,1,250,1,248,
- 2,203,1,248,1,250,1,246,1,243,17,245,1,243,1,246,1,250,1,248,2,249,1,233,4,249,2,250,3,248,1,249,
- 1,250,1,249,1,247,10,245,1,243,1,246,1,250,1,248,1,219,1,173,1,188,1,108,3,0,2,0,1,88,1,248,
- 1,250,1,247,10,242,1,247,1,250,1,249,4,250,1,247,1,248,3,249,1,248,1,250,1,246,10,242,1,247,5,249,
- 1,245,4,242,5,243,1,246,1,250,1,248,1,249,1,247,9,243,1,247,1,250,1,249,1,250,1,246,8,243,1,246,
- 1,250,1,248,2,249,1,247,1,245,15,243,1,247,1,250,1,249,1,203,1,249,1,250,1,247,5,243,1,245,2,243,
- 5,245,3,243,1,247,1,250,1,248,2,203,1,248,1,250,1,247,1,243,19,245,1,247,1,250,1,248,1,249,1,248,
- 2,249,1,250,1,247,1,246,1,247,2,250,1,249,3,248,1,250,1,247,10,245,1,246,1,250,1,248,1,219,1,173,
- 1,188,1,124,3,0,2,0,1,72,1,248,1,250,1,247,10,242,1,247,1,250,1,249,4,248,5,249,1,248,1,250,
- 1,247,10,242,1,247,1,250,1,248,3,249,1,245,9,243,1,246,1,250,1,248,1,249,1,247,1,245,8,243,1,247,
- 1,250,1,247,1,246,8,243,1,245,1,247,5,249,1,245,13,243,1,245,1,243,1,247,1,250,1,248,1,203,2,249,
- 1,247,9,245,3,243,3,245,1,246,1,248,1,249,1,248,1,203,1,188,1,248,1,250,1,247,1,243,20,245,1,247,
- 1,249,1,248,2,249,1,248,1,250,1,246,1,243,1,245,1,246,1,247,1,249,4,250,1,247,10,245,1,246,1,250,
- 1,248,1,235,1,173,1,188,1,140,3,0,2,0,1,57,1,248,1,250,1,247,11,242,1,247,1,248,2,250,1,249,
- 2,248,4,249,1,248,1,250,1,247,1,242,9,243,1,247,1,250,1,248,1,249,1,248,1,250,1,246,9,243,1,246,
- 1,249,1,248,1,249,1,248,1,245,8,243,2,246,8,243,1,245,1,243,1,246,1,250,1,248,4,249,1,245,1,243,
- 1,245,2,243,2,245,1,243,7,245,1,243,1,247,1,250,1,248,1,203,1,233,1,249,1,247,1,245,1,243,6,245,
- 1,243,1,246,4,247,1,248,3,249,1,248,1,203,1,172,1,248,1,250,1,247,9,245,2,247,10,245,1,246,1,250,
- 1,248,1,249,1,248,1,249,1,247,5,245,2,246,2,247,1,246,11,245,1,247,1,250,1,248,1,233,1,173,1,188,
- 1,156,3,0,2,0,1,40,1,248,1,249,1,247,12,242,1,245,1,246,1,247,1,249,1,250,1,249,1,248,3,249,
- 1,248,1,250,1,247,10,243,1,247,1,250,1,248,1,249,1,248,1,250,1,246,9,243,1,245,4,249,1,245,11,243,
- 1,245,5,243,1,245,1,243,1,246,4,249,1,248,1,249,1,250,1,246,1,243,13,245,1,243,1,247,1,250,1,248,
- 1,219,1,233,1,248,1,249,1,245,1,243,6,245,1,243,1,246,1,250,7,249,1,248,1,235,1,219,2,249,1,247,
- 9,245,1,247,1,250,1,246,10,245,1,246,1,250,2,248,1,250,1,247,21,245,1,247,1,250,1,248,1,233,1,173,
- 1,188,1,156,3,0,2,0,1,24,1,233,1,248,1,250,1,246,1,242,13,243,1,246,1,247,1,249,1,250,1,248,
- 2,249,1,248,1,250,1,247,10,243,1,246,1,250,1,248,1,249,1,248,1,250,1,246,9,243,1,245,1,248,1,249,
- 1,248,1,250,1,246,1,243,1,245,6,243,3,245,1,243,5,245,1,243,1,246,3,249,1,248,2,233,1,248,1,250,
- 1,246,1,243,8,245,1,243,5,245,1,247,1,249,1,248,1,219,1,233,1,248,1,249,1,246,8,245,1,246,1,250,
- 1,248,1,249,2,248,1,249,5,248,2,249,1,248,9,245,1,247,1,250,1,247,11,245,1,247,1,250,1,248,1,250,
- 1,246,21,245,2,249,1,248,1,235,1,173,1,188,1,172,1,28,2,0,3,0,1,217,1,248,1,250,1,246,16,243,
- 1,246,1,247,1,250,1,248,3,249,1,247,1,245,9,243,1,246,1,250,1,248,1,249,1,248,1,250,1,246,1,243,
- 1,245,7,243,1,245,1,247,1,249,1,248,1,250,1,246,1,243,16,245,1,243,1,245,1,248,2,249,1,248,1,233,
- 1,219,1,248,1,250,1,246,1,243,8,245,4,247,1,248,3,249,1,248,2,219,1,248,1,250,1,246,8,245,1,246,
- 1,249,1,248,4,249,3,250,5,249,9,245,1,247,2,250,1,246,10,245,1,246,1,249,1,248,1,250,1,246,20,245,
- 1,246,1,250,2,248,1,219,1,173,1,188,1,172,1,29,2,0,3,0,1,185,1,248,1,249,1,247,1,245,17,243,
- 1,246,1,250,1,248,2,249,1,248,1,245,7,243,1,245,1,243,1,246,1,250,1,248,1,249,1,248,1,250,1,247,
- 1,243,2,245,1,243,5,245,1,243,1,247,1,250,1,248,1,250,1,246,1,243,17,245,1,243,1,246,1,250,1,248,
- 3,249,1,248,1,250,1,246,1,243,8,245,1,248,1,250,3,249,4,248,2,219,1,248,1,250,1,246,9,245,2,250,
- 1,249,1,248,6,247,4,249,1,246,8,245,1,246,1,250,1,249,1,247,11,245,1,246,2,250,1,246,20,245,1,248,
- 2,249,1,248,1,203,1,173,1,188,1,172,1,44,2,0,3,0,1,137,2,248,1,250,1,246,1,243,1,245,13,243,
- 1,245,2,243,1,246,1,250,1,248,2,249,1,245,1,243,1,245,4,243,2,245,1,243,1,246,1,250,1,248,1,249,
- 1,248,1,250,1,247,1,243,8,245,1,243,1,247,1,250,1,248,1,250,1,246,1,243,8,245,1,243,9,245,1,243,
- 1,246,1,250,1,248,2,249,1,248,1,250,1,247,1,243,8,245,1,247,1,249,1,248,2,249,2,233,1,219,1,217,
- 1,188,1,219,1,248,1,250,1,246,9,245,2,246,6,245,1,243,1,246,1,250,2,248,1,250,1,246,8,245,1,246,
- 1,250,1,248,1,250,1,246,11,245,1,247,1,250,1,246,19,245,1,247,1,250,1,248,2,249,1,188,1,172,1,188,
- 1,172,1,28,2,0,3,0,1,73,1,248,1,249,1,248,1,250,1,246,1,243,1,245,13,243,2,245,1,243,1,247,
- 1,250,1,248,1,249,1,246,1,243,7,245,1,243,1,246,1,250,1,248,1,249,1,248,1,250,1,247,1,243,8,245,
- 1,243,1,247,1,250,1,248,1,250,1,247,1,243,8,245,2,246,10,245,1,247,1,250,1,248,1,249,1,248,1,250,
- 1,247,9,245,1,247,1,250,1,248,1,203,2,172,4,173,1,219,1,248,1,250,1,246,19,245,1,248,1,249,1,248,
- 1,250,1,246,8,245,1,246,1,250,1,248,1,249,1,248,11,245,1,247,1,250,1,247,18,245,1,246,1,250,1,248,
- 1,249,1,248,1,219,1,173,1,172,1,188,1,172,1,28,2,0,4,0,1,201,1,248,2,249,1,248,1,246,2,243,
- 2,245,1,243,2,245,1,243,8,245,1,243,1,246,1,249,1,248,1,250,1,246,1,243,7,245,1,243,1,245,3,249,
- 1,248,1,250,1,247,9,245,1,243,1,247,1,250,1,248,1,250,1,247,1,243,8,245,1,250,1,247,11,245,3,249,
- 1,248,1,250,1,247,9,245,1,247,1,250,1,248,1,203,1,173,1,188,3,172,1,173,1,203,1,248,1,250,1,247,
- 19,245,1,247,1,250,1,248,1,250,1,246,8,245,1,246,1,250,1,249,1,248,1,250,1,246,9,245,1,246,1,250,
- 1,248,1,250,1,247,16,245,1,247,1,250,1,248,3,249,1,188,1,173,1,172,1,188,1,156,3,0,4,0,1,73,
- 1,248,3,249,1,250,1,247,1,245,2,243,14,245,1,247,1,249,1,250,1,246,1,243,9,245,1,248,4,249,1,247,
- 9,245,1,243,1,246,1,250,1,248,1,250,1,247,9,245,1,247,1,250,1,246,10,245,1,246,1,250,1,248,2,249,
- 1,247,9,245,1,247,1,250,1,248,1,203,1,173,1,172,3,188,1,189,1,203,1,248,1,250,1,247,19,245,1,247,
- 1,250,1,248,1,250,1,246,8,245,1,246,5,249,8,245,1,246,1,250,2,249,1,248,1,250,1,247,1,246,11,245,
- 2,246,1,248,1,250,1,248,2,249,1,248,1,203,1,173,1,188,1,172,1,188,1,124,3,0,4,0,1,73,1,232,
- 2,249,2,248,1,250,1,248,2,246,2,243,11,245,1,243,1,246,2,250,1,246,1,243,9,245,1,247,1,249,2,248,
- 1,249,1,248,9,245,1,243,1,246,1,250,1,248,1,250,1,247,9,245,1,247,1,250,1,247,11,245,1,247,1,250,
- 1,248,1,249,1,247,9,245,1,246,1,250,1,248,1,219,1,173,1,188,1,156,2,124,1,109,1,123,1,248,1,250,
- 1,247,19,245,1,247,1,250,1,248,1,250,1,247,9,245,3,249,1,248,1,250,1,247,6,245,1,247,1,250,1,248,
- 3,249,1,248,1,249,1,250,1,248,1,247,7,246,2,247,1,249,1,250,1,249,1,248,1,249,2,248,1,203,1,173,
- 1,188,2,172,1,188,1,61,3,0,4,0,1,217,1,248,3,249,2,248,1,249,1,250,1,249,1,247,1,246,1,245,
- 1,243,9,245,1,243,1,246,2,250,1,246,1,243,9,245,1,247,4,250,1,247,10,245,1,246,1,250,1,248,1,249,
- 1,247,9,245,1,247,1,249,1,250,1,246,11,245,1,247,2,249,1,248,9,245,1,246,1,250,1,248,1,219,1,173,
- 1,188,1,108,3,0,1,40,1,248,1,249,1,247,19,245,1,247,1,250,1,248,1,250,1,247,9,245,1,247,5,249,
- 1,246,3,245,1,246,1,247,1,250,1,248,2,249,2,248,2,249,1,248,1,249,9,250,2,249,4,248,1,233,1,188,
- 1,173,1,188,2,172,1,188,1,140,4,0,3,0,1,57,5,249,1,250,1,249,2,248,1,249,2,250,1,248,1,246,
- 9,245,1,243,1,246,2,250,1,247,11,245,1,246,2,247,1,246,11,245,1,246,1,250,1,248,1,249,1,248,9,245,
- 1,247,1,250,1,249,1,248,11,245,1,246,3,249,9,245,1,246,1,250,1,248,1,219,1,173,1,188,1,124,3,0,
- 1,40,1,232,1,249,1,247,19,245,1,247,1,250,1,248,1,250,1,247,7,245,2,246,6,249,1,250,3,247,1,250,
- 1,249,1,248,1,249,1,248,1,249,1,203,1,219,1,249,13,248,2,249,1,233,1,219,1,203,2,173,1,188,3,172,
- 1,188,1,60,4,0,3,0,1,121,1,248,1,249,1,250,1,247,1,245,1,247,1,248,1,250,1,249,3,248,1,250,
- 1,247,10,245,1,246,1,250,1,249,1,247,26,245,1,247,1,250,1,248,2,249,9,245,1,247,1,250,1,248,1,250,
- 1,246,11,245,1,247,1,250,1,249,1,246,8,245,1,246,1,250,1,248,1,233,1,173,1,188,1,140,3,0,1,25,
- 1,217,1,249,1,248,18,245,1,246,1,248,4,249,6,247,1,248,2,250,3,249,1,248,2,249,1,248,1,249,1,250,
- 1,249,4,248,1,233,1,187,2,173,1,188,1,203,1,219,6,233,2,219,3,203,2,188,1,172,2,173,1,172,1,188,
- 3,172,1,188,1,92,5,0,3,0,1,169,1,248,1,249,1,250,1,246,1,243,2,245,1,246,1,247,1,249,3,250,
- 1,247,10,245,1,246,1,250,1,248,1,250,1,246,25,245,5,249,1,246,8,245,1,246,1,250,1,248,2,249,10,245,
- 1,246,1,249,1,248,1,250,1,246,8,245,1,246,1,249,1,248,1,233,1,172,1,188,1,156,4,0,1,200,1,248,
- 1,250,1,246,5,245,5,246,5,247,1,248,1,249,1,250,5,249,4,250,3,249,5,248,1,233,1,249,4,248,2,249,
- 2,233,1,203,1,188,1,173,2,188,4,173,3,172,9,173,6,172,2,188,1,92,6,0,3,0,1,169,1,248,1,249,
- 1,247,6,245,4,246,11,245,1,246,1,250,1,248,1,250,1,247,24,245,1,246,1,250,1,248,1,249,1,248,1,250,
- 1,246,8,245,1,246,1,250,2,248,1,250,1,247,8,245,1,246,1,248,1,249,1,248,1,250,1,246,9,245,2,249,
- 1,233,1,172,1,188,1,172,4,0,1,185,1,248,1,249,1,248,4,247,1,248,1,249,8,250,2,249,11,248,2,249,
- 3,233,2,219,1,203,1,173,1,188,3,203,4,188,2,173,1,172,1,188,2,172,5,188,11,172,6,188,1,141,1,44,
- 7,0,3,0,1,185,1,248,1,250,1,247,21,245,1,247,1,250,1,248,2,249,1,246,22,245,1,246,4,249,1,248,
- 1,250,1,246,8,245,1,246,1,250,1,248,3,249,7,245,1,246,3,249,1,248,1,250,1,246,7,245,1,246,1,247,
- 3,249,1,188,2,172,1,28,3,0,1,169,1,248,2,249,2,250,3,249,9,248,2,249,2,233,1,235,5,219,3,203,
- 3,188,1,172,4,173,1,172,6,173,7,172,2,188,1,92,1,45,1,124,1,172,11,188,1,172,1,156,1,157,1,125,
- 1,92,1,44,9,0,3,0,1,153,1,248,1,250,1,246,21,245,1,248,4,249,1,247,22,245,1,247,4,249,1,248,
- 1,250,1,246,8,245,1,246,1,250,2,249,1,248,1,250,1,247,5,245,1,247,1,250,5,249,2,247,3,246,3,247,
- 1,249,1,250,3,249,1,188,1,173,1,188,1,44,3,0,1,136,6,248,1,249,3,233,3,219,3,203,3,188,1,172,
- 11,173,9,172,12,188,1,156,1,61,3,0,1,29,1,60,1,92,4,108,1,92,1,76,1,60,2,44,1,29,14,0,
- 3,0,1,137,1,248,1,250,1,246,20,245,1,246,1,250,1,248,2,249,1,248,1,250,1,247,20,245,1,247,1,250,
- 1,248,3,249,1,248,1,250,1,246,8,245,1,246,1,249,1,248,3,249,1,250,1,247,2,246,2,247,1,250,3,249,
- 1,248,3,249,6,250,2,249,4,248,1,188,1,173,1,188,1,45,3,0,1,24,2,121,1,155,1,203,4,188,1,172,
- 9,173,12,172,11,188,1,108,1,125,1,188,2,172,1,156,2,140,1,125,1,108,1,61,32,0,3,0,1,121,1,248,
- 1,250,1,246,20,245,1,247,5,249,1,248,1,250,1,247,1,246,16,245,1,246,1,247,1,250,1,248,1,249,1,248,
- 1,233,1,203,1,248,1,249,1,247,6,246,2,247,7,249,4,250,1,249,1,248,1,249,1,248,1,249,1,233,9,248,
- 2,249,2,233,1,219,1,203,2,172,1,188,1,61,6,0,1,77,1,189,2,173,11,172,13,188,3,172,1,157,1,140,
- 1,124,2,108,1,76,1,60,1,29,2,0,1,45,1,29,1,28,38,0,3,0,1,105,1,248,1,250,1,247,19,245,
- 1,247,1,250,1,248,3,249,1,248,1,249,1,248,1,249,1,250,1,247,1,246,12,245,1,246,1,247,1,250,1,249,
- 1,248,1,249,1,248,1,249,1,188,1,203,1,248,2,249,8,250,2,249,2,248,1,249,9,248,1,233,1,203,1,172,
- 1,219,3,233,2,219,3,203,3,188,3,173,2,172,1,188,1,77,6,0,1,76,1,188,2,172,11,188,2,172,2,156,
- 1,140,1,124,1,108,1,92,1,76,1,60,1,45,1,61,1,44,1,45,1,28,1,29,51,0,3,0,1,73,1,248,
- 1,249,1,250,1,246,17,245,1,247,1,250,1,248,1,249,1,248,1,219,1,188,1,249,1,248,3,249,1,250,1,249,
- 1,247,3,246,3,245,3,246,2,247,2,250,3,249,1,248,1,233,1,188,1,173,1,188,1,248,1,249,10,248,1,249,
- 1,233,1,219,1,203,4,233,3,219,1,203,1,188,1,172,1,173,1,172,11,173,6,172,1,188,1,93,6,0,1,45,
- 1,172,2,188,2,172,1,156,1,140,1,124,1,125,1,108,1,93,1,76,1,60,1,44,1,45,1,29,65,0,3,0,
- 1,57,1,248,2,249,1,248,1,246,14,245,1,246,1,247,1,250,1,248,3,249,1,188,1,173,1,188,1,233,2,248,
- 1,249,1,248,1,249,3,250,2,249,1,248,2,249,3,250,1,249,4,248,1,249,1,219,1,188,1,173,1,172,1,188,
- 1,233,1,249,4,233,1,235,2,219,3,203,2,188,3,173,1,188,7,173,1,172,1,188,2,172,3,188,6,172,8,188,
- 1,92,7,0,1,28,1,61,1,44,1,28,1,29,76,0,3,0,1,41,1,233,3,249,1,250,1,247,1,246,10,245,
- 1,246,1,247,1,249,1,250,1,248,2,249,1,248,1,203,1,173,1,188,2,173,1,219,1,233,6,248,3,249,7,248,
- 1,249,1,233,1,219,1,188,1,173,1,172,1,188,2,172,1,188,1,172,1,59,1,172,1,188,8,173,5,172,1,188,
- 8,172,3,188,1,108,1,156,1,204,5,188,2,172,1,156,2,140,1,108,1,77,1,44,89,0,4,0,1,153,1,248,
- 2,249,1,248,2,250,4,247,1,246,4,247,1,248,2,250,3,249,1,248,1,249,1,203,1,173,1,188,1,172,1,188,
- 1,172,1,125,1,188,1,203,1,219,1,233,6,249,3,233,3,219,1,203,1,188,1,172,2,173,1,188,3,172,1,188,
- 1,172,1,45,1,0,1,156,1,188,8,172,5,188,1,156,7,188,2,172,1,140,1,61,1,0,1,44,3,92,1,76,
- 1,60,1,45,1,29,1,28,95,0,4,0,1,25,1,185,2,248,4,249,7,250,2,249,4,248,1,249,1,217,1,188,
- 1,173,1,188,2,172,1,188,1,156,1,0,1,92,1,189,1,173,1,172,6,188,2,172,6,173,1,172,1,188,3,172,
- 2,188,1,156,1,45,2,0,1,156,1,204,8,188,2,172,1,156,1,140,1,93,1,29,1,76,1,124,1,108,1,93,
- 1,76,2,61,1,44,1,28,107,0,6,0,1,105,1,233,1,249,11,248,2,249,2,233,1,203,1,188,2,173,1,188,
- 3,172,1,188,1,61,2,0,1,76,1,172,2,188,4,173,10,172,4,188,1,172,1,92,4,0,1,77,3,124,2,108,
- 1,92,1,77,1,60,1,45,1,29,1,28,120,0,7,0,1,125,1,204,1,203,2,219,1,235,3,219,3,203,3,188,
- 1,172,3,173,2,188,2,172,2,188,1,77,4,0,1,28,1,108,1,156,14,188,1,172,1,156,1,124,1,76,1,29,
- 137,0,7,0,1,44,1,173,1,189,11,173,7,172,2,188,1,172,1,76,8,0,1,60,1,109,1,124,4,156,1,140,
- 1,124,1,108,1,92,2,77,1,60,1,44,141,0,8,0,1,60,1,156,3,188,8,172,7,188,1,172,1,108,1,29,
- 165,0,9,0,1,28,1,92,1,156,9,188,1,172,2,156,1,140,1,124,1,93,1,60,1,28,167,0,12,0,1,44,
- 1,60,4,76,1,60,2,44,1,29,174,0,196,0,196,0,
-};
diff --git a/games/subway/src/assets.h b/games/subway/src/assets.h
index e80bc840..def63056 100644
--- a/games/subway/src/assets.h
+++ b/games/subway/src/assets.h
@@ -1,4 +1,4 @@
-/* Subway Surfers: the fonts and the logo (assets.c, made by tools/assets.py). */
+/* Subway Surfers: the fonts (assets.c, made by tools/assets.py). */
#ifndef SS_ASSETS_H
#define SS_ASSETS_H
#include <stdint.h>
@@ -20,9 +20,4 @@ typedef struct {
extern const Font font_big, font_mid, font_small;
-/* the logo: each row is runs of (count, byte), the byte's high 4 bits its alpha, the low ones its colour */
-extern const uint16_t logo_w, logo_h;
-extern const uint16_t logo_pal[16];
-extern const uint16_t logo_rows[];
-extern const uint8_t logo_runs[];
#endif
diff --git a/games/subway/src/draw.c b/games/subway/src/draw.c
index 6b2fb36e..adde28c7 100644
--- a/games/subway/src/draw.c
+++ b/games/subway/src/draw.c
@@ -208,25 +208,6 @@ void d_label(const Font *f, int x, int baseline, const char *s, uint16_t fill, u
d_text(f, x, baseline, s, fill, 255);
}
-void d_logo(int x, int y) {
- int y0 = imax(y, r_y0), y1 = imin(y + logo_h, r_y1);
- for (int j = y0; j < y1; j++) {
- const uint8_t *r = logo_runs + logo_rows[j - y], *e = logo_runs + logo_rows[j - y + 1];
- uint16_t *p = row(j);
- int i = x;
- for (; r < e; r += 2) {
- int n = r[0], v = r[1], a = v >> 4;
- if (a) {
- uint16_t c = logo_pal[v & 15];
- int t = a * 2 + (a >> 3);
- for (int k = 0; k < n; k++)
- if ((unsigned)(i + k) < SCREEN_W) p[i + k] = t >= 32 ? c : r_mix565(p[i + k], c, t);
- }
- i += n;
- }
- }
-}
-
void d_image(int x, int y, const Image *im) {
int y0 = imax(y, r_y0), y1 = imin(y + im->h, r_y1);
for (int j = y0; j < y1; j++) {
diff --git a/games/subway/src/draw.h b/games/subway/src/draw.h
index c7d4a67c..fa841a80 100644
--- a/games/subway/src/draw.h
+++ b/games/subway/src/draw.h
@@ -1,5 +1,5 @@
/* Subway Surfers: flat drawing over the band being drawn (r3d.h): boxes, round boxes, discs,
- * polygons, text with an outline, the logo. Everything clips itself to the band's rows. */
+ * polygons, text with an outline, pictures. Everything clips itself to the band's rows. */
#ifndef SS_DRAW_H
#define SS_DRAW_H
#include <stdint.h>
@@ -27,7 +27,6 @@ int d_text_width(const Font *f, const char *s);
/* white-ish text with a dark outline t pixels thick, the game's lettering; align -1 left, 0 centre,
* 1 right of x */
void d_label(const Font *f, int x, int baseline, const char *s, uint16_t fill, uint16_t outline, int t, int align);
-void d_logo(int x, int y);
/* one of the game's pictures (data.c), its top-left at (x, y) */
void d_image(int x, int y, const Image *im);
#endif
diff --git a/games/subway/src/scene.c b/games/subway/src/scene.c
index c5132138..1a570b84 100644
--- a/games/subway/src/scene.c
+++ b/games/subway/src/scene.c
@@ -386,7 +386,7 @@ static void bridge(float z0, float dist) {
}
/* the overhead line: a gantry across the tracks and a wire over each one */
-static void catenary(float z0, float dist) {
+static void catenary(float z0, float dist, uint32_t h) {
float gz = z0 + 12;
uint32_t pole = 0x4E5A66;
cube(-5.2f, 0, gz, -4.85f, 7.8f, gz + 0.35f, pole, 2);
@@ -398,6 +398,14 @@ static void catenary(float z0, float dist) {
cube(x - 0.06f, 6.9f, gz + 0.1f, x + 0.06f, 7.4f, gz + 0.25f, 0x26262A, 2);
V3 w[4] = {{x - 0.03f, 6.9f, z0 + BLOCK}, {x + 0.03f, 6.9f, z0 + BLOCK}, {x + 0.03f, 6.9f, z0}, {x - 0.03f, 6.9f, z0}};
r_poly(w, 4, L(0x2A2A2E), P_TWOSIDED, 0);
+ if (h % 3 == 0) {
+ /* a signal over the track, its lamps facing the runner */
+ float sx = x + 0.75f;
+ cube(sx - 0.22f, 6.3f, gz - 0.25f, sx + 0.22f, 7.4f, gz, 0x1E2024, 2);
+ uint32_t lamp = (h >> (3 + l)) & 1 ? 0xFF3B30 : 0x3CFF6A;
+ front(gz - 0.26f, sx - 0.12f, sx + 0.12f, 7.0f, 7.24f, (h >> (3 + l)) & 1 ? lamp : 0x3A3A3A, P_DECAL | P_NOHAZE);
+ front(gz - 0.26f, sx - 0.12f, sx + 0.12f, 6.55f, 6.79f, (h >> (3 + l)) & 1 ? 0x3A3A3A : lamp, P_DECAL | P_NOHAZE);
+ }
}
}
@@ -412,7 +420,7 @@ static bool bridge_at(int b) {
static void open_block(int b, float z0, float dist) {
uint32_t h = world_hash((uint32_t)b * 7919u + 3 + world_seed);
bool before_tunnel = world_tunnel(z0 + BLOCK + 1);
- catenary(z0, dist);
+ catenary(z0, dist, h);
if (bridge_at(b)) {
bridge(z0, dist);
return;
diff --git a/games/subway/tools/assets.py b/games/subway/tools/assets.py
index 55ec0d0d..06dc613f 100644
--- a/games/subway/tools/assets.py
+++ b/games/subway/tools/assets.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-"""Makes src/assets.c: Subway Surfers' fonts and logo, from Lilita One.
+"""Makes src/assets.c: Subway Surfers' fonts, from Lilita One.
Lilita One (Juan Montoreano, SIL Open Font License 1.1) is the round, heavy
lettering the game's own buttons and numbers look like. Its glyphs are
@@ -8,10 +8,7 @@ rendered 4x supersampled with the baseline on a pixel boundary and kept as
letter also comes grown by 1 and by 2 pixels all round and 1 more below: the
game's lettering is white with a dark outline and a shadow, drawn in two.
-The logo, "SUBWAY SURFERS" on two lines, is drawn from the same font: filled
-with the game's yellow, a thick navy outline and a shadow under it, tilted a
-little. It is kept as one byte a pixel, its alpha (4 bits) and its colour
-(4 bits, from a palette of 16), in runs: a count, then the byte, row by row.
+(The logo is the game's own: tools/pack.py.)
The output is committed; run it again only to change sizes or colours.
Usage: assets.py src/assets.c
@@ -22,7 +19,7 @@ import urllib.request
from pathlib import Path
import numpy as np
-from PIL import Image, ImageDraw, ImageFilter, ImageFont
+from PIL import Image, ImageDraw, ImageFont
ROOT = Path(__file__).resolve().parent
CACHE = ROOT / ".fonts"
@@ -144,111 +141,11 @@ def fonts(lines):
return total
-# ---------------------------------------------------------------- the logo
-NAVY = (22, 34, 92)
-SHADOW = (10, 16, 48)
-
-
-def word(text, cap, top, bottom, outline):
- """A word drawn big (4x), filled with a gradient from top to bottom, its outline around it."""
- up = 4
- f = load(cap, up)
- bb = f.getbbox(text, anchor="ls")
- pad = (outline + 4) * up
- w, h = bb[2] - bb[0] + 2 * pad, bb[3] - bb[1] + 2 * pad
- mask = Image.new("L", (w, h), 0)
- ImageDraw.Draw(mask).text((pad - bb[0], pad - bb[1]), text, font=f, fill=255, anchor="ls")
- fill = np.asarray(mask).astype(np.float32) / 255
- ring = np.asarray(mask.filter(ImageFilter.MaxFilter(2 * outline * up + 1))).astype(np.float32) / 255
- ys = np.linspace(0, 1, h)[:, None]
- top, bottom = np.array(top, np.float32), np.array(bottom, np.float32)
- grad = top[None, None, :] * (1 - ys[..., None]) + bottom[None, None, :] * ys[..., None]
- # a light band near the top of the letters, as on the game's lettering
- shine = np.clip(1 - np.abs(ys - 0.33) * 9, 0, 1)[..., None] * 0.35
- grad = grad * (1 - shine) + 255 * shine
- rgb = np.zeros((h, w, 3), np.float32) + np.array(NAVY, np.float32)
- rgb = rgb * (1 - fill[..., None]) + grad * fill[..., None]
- img = np.dstack([rgb, ring * 255]).astype(np.uint8)
- return Image.fromarray(img, "RGBA")
-
-
-def logo(lines):
- up = 4
- a = word("SUBWAY", 30, (255, 255, 255), (150, 220, 255), 3)
- b = word("SURFERS", 34, (255, 238, 60), (255, 150, 20), 3)
- w = max(a.width, b.width)
- gap = -6 * up
- canvas = Image.new("RGBA", (w + 24 * up, a.height + b.height + gap + 24 * up), (0, 0, 0, 0))
- canvas.alpha_composite(a, ((canvas.width - a.width) // 2, 8 * up))
- canvas.alpha_composite(b, ((canvas.width - b.width) // 2, 8 * up + a.height + gap))
- # the shadow, down and to the right
- alpha = canvas.getchannel("A")
- shadow = Image.new("RGBA", canvas.size, SHADOW + (0,))
- shadow.putalpha(alpha.point(lambda v: v * 0.7))
- out = Image.new("RGBA", canvas.size, (0, 0, 0, 0))
- out.alpha_composite(shadow, (3 * up, 4 * up))
- out.alpha_composite(canvas)
- out = out.rotate(5, resample=Image.BICUBIC, expand=True)
- out = out.resize((out.width // up, out.height // up), Image.LANCZOS)
- box = out.getbbox()
- out = out.crop(box)
- px = np.asarray(out).astype(np.int32)
- # 15 colours for the opaque parts (pngquant would do as well; this keeps it to Pillow)
- opaque = px[..., 3] > 0
- rgb = Image.fromarray(px[..., :3].astype(np.uint8), "RGB")
- pal_img = rgb.quantize(colors=15, method=Image.MEDIANCUT, dither=Image.NONE)
- pal = pal_img.getpalette()[:45]
- idx = np.asarray(pal_img).astype(np.int32)
- alpha4 = np.clip(np.round(px[..., 3] / 255 * 15), 0, 15).astype(np.int32)
- alpha4[~opaque] = 0
- vals = (alpha4 << 4) | np.where(alpha4 > 0, idx, 0)
- h, w = vals.shape
- data = bytearray()
- rows = []
- for y in range(h):
- rows.append(len(data))
- row = vals[y].tolist()
- x = 0
- while x < w:
- v = row[x]
- n = 1
- while x + n < w and row[x + n] == v and n < 255:
- n += 1
- data += bytes([n, v])
- x += n
- rows.append(len(data))
- colours = []
- for i in range(15):
- r, g, bl = pal[3 * i:3 * i + 3]
- colours.append(((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (bl >> 3))
- lines.append(f"#define LOGO_W {w}")
- lines.append(f"#define LOGO_H {h}")
- lines.append(f"const uint16_t logo_w = {w}, logo_h = {h};")
- lines.append("const uint16_t logo_pal[16] = {" + ", ".join(f"0x{c:04X}" for c in colours + [0]) + "};")
- lines.append(f"const uint16_t logo_rows[{len(rows)}] = {{")
- for i in range(0, len(rows), 16):
- lines.append(" " + ",".join(str(r) for r in rows[i:i + 16]) + ",")
- lines.append("};")
- lines.append(f"const uint8_t logo_runs[{len(data)}] = {{")
- for i in range(0, len(data), 32):
- lines.append(" " + ",".join(str(v) for v in data[i:i + 32]) + ",")
- lines.append("};")
- print(f"logo: {w}x{h}, {len(data)} bytes of runs")
- preview = Image.fromarray(np.dstack([px[..., :3], px[..., 3]]).astype(np.uint8), "RGBA")
- return preview, len(data) + 2 * len(rows)
-
-
def main(out):
lines = ["/* Made by tools/assets.py from Lilita One by Juan Montoreano (SIL Open Font License 1.1). */",
'#include "assets.h"', ""]
total = fonts(lines)
- preview, n = logo(lines)
- total += n
Path(out).write_text("\n".join(lines) + "\n")
- if len(sys.argv) > 2:
- bg = Image.new("RGBA", preview.size, (90, 180, 240, 255))
- bg.alpha_composite(preview)
- bg.save(sys.argv[2])
print(f"total {total} bytes")