diff --git a/bin/assets/gfx/tree.png b/bin/assets/gfx/tree.png new file mode 100644 index 0000000..66806d2 Binary files /dev/null and b/bin/assets/gfx/tree.png differ diff --git a/bin/assets/maps/CuteRPG_Field_Tiles.png b/bin/assets/maps/CuteRPG_Field_Tiles.png new file mode 100644 index 0000000..aafd006 Binary files /dev/null and b/bin/assets/maps/CuteRPG_Field_Tiles.png differ diff --git a/bin/assets/maps/Field Tiles.tsx b/bin/assets/maps/Field Tiles.tsx new file mode 100644 index 0000000..7807fdf --- /dev/null +++ b/bin/assets/maps/Field Tiles.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/bin/assets/maps/Town1.png b/bin/assets/maps/Town1.png index e972c33..7f9667c 100644 Binary files a/bin/assets/maps/Town1.png and b/bin/assets/maps/Town1.png differ diff --git a/bin/assets/maps/Town1.tmx b/bin/assets/maps/Town1.tmx index bc3da14..0a9e7e1 100644 --- a/bin/assets/maps/Town1.tmx +++ b/bin/assets/maps/Town1.tmx @@ -1,93 +1,215 @@ - + - + + -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,33,34,34,34,34,34,34,34,34,34,34,34,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,4,34,34,34,34,34,34,5,0,0,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,69,34,34,34,34,68,66,66,66,66,66,66,69,5,0,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,69,35,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, -0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, -0,97,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,99,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,33,34,34,34,34,34,34,34,34,34,34,34,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,4,34,34,34,34,34,34,5,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,69,34,34,34,34,68,66,66,66,66,66,66,69,5,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,69,35,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,65,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,97,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,99,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - + -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,8,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,7,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,9,0,6,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,100,66,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,65,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,65,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,289,290,290,290,290,324,322,325,290,290,290,290,290,290,290,291,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,289,290,324,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,289,290,324,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,353,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,355,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1371,1372,1369,1370,1346,1347,1369,1370,1371,1372,1369,1370,1348,1345,1369,1370,1371,1372,1369,1370,1348,1345,1369,1370,1371,1372,1369,1370,1348,1345,1369,1370,1369,1370,1371,1372,1369,1370,1348,1345,1371, +1393,1394,1395,1396,1324,1321,1393,1394,1395,1396,1393,1394,1372,1369,1393,1394,1395,1396,1393,1394,1372,1369,1393,1394,1395,1396,1393,1394,1372,1369,1393,1394,1393,1394,1395,1396,1393,1394,1372,1369,1395, +1371,1372,1369,1370,1348,1345,1321,1322,1323,1324,1321,1322,1394,1395,1321,1322,1323,1324,1321,1322,1394,1395,1321,1322,1323,1324,1321,1322,1394,1395,1321,1322,1321,1322,1323,1324,1321,1322,1394,1395,1323, +1395,1396,1393,1394,1372,1369,1345,1346,1347,1348,1345,1346,1322,1323,1345,1346,1347,1348,1345,1346,1322,1323,1345,1346,1347,1348,1345,1346,1322,1323,1345,1346,1345,1346,1347,1348,1345,1346,1322,1323,1347, +1323,1324,1321,1322,1394,1395,1369,1370,1371,1372,1369,1370,1346,1347,1369,1370,1371,1372,1369,1370,1346,1347,1369,1370,1371,1372,1369,1370,1346,1347,1369,1370,1369,1370,1371,1372,1369,1370,1346,1347,1371, +1347,1348,1345,1346,1322,1323,1370,1348,1345,1346,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,1393,1394,1395,1396,1324,1321,0, +1371,1372,1369,1370,1346,1347,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1369,1370,1371,1372,1369,1370,1348,1345,0, +1393,1394,1395,1396,1324,1321,1370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1393,1394,1395,1396,1393,1394,1372,1369,0, +1371,1372,1369,1370,1348,1345,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1321,1322,1323,1324,1321,1322,1394,1395,0, +1395,1396,1393,1394,1372,1369,1322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1345,1346,1347,1348,1345,1346,1322,1323,0, +1323,1324,1321,1322,1394,1395,1346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1369,1370,1371,1372,1369,1370,1346,1347,0, +1347,1348,1345,1346,1322,1323,1370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,1393,1394,1395,1396,1324,1321,0, +1371,1372,1369,1370,1346,1347,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1369,1370,1371,1372,1369,1370,1348,1345,0, +1393,1394,1395,1396,1324,1321,1370,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1393,1394,1395,1396,1393,1394,1372,1369,0, +1371,1372,1369,1370,1348,1345,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1321,1322,1323,1324,1321,1322,1394,1395,0, +1395,1396,1393,1394,1372,1369,1322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1345,1346,1347,1348,1345,1346,1322,1323,0, +1323,1324,1321,1322,1394,1395,1346,1324,1321,1322,1323,1324,1321,1322,1323,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1369,1370,1371,1372,1369,1370,1346,1347,0, +1347,1348,1345,1346,1322,1323,1370,1348,1345,1346,1347,1348,1345,1346,1347,1348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,1393,1394,1395,1396,1324,1321,0, +1371,1372,1369,1370,1346,1347,1396,1372,1369,1370,1371,1372,1369,1370,1371,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1369,1370,1371,1372,1369,1370,1348,1345,0, +1393,1394,1395,1396,1324,1321,1370,1396,1393,1394,1395,1396,1393,1394,1395,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1393,1394,1395,1396,1393,1394,1372,1369,0, +1371,1372,1369,1370,1348,1345,1394,1324,1321,1322,1323,1324,1321,1322,1323,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1321,1322,1323,1324,1321,1322,1394,1395,0, +1395,1396,1393,1394,1372,1369,1322,1348,1345,1346,1347,1348,1345,1346,1347,1348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1345,1346,1347,1348,1345,1346,1322,1323,0, +1323,1324,1321,1322,1394,1395,1346,1372,1369,1370,1371,1372,1369,1370,1371,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1369,1370,1371,1372,1369,1370,1346,1347,0, +1347,1348,1345,1346,1322,1323,1370,1396,1393,1394,1395,1396,1393,1394,1395,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,1393,1394,1395,1396,1324,1321,0, +1371,1372,1369,1370,1346,1347,1396,1324,1321,1322,1323,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1369,1370,1371,1372,1369,1370,1348,1345,0, +1393,1394,1395,1396,1324,1321,1370,1396,1393,1394,1395,1396,1393,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1393,1394,1395,1396,1393,1394,1372,1369,0, +1371,1372,1369,1370,1348,1345,1394,1324,1321,1322,1323,1324,1321,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1321,1322,1323,1324,1321,1322,1394,1395,0, +1395,1396,1393,1394,1372,1369,1322,1348,1345,1346,1347,1348,1345,1348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1345,1346,1347,1348,1345,1346,1322,1323,0, +1323,1324,1321,1322,1394,1395,1346,1395,1396,1393,1394,1395,1396,1324,1321,1395,1396,1393,1394,1395,1396,1324,1321,1395,1396,1393,1394,1395,1396,1324,1321,1395,1396,1393,1394,1395,1396,1324,1321,1347,0, +1347,1348,1345,1346,1322,1323,1370,1369,1370,1371,1372,1369,1370,1348,1345,1369,1370,1371,1372,1369,1370,1348,1345,1369,1370,1371,1372,1369,1370,1348,1345,1369,1370,1371,1372,1369,1370,1348,1345,1321,0, +1371,1372,1369,1370,1346,1347,1396,1393,1394,1395,1396,1393,1394,1372,1369,1393,1394,1395,1396,1393,1394,1372,1369,1393,1394,1395,1396,1393,1394,1372,1369,1393,1394,1395,1396,1393,1394,1372,1369,1345,0, +1393,1394,1395,1396,1324,1321,1370,1321,1322,1323,1324,1321,1322,1394,1395,1321,1322,1323,1324,1321,1322,1394,1395,1321,1322,1323,1324,1321,1322,1394,1395,1321,1322,1323,1324,1321,1322,1394,1395,1369,0, +1371,1372,1369,1370,1348,1345,1394,1345,1346,1347,1348,1345,1346,1322,1323,1345,1346,1347,1348,1345,1346,1322,1323,1345,1346,1347,1348,1345,1346,1322,1323,1345,1346,1347,1348,1345,1346,1322,1323,1395,0, +1395,1396,1393,1394,1372,1369,1322,1369,1370,1371,1372,1369,1370,1346,1347,1369,1370,1371,1372,1369,1370,1346,1347,1369,1370,1371,1372,1369,1370,1346,1347,1369,1370,1371,1372,1369,1370,1346,1347,1323,0, +1323,1324,1321,1322,1394,1395,1346,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1369,1370,1371,1372,1369,1370,1346,1347,0, +1347,1348,1345,1346,1322,1323,1370,1346,1347,1348,1345,1346,1347,1348,1345,1346,1347,1348,1345,1346,1347,1348,1345,1346,1347,1348,1345,1346,1347,1348,1345,1346,1347,1348,1345,1346,1347,1348,1345,1346,0, +1371,1372,1369,1370,1346,1347,1396,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,0 - + -1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,1025,1025,1025,0,0,0,0,0,0,0,0,1025,1025,0,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,1025,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, -1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, -1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0, -0,0,0,0,0,0,0,1025,1025,1025,1025,1025,1025,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, -0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0 +1321,1322,1323,1324,1396,1393,1323,1324,1321,1322,1323,1324,1394,1395,1323,1324,1321,1322,1323,1324,1394,1395,1323,1324,1321,1322,1323,1324,1394,1395,1323,1324,1323,1324,1321,1322,1323,1324,1394,1395,1321, +1347,1348,1345,1346,1370,1371,1347,1348,1345,1346,1347,1348,1322,1323,1347,1348,1345,1346,1347,1348,1322,1323,1347,1348,1345,1346,1347,1348,1322,1323,1347,1348,1347,1348,1345,1346,1347,1348,1322,1323,1345, +1321,1322,1323,1324,1394,1395,1371,1372,1369,1370,1371,1372,1348,1345,1371,1372,1369,1370,1371,1372,1348,1345,1371,1372,1369,1370,1371,1372,1348,1345,1371,1372,1371,1372,1369,1370,1371,1372,1348,1345,1369, +1345,1346,1347,1348,1322,1323,1395,1396,1393,1394,1395,1396,1372,1369,1395,1396,1393,1394,1395,1396,1372,1369,1395,1396,1393,1394,1395,1396,1372,1369,1395,1396,1395,1396,1393,1394,1395,1396,1372,1369,1393, +1369,1370,1371,1372,1348,1345,1323,1324,1321,1322,1323,1324,1396,1393,1323,1324,1321,1322,1323,1324,1396,1393,1323,1324,1321,1322,1323,1324,1396,1393,1323,1324,1323,1324,1321,1322,1323,1324,1396,1393,1321, +1393,1394,1395,1396,1372,1369,1324,1394,1395,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1345,1346,1347,1348,1345,1346,1370,1371,0, +1321,1322,1323,1324,1396,1393,1346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1323,1324,1321,1322,1323,1324,1394,1395,0, +1347,1348,1345,1346,1370,1371,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1347,1348,1345,1346,1347,1348,1322,1323,0, +1321,1322,1323,1324,1394,1395,1348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1371,1372,1369,1370,1371,1372,1348,1345,0, +1345,1346,1347,1348,1322,1323,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,1393,1394,1395,1396,1372,1369,0, +1369,1370,1371,1372,1348,1345,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1323,1324,1321,1322,1323,1324,1396,1393,0, +1393,1394,1395,1396,1372,1369,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1345,1346,1347,1348,1345,1346,1370,1371,0, +1321,1322,1323,1324,1396,1393,1346,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1323,1324,1321,1322,1323,1324,1394,1395,0, +1347,1348,1345,1346,1370,1371,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1347,1348,1345,1346,1347,1348,1322,1323,0, +1321,1322,1323,1324,1394,1395,1348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1371,1372,1369,1370,1371,1372,1348,1345,0, +1345,1346,1347,1348,1322,1323,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,1393,1394,1395,1396,1372,1369,0, +1369,1370,1371,1372,1348,1345,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1323,1324,1321,1322,1323,1324,1396,1393,0, +1393,1394,1395,1396,1372,1369,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1345,1346,1347,1348,1345,1346,1370,1371,0, +1321,1322,1323,1324,1396,1393,1346,1322,1323,1324,1321,1322,1323,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1323,1324,1321,1322,1323,1324,1394,1395,0, +1347,1348,1345,1346,1370,1371,1324,1346,1347,1348,1345,1346,1347,1348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1347,1348,1345,1346,1347,1348,1322,1323,0, +1321,1322,1323,1324,1394,1395,1348,1370,1371,1372,1369,1370,1371,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1371,1372,1369,1370,1371,1372,1348,1345,0, +1345,1346,1347,1348,1322,1323,1372,1394,1395,1396,1393,1394,1395,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,1393,1394,1395,1396,1372,1369,0, +1369,1370,1371,1372,1348,1345,1396,1322,1323,1324,1321,1322,1323,1324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1323,1324,1321,1322,1323,1324,1396,1393,0, +1393,1394,1395,1396,1372,1369,1324,1346,1347,1348,1345,1346,1347,1348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1345,1346,1347,1348,1345,1346,1370,1371,0, +1321,1322,1323,1324,1396,1393,1346,1370,1371,1372,1369,1370,1371,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1323,1324,1321,1322,1323,1324,1394,1395,0, +1347,1348,1345,1346,1370,1371,1324,1346,1347,1348,1345,1346,1347,1348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1347,1348,1345,1346,1347,1348,1322,1323,0, +1321,1322,1323,1324,1394,1395,1348,1370,1371,1372,1369,1370,1371,1372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1371,1372,1369,1370,1371,1372,1348,1345,0, +1345,1346,1347,1348,1322,1323,1372,1394,1395,1396,1393,1394,1395,1396,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1395,1396,1393,1394,1395,1396,1372,1369,0, +1369,1370,1371,1372,1348,1345,1396,1345,1346,1347,1348,1345,1346,1370,1371,1345,1346,1347,1348,1345,1346,1370,1371,1345,1346,1347,1348,1345,1346,1370,1371,1345,1346,1347,1348,1345,1346,1370,1371,1393,0, +1393,1394,1395,1396,1372,1369,1324,1323,1324,1321,1322,1323,1324,1394,1395,1323,1324,1321,1322,1323,1324,1394,1395,1323,1324,1321,1322,1323,1324,1394,1395,1323,1324,1321,1322,1323,1324,1394,1395,1371,0, +1321,1322,1323,1324,1396,1393,1346,1347,1348,1345,1346,1347,1348,1322,1323,1347,1348,1345,1346,1347,1348,1322,1323,1347,1348,1345,1346,1347,1348,1322,1323,1347,1348,1345,1346,1347,1348,1322,1323,1395,0, +1347,1348,1345,1346,1370,1371,1324,1371,1372,1369,1370,1371,1372,1348,1345,1371,1372,1369,1370,1371,1372,1348,1345,1371,1372,1369,1370,1371,1372,1348,1345,1371,1372,1369,1370,1371,1372,1348,1345,1323,0, +1321,1322,1323,1324,1394,1395,1348,1395,1396,1393,1394,1395,1396,1372,1369,1395,1396,1393,1394,1395,1396,1372,1369,1395,1396,1393,1394,1395,1396,1372,1369,1395,1396,1393,1394,1395,1396,1372,1369,1345,0, +1345,1346,1347,1348,1322,1323,1372,1323,1324,1321,1322,1323,1324,1396,1393,1323,1324,1321,1322,1323,1324,1396,1393,1323,1324,1321,1322,1323,1324,1396,1393,1323,1324,1321,1322,1323,1324,1396,1393,1369,0, +1369,1370,1371,1372,1348,1345,1396,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1369,1370,1371,1372,1323,1324,1321,1322,1323,1324,1396,1393,0, +1393,1394,1395,1396,1372,1369,1324,1396,1393,1394,1395,1396,1393,1394,1395,1396,1393,1394,1395,1396,1393,1394,1395,1396,1393,1394,1395,1396,1393,1394,1395,1396,1393,1394,1395,1396,1393,1394,1395,1396,0, +1321,1322,1323,1324,1396,1393,1346,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,1321,1322,1323,1324,0 - - + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,7,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,9,0,6,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,66,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,66,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,289,290,290,290,290,324,322,325,290,290,290,290,290,290,290,291,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,289,290,324,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,289,290,324,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,321,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,322,323,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,353,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,354,355,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,1025,1025,1025,0,0,0,0,0,0,0,0,1025,1025,0,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,1025,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, +0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0, +0,0,0,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,1025,1025,1025,1025,1025,1025,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1025,1025,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + diff --git a/src/GameSettings.h b/src/GameSettings.h index 618ffdb..d5514de 100644 --- a/src/GameSettings.h +++ b/src/GameSettings.h @@ -48,8 +48,8 @@ public: inline static constexpr bool DEBUG_CAMERA{true}; inline static constexpr float PLAYER_SPD{5.f}; - inline static vf3d CAMERA_FOLLOW_POS{0,-3.77,-3.2}; - inline static float CAMERA_TILT{51.35}; + inline static vf3d CAMERA_FOLLOW_POS{0,-3.29,-2.5}; + inline static float CAMERA_TILT{54.54}; inline static float FRAME_TIME_PER_CHAR{1/30.f}; inline static Action CONFIRM_DIALOG{{Key::ENTER,Key::SPACE,Key::Z,Key::SHIFT,Key::RETURN}}; @@ -67,4 +67,16 @@ public: S MOM_OUTFIT2{"Oh, you like your knight outfit that much don't you? I understand. Have fun today {}!"}; }; #undef S + + using TileID=uint32_t; + using TileSetFilenamePair=std::pair; + using GraphicFilename=std::string; + + inline static const std::unordered_mapTILE_MODELS{ + {296,{"Field Tiles.tsx","tree.png"}}, + {321,{"Field Tiles.tsx","tree.png"}}, + {319,{"Field Tiles.tsx","tree.png"}}, + {344,{"Field Tiles.tsx","tree.png"}}, + }; + inline static std::unordered_mapCONVERTED_TILE_MODELS; }; \ No newline at end of file diff --git a/src/ShepGame.cpp b/src/ShepGame.cpp index ab5e820..c6ea693 100644 --- a/src/ShepGame.cpp +++ b/src/ShepGame.cpp @@ -131,6 +131,26 @@ void ShepGame::LoadMap(const std::string&filename){ if(tiles[y][x]!=0)collisionTiles.emplace(x,y); } } + for(const XMLTag&tag:map.GetData().TilesetData){ + const std::string tilesetName{tag.data.at("source")}; + const uint32_t firstgid{uint32_t(tag.GetInteger("firstgid"))}; + for(const auto&[tileID,tilesetFilenamePair]:GameSettings::TILE_MODELS){ + if(tilesetFilenamePair.first==tilesetName){ + const GameSettings::TileID newTileID{tileID+firstgid}; + GameSettings::CONVERTED_TILE_MODELS[newTileID]=tilesetFilenamePair.second; + } + } + } + for(const LayerTag&layer:map.GetData().GetLayers()){ + std::vector>tiles{layer.tiles}; + for(int y:std::ranges::iota_view(size_t(0),tiles.size())){ + for(int x:std::ranges::iota_view(size_t(0),tiles[0].size())){ + if(GameSettings::CONVERTED_TILE_MODELS.count(tiles[y][x])){ + AddGameObject({float(x),0.f,float(y)},{2,2,2},GameObject::ObjectID::DEFAULT,GameSettings::CONVERTED_TILE_MODELS[tiles[y][x]],MeshType::SPRITE); + } + } + } + } if(map.GetData().ZoneData.count("Building")>0){ const std::vector&zones{map.GetData().ZoneData.at("Building")}; for(const ZoneData&zone:zones){ diff --git a/src/TMXParser.h b/src/TMXParser.h index 6fc9c81..951aab0 100644 --- a/src/TMXParser.h +++ b/src/TMXParser.h @@ -50,10 +50,10 @@ struct XMLTag{ const std::string FormatTagData(std::maptiles); friend std::ostream& operator << (std::ostream& os, XMLTag& rhs); std::string str(); - int GetInteger(std::string dataTag); - float GetFloat(std::string dataTag); - double GetDouble(std::string dataTag); - bool GetBool(std::string dataTag); + int GetInteger(std::string dataTag)const; + float GetFloat(std::string dataTag)const; + double GetDouble(std::string dataTag)const; + bool GetBool(std::string dataTag)const; std::string GetString(std::string dataTag)const; }; @@ -102,7 +102,6 @@ private: MapTag MapData; std::string name; Renderable*optimizedTile=nullptr; - std::vector TilesetData; std::vector LayerData; std::string mapType=""; std::setspawns; @@ -125,6 +124,7 @@ public: friend std::ostream& operator << (std::ostream& os, std::vector& rhs); const std::string&GetBGM()const; std::map>ZoneData; + std::vector TilesetData; }; struct Property{ @@ -175,20 +175,20 @@ class TMXParser{ "(width:"<