diff --git a/.gitignore b/.gitignore index 144401e..299abeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,3 @@ -# Ignore Gradle project-specific cache directory -.gradle - -# Ignore Gradle build output directory -build - # Ignore bin bin/ *.tiled-session diff --git a/resources/map/21N2.tmx b/resources/map/21N2.tmx new file mode 100644 index 0000000..412a425 --- /dev/null +++ b/resources/map/21N2.tmx @@ -0,0 +1,123 @@ + + + + + + + +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1228,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1228,1007,1007,1228,1007,1007,1007,1007,1228,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1228,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,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,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +1044,0,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1267,0,0,0,0,0,0,0,0,0,0,0, +620,620,620,620,620,620,620,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,620,620,620,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031, +0,0,0,0,0,0,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1276,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,990,991,991,991,991,991,991,992,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1009,1010,1010,1010,1010,1010,1010,1011,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,0, +1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,1050, +1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,1050, +1149,1027,0,1025,1027,620,1025,991,991,991,0,991,0,991,991,991,991,991,991,991,991,0,1027,1050,1050,1050,1050,1050,1050,1006,0,0,0,0,0,0,0,0,0,0,1050, +1009,1169,0,1044,1046,0,1044,1010,1010,1010,0,1010,0,1010,1010,1010,1010,1010,1010,1010,1010,0,1046,1050,1050,1050,1050,1050,1050,1006,0,0,0,0,0,0,0,0,0,0,1050, +1008,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,1050, +1008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,1050, +1028,1031,1029,1029,1029,1029,1029,1029,1029,1029,1029,1031,1029,1029,1029,1029,1029,1029,1029,1029,0,1029,1029,1188,1277,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,1050, +1047,1031,1048,1048,1048,1048,1048,1048,1048,1048,1048,1031,1048,1048,1048,1048,1048,1048,1048,1048,0,1048,1048,1207,1277,0,0,0,0,1025,991,991,0,991,991,991,991,991,991,991,992, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1044,1010,1010,0,1010,1010,1010,1010,1010,1010,1010,1011, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1189,1029,1050,1029,1029,1029,1029,1029,1029,1029,1029,1190, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1208,1048,1050,1048,1048,1048,1048,1048,1048,1048,1048,1209, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,727,0,1006,0,0,0,0,0,0,0,0,0,0,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,761,0,1006,0,0,0,0,620,620,620,620,0,0,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1028,1029,1029,1029,1029,1029,1030,620,620,620,620,620,620,620,620,620,620,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1048,1048,1048,1048,1048,1049,620,620,620,620,620,620,620,620,620,620,620 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/21N3.tmx b/resources/map/21N3.tmx new file mode 100644 index 0000000..8903aee --- /dev/null +++ b/resources/map/21N3.tmx @@ -0,0 +1,139 @@ + + + + + + + +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1228,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1228,1007,1007,1228,1007,1007,1007,1007,1228,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1228,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1228,1228,1228,1228,1228,1228,1228,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,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,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +1044,0,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1267,0,0,0,0,0,0,0,0,0,0,0, +620,620,620,620,620,620,620,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,620,620,620,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031, +0,0,0,0,0,0,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1276,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + +1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1050, +1031,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1050, +1149,1027,0,1025,1027,620,1025,991,991,991,0,991,0,991,991,991,991,991,991,991,991,0,991,991,991,991,991,991,991,992,0,0,0,0,0,0,0,0,0,0,1050, +1009,1169,0,1044,1046,0,1044,1010,1010,1010,0,1010,0,1010,1010,1010,1010,1010,1010,1010,1010,0,1010,1010,1010,1010,1010,1010,1010,1011,0,0,0,0,0,0,0,0,0,0,1050, +1008,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,1050, +1008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,1050, +1028,1031,1029,1029,1029,1029,1029,1029,1029,1029,1029,1031,1029,1029,1029,1029,1029,1029,1029,1029,0,1029,1029,1188,1277,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,1050, +1047,1031,1048,1048,1048,1048,1048,1048,1048,1048,1048,1031,1048,1048,1048,1048,1048,1048,1048,1048,0,1048,1048,1207,1277,0,0,0,0,1025,991,991,0,991,991,991,991,991,991,991,992, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1044,1010,1010,0,1010,1010,1010,1010,1010,1010,1010,1011, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1006, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1189,1029,1050,1029,1029,1029,1029,1029,1029,1029,1029,1190, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1208,1048,1050,1048,1048,1048,1048,1048,1048,1048,1048,1209, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,0,0,1006,0,0,0,0,0,0,0,0,0,0,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,727,0,1006,0,0,0,0,0,0,0,0,0,0,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1008,1277,0,0,761,0,1006,0,0,0,0,620,620,620,620,0,0,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1028,1029,1029,1029,1029,1029,1030,620,620,620,620,620,620,620,620,620,620,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1048,1048,1048,1048,1048,1049,620,620,620,620,620,620,620,620,620,620,620 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/21RI.tmx b/resources/map/21RI.tmx new file mode 100644 index 0000000..d65c358 --- /dev/null +++ b/resources/map/21RI.tmx @@ -0,0 +1,124 @@ + + + + + + + +1007,1007,1007,1007,1007,1007,1007,1007,1007,586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1063,1007,1007,1063,1007,1007,1007,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +586,586,1063,586,586,1063,586,586,586,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,1255,586,586,586,586,586,586,586,586,586,586,586,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,1063,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,586,586,586,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,586,586,586,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,586,586,586,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,586,586,586,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007, +1063,1063,1063,1063,1063,1063,1063,1063,586,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007, +586,586,809,809,809,809,809,1063,586,586,586,809,586,586,586,586,586,809,586,586,586,586,586,809,586,586,586,586,586,809,586,586,586,586,586,809,586,586,586,586,1007 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,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,3221225833,1073742184,3221225831,359,360,361,0,0,724,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,724,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +1044,0,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1267,0,0,0,0,0,0,0,0,0,0,0, +620,620,620,620,620,620,620,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,620,620,620,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031, +0,0,0,0,0,0,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1276,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,360,361,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,360,361,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,360,361,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,360,361,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,990,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,992,586,586,586,586,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1009,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1011,586,586,586,586,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,0,0,0,0,0,0,586,586,0,1006,1050,586,0,586,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,0,0,0,0,0,0,586,0,0,1006,1050,0,586,586,0,0,0,0,0,0,0,0,0,0,0, +1031,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,0,0,0,0,0,0,586,0,0,1006,1050,0,586,586,0,0,0,0,0,0,0,0,0,0,1050, +1031,0,0,0,0,0,0,0,0,1008,586,0,0,586,586,586,586,586,586,586,586,0,586,0,0,1006,0,0,0,586,0,0,0,0,0,0,0,0,0,0,1050, +1149,1027,0,1025,1027,620,1025,991,991,1027,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,1025,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,992,0,0,0,1050, +1009,1169,0,1044,1046,0,1044,1010,1010,1046,586,586,586,586,586,586,586,586,586,586,586,586,586,1050,1050,1044,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1011,0,0,0,1050, +1008,620,0,0,0,0,0,0,0,586,586,586,586,0,586,0,586,0,586,586,586,586,0,0,0,0,0,0,0,586,0,0,0,0,0,0,1006,0,0,0,1050, +1008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,586,586,586,0,0,0,0,0,0,0,586,0,0,0,0,0,0,1006,0,0,0,1050, +1008,727,586,586,586,586,586,586,586,586,727,586,586,586,586,727,586,586,586,586,586,727,586,586,1277,0,0,727,0,586,0,0,0,727,586,586,1006,586,0,0,1050, +1008,761,586,586,586,586,586,586,586,586,761,586,586,586,586,761,586,586,586,586,586,761,586,586,1277,0,0,761,0,586,586,586,586,761,586,586,1006,586,586,586,586, +1008,0,0,0,0,0,0,987,988,989,0,0,0,586,586,586,0,586,586,586,586,0,586,586,1277,0,0,0,0,586,586,586,586,586,586,586,1006,586,586,586,586, +1008,586,586,586,586,586,586,1006,1007,1008,586,586,586,0,0,0,0,586,0,0,586,0,586,586,1277,0,0,0,0,586,586,0,586,586,586,0,1006,0,0,0,586, +1008,0,0,0,0,0,0,1006,1007,1008,0,0,0,0,0,0,586,0,0,0,586,586,586,586,1277,0,0,0,0,586,586,586,0,0,586,586,1006,0,0,0,586, +1008,0,0,0,0,0,0,1006,1007,1008,0,0,0,0,0,586,0,0,0,0,0,0,586,586,1277,0,0,0,0,586,586,586,586,586,586,586,1006,586,586,586,586, +1008,0,0,0,0,0,0,1006,1007,1008,0,0,0,0,586,586,0,0,0,0,0,0,586,594,594,0,0,0,0,586,586,586,586,586,586,586,1006,1007,1007,1007,586, +1008,0,0,0,0,0,0,1006,1007,1008,0,0,0,0,586,0,0,0,0,0,0,0,586,586,1277,0,0,0,0,586,586,586,0,0,0,0,1006,1008,0,1006,620, +1008,0,0,0,0,0,0,1006,1007,1008,0,0,0,586,586,0,0,0,0,0,0,0,0,586,1277,0,0,0,0,586,586,586,0,0,0,0,1006,1008,0,1006,620, +1008,0,0,0,0,0,0,1006,1007,1008,0,0,0,586,0,0,0,0,0,0,0,0,0,586,1277,0,0,0,0,586,586,0,0,0,0,0,1025,1027,0,1006,620, +1008,727,0,0,0,0,0,1006,1007,1008,0,0,0,586,0,727,0,0,0,0,0,727,0,586,1277,0,0,727,0,586,586,0,0,727,0,0,1044,1046,0,1006,620, +1008,761,0,0,0,0,0,1006,1007,1008,0,0,0,586,0,761,0,0,0,0,0,761,0,586,1277,0,0,761,0,586,0,0,0,761,620,620,620,620,0,1006,620, +1028,1029,1029,0,0,0,1029,1030,1007,1028,1029,0,1029,1029,1029,1029,1029,0,1029,1029,1029,1029,1029,586,1029,1029,1029,1029,1029,586,1029,1029,1029,1029,1029,620,1029,1029,1029,1030,620, +1047,1048,1048,0,0,0,1048,1049,1007,1047,1048,0,1048,1048,1048,1048,1048,586,1048,1048,1048,1048,1048,586,1048,1048,1048,1048,1048,586,1048,1048,1048,1048,1048,620,1048,1048,1048,1049,620 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/21RS.tmx b/resources/map/21RS.tmx new file mode 100644 index 0000000..7a3d2d7 --- /dev/null +++ b/resources/map/21RS.tmx @@ -0,0 +1,135 @@ + + + + + + + + + + +1007,1007,1007,1007,1007,1007,1007,1007,1007,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1007,1007,1007,1007,1031,1031,1031,809,809,1031,1031, +1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, +1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, +1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, +1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, +1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, +1031,1031,1031,1031,1031,1031,1031,1031,1031,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1007,1007,1007,1007,837,837,837,837,837,837,837, +1031,1031,1031,1031,1031,1031,1031,1031,1031,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,1031,1031,1031,1031,837,837,837,837,837,837,837, +1031,1031,1031,1031,1031,1031,1031,1031,1031,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +1031,1031,1031,1031,1031,1031,1031,1031,1031,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +459,1031,1031,1031,1031,1031,1031,1031,1031,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +459,1031,1031,1031,1031,1031,1031,1031,1050,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +459,1031,1031,1031,1031,1031,459,459,459,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,837,837,837,1031, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1031,1031,1031,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1031,1031,1031,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1031,1031,1031,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007, +1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,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,3221225833,1073742184,3221225831,359,360,361,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +1044,0,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1267,0,0,0,0,0,0,0,0,0,0,0, +620,620,620,620,620,620,620,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,620,620,620,620,620,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +594,594,594,594,594,594,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031, +0,0,0,0,0,0,620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,360,361,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,360,361,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,360,361,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1276,0,0,0,0,0,0,359,360,361,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,990,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,992,0,0,0,0,990,991,991,0,0,991,992, +0,0,0,0,0,0,0,0,0,1009,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1011,0,0,0,0,1009,1010,1010,0,0,1010,1011, +0,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,0,0,1031,0,0,1031,1031,0,0,0,0,0,0,1006,0,0,0,0,1008,0,0,0,0,0,1006, +0,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,0,0,1031,0,0,1031,1031,0,0,0,0,0,0,1006,0,0,0,0,1008,0,0,0,0,0,1006, +1031,0,0,0,0,0,0,0,0,1008,0,0,0,0,0,0,0,0,1031,0,0,1031,1031,0,0,0,0,0,0,1006,0,0,0,0,1008,0,0,0,0,0,1006, +1031,0,0,0,0,0,0,0,0,1008,0,1031,1031,1031,0,1031,1031,1031,1031,1031,1031,1031,1031,0,0,0,0,0,0,1006,0,0,0,0,1008,0,0,0,0,0,1006, +1149,1027,0,1025,1027,620,1025,991,991,1027,0,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1050,1050,1050,1050,1050,1050,1006,0,0,0,0,1008,0,0,0,0,0,1006, +1009,1169,0,1044,1046,0,1044,1010,1010,1046,1031,1031,0,1031,1031,1031,1031,1031,1031,1031,1031,0,1031,1050,1050,1050,1050,1050,1050,1025,1026,1026,1026,1026,1027,0,0,0,0,0,1006, +1008,620,0,0,0,0,0,0,0,1031,1031,1031,1031,1031,0,1031,0,0,0,1031,1031,0,0,0,0,0,0,0,0,1044,1045,1045,1045,1045,1046,0,0,0,0,0,1006, +1008,0,0,0,0,0,0,0,0,1031,1031,0,1031,1031,1031,1031,0,0,0,0,1031,0,0,0,1031,0,0,0,0,1031,0,0,0,0,0,0,0,0,0,0,1006, +1008,727,1031,1031,1031,1029,1031,1031,1031,727,1031,1031,1031,1031,1031,727,1031,1031,1031,1031,1031,727,1031,1031,1031,0,0,727,0,1031,1031,0,0,727,1031,1031,1031,0,1031,727,1006, +1008,761,1031,1031,1031,1031,1031,1031,1031,761,1031,1031,1031,1031,1031,761,1031,1031,1031,1031,1031,761,1031,1031,1031,1031,1031,761,1031,1031,1031,1031,1031,761,1031,1031,1031,1031,1031,761,1006, +1028,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1188,1031,1189,1190, +1047,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1207,1031,1208,1209, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1277,0,0,0,0,0,0,0,0,0,0,0,0,1008,1031,1006,1031, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1277,0,0,0,0,1031,1031,1031,1031,1031,1031,1031,1031,1008,1031,1006,1031, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1277,0,0,0,0,1031,1031,1031,1031,1031,1031,1031,1031,1008,1031,1006,1031, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1277,0,0,0,0,1031,0,0,0,0,0,0,0,1012,1031,1012,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1277,0,0,1031,0,1031,0,0,0,0,0,0,0,1012,0,1012,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1277,0,0,1031,0,1031,0,0,0,0,0,0,0,1012,0,1012,620, +620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1277,0,1031,1031,0,1031,0,0,0,0,0,0,0,1012,0,1012,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1277,0,1031,1031,0,1031,1031,0,0,0,620,620,620,620,0,0,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1031,1031,1031,1031,1031,1031,1031,620,620,620,620,620,620,620,620,620,620, +620,620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1031,1031,1031,1031,1031,1031,1031,620,620,620,620,620,620,620,620,620,620,620 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/Maps.tiled-session b/resources/map/Maps.tiled-session index d5719c9..956c037 100644 --- a/resources/map/Maps.tiled-session +++ b/resources/map/Maps.tiled-session @@ -3,16 +3,70 @@ "height": 4300, "width": 2 }, - "activeFile": "test_couloir.tmx", + "activeFile": "21RI.tmx", "expandedProjectPaths": [ - "." + "png", + ".", + "assets" ], - "file.lastUsedOpenFilter": "Fichiers de jeu de tuiles Tiled (*.tsx *.xml)", + "file.lastUsedOpenFilter": "Tous les Fichiers (*)", "fileStates": { "": { "scaleInDock": 1, "scaleInEditor": 1 }, + "21N2.tmx": { + "expandedObjectLayers": [ + 6 + ], + "scale": 0.75, + "selectedLayer": 3, + "viewCenter": { + "x": 648, + "y": 186 + } + }, + "21N3.tmx": { + "expandedObjectLayers": [ + 6 + ], + "scale": 0.75, + "selectedLayer": 3, + "viewCenter": { + "x": 425.3333333333333, + "y": 276.66666666666663 + } + }, + "21N3_v2.tmx": { + "scale": 3, + "selectedLayer": 3, + "viewCenter": { + "x": 404.3333333333333, + "y": 137.5 + } + }, + "21RI.tmx": { + "expandedObjectLayers": [ + 6 + ], + "scale": 1, + "selectedLayer": 2, + "viewCenter": { + "x": 653, + "y": 393.5 + } + }, + "21RS.tmx": { + "expandedObjectLayers": [ + 6 + ], + "scale": 0.5, + "selectedLayer": 4, + "viewCenter": { + "x": 756, + "y": -33 + } + }, "C:/Users/remi/AppData/Roaming/Tiled/#Tests": { "dynamicWrapping": true }, @@ -116,6 +170,17 @@ "scaleInDock": 1, "scaleInEditor": 5.5 }, + "I21N3.tmx": { + "expandedObjectLayers": [ + 6 + ], + "scale": 0.75, + "selectedLayer": 1, + "viewCenter": { + "x": 397.3333333333333, + "y": 347.3333333333333 + } + }, "assets/32x32 first tileset.tsx": { "dynamicWrapping": false, "scaleInDock": 1, @@ -131,10 +196,14 @@ "scaleInEditor": 1 }, "assets/Dungeon_v2.tsx": { + "scaleInDock": 1.5, + "scaleInEditor": 1.5 + }, + "assets/HKU tileset.tsx": { "scaleInDock": 1, "scaleInEditor": 1 }, - "assets/HKU tileset.tsx": { + "assets/Interior.tsx": { "scaleInDock": 1, "scaleInEditor": 1 }, @@ -145,7 +214,11 @@ }, "assets/Interior_v2.tsx": { "scaleInDock": 1, - "scaleInEditor": 1 + "scaleInEditor": 3 + }, + "assets/MegaPixelArt_v2.tsx": { + "scaleInDock": 1, + "scaleInEditor": 3 }, "assets/OuterTileset.tsx": { "scaleInDock": 1, @@ -167,7 +240,7 @@ }, "assets/Slates_v2.tsx": { "scaleInDock": 1, - "scaleInEditor": 1 + "scaleInEditor": 3 }, "assets/TileSet_V2.tsx": { "scaleInDock": 1, @@ -184,7 +257,7 @@ "scaleInEditor": 1.5 }, "assets/pokemon_v2.tsx": { - "scaleInDock": 1, + "scaleInDock": 1.5, "scaleInEditor": 1 }, "assets/tpq_v2.tsx": { @@ -198,8 +271,8 @@ "scale": 0.75, "selectedLayer": 1, "viewCenter": { - "x": 640, - "y": 640 + "x": 18, + "y": 524.6666666666666 } }, "desert.tmx#Desert": { @@ -213,8 +286,8 @@ "scale": 1.5, "selectedLayer": 1, "viewCenter": { - "x": 159.33333333333331, - "y": 160.66666666666663 + "x": 208.66666666666663, + "y": 17 } }, "test.tmx#test": { @@ -226,10 +299,10 @@ 9 ], "scale": 1.5, - "selectedLayer": 4, + "selectedLayer": 0, "viewCenter": { - "x": 299.66666666666663, - "y": 221 + "x": 285.99999999999994, + "y": 60.333333333333314 } }, "test_couloir.tmx#Dungeon_Tileset": { @@ -273,8 +346,8 @@ } }, "last.exportedFilePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/vscode/tests_gdx2d_gradle/app/src/main/java/test_map/data", - "last.externalTilesetPath": "C:/Users/remi/Desktop", - "last.imagePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/map/assets", + "last.externalTilesetPath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/vscode/PokeMudry/resources/map/assets", + "last.imagePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/vscode/PokeMudry/resources/map/assets", "last.objectTypesPath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/map/propertytypes.json", "last.worldFilePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/map", "lastUsedTilesetExportFilter": "Tous les Fichiers (*)", @@ -288,26 +361,28 @@ "map.tileWidth": 32, "map.width": 20, "openFiles": [ - "test_couloir.tmx", - "test.tmx", - "desert.tmx" + "21RI.tmx", + "21RS.tmx", + "21N2.tmx", + "21N3.tmx" ], "project": "Maps.tiled-project", "property.type": "string", "recentFiles": [ - "desert.tmx", - "test.tmx", - "test_couloir.tmx", - "assets/Dungeon_v2.tsx", - "assets/Interior_v2.tsx", + "21N3.tmx", + "21N2.tmx", + "21RS.tmx", + "21RI.tmx", "assets/pokemon_v2.tsx", "assets/Slates_v2.tsx", - "assets/TileSet_V2.tsx", - "assets/tpq_v2.tsx", - "assets/Dungeon.tsx", - "assets/pokemon.tsx", - "assets/Tiny Platform Quest Tiles.tsx" + "assets/Dungeon_v2.tsx", + "assets/Interior_v2.tsx", + "test.tmx", + "test_couloir.tmx", + "I21N3.tmx", + "desert.tmx" ], + "tileset.lastUsedFilter": "Fichiers de jeu de tuiles Tiled (*.tsx *.xml)", "tileset.lastUsedFormat": "tsx", "tileset.margin": 0, "tileset.spacing": 0, diff --git a/resources/map/assets/Dungeon_v2.tsx b/resources/map/assets/Dungeon_v2.tsx index 6fe7894..290f812 100644 --- a/resources/map/assets/Dungeon_v2.tsx +++ b/resources/map/assets/Dungeon_v2.tsx @@ -40,7 +40,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -328,19 +328,19 @@ - + - + - + @@ -382,7 +382,7 @@ - + @@ -436,25 +436,25 @@ - + - + - + - + @@ -490,49 +490,49 @@ - + - + - + - + - + - + - + - + @@ -586,7 +586,7 @@ - + @@ -694,19 +694,19 @@ - + - + - + @@ -766,37 +766,37 @@ - + - + - + - + - + - + @@ -814,7 +814,7 @@ - + @@ -832,85 +832,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1000,31 +1000,31 @@ - + - + - + - + - + @@ -1042,7 +1042,7 @@ - + @@ -1114,31 +1114,31 @@ - + - + - + - + - + @@ -1150,19 +1150,19 @@ - + - + - + @@ -1210,13 +1210,13 @@ - + - + @@ -1228,67 +1228,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -1306,13 +1306,13 @@ - + - + @@ -1342,31 +1342,31 @@ - + - + - + - + - + diff --git a/resources/map/assets/Interior_v2.tsx b/resources/map/assets/Interior_v2.tsx index 3fa48f7..4f4cebc 100644 --- a/resources/map/assets/Interior_v2.tsx +++ b/resources/map/assets/Interior_v2.tsx @@ -111,19 +111,19 @@ - + - + - + @@ -147,19 +147,19 @@ - + - + - + @@ -183,19 +183,19 @@ - + - + - + diff --git a/resources/map/assets/MegaPixelArt_v2.png b/resources/map/assets/MegaPixelArt_v2.png new file mode 100644 index 0000000..1bb428d Binary files /dev/null and b/resources/map/assets/MegaPixelArt_v2.png differ diff --git a/resources/map/assets/MegaPixelArt_v2.tsx b/resources/map/assets/MegaPixelArt_v2.tsx new file mode 100644 index 0000000..72baf9f --- /dev/null +++ b/resources/map/assets/MegaPixelArt_v2.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/resources/map/assets/cuteRPG.png b/resources/map/assets/cuteRPG.png deleted file mode 100644 index 8815e0d..0000000 Binary files a/resources/map/assets/cuteRPG.png and /dev/null differ diff --git a/resources/map/assets/pokemon_v2.tsx b/resources/map/assets/pokemon_v2.tsx index b807936..1d49493 100644 --- a/resources/map/assets/pokemon_v2.tsx +++ b/resources/map/assets/pokemon_v2.tsx @@ -52,157 +52,157 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -232,7 +232,7 @@ - + @@ -256,157 +256,157 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -460,1489 +460,1489 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1954,7 +1954,7 @@ - + @@ -1966,187 +1966,187 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2158,7 +2158,7 @@ - + @@ -2170,187 +2170,187 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2362,7 +2362,7 @@ - + @@ -2374,1543 +2374,1543 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3922,1999 +3922,1999 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/resources/map/desert.tmx b/resources/map/desert.tmx index f571265..88c7f59 100644 --- a/resources/map/desert.tmx +++ b/resources/map/desert.tmx @@ -468,6 +468,7 @@ + @@ -475,6 +476,7 @@ + diff --git a/resources/map/png/21.xcf b/resources/map/png/21.xcf index c5555d6..2d65568 100644 Binary files a/resources/map/png/21.xcf and b/resources/map/png/21.xcf differ diff --git a/resources/map/png/21N1.PNG b/resources/map/png/21N1.PNG index 13138d9..d0f19b2 100644 Binary files a/resources/map/png/21N1.PNG and b/resources/map/png/21N1.PNG differ diff --git a/resources/map/png/21N2.PNG b/resources/map/png/21N2.PNG index 2a9ba72..4d7141c 100644 Binary files a/resources/map/png/21N2.PNG and b/resources/map/png/21N2.PNG differ diff --git a/resources/map/png/21N3.PNG b/resources/map/png/21N3.PNG index a347737..498d7d6 100644 Binary files a/resources/map/png/21N3.PNG and b/resources/map/png/21N3.PNG differ diff --git a/resources/map/png/21N4.PNG b/resources/map/png/21N4.PNG index 7d8d6ed..23890f5 100644 Binary files a/resources/map/png/21N4.PNG and b/resources/map/png/21N4.PNG differ diff --git a/resources/map/png/21N5.PNG b/resources/map/png/21N5.PNG index 128f141..467ac11 100644 Binary files a/resources/map/png/21N5.PNG and b/resources/map/png/21N5.PNG differ diff --git a/resources/map/png/21N6.PNG b/resources/map/png/21N6.PNG index 3ff4d96..41e7cda 100644 Binary files a/resources/map/png/21N6.PNG and b/resources/map/png/21N6.PNG differ diff --git a/resources/map/png/21N7.PNG b/resources/map/png/21N7.PNG index 55a1a4b..5cee252 100644 Binary files a/resources/map/png/21N7.PNG and b/resources/map/png/21N7.PNG differ diff --git a/resources/map/png/21RI.PNG b/resources/map/png/21RI.PNG index ea4013f..4e3e66d 100644 Binary files a/resources/map/png/21RI.PNG and b/resources/map/png/21RI.PNG differ diff --git a/resources/map/png/21RS.PNG b/resources/map/png/21RS.PNG index 4ecc7f9..ca0b067 100644 Binary files a/resources/map/png/21RS.PNG and b/resources/map/png/21RS.PNG differ diff --git a/resources/map/png/21SS.PNG b/resources/map/png/21SS.PNG index b620639..92975d0 100644 Binary files a/resources/map/png/21SS.PNG and b/resources/map/png/21SS.PNG differ diff --git a/resources/map/test.tmx b/resources/map/test.tmx index e6b6c8b..4f4c896 100644 --- a/resources/map/test.tmx +++ b/resources/map/test.tmx @@ -1823,6 +1823,7 @@ + @@ -1830,6 +1831,7 @@ + diff --git a/resources/map/test_couloir.tmx b/resources/map/test_couloir.tmx index bb2d47c..d61c3d5 100644 --- a/resources/map/test_couloir.tmx +++ b/resources/map/test_couloir.tmx @@ -6,8981 +6,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, -21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21 - - + + + + 956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956, @@ -9026,6 +55,7 @@ + @@ -9033,6 +63,7 @@ + @@ -9040,6 +71,7 @@ + @@ -9047,6 +79,7 @@ + diff --git a/resources/map/texture_splitter_v2.py b/resources/map/texture_splitter_v2.py index 837c55a..6562c46 100644 --- a/resources/map/texture_splitter_v2.py +++ b/resources/map/texture_splitter_v2.py @@ -9,7 +9,7 @@ W, H = 32, 32 def pilToPygame(pilImage): return pygame.image.fromstring( - pilImage.tobytes(), pilImage.size, pilImage.mode).convert() + pilImage.tobytes(), pilImage.size, pilImage.mode).convert_alpha() def rect(p1, p2): x = min(p1[0], p2[0]) @@ -38,7 +38,7 @@ class Rect: color = (0,255,0) self.hover = True - pygame.draw.rect(w, color, [x*W-sx, y*H-sy, self.w*W, self.h*H], 1) + pygame.draw.rect(w, color, [x*W-sx, y*H-sy, self.w*W, self.h*H], 2) @property def area(self): @@ -76,6 +76,7 @@ class Editor: self.win = pygame.display.set_mode([self.WIDTH, self.HEIGHT], pygame.SRCALPHA) self.over = pygame.Surface([self.WIDTH, self.HEIGHT], pygame.SRCALPHA) self.clock = pygame.time.Clock() + pygame.display.set_caption(f"Texture Splitter - {self.base}{self.ext}") self.img = pilToPygame(img) self.a = np.array(img) @@ -91,6 +92,7 @@ class Editor: self.rects = [] self.sel = (False, None) self.scroll_x, self.scroll_y = 0, 0 + self.moving = False def mainloop(self): while self.running: @@ -140,26 +142,43 @@ class Editor: speed = self.SCROLL_SPEED if event.button == 5 else -self.SCROLL_SPEED if pygame.key.get_pressed()[pygame.K_LSHIFT]: self.scroll_x += speed - self.scroll_x = min(self.a.shape[1]-self.WIDTH, self.scroll_x) - self.scroll_x = max(0, self.scroll_x) + else: self.scroll_y += speed - self.scroll_y = min(self.a.shape[0]-self.HEIGHT, self.scroll_y) - self.scroll_y = max(0, self.scroll_y) + + self.clamp_scroll() elif event.button == 3: self.rects = list(filter(lambda r: not r.hover, self.rects)) + elif event.button == 2: + self.moving = True + elif event.type == pygame.MOUSEBUTTONUP: if event.button == 1: if self.sel[0]: self.rects.append(Rect(*self.sel[1], self.mx, self.my)) self.sel = (False, None) self.organize() + + elif event.button == 2: + self.moving = False elif event.type == pygame.KEYDOWN: if event.key == pygame.K_s and event.mod & pygame.KMOD_CTRL: self.save() + + elif event.type == pygame.MOUSEMOTION: + if self.moving: + self.scroll_x -= event.rel[0] + self.scroll_y -= event.rel[1] + self.clamp_scroll() + + def clamp_scroll(self): + self.scroll_x = min(self.a.shape[1]-self.WIDTH, self.scroll_x) + self.scroll_x = max(0, self.scroll_x) + self.scroll_y = min(self.a.shape[0]-self.HEIGHT, self.scroll_y) + self.scroll_y = max(0, self.scroll_y) def organize(self): for rect in self.rects: diff --git a/src/Entity/Player.java b/src/Entity/Player.java index d4aa5ac..d5fa801 100644 --- a/src/Entity/Player.java +++ b/src/Entity/Player.java @@ -76,12 +76,13 @@ public class Player extends Character{ nMap = ScreenMap.Door.nextMap; x = ScreenMap.Door.nextX; y = ScreenMap.Door.nextY; + goalDirection = ScreenMap.Door.direction; } catch (Exception e) { } ScreenMap.Door.reset(); if (nMap == null || x == null || y == null) return; map = nMap; setPosition(x*sm.tileWidth, y*sm.tileHeight); - System.out.println("Go to: " + sm.map + " in " + x + " x " + y); + System.out.println("Go to: " + map + " in " + x + " x " + y); } } } diff --git a/src/Screen/ScreenMap.java b/src/Screen/ScreenMap.java index 09c2a9f..5f27e08 100644 --- a/src/Screen/ScreenMap.java +++ b/src/Screen/ScreenMap.java @@ -59,11 +59,12 @@ public class ScreenMap extends RenderingScreen{ tiledLayer.clear(); - try { map = player.getMap(); } catch (Exception e) {} + try { map = player.getMap(); } catch (Exception e) { System.out.println("error for get map");} for (int i = 0; i < 50; i++) { try { tiledLayer.add((TiledMapTileLayer) tMap.get(map).getLayers().get(i)); } catch (Exception e) { } } + if (tiledLayer.size() <= 0) System.out.println("TiledLayer empty !!!"); TiledMapTileLayer tl = tiledLayer.get(0); width = tl.getWidth(); tileWidth = (int) tl.getTileWidth(); @@ -106,10 +107,11 @@ public class ScreenMap extends RenderingScreen{ public boolean isWalkable(Vector tile) { if (tile == null) return false; - boolean walkable = false; + if (tile.size() == 0) return false; + boolean walkable = true; for (TiledMapTile tiledMapTile : tile) { Object test = tiledMapTile.getProperties().get("walkable"); - walkable = Boolean.parseBoolean(test.toString()) ? true:walkable; + walkable = Boolean.parseBoolean(test.toString()) ? walkable:false; } return walkable; } @@ -150,6 +152,7 @@ public class ScreenMap extends RenderingScreen{ try { Door.nextMap = mapProperties.get("nextMap").toString(); } catch (Exception e) { } try { Door.nextX = Integer.parseInt(mapProperties.get("nextX").toString()); } catch (Exception e) { } try { Door.nextY = Integer.parseInt(mapProperties.get("nextY").toString()); } catch (Exception e) { } + try { Door.direction = Player.Direction.valueOf(mapProperties.get("nextDirection").toString()); } catch (Exception e) { } } } @@ -160,11 +163,13 @@ public class ScreenMap extends RenderingScreen{ public static String nextMap; public static Integer nextX; public static Integer nextY; + public static Player.Direction direction; public static void reset(){ nextMap = null; nextX = null; nextY = null; + direction = null; } }