diff --git a/assets/maps/br-tiles.tsx b/assets/maps/br-tiles.tsx index 561ba45..389b54b 100644 --- a/assets/maps/br-tiles.tsx +++ b/assets/maps/br-tiles.tsx @@ -1,21 +1,11 @@ - - - - - - - - - - @@ -31,15 +21,11 @@ - - - - @@ -55,31 +41,11 @@ - - - - - - - - - - - - - - - - - - - - @@ -96,8 +62,4 @@ - - - - diff --git a/assets/maps/testmap.tmx b/assets/maps/testmap.tmx index 20ae09e..f8eb2e5 100644 --- a/assets/maps/testmap.tmx +++ b/assets/maps/testmap.tmx @@ -3,24 +3,24 @@ -11,12,13,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,45,46,44,44,44,45,46,44,45,46,44,45,46,44,45,46,44,45,46,44,45,44,45,44,45,46,45,44,44,44,44,44,44,44,44,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, -14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +11,12,13,35,35,35,36,36,36,35,36,35,35,9,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,35,35,35,36,36,35,35,35,35,10,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,35,37,35,35,35,35,41,42,43,35,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,35,35,35,35,35,38,38,35,35,35,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,35,35,35,35,38,38,35,35,35,35,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,35,35,35,38,38,35,35,37,35,35,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,35,35,38,38,35,35,35,37,37,35,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,35,38,38,35,35,35,37,37,37,35,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,38,38,35,35,35,35,35,35,37,35,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,34,45,46,34,34,34,45,46,44,45,46,44,45,46,44,45,46,44,45,46,44,45,44,45,44,45,46,45,44,44,44,44,44,44,44,44,14,15,16, +14,15,16,34,34,34,34,34,34,34,34,34,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,34,34,34,34,34,34,34,34,34,34,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,34,34,34,41,42,43,34,34,34,34,34,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,34,34,34,34,34,34,34,34,34,34,34,34,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,34,34,34,34,34,34,34,34,34,34,34,34,34,34,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,34,34,34,34,34,34,34,34,34,34,34,34,34,34,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, +14,15,16,34,34,34,34,34,34,34,34,34,34,34,34,34,34,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, 14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, 14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, 14,15,16,17,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,40,14,15,16, diff --git a/assets/maps/testmapb64.tmx b/assets/maps/testmapb64.tmx index f744aa4..413a88e 100644 --- a/assets/maps/testmapb64.tmx +++ b/assets/maps/testmapb64.tmx @@ -3,7 +3,7 @@ - #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   -   .   ,   -   .   ,   ,   ,   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   -   .   #   #   #   #   ,   ,   -   .   .   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   ,   -   .   #   ,   ,   ,   ,   ,   -   .   .   .   ,   ,   ,   ,   ,   ,   ,   ,   -   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   -   .   .   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   ,   -   .   .   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #    +          #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   &   #   #   #   #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   &   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   (   (   #   #   #   #   #   #   #   #   #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   (   (   (   (   (   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   (   (   (   #   #   (   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   ,   ,   ,   ,   ,   ,   ,   #   #   #   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   -   .   ,   -   .   ,   ,   ,            )   *   +   #   #   #   #   (   (   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   ,   ,   ,   ,   ,   -   .   #   #            #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   -   .   #   #            ,   -   .   .   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   ,   -   .   #   ,   ,   ,   ,   ,   -   .   .   .   ,   ,   ,   ,   ,   ,   ,   ,   -   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   -   .   .   ,   ,   ,   ,   ,   -   .            #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   ,   ,   -   .   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   ,   -   .   .   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #    diff --git a/assets/maps/testmapb64decoded.txt b/assets/maps/testmapb64decoded.txt new file mode 100644 index 0000000..e69de29 diff --git a/build/BeagleRescue b/build/BeagleRescue index de2d48a..541398d 100755 Binary files a/build/BeagleRescue and b/build/BeagleRescue differ diff --git a/src/config/config.json b/src/config/config.json index bffe0fe..7185755 100644 --- a/src/config/config.json +++ b/src/config/config.json @@ -3,5 +3,5 @@ "WindowName":"Beagle Rescue", "WindowSize":{"w":320,"h":240}, "WindowFullScreen": 0, -"GlobalScale": 3 +"GlobalScale": 1 } diff --git a/src/ecs/KeyboardController.h b/src/ecs/KeyboardController.h index eae4f2d..56ba412 100644 --- a/src/ecs/KeyboardController.h +++ b/src/ecs/KeyboardController.h @@ -41,11 +41,25 @@ public: { switch (Game::event.key.keysym.sym) { - case SDLK_UP: + case SDLK_UP: + if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ + transform->velocity.y = -1; +// if(Game::playerIsGrounded){ + sprite->Play("Walk"); +// } + sprite->spriteFlip = SDL_FLIP_NONE; + } break; - case SDLK_DOWN: + case SDLK_DOWN: + if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ + transform->velocity.y = 1; +// if(Game::playerIsGrounded){ + sprite->Play("Walk"); +// } + sprite->spriteFlip = SDL_FLIP_NONE; + } break; - case SDLK_LEFT: + case SDLK_LEFT: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ // if (playerCtrl == NULL){ // printf("No player controller found\n"); @@ -56,13 +70,13 @@ public: // transform->lastSafePos = Vector2D(transform->position.x,transform->position.y); // printf("lastSafePos .x: %g .y: %g \n",transform->lastSafePos.x,transform->lastSafePos.y); transform->velocity.x = -1; - if(Game::playerIsGrounded){ +// if(Game::playerIsGrounded){ sprite->Play("Walk"); - } +// } sprite->spriteFlip = SDL_FLIP_NONE; } break; - case SDLK_RIGHT: + case SDLK_RIGHT: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ // &entity->getComponent().setLastSafePos(Vector2D(transform->position.x,transform->position.y)); // playerCtrl->lastSafePosition.x = transform->position.x; @@ -72,30 +86,30 @@ public: // ========= // int intersectionTileX = collider->center.x; transform->velocity.x = 1; - if(Game::playerIsGrounded){ +// if(Game::playerIsGrounded){ sprite->Play("Walk"); - } +// } sprite->spriteFlip = SDL_FLIP_HORIZONTAL; } break; - case SDLK_a: - if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ - transform->velocity.x = -1; - if(Game::playerIsGrounded){ - sprite->Play("Walk"); - } - sprite->spriteFlip = SDL_FLIP_NONE; - } - break; - case SDLK_d: - if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ - transform->velocity.x = 1; - if(Game::playerIsGrounded){ - sprite->Play("Walk"); - } - sprite->spriteFlip = SDL_FLIP_HORIZONTAL; - } - break; +// case SDLK_a: +// if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ +// transform->velocity.x = -1; +// if(Game::playerIsGrounded){ +// sprite->Play("Walk"); +// } +// sprite->spriteFlip = SDL_FLIP_NONE; +// } +// break; +// case SDLK_d: +// if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ +// transform->velocity.x = 1; +// if(Game::playerIsGrounded){ +// sprite->Play("Walk"); +// } +// sprite->spriteFlip = SDL_FLIP_HORIZONTAL; +// } +// break; case SDLK_k: if (!Game::debugCollisionBoxes) { Game::debugCollisionBoxes = true; } @@ -137,44 +151,63 @@ public: { switch (Game::event.key.keysym.sym) { - case SDLK_LEFT: + case SDLK_LEFT: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ transform->velocity.x = 0; sprite->Play("Idle"); - if (!Game::gravityOnPlayer){ - Game::gravityOnPlayer = true; - // sprite->Play("Fall"); - } +// if (!Game::gravityOnPlayer){ +// Game::gravityOnPlayer = true; +// // sprite->Play("Fall"); +// } } break; - case SDLK_RIGHT: + case SDLK_RIGHT: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ transform->velocity.x = 0; sprite->Play("Idle"); - if (!Game::gravityOnPlayer){ - Game::gravityOnPlayer = true; - } +// if (!Game::gravityOnPlayer){ +// Game::gravityOnPlayer = true; +// } } break; - case SDLK_a: + case SDLK_UP: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ - transform->velocity.x = 0; + transform->velocity.y = 0; sprite->Play("Idle"); - if (!Game::gravityOnPlayer){ - Game::gravityOnPlayer = true; - // sprite->Play("Fall"); - } +// if (!Game::gravityOnPlayer){ +// Game::gravityOnPlayer = true; +// // sprite->Play("Fall"); +// } } break; - case SDLK_d: + case SDLK_DOWN: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ - transform->velocity.x = 0; + transform->velocity.y = 0; sprite->Play("Idle"); - if (!Game::gravityOnPlayer){ - Game::gravityOnPlayer = true; - } +// if (!Game::gravityOnPlayer){ +// Game::gravityOnPlayer = true; +// } } - break; + break; +// case SDLK_a: +// if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ +// transform->velocity.x = 0; +// sprite->Play("Idle"); +// if (!Game::gravityOnPlayer){ +// Game::gravityOnPlayer = true; +// // sprite->Play("Fall"); +// } +// } +// break; +// case SDLK_d: +// if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ +// transform->velocity.x = 0; +// sprite->Play("Idle"); +// if (!Game::gravityOnPlayer){ +// Game::gravityOnPlayer = true; +// } +// } +// break; case SDLK_k: break; case SDLK_j: diff --git a/src/ecs/TileMapComponent.h b/src/ecs/TileMapComponent.h index cdc6b92..87c8337 100644 --- a/src/ecs/TileMapComponent.h +++ b/src/ecs/TileMapComponent.h @@ -23,11 +23,13 @@ public: // TransformComponent *transform; SDL_Texture* texture; SDL_Rect srcRect, destRect; - Vector2D position; +// Vector2D position; // std::tuple tile; tmxparser::TmxMap map; int globalScale; std::vector tileSet; + std::vector destRects; + int totalTiles; TileMapComponent() = default; @@ -40,10 +42,10 @@ public: { map = loadedMap; std::string texturePath = "assets/textures/tiles/" + loadedMap.tilesetCollection[0].name + ".png"; - Game::assets->AddTexture(loadedMap.tilesetCollection[0].name, texturePath.c_str()); + Game::assets->AddTexture(map.tilesetCollection[0].name, texturePath.c_str()); setTex(map.tilesetCollection[0].name); globalScale = gScale; - int totalTiles = map.tilesetCollection[0].colCount*map.tilesetCollection[0].rowCount; + totalTiles = map.tilesetCollection[0].colCount*map.tilesetCollection[0].rowCount; // std::cout << "Number of Tiles: " << totalTiles << std::endl; tileSet.resize(totalTiles); for (int r=0;rAddTexture("terrain", tileMapTexture.c_str()); - -// assets->AddTexture("terrain", "assets/textures/tiles/br-tiles.png"); assets->AddTexture("player", "assets/textures/actors/firefighter.png"); assets->AddTexture("font", "assets/textures/ui/ui-font-cloud-sans.png"); assets->AddTexture("textBox", "assets/textures/ui/ui-element-cloud.png"); @@ -177,14 +186,13 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g my9Slice->MakeSlices("textBox",32,32,14,16,14,16,myDestRect,globalScale,Game::groupUI_Layer0); uiInfo.addComponent(camera.w-94,10,72,96,gScale); - uiInfo.addComponent("font", "CollisionHori: Vert: Jump: P.y : P.dy: YVec: ", 8, 12, 1); +// uiInfo.addComponent("font", "CollisionHori: Vert: Jump: P.y : P.dy: YVec: ", 8, 12, 1); + uiInfo.addComponent("font", "Camera CamX: CamY: Jump: P.y : P.dy: YVec: ", 8, 12, 1); uiInfo.addGroup(groupUI_Layer3); uiJumpInfo.addComponent(camera.w-48,48,40,12,gScale); uiJumpInfo.addComponent("font", "false", 8, 12, 1); - uiJumpInfo.addGroup(groupUI_Layer3); -// debugJumpText = new UIText(Game::BoolToString(playerIsJumping), "font", 0,0,8,12,1,"debug text",Game::groupUI_Layer3); -// debugJumpText->ParseString(Game::BoolToString(playerIsJumping),camera.w-50*globalScale,44*gScale,1,"debugJumpText",Game::groupUI_Layer3); + uiJumpInfo.addGroup(groupUI_Layer3); // debug UI box SDL_Rect debugBoxRect = SDL_Rect(); @@ -197,8 +205,6 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g //ecs implementation -// map->LoadMap("assets/maps/br-map-color.txt",70,45, globalScale); - // player.addComponent(860*globalScale,640*globalScale,22,42,globalScale); player.addComponent(120*globalScale,120*globalScale,22,42,globalScale); player.addComponent("player", SpriteComponent::spriteAnimation, "assets/textures/actors/firefighter.json"); @@ -212,10 +218,6 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g puppy.addComponent("puppy", SpriteComponent::spriteObject); puppy.addGroup(groupObjects); -// enemy.addComponent(180*globalScale,180*globalScale,32,32,globalScale); -// enemy.addComponent("robber", SpriteComponent::spriteAnimation, "assets/textures/actors/robberrodent.json"); -// enemy.addGroup(groupEnemies); - } else { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't Initialize SDL: %s", SDL_GetError()); isRunning = false; @@ -275,14 +277,6 @@ void Game::update() // Mix_PlayChannel(-1, Game::assets->GetSoundClip("bark1"),0); // } -// for (auto& letter : debugText) -// { -// if(letter->tag=="debugJumpText"){ -// std::cout<tag<ParseString(Game::BoolToString(playerIsJumping),260*gScale,44*gScale,1,"debugJumpText",Game::groupUI_Layer3); - manager.refresh(); manager.update(); @@ -291,10 +285,9 @@ void Game::update() SDL_Rect cCol = c->getComponent().collider; if(Collision::AABB(cCol, playerCol)) { -// printDebug("Collision Detected"); - if(!playerIsGrounded){ - player.getComponent().Play("Idle"); - } +// if(!playerIsGrounded){ +// player.getComponent().Play("Idle"); +// } // playerIsGrounded = true; // player.getComponent().position.y = player.getComponent().lastSafePos.y; // gravityOnPlayer = false; @@ -325,10 +318,10 @@ void Game::update() camera.x = 0; if (camera.y < 0) camera.y = 0; -// if (camera.x > map->width-camera.w) -// camera.x = map->width-camera.w; -// if (camera.y > map->height-camera.h) -// camera.y = map->height-camera.h; +// if (camera.x > levelMap.w-camera.w) +// camera.x = levelMap.w-camera.w; +// if (camera.y > levelMap.h-camera.h) +// camera.y = levelMap.h-camera.h; if (Game::debugCollisionBoxes) { for (auto& c: colliders) @@ -417,20 +410,8 @@ void Game::clean() printf("Game Cleaned\n"); } -std::string previousMessage = ""; - -void Game::printDebug(std::string debugInfo) -{ - if (previousMessage != debugInfo) - { - std::cout << debugInfo; - printf("\n"); - } - previousMessage = debugInfo; -} - void Game::drawLine(Vector2D srcpt, Vector2D destpt, int red, int green, int blue) { - SDL_SetRenderDrawColor(renderer, red, green, blue, 255); + SDL_SetRenderDrawColor(renderer, red, green, blue, 200); SDL_RenderDrawLine(renderer, srcpt.x, srcpt.y, destpt.x, destpt.y); }