diff --git a/assets/CollisionLayer.txt b/assets/CollisionLayer.txt deleted file mode 100644 index 27abfcd..0000000 --- a/assets/CollisionLayer.txt +++ /dev/null @@ -1,69 +0,0 @@ -tileswide 40 -tileshigh 30 -tilewidth 16 -tileheight 16 - -layer 0 -34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, -34,34,34,34,34,34,34,34,34,34,34,43,52,52,52,52,52,44,34,34,34,34,34,43,52,52,52,52,52,52,52,52,44,34,34,34,34,34,34,34, -34,34,34,39,52,52,44,34,34,34,34,50,82,15,16,17,82,48,34,34,34,34,34,50,82,82,82,82,82,82,82,82,51,52,44,34,34,34,34,34, -34,34,39,38,82,82,36,52,52,44,34,50,82,18,19,20,82,48,34,34,34,34,34,50,82,82,82,82,82,82,82,82,82,82,48,34,34,34,34,34, -34,39,38,0,1,1,2,82,82,48,34,28,47,21,22,23,82,48,34,34,34,34,34,50,82,82,82,82,82,82,82,82,82,82,51,44,34,34,34,34, -34,50,82,3,4,4,11,2,82,51,44,34,41,46,47,82,30,29,34,34,34,34,39,38,82,82,82,82,82,82,82,82,82,82,82,48,34,34,34,34, -34,50,82,3,4,4,4,5,82,30,29,34,34,34,50,82,48,34,34,34,34,34,50,82,82,82,82,82,82,82,82,82,82,82,82,51,52,44,34,34, -34,50,82,6,7,7,7,8,30,29,34,34,34,34,50,82,48,34,34,34,39,52,38,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34,34, -34,28,56,82,82,82,82,30,29,34,34,34,39,52,38,82,48,34,34,34,50,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34,34, -34,34,59,82,82,82,30,29,34,34,34,39,38,82,82,82,51,44,34,34,28,56,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,51,44,34, -34,34,28,32,82,82,51,52,52,52,52,38,82,82,82,82,82,48,34,34,34,28,56,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34, -34,34,34,28,46,46,46,46,46,56,82,82,82,82,82,82,30,29,34,34,34,34,28,56,82,82,82,82,82,82,82,82,82,82,82,82,82,30,29,34, -34,34,34,34,34,34,34,34,39,38,82,82,82,82,82,30,29,34,34,34,34,34,34,28,46,46,56,82,82,82,82,82,82,82,30,46,46,29,34,34, -34,34,34,34,34,34,34,34,28,46,46,46,56,30,46,29,34,34,34,34,34,34,34,34,34,34,28,46,46,46,46,46,46,46,29,34,34,34,34,34, -34,34,34,34,34,34,34,34,34,34,34,34,59,48,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, -34,34,34,34,34,34,34,34,34,34,34,34,59,48,34,34,34,34,34,34,34,34,34,34,34,34,34,34,39,52,52,52,52,52,52,44,34,34,34,34, -34,34,34,34,34,34,34,34,34,39,52,52,38,51,52,52,52,52,44,34,34,34,34,34,34,39,52,52,38,82,82,82,82,82,82,51,44,34,34,34, -34,34,34,34,34,39,52,52,52,38,82,82,82,82,82,82,82,82,51,52,52,44,34,34,39,38,82,82,82,82,82,82,82,82,82,82,51,44,34,34, -34,34,34,39,52,38,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,51,52,52,38,82,82,82,82,82,82,82,82,82,82,82,82,51,44,34, -34,34,39,38,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34, -34,39,38,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,48,34, -34,50,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,30,46,46,29,34, -34,50,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,30,29,34,34,34,34, -34,50,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,30,46,46,56,82,82,82,82,82,82,82,30,29,34,34,34,34,34, -34,28,32,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,30,46,46,29,34,34,28,46,46,46,56,82,82,30,29,34,34,34,34,34,34, -34,34,28,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,29,34,34,34,34,34,34,34,34,34,28,46,46,29,34,34,34,34,34,34,34, -34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, -34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, -34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, -34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, - -layer 1 -0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0 -0,0,0,1,1,1,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0 -0,0,1,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0 -0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0 -1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0 -1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0 -1,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 -1,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 -1,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 -0,1,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 -0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,1,1,0,0 -0,0,0,0,0,0,0,0,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,0,0,0,0 -0,0,0,0,0,0,0,0,0,1,1,1,0,0,1,1,1,1,1,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0 -0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 -0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0 -0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0 -0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,1,1,1,1,0,0,0,0,1,0,0,0,0,0,0 -0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0 -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/assets/audio/music/sailing16.ogg b/assets/audio/music/sailing16.ogg deleted file mode 100644 index b5e6c60..0000000 Binary files a/assets/audio/music/sailing16.ogg and /dev/null differ diff --git a/assets/audio/music/sillypuppy.ogg b/assets/audio/music/sillypuppy.ogg new file mode 100644 index 0000000..58ed4c1 Binary files /dev/null and b/assets/audio/music/sillypuppy.ogg differ diff --git a/assets/maps/GS-Day.txt b/assets/maps/GS-Day.txt deleted file mode 100644 index 0a53468..0000000 --- a/assets/maps/GS-Day.txt +++ /dev/null @@ -1,33 +0,0 @@ -50,48,48,48,48,48,48,49,44,43,46,44,47,48,48,48,48,48,48,48,52,45,45,45,45,45,45,45,45,50,48,48,48,48,48,48,49,44,46,43,44,47,48,48,48,48,48,52 -53,45,37,38,45,37,38,45,44,43,43,44,46,37,38,44,37,38,44,44,54,45,37,38,45,45,37,38,45,53,46,44,37,38,44,37,38,44,46,43,44,37,38,44,37,38,44,54 -53,45,18,19,45,18,19,45,46,43,43,44,46,18,19,46,18,19,46,44,54,44,18,19,44,44,18,19,44,53,46,44,18,19,44,18,19,44,43,43,44,18,19,44,18,19,44,54 -53,45,45,46,45,46,44,44,46,43,43,44,44,44,44,44,46,44,44,44,54,44,44,44,44,44,44,44,44,53,46,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,54 -53,45,44,44,44,44,44,44,44,43,43,46,46,44,44,44,44,44,44,44,47,48,48,48,48,48,48,48,48,49,44,45,44,44,45,44,44,45,43,43,45,44,44,45,44,44,45,54 -53,45,44,44,46,44,44,44,44,43,43,46,44,44,44,44,44,44,44,44,44,44,44,44,46,44,44,44,44,44,44,45,44,44,45,44,44,45,43,43,45,44,44,45,44,44,45,54 -53,43,43,43,43,43,43,43,43,43,46,43,43,43,43,43,43,43,43,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,54 -53,44,37,38,44,37,38,44,44,46,43,44,46,43,43,46,46,44,44,43,43,43,43,43,43,46,43,43,43,43,43,44,43,43,43,43,44,43,43,43,44,37,38,44,37,38,44,54 -53,44,18,19,44,18,19,44,44,44,46,44,46,46,44,44,44,44,59,56,56,56,56,56,56,56,56,56,56,56,58,44,44,44,44,44,44,43,46,43,44,18,19,44,18,19,44,54 -53,44,44,44,44,46,46,44,44,43,46,44,46,46,44,44,44,44,60,48,48,48,48,48,48,48,48,48,48,48,49,44,44,44,46,46,44,44,43,43,44,44,44,44,44,44,44,54 -53,44,44,44,46,46,46,44,44,43,43,44,44,44,46,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,46,44,44,44,44,43,43,44,44,44,44,44,44,44,54 -49,44,44,46,46,46,44,44,43,43,43,46,46,43,44,46,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,46,46,44,44,44,44,43,46,44,44,44,44,44,44,44,47 -44,46,46,44,44,46,46,44,44,43,43,43,43,46,43,43,43,46,43,44,44,44,44,44,44,44,44,44,44,44,44,44,46,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44 -44,44,43,46,44,44,44,46,43,43,43,43,43,43,45,45,45,45,45,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,44,44 -43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44 -43,43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,44 -46,44,44,43,46,43,46,44,43,43,43,44,44,44,44,44,44,44,44,45,45,45,45,45,45,45,45,45,45,44,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,43,44,44 -58,44,44,44,44,44,44,44,44,43,43,44,50,51,51,51,51,52,44,44,45,45,45,45,45,45,46,45,44,44,44,50,51,51,51,51,52,44,43,46,44,44,44,44,44,44,44,59 -53,44,44,44,44,44,44,44,44,43,44,44,53,44,44,44,44,54,44,44,46,46,44,44,44,44,46,46,44,44,44,53,44,44,44,44,54,44,43,43,44,44,44,44,44,44,44,54 -53,44,37,38,44,37,38,44,44,43,43,43,53,44,44,44,44,54,44,44,44,46,46,44,44,46,46,44,44,44,44,53,44,44,44,44,54,44,43,43,44,44,44,44,44,44,44,54 -53,44,18,19,44,18,19,44,44,43,43,44,55,56,58,44,44,54,44,44,44,44,44,44,46,44,44,44,44,44,44,53,44,44,59,56,57,44,43,43,43,44,37,38,44,37,38,54 -53,44,44,44,44,44,44,44,44,46,43,44,44,44,53,44,44,54,44,37,38,44,44,44,44,44,44,44,37,38,44,53,44,44,54,44,44,44,43,44,44,44,18,19,45,18,19,54 -53,44,44,44,44,44,44,44,44,43,44,44,44,44,55,56,56,57,44,18,19,44,37,38,44,37,38,44,18,19,44,55,56,56,57,44,44,44,43,43,44,45,45,45,45,45,45,54 -53,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,18,19,44,18,19,44,44,44,44,44,44,44,44,44,44,44,43,43,44,45,45,45,45,45,45,54 -53,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,43,44,45,45,45,45,45,45,54 -53,44,37,38,44,37,38,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,44,45,37,38,45,37,38,54 -53,44,18,19,43,18,19,44,44,46,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,44,45,18,19,45,18,19,54 -53,44,44,44,44,44,44,44,44,43,44,44,46,46,43,43,43,43,43,43,43,43,43,43,43,43,43,46,43,43,43,46,43,44,44,44,44,43,43,43,44,45,45,45,45,45,44,54 -53,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,54 -53,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,46,43,43,44,44,44,44,44,44,44,54 -53,44,44,43,44,44,44,44,44,43,43,44,44,44,44,44,43,43,43,43,43,44,44,46,46,46,43,43,43,43,43,44,44,44,46,44,44,46,43,43,44,44,44,44,44,44,44,54 -55,56,56,56,56,56,56,58,44,43,43,44,59,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,58,44,43,43,44,59,56,56,56,56,56,57 - diff --git a/assets/maps/GS-Night-Meta.txt b/assets/maps/GS-Night-Meta.txt deleted file mode 100644 index bd14448..0000000 --- a/assets/maps/GS-Night-Meta.txt +++ /dev/null @@ -1,6 +0,0 @@ -tileswide 48 -tileshigh 32 -tilewidth 16 -tileheight 16 - -layer 1 diff --git a/assets/maps/GS-Night.map b/assets/maps/GS-Night.map deleted file mode 100644 index 40ccd7b..0000000 --- a/assets/maps/GS-Night.map +++ /dev/null @@ -1,65 +0,0 @@ -00,01,01,01,01,01,01,06,07,03,09,07,08,01,01,01,01,01,01,01,02,14,14,14,14,14,14,14,14,00,01,01,01,01,01,01,06,07,09,03,07,08,01,01,01,01,01,02 -12,14,14,14,14,14,14,14,07,03,03,07,09,09,07,07,07,07,07,07,13,14,07,07,14,14,07,07,14,12,09,07,07,07,07,07,07,07,09,03,07,07,07,07,07,07,07,13 -12,14,14,14,14,07,07,14,09,03,03,07,09,07,07,09,07,07,09,07,13,07,07,07,07,07,07,07,07,12,09,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,13 -12,14,14,09,14,09,07,07,09,03,03,07,07,07,07,07,09,07,07,07,13,07,07,07,07,07,07,07,07,12,09,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,13 -12,14,07,07,07,07,07,07,07,03,03,09,09,07,07,07,07,07,07,07,08,01,01,01,01,01,01,01,01,06,07,14,07,07,14,07,07,14,03,03,14,07,07,14,07,07,14,13 -12,14,07,07,09,07,07,07,07,03,03,09,07,07,07,07,07,07,07,07,07,07,07,07,09,07,07,07,07,07,07,14,07,07,14,07,07,14,03,03,14,07,07,14,07,07,14,13 -12,03,03,03,03,03,03,03,03,03,09,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,13 -12,07,07,07,07,09,09,07,07,09,03,07,09,03,03,09,09,07,07,03,03,03,03,03,03,09,03,03,03,03,03,07,03,03,03,03,07,03,03,03,07,07,07,07,07,07,07,13 -12,07,07,07,07,07,07,07,07,07,09,07,09,09,07,07,07,07,19,24,24,24,24,24,24,24,24,24,24,24,18,07,07,07,07,07,07,03,09,03,07,07,07,07,07,07,07,13 -12,07,07,07,07,09,09,07,07,03,09,07,09,09,07,07,07,07,08,01,01,01,01,01,01,01,01,01,01,01,06,07,07,07,09,09,07,07,03,03,07,07,07,07,07,07,07,13 -12,07,07,07,09,09,09,07,07,03,03,07,07,07,09,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,09,09,07,07,07,07,03,03,07,07,07,07,07,07,07,13 -06,07,07,09,09,09,07,07,03,03,03,09,09,03,07,09,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,09,09,09,07,07,07,07,03,09,07,07,07,07,07,07,07,08 -07,09,09,07,07,09,09,07,07,03,03,03,03,09,03,03,03,09,03,07,07,07,07,07,07,07,07,07,07,07,07,07,09,07,07,07,07,07,03,03,07,07,07,07,07,07,07,07 -07,07,03,09,07,07,07,09,03,03,03,03,07,07,14,14,14,14,14,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,07,07 -03,03,03,03,03,03,03,03,03,03,03,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,03,03,07 -03,03,03,03,03,03,03,03,03,03,03,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,07 -09,07,07,03,09,03,09,07,03,03,03,07,07,07,07,07,07,07,07,14,14,14,14,14,14,14,14,14,14,07,07,07,07,07,07,07,07,07,03,03,07,07,07,07,07,03,07,07 -18,07,07,07,07,07,07,07,07,03,03,07,00,01,01,01,01,02,07,07,14,14,14,14,14,14,09,14,07,07,07,00,01,01,01,01,02,07,03,09,07,07,07,07,07,07,07,19 -12,07,07,07,07,07,07,07,07,03,07,07,12,07,07,07,07,13,07,07,09,09,07,07,07,07,09,09,07,07,07,12,07,07,07,07,13,07,03,03,07,07,07,07,07,07,07,13 -12,07,07,07,07,07,07,07,07,03,03,03,12,07,07,07,07,13,07,07,07,09,09,07,07,09,09,07,07,07,07,12,07,07,07,07,13,07,03,03,07,07,07,07,07,07,07,13 -12,07,07,07,07,07,07,07,07,03,03,07,17,24,18,07,07,13,07,07,07,07,07,07,09,07,07,07,07,07,07,12,07,07,19,24,20,07,03,03,03,07,07,07,07,07,07,13 -12,07,07,07,07,07,07,07,07,09,03,07,07,07,12,07,07,13,07,07,07,07,07,07,07,07,07,07,07,07,07,12,07,07,13,07,07,07,03,07,07,07,14,14,14,14,07,13 -12,07,07,07,07,07,07,07,07,03,07,07,07,07,17,24,24,20,07,07,07,07,07,07,07,07,07,07,07,07,07,17,24,24,20,07,07,07,03,03,07,14,14,14,14,14,14,13 -12,07,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,07,14,14,14,14,14,14,13 -12,07,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,09,03,07,14,14,14,14,14,14,13 -12,07,07,07,07,07,07,07,07,03,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,07,14,14,14,14,14,14,13 -12,07,07,07,03,07,07,07,07,09,03,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,07,03,03,03,07,14,14,14,14,14,14,13 -12,07,07,07,07,07,07,07,07,03,07,07,09,09,03,03,03,03,03,03,03,03,03,03,03,03,03,09,03,03,03,09,03,07,07,07,07,03,03,03,07,14,14,14,14,14,07,13 -12,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,07,07,07,07,07,07,07,13 -12,07,07,07,07,07,07,07,07,07,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,09,03,03,07,07,07,07,07,07,07,13 -12,07,07,03,07,07,07,07,07,03,03,07,07,07,07,07,03,03,03,03,03,07,07,09,09,09,03,03,03,03,03,07,07,07,09,07,07,09,03,03,07,07,07,07,07,07,07,13 -17,24,24,24,24,24,24,18,07,03,03,07,19,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,18,07,03,03,07,19,24,24,24,24,24,20 - -1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 -1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 diff --git a/assets/maps/GS-Night.txt b/assets/maps/GS-Night.txt deleted file mode 100644 index 84ce0a8..0000000 --- a/assets/maps/GS-Night.txt +++ /dev/null @@ -1,33 +0,0 @@ -61,62,62,62,62,62,62,65,66,64,68,66,67,62,62,62,62,62,62,62,63,10,10,10,10,10,10,10,10,61,62,62,62,62,62,62,65,66,68,64,66,67,62,62,62,62,62,63 -42,10,15,16,10,15,16,10,66,64,64,66,68,15,16,66,15,16,66,66,69,10,15,16,10,10,15,16,10,42,68,66,15,16,66,15,16,66,68,64,66,15,16,66,15,16,66,69 -42,10,18,19,10,18,19,10,68,64,64,66,68,18,19,68,18,19,68,66,69,66,18,19,66,66,18,19,66,42,68,66,18,19,66,18,19,66,64,64,66,18,19,66,18,19,66,69 -42,10,10,68,10,68,66,66,68,64,64,66,66,66,66,66,68,66,66,66,69,66,66,66,66,66,66,66,66,42,68,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,69 -42,10,66,66,66,66,66,66,66,64,64,68,68,66,66,66,66,66,66,66,67,62,62,62,62,62,62,62,62,65,66,10,66,66,10,66,66,10,64,64,10,66,66,10,66,66,10,69 -42,10,66,66,68,66,66,66,66,64,64,68,66,66,66,66,66,66,66,66,66,66,66,66,68,66,66,66,66,66,66,10,66,66,10,66,66,10,64,64,10,66,66,10,66,66,10,69 -42,64,64,64,64,64,64,64,64,64,68,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,69 -42,66,15,16,66,15,16,66,66,68,64,66,68,64,64,68,68,66,66,64,64,64,64,64,64,68,64,64,64,64,64,66,64,64,64,64,66,64,64,64,66,15,16,66,15,16,66,69 -42,66,18,19,66,18,19,66,66,66,68,66,68,68,66,66,66,66,13,17,17,17,17,17,17,17,17,17,17,17,12,66,66,66,66,66,66,64,68,64,66,18,19,66,18,19,66,69 -42,66,66,66,66,68,68,66,66,64,68,66,68,68,66,66,66,66,67,62,62,62,62,62,62,62,62,62,62,62,65,66,66,66,68,68,66,66,64,64,66,66,66,66,66,66,66,69 -42,66,66,66,68,68,68,66,66,64,64,66,66,66,68,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,68,66,66,66,66,64,64,66,66,66,66,66,66,66,69 -65,66,66,68,68,68,66,66,64,64,64,68,68,64,66,68,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,68,68,66,66,66,66,64,68,66,66,66,66,66,66,66,67 -66,68,68,66,66,68,68,66,66,64,64,64,64,68,64,64,64,68,64,66,66,66,66,66,66,66,66,66,66,66,66,66,68,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66 -66,66,64,68,66,66,66,68,64,64,64,64,66,66,10,10,10,10,10,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,66,66 -64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,66 -64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,66 -68,66,66,64,68,64,68,66,64,64,64,66,66,66,66,66,66,66,66,10,10,10,10,10,10,10,10,10,10,66,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,64,66,66 -12,66,66,66,66,66,66,66,66,64,64,66,61,62,62,62,62,63,66,66,10,10,10,10,10,10,68,10,66,66,66,61,62,62,62,62,63,66,64,68,66,66,66,66,66,66,66,13 -42,66,66,66,66,66,66,66,66,64,66,66,42,66,66,66,66,69,66,66,68,68,66,66,66,66,68,68,66,66,66,42,66,66,66,66,69,66,64,64,66,66,66,66,66,66,66,69 -42,66,15,16,66,15,16,66,66,64,64,64,42,66,66,66,66,69,66,66,66,68,68,66,66,68,68,66,66,66,66,42,66,66,66,66,69,66,64,64,66,66,66,66,66,66,66,69 -42,66,18,19,66,18,19,66,66,64,64,66,11,17,12,66,66,69,66,66,66,66,66,66,68,66,66,66,66,66,66,42,66,66,13,17,14,66,64,64,64,66,15,16,66,15,16,69 -42,66,66,66,66,66,66,66,66,68,64,66,66,66,42,66,66,69,66,15,16,66,66,66,66,66,66,66,15,16,66,42,66,66,69,66,66,66,64,66,66,66,18,19,10,18,19,69 -42,66,66,66,66,66,66,66,66,64,66,66,66,66,11,17,17,14,66,18,19,66,15,16,66,15,16,66,18,19,66,11,17,17,14,66,66,66,64,64,66,10,10,10,10,10,10,69 -42,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66,66,66,66,18,19,66,18,19,66,66,66,66,66,66,66,66,66,66,66,64,64,66,10,10,10,10,10,10,69 -42,66,66,66,66,66,66,66,66,64,64,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,66,66,68,64,66,10,10,10,10,10,10,69 -42,66,15,16,66,15,16,66,66,64,64,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,66,66,64,64,66,10,15,16,10,15,16,69 -42,66,18,19,64,18,19,66,66,68,64,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,66,64,64,64,66,10,18,19,10,18,19,69 -42,66,66,66,66,66,66,66,66,64,66,66,68,68,64,64,64,64,64,64,64,64,64,64,64,64,64,68,64,64,64,68,64,66,66,66,66,64,64,64,66,10,10,10,10,10,66,69 -42,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,69 -42,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,68,64,64,66,66,66,66,66,66,66,69 -42,66,66,64,66,66,66,66,66,64,64,66,66,66,66,66,64,64,64,64,64,66,66,68,68,68,64,64,64,64,64,66,66,66,68,66,66,68,64,64,66,66,66,66,66,66,66,69 -11,17,17,17,17,17,17,12,66,64,64,66,13,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,12,66,64,64,66,13,17,17,17,17,17,14 - diff --git a/assets/maps/GS-map.txt b/assets/maps/GS-map.txt deleted file mode 100644 index 69c3e8c..0000000 --- a/assets/maps/GS-map.txt +++ /dev/null @@ -1,107 +0,0 @@ -tileswide 48 -tileshigh 32 -tilewidth 16 -tileheight 16 - -layer 0 -50,48,48,48,48,48,48,49,44,43,46,44,47,48,48,48,48,48,48,48,52,45,45,45,45,45,45,45,45,50,48,48,48,48,48,48,49,44,46,43,44,47,48,48,48,48,48,52, -53,45,37,38,45,37,38,45,44,43,43,44,46,37,38,44,37,38,44,44,54,45,37,38,45,45,37,38,45,53,46,44,37,38,44,37,38,44,46,43,44,37,38,44,37,38,44,54, -53,45,18,19,45,18,19,45,46,43,43,44,46,18,19,46,18,19,46,44,54,44,18,19,44,44,18,19,44,53,46,44,18,19,44,18,19,44,43,43,44,18,19,44,18,19,44,54, -53,45,45,46,45,46,44,44,46,43,43,44,44,44,44,44,46,44,44,44,54,44,44,44,44,44,44,44,44,53,46,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,54, -53,45,44,44,44,44,44,44,44,43,43,46,46,44,44,44,44,44,44,44,47,48,48,48,48,48,48,48,48,49,44,45,44,44,45,44,44,45,43,43,45,44,44,45,44,44,45,54, -53,45,44,44,46,44,44,44,44,43,43,46,44,44,44,44,44,44,44,44,44,44,44,44,46,44,44,44,44,44,44,45,44,44,45,44,44,45,43,43,45,44,44,45,44,44,45,54, -53,43,43,43,43,43,43,43,43,43,46,43,43,43,43,43,43,43,43,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,54, -53,44,37,38,44,37,38,44,44,46,43,44,46,43,43,46,46,44,44,43,43,43,43,43,43,46,43,43,43,43,43,44,43,43,43,43,44,43,43,43,44,37,38,44,37,38,44,54, -53,44,18,19,44,18,19,44,44,44,46,44,46,46,44,44,44,44,59,56,56,56,56,56,56,56,56,56,56,56,58,44,44,44,44,44,44,43,46,43,44,18,19,44,18,19,44,54, -53,44,44,44,44,46,46,44,44,43,46,44,46,46,44,44,44,44,60,48,48,48,48,48,48,48,48,48,48,48,49,44,44,44,46,46,44,44,43,43,44,44,44,44,44,44,44,54, -53,44,44,44,46,46,46,44,44,43,43,44,44,44,46,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,46,44,44,44,44,43,43,44,44,44,44,44,44,44,54, -49,44,44,46,46,46,44,44,43,43,43,46,46,43,44,46,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,46,46,44,44,44,44,43,46,44,44,44,44,44,44,44,47, -44,46,46,44,44,46,46,44,44,43,43,43,43,46,43,43,43,46,43,44,44,44,44,44,44,44,44,44,44,44,44,44,46,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44, -44,44,43,46,44,44,44,46,43,43,43,43,43,43,45,45,45,45,45,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,44,44, -43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44, -43,43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,44, -46,44,44,43,46,43,46,44,43,43,43,44,44,44,44,44,44,44,44,45,45,45,45,45,45,45,45,45,45,44,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,43,44,44, -58,44,44,44,44,44,44,44,44,43,43,44,50,51,51,51,51,52,44,44,45,45,45,45,45,45,46,45,44,44,44,50,51,51,51,51,52,44,43,46,44,44,44,44,44,44,44,59, -53,44,44,44,44,44,44,44,44,43,44,44,53,44,44,44,44,54,44,44,46,46,44,44,44,44,46,46,44,44,44,53,44,44,44,44,54,44,43,43,44,44,44,44,44,44,44,54, -53,44,37,38,44,37,38,44,44,43,43,43,53,44,44,44,44,54,44,44,44,46,46,44,44,46,46,44,44,44,44,53,44,44,44,44,54,44,43,43,44,44,44,44,44,44,44,54, -53,44,18,19,44,18,19,44,44,43,43,44,55,56,58,44,44,54,44,44,44,44,44,44,46,44,44,44,44,44,44,53,44,44,59,56,57,44,43,43,43,44,37,38,44,37,38,54, -53,44,44,44,44,44,44,44,44,46,43,44,44,44,53,44,44,54,44,37,38,44,44,44,44,44,44,44,37,38,44,53,44,44,54,44,44,44,43,44,44,44,18,19,45,18,19,54, -53,44,44,44,44,44,44,44,44,43,44,44,44,44,55,56,56,57,44,18,19,44,37,38,44,37,38,44,18,19,44,55,56,56,57,44,44,44,43,43,44,45,45,45,45,45,45,54, -53,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,18,19,44,18,19,44,44,44,44,44,44,44,44,44,44,44,43,43,44,45,45,45,45,45,45,54, -53,44,44,44,44,44,44,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,46,43,44,45,45,45,45,45,45,54, -53,44,37,38,44,37,38,44,44,43,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,44,45,37,38,45,37,38,54, -53,44,18,19,43,18,19,44,44,46,43,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,43,43,43,44,45,18,19,45,18,19,54, -53,44,44,44,44,44,44,44,44,43,44,44,46,46,43,43,43,43,43,43,43,43,43,43,43,43,43,46,43,43,43,46,43,44,44,44,44,43,43,43,44,45,45,45,45,45,44,54, -53,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44,44,44,44,44,44,44,54, -53,44,44,44,44,44,44,44,44,44,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,46,43,43,44,44,44,44,44,44,44,54, -53,44,44,43,44,44,44,44,44,43,43,44,44,44,44,44,43,43,43,43,43,44,44,46,46,46,43,43,43,43,43,44,44,44,46,44,44,46,43,43,44,44,44,44,44,44,44,54, -55,56,56,56,56,56,56,58,44,43,43,44,59,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,58,44,43,43,44,59,56,56,56,56,56,57, - -layer 1 -61,62,62,62,62,62,62,65,66,64,68,66,67,62,62,62,62,62,62,62,63,10,10,10,10,10,10,10,10,61,62,62,62,62,62,62,65,66,68,64,66,67,62,62,62,62,62,63, -42,10,15,16,10,15,16,10,66,64,64,66,68,15,16,66,15,16,66,66,69,10,15,16,10,10,15,16,10,42,68,66,15,16,66,15,16,66,68,64,66,15,16,66,15,16,66,69, -42,10,18,19,10,18,19,10,68,64,64,66,68,18,19,68,18,19,68,66,69,66,18,19,66,66,18,19,66,42,68,66,18,19,66,18,19,66,64,64,66,18,19,66,18,19,66,69, -42,10,10,68,10,68,66,66,68,64,64,66,66,66,66,66,68,66,66,66,69,66,66,66,66,66,66,66,66,42,68,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,69, -42,10,66,66,66,66,66,66,66,64,64,68,68,66,66,66,66,66,66,66,67,62,62,62,62,62,62,62,62,65,66,10,66,66,10,66,66,10,64,64,10,66,66,10,66,66,10,69, -42,10,66,66,68,66,66,66,66,64,64,68,66,66,66,66,66,66,66,66,66,66,66,66,68,66,66,66,66,66,66,10,66,66,10,66,66,10,64,64,10,66,66,10,66,66,10,69, -42,64,64,64,64,64,64,64,64,64,68,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,69, -42,66,15,16,66,15,16,66,66,68,64,66,68,64,64,68,68,66,66,64,64,64,64,64,64,68,64,64,64,64,64,66,64,64,64,64,66,64,64,64,66,15,16,66,15,16,66,69, -42,66,18,19,66,18,19,66,66,66,68,66,68,68,66,66,66,66,13,17,17,17,17,17,17,17,17,17,17,17,12,66,66,66,66,66,66,64,68,64,66,18,19,66,18,19,66,69, -42,66,66,66,66,68,68,66,66,64,68,66,68,68,66,66,66,66,67,62,62,62,62,62,62,62,62,62,62,62,65,66,66,66,68,68,66,66,64,64,66,66,66,66,66,66,66,69, -42,66,66,66,68,68,68,66,66,64,64,66,66,66,68,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,68,66,66,66,66,64,64,66,66,66,66,66,66,66,69, -65,66,66,68,68,68,66,66,64,64,64,68,68,64,66,68,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,68,68,68,66,66,66,66,64,68,66,66,66,66,66,66,66,67, -66,68,68,66,66,68,68,66,66,64,64,64,64,68,64,64,64,68,64,66,66,66,66,66,66,66,66,66,66,66,66,66,68,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66, -66,66,64,68,66,66,66,68,64,64,64,64,66,66,10,10,10,10,10,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,66,66, -64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,66, -64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,66, -68,66,66,64,68,64,68,66,64,64,64,66,66,66,66,66,66,66,66,10,10,10,10,10,10,10,10,10,10,66,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,64,66,66, -12,66,66,66,66,66,66,66,66,64,64,66,61,62,62,62,62,63,66,66,10,10,10,10,10,10,68,10,66,66,66,61,62,62,62,62,63,66,64,68,66,66,66,66,66,66,66,13, -42,66,66,66,66,66,66,66,66,64,66,66,42,66,66,66,66,69,66,66,68,68,66,66,66,66,68,68,66,66,66,42,66,66,66,66,69,66,64,64,66,66,66,66,66,66,66,69, -42,66,15,16,66,15,16,66,66,64,64,64,42,66,66,66,66,69,66,66,66,68,68,66,66,68,68,66,66,66,66,42,66,66,66,66,69,66,64,64,66,66,66,66,66,66,66,69, -42,66,18,19,66,18,19,66,66,64,64,66,11,17,12,66,66,69,66,66,66,66,66,66,68,66,66,66,66,66,66,42,66,66,13,17,14,66,64,64,64,66,15,16,66,15,16,69, -42,66,66,66,66,66,66,66,66,68,64,66,66,66,42,66,66,69,66,15,16,66,66,66,66,66,66,66,15,16,66,42,66,66,69,66,66,66,64,66,66,66,18,19,10,18,19,69, -42,66,66,66,66,66,66,66,66,64,66,66,66,66,11,17,17,14,66,18,19,66,15,16,66,15,16,66,18,19,66,11,17,17,14,66,66,66,64,64,66,10,10,10,10,10,10,69, -42,66,66,66,66,66,66,66,66,64,64,66,66,66,66,66,66,66,66,66,66,66,18,19,66,18,19,66,66,66,66,66,66,66,66,66,66,66,64,64,66,10,10,10,10,10,10,69, -42,66,66,66,66,66,66,66,66,64,64,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,66,66,68,64,66,10,10,10,10,10,10,69, -42,66,15,16,66,15,16,66,66,64,64,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,66,66,64,64,66,10,15,16,10,15,16,69, -42,66,18,19,64,18,19,66,66,68,64,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,66,64,64,64,66,10,18,19,10,18,19,69, -42,66,66,66,66,66,66,66,66,64,66,66,68,68,64,64,64,64,64,64,64,64,64,64,64,64,64,68,64,64,64,68,64,66,66,66,66,64,64,64,66,10,10,10,10,10,66,69, -42,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,66,66,66,66,66,66,66,69, -42,66,66,66,66,66,66,66,66,66,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,68,64,64,66,66,66,66,66,66,66,69, -42,66,66,64,66,66,66,66,66,64,64,66,66,66,66,66,64,64,64,64,64,66,66,68,68,68,64,64,64,64,64,66,66,66,68,66,66,68,64,64,66,66,66,66,66,66,66,69, -11,17,17,17,17,17,17,12,66,64,64,66,13,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,12,66,64,64,66,13,17,17,17,17,17,14, - -layer 4 -1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1, -1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,-1,1,-1,1,1,-1,-1,1,1,-1,1,-1,-1,1,1,-1,1,1,-1,-1,-1,-1,1,1,-1,1,1,-1,1, -1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,-1,1,-1,1,1,-1,-1,1,1,-1,1,-1,-1,1,1,-1,1,1,-1,-1,-1,-1,1,1,-1,1,1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,1, -1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1,-1,-1,-1,1,1,-1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,1,1,1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,1,1,1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,1,1,1,-1,-1,-1,-1,-1,1,1,-1,1,1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,-1,-1,1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,1,1,-1,1,1,-1,1,1,-1,1,1,-1,1,1,-1,1,1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,1, -1,-1,1,1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1,1,-1,1,1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1, -1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,-1,-1,-1,1,1,1,1,1,1,1, - diff --git a/assets/maps/GraveyardShift-Tiles.pyxel b/assets/maps/GraveyardShift-Tiles.pyxel deleted file mode 100644 index 7bab00e..0000000 Binary files a/assets/maps/GraveyardShift-Tiles.pyxel and /dev/null differ diff --git a/assets/maps/br-map.txt b/assets/maps/br-map.txt index 51bd879..18b6ab8 100644 --- a/assets/maps/br-map.txt +++ b/assets/maps/br-map.txt @@ -1,26 +1,92 @@ --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,10,11,12,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 -10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,12,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 -13,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 --1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 +10,11,12,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,12,10,11,11,11,11,11,11,11,11,11,11,12,13,15,10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,12,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,19,21,17,17,17,17,17,17,17,17,17,17,17,17,19,21,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,12,11,11,17,17,17,17,17,17,17,17,11,11,13,15,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,19,21,17,17,17,17,17,17,17,17,17,17,17,17,19,21,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,12,11,11,11,17,17,17,17,17,17,17,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,19,21,17,17,17,17,17,17,17,17,17,17,17,17,19,21,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,12,11,11,11,16,17,17,17,17,17,29,28,28,10,12,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,13,14,15 +13,14,15,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,13,15,16,17,17,17,17,17,17,17,29,30,17,18,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,13,15,16,17,17,17,17,17,17,29,30,17,17,18,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,19,21,16,17,17,17,17,17,29,30,17,17,17,18,19,21,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,22,25,16,17,17,17,17,29,30,17,17,17,17,18,22,25,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,23,26,16,17,17,17,29,30,17,17,17,17,17,18,23,26,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,16,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,18,24,27,16,17,17,17,17,17,17,17,17,17,17,18,24,27,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,12,11,11,12,31,17,17,17,17,17,11,11,11,10,12,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,32,31,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,32,31,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,19,21,17,17,17,17,17,32,31,17,17,17,17,17,19,21,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,22,25,17,17,17,17,17,17,32,31,17,17,17,17,22,25,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,23,26,17,17,17,17,17,17,17,32,31,17,17,17,23,26,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,24,27,17,17,17,17,17,17,17,17,17,17,17,17,24,27,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,19,20,21 +13,14,15,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,12,11,11,17,17,17,17,17,17,17,29,11,11,10,12,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,17,29,30,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,15,17,17,17,17,17,17,17,29,30,17,17,17,13,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,19,21,17,17,17,17,17,17,29,30,17,17,17,17,19,21,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,22,25,17,17,17,17,17,29,30,17,17,17,17,17,22,25,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,23,26,17,17,17,17,29,30,17,17,17,17,17,17,23,26,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,24,27,17,17,17,17,17,17,17,17,17,17,17,17,24,27,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,13,14,15 +13,14,15,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,13,14,15 +13,14,15,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,13,14,15 + +0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0 +0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/assets/textures/actors/beagle.aseprite b/assets/textures/actors/beagle.aseprite index d3bf02c..d601d8e 100644 Binary files a/assets/textures/actors/beagle.aseprite and b/assets/textures/actors/beagle.aseprite differ diff --git a/assets/textures/actors/beagle.png b/assets/textures/actors/beagle.png index cb93790..7d82b42 100644 Binary files a/assets/textures/actors/beagle.png and b/assets/textures/actors/beagle.png differ diff --git a/assets/textures/actors/firefighter.aseprite b/assets/textures/actors/firefighter.aseprite index 98aadeb..2e08500 100644 Binary files a/assets/textures/actors/firefighter.aseprite and b/assets/textures/actors/firefighter.aseprite differ diff --git a/assets/textures/actors/firefighter.json b/assets/textures/actors/firefighter.json new file mode 100644 index 0000000..dc8df61 --- /dev/null +++ b/assets/textures/actors/firefighter.json @@ -0,0 +1,96 @@ +{ "frames": [ + { + "filename": "0", + "frame": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + }, + { + "filename": "1", + "frame": { "x": 22, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + }, + { + "filename": "2", + "frame": { "x": 44, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + }, + { + "filename": "3", + "frame": { "x": 66, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + }, + { + "filename": "4", + "frame": { "x": 88, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + }, + { + "filename": "5", + "frame": { "x": 110, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + }, + { + "filename": "6", + "frame": { "x": 132, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + }, + { + "filename": "7", + "frame": { "x": 154, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + }, + { + "filename": "8", + "frame": { "x": 176, "y": 0, "w": 22, "h": 42 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 42 }, + "sourceSize": { "w": 22, "h": 42 }, + "duration": 100 + } + ], + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.2.25-x64", + "image": "firefighter.png", + "format": "RGBA8888", + "size": { "w": 198, "h": 42 }, + "scale": "1", + "frameTags": [ + { "name": "idle", "from": 0, "to": 2, "direction": "forward" }, + { "name": "walk", "from": 3, "to": 8, "direction": "forward" } + ] + } +} diff --git a/assets/textures/actors/firefighter.png b/assets/textures/actors/firefighter.png index 1860171..e27bac3 100644 Binary files a/assets/textures/actors/firefighter.png and b/assets/textures/actors/firefighter.png differ diff --git a/assets/textures/actors/firefighter1.png b/assets/textures/actors/firefighter1.png deleted file mode 100644 index 031af70..0000000 Binary files a/assets/textures/actors/firefighter1.png and /dev/null differ diff --git a/assets/textures/actors/firefighter2.png b/assets/textures/actors/firefighter2.png deleted file mode 100644 index b232640..0000000 Binary files a/assets/textures/actors/firefighter2.png and /dev/null differ diff --git a/assets/textures/actors/firefighter3.png b/assets/textures/actors/firefighter3.png deleted file mode 100644 index b232640..0000000 Binary files a/assets/textures/actors/firefighter3.png and /dev/null differ diff --git a/assets/textures/actors/firefighter4.png b/assets/textures/actors/firefighter4.png deleted file mode 100644 index b232640..0000000 Binary files a/assets/textures/actors/firefighter4.png and /dev/null differ diff --git a/assets/textures/actors/firefighter5.png b/assets/textures/actors/firefighter5.png deleted file mode 100644 index b232640..0000000 Binary files a/assets/textures/actors/firefighter5.png and /dev/null differ diff --git a/assets/textures/actors/firefighter6.png b/assets/textures/actors/firefighter6.png deleted file mode 100644 index b232640..0000000 Binary files a/assets/textures/actors/firefighter6.png and /dev/null differ diff --git a/assets/textures/actors/firefighter7.png b/assets/textures/actors/firefighter7.png deleted file mode 100644 index b232640..0000000 Binary files a/assets/textures/actors/firefighter7.png and /dev/null differ diff --git a/assets/textures/actors/firefighter8.png b/assets/textures/actors/firefighter8.png deleted file mode 100644 index b232640..0000000 Binary files a/assets/textures/actors/firefighter8.png and /dev/null differ diff --git a/assets/textures/actors/firefighter9.png b/assets/textures/actors/firefighter9.png deleted file mode 100644 index b232640..0000000 Binary files a/assets/textures/actors/firefighter9.png and /dev/null differ diff --git a/assets/textures/actors/owl.aseprite b/assets/textures/actors/owl.aseprite deleted file mode 100644 index 6bb2c61..0000000 Binary files a/assets/textures/actors/owl.aseprite and /dev/null differ diff --git a/assets/textures/actors/owl_anim.json b/assets/textures/actors/owl_anim.json deleted file mode 100644 index 0ffb43f..0000000 --- a/assets/textures/actors/owl_anim.json +++ /dev/null @@ -1,68 +0,0 @@ -{ "frames": [ - { - "filename": "0", - "frame": { "x": 0, "y": 0, "w": 40, "h": 40 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, - "sourceSize": { "w": 40, "h": 40 }, - "duration": 100 - }, - { - "filename": "1", - "frame": { "x": 40, "y": 0, "w": 40, "h": 40 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, - "sourceSize": { "w": 40, "h": 40 }, - "duration": 100 - }, - { - "filename": "2", - "frame": { "x": 80, "y": 0, "w": 40, "h": 40 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, - "sourceSize": { "w": 40, "h": 40 }, - "duration": 100 - }, - { - "filename": "3", - "frame": { "x": 120, "y": 0, "w": 40, "h": 40 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, - "sourceSize": { "w": 40, "h": 40 }, - "duration": 100 - }, - { - "filename": "4", - "frame": { "x": 160, "y": 0, "w": 40, "h": 40 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, - "sourceSize": { "w": 40, "h": 40 }, - "duration": 100 - }, - { - "filename": "5", - "frame": { "x": 200, "y": 0, "w": 40, "h": 40 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 40, "h": 40 }, - "sourceSize": { "w": 40, "h": 40 }, - "duration": 100 - } - ], - "meta": { - "app": "http://www.aseprite.org/", - "version": "1.2.25-x64", - "image": "owl_anim.png", - "format": "RGBA8888", - "size": { "w": 240, "h": 40 }, - "scale": "1", - "frameTags": [ - { "name": "S-Fly", "from": 0, "to": 5, "direction": "forward" } - ] - } -} diff --git a/assets/textures/actors/owl_anim.png b/assets/textures/actors/owl_anim.png deleted file mode 100644 index b9277f0..0000000 Binary files a/assets/textures/actors/owl_anim.png and /dev/null differ diff --git a/assets/textures/tiles/GS-tiles2.png b/assets/textures/tiles/GS-tiles2.png deleted file mode 100644 index 6dcb070..0000000 Binary files a/assets/textures/tiles/GS-tiles2.png and /dev/null differ diff --git a/assets/textures/tiles/br-tiles.png b/assets/textures/tiles/br-tiles.png index 3320dfc..78f45b1 100644 Binary files a/assets/textures/tiles/br-tiles.png and b/assets/textures/tiles/br-tiles.png differ diff --git a/assets/textures/tiles/br-tiles.pyxel b/assets/textures/tiles/br-tiles.pyxel index 925e3ab..445c931 100644 Binary files a/assets/textures/tiles/br-tiles.pyxel and b/assets/textures/tiles/br-tiles.pyxel differ diff --git a/build/BeagleRescue b/build/BeagleRescue index d193499..83f6a83 100755 Binary files a/build/BeagleRescue and b/build/BeagleRescue differ diff --git a/src/assetmgr/Map.cpp b/src/assetmgr/Map.cpp index 8c47c32..af91a13 100644 --- a/src/assetmgr/Map.cpp +++ b/src/assetmgr/Map.cpp @@ -60,9 +60,8 @@ void Map::LoadMap(std::string path, int sizeX, int sizeY, int scale) if (c == '1') { auto& tcol(manager.addEntity()); - tcol.addComponent("terrain",x*scaledSize,y*scaledSize,tileSize,scale); + tcol.addComponent("terrain",x*scaledSize,y*scaledSize,tileSize,scale); tcol.addGroup(Game::groupColliders); - mapFile.ignore(); } mapFile.ignore(2,','); } diff --git a/src/ecs/KeyboardController.h b/src/ecs/KeyboardController.h index 99cf343..2a4e0d7 100644 --- a/src/ecs/KeyboardController.h +++ b/src/ecs/KeyboardController.h @@ -62,11 +62,12 @@ public: case SDLK_LEFT: transform->velocity.x = -1; // sprite->Play("Walk"); + sprite->spriteFlip = SDL_FLIP_NONE; break; case SDLK_RIGHT: transform->velocity.x = 1; // sprite->Play("Walk"); -// sprite->spriteFlip = SDL_FLIP_HORIZONTAL; + sprite->spriteFlip = SDL_FLIP_HORIZONTAL; break; case SDLK_k: // game->printDebug(""); @@ -88,22 +89,21 @@ public: { case SDLK_UP: transform->velocity.y = 0; -// sprite->Play("Idle"); +// sprite->Play("idle"); // sprite->spriteFlip = SDL_FLIP_NONE; break; case SDLK_DOWN: transform->velocity.y = 0; -// sprite->Play("Idle"); +// sprite->Play("idle"); // sprite->spriteFlip = SDL_FLIP_NONE; break; case SDLK_LEFT: transform->velocity.x = 0; -// sprite->Play("Idle"); +// sprite->Play("idle"); break; case SDLK_RIGHT: transform->velocity.x = 0; -// sprite->Play("Idle"); -// sprite->spriteFlip = SDL_FLIP_NONE; +// sprite->Play("idle"); break; case SDLK_k: if (Game::debugCollisionBoxes) diff --git a/src/ecs/SpriteComponent.h b/src/ecs/SpriteComponent.h index 575f431..d468dae 100644 --- a/src/ecs/SpriteComponent.h +++ b/src/ecs/SpriteComponent.h @@ -96,11 +96,8 @@ public: int toFrame = cJSON_GetObjectItem(animItem, "to")->valueint; Animation anim = Animation(fromFrame,toFrame,100); animations.emplace(name, anim); +// printf("Playing animation named: %s fromFrame:%d toFrame:%d \n",name,fromFrame,toFrame); Play(name); -// printf("Animation name: \n%s\n",name); -// printf("animation.frames: %d\n", animations[name].frames); -// printf("animations.index: %d\n", animations[name].index); -// printf("animations.speed: %d\n", animations[name].speed); } // if(!animations.empty()){ @@ -108,9 +105,12 @@ public: // }else{ // printf("No animations\n"); // } -// Play("S-Fly"); - setTex(id); +// Play("idle"); } + Animation Idle = Animation(0,2,100); + animations.emplace("Idle", Idle); + Play("Idle"); + setTex(id); } SpriteComponent(std::string id, SpriteType sType, char fontLetter, int letterW, int letterH, int letterScale) diff --git a/src/game/Game.cpp b/src/game/Game.cpp index 650dc10..7c7b770 100644 --- a/src/game/Game.cpp +++ b/src/game/Game.cpp @@ -40,9 +40,7 @@ bool Game::isRunning = false; auto& player(manager.addEntity()); -auto& enemy(manager.addEntity()); - -auto& background(manager.addEntity()); +// auto& enemy(manager.addEntity()); // auto& scoreboard(manager.addEntity()); auto& uiInfo(manager.addEntity()); @@ -95,12 +93,12 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g } assets->AddTexture("terrain", "assets/textures/tiles/br-tiles.png"); - assets->AddTexture("player", "assets/textures/actors/owl_anim.png"); + assets->AddTexture("player", "assets/textures/actors/firefighter.png"); +// assets->AddTexture("player", "assets/textures/actors/owl_anim.png"); assets->AddTexture("font", "assets/textures/ui/ui-font-cloud-sans.png"); assets->AddTexture("textBox", "assets/textures/ui/ui-element-cloud.png"); - assets->AddMusicTrack("simonZ","assets/audio/music/sailing16.ogg"); + assets->AddMusicTrack("simonZ","assets/audio/music/sillypuppy.ogg"); assets->AddSoundClip("bwoop","assets/audio/sfx/bwoop.wav"); - assets->AddTexture("background","assets/textures/tiles/background-sky.png"); map = new Map("terrain",globalScale,16); @@ -117,18 +115,15 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g //ecs implementation - map->LoadMap("assets/maps/br-map.txt",60,25, globalScale); + map->LoadMap("assets/maps/br-map.txt",70,45, globalScale); - player.addComponent(50*globalScale,50*globalScale,40,40,globalScale); - player.addComponent("player", SpriteComponent::spriteAnimation, "assets/textures/actors/owl_anim.json"); + player.addComponent(150*globalScale,80*globalScale,22,42,globalScale); +// player.addComponent(150*globalScale,80*globalScale,40,40,globalScale); + player.addComponent("player", SpriteComponent::spriteAnimation, "assets/textures/actors/firefighter.json"); player.addComponent(); player.addComponent("player"); player.addGroup(groupPlayers); - - background.addComponent(0*globalScale,0*globalScale,320,240,globalScale); - background.addComponent("background", SpriteComponent::spriteObject); - background.addGroup(groupObjects); // enemy.addComponent(180*globalScale,180*globalScale,32,32,globalScale); // enemy.addComponent("robber", SpriteComponent::spriteAnimation, "assets/textures/actors/robberrodent.json"); // enemy.addGroup(groupEnemies); @@ -144,12 +139,12 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g auto& tiles(manager.getGroup(Game::groupMap)); auto& players(manager.getGroup(Game::groupPlayers)); auto& colliders(manager.getGroup(Game::groupColliders)); -auto& objects(manager.getGroup(Game::groupObjects)); -auto& enemies(manager.getGroup(Game::groupEnemies)); +// auto& objects(manager.getGroup(Game::groupObjects)); +// auto& enemies(manager.getGroup(Game::groupEnemies)); // auto& projectiles(manager.getGroup(Game::groupProjectiles)); auto& gui(manager.getGroup(Game::groupUI_Layer0)); auto& uiText(manager.getGroup(Game::groupUI_Layer1)); -auto& backgrounds(manager.getGroup(Game::groupBackground)); + void Game::handleEvents() { @@ -169,11 +164,11 @@ void Game::update() { SDL_Rect playerCol = player.getComponent().collider; Vector2D playerPos = player.getComponent().position; - + if (Mix_PlayingMusic() == 0) { // std::cout << "Play Music Now" << std::endl; - Mix_PlayMusic(assets->GetMusicTrack("simonZ"), -1); +// Mix_PlayMusic(assets->GetMusicTrack("simonZ"), -1); } manager.refresh(); @@ -214,16 +209,6 @@ void Game::update() void Game::render() { SDL_RenderClear(renderer); - - for (auto& b : backgrounds) - { - b->draw(); - } - - for (auto& o : objects) - { - o->draw(); - } for (auto& t : tiles) { @@ -236,11 +221,16 @@ void Game::render() c->draw(); } } - - for (auto& e : enemies) - { - e->draw(); - } + +// for (auto& o : objects) +// { +// o->draw(); +// } +// +// for (auto& e : enemies) +// { +// e->draw(); +// } for (auto& p : players) {