From 378f27a01ec4c418ca63527cbe015dc6758f1769 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 20 Sep 2022 21:26:37 +0200 Subject: [PATCH] Empezando a trabajar con los nuevos mapas --- data/map/01.ene | 6 +- data/map/01.tmx | 81 +- data/map/surface.png | Bin 17784 -> 35281 bytes data/map/surface.tsx | 1798 ++++++++++++++--------------- data/map/tile_class.png | Bin 0 -> 105 bytes data/map/tile_class.tsx | 4 + data/map_old/01.ene | 14 + data/map_old/01.map | 74 ++ data/map_old/01.tmx | 34 + data/map_old/02.ene | 14 + data/map_old/02.map | 89 ++ data/map_old/02.tmx | 34 + data/map_old/03.ene | 44 + data/map_old/03.map | 44 + data/map_old/03.tmx | 34 + data/map_old/04.map | 12 + data/map_old/04.tmx | 34 + data/map_old/05.map | 76 ++ data/map_old/05.tmx | 37 + data/map_old/06.map | 12 + data/map_old/06.tmx | 34 + data/map_old/07.map | 12 + data/map_old/07.tmx | 34 + data/map_old/08.map | 12 + data/map_old/08.tmx | 34 + data/map_old/09.map | 12 + data/map_old/09.tmx | 34 + data/map_old/10.map | 12 + data/map_old/10.tmx | 34 + data/map_old/surface.png | Bin 0 -> 17784 bytes data/map_old/surface.tsx | 1028 +++++++++++++++++ data/map_old/surface.world | 76 ++ data/{map => map_old}/volcano.png | Bin source/map.cpp | 45 +- source/map.h | 1 + source/player.cpp | 2 +- 36 files changed, 2873 insertions(+), 938 deletions(-) create mode 100644 data/map/tile_class.png create mode 100644 data/map/tile_class.tsx create mode 100644 data/map_old/01.ene create mode 100644 data/map_old/01.map create mode 100644 data/map_old/01.tmx create mode 100644 data/map_old/02.ene create mode 100644 data/map_old/02.map create mode 100644 data/map_old/02.tmx create mode 100644 data/map_old/03.ene create mode 100644 data/map_old/03.map create mode 100644 data/map_old/03.tmx create mode 100644 data/map_old/04.map create mode 100644 data/map_old/04.tmx create mode 100644 data/map_old/05.map create mode 100644 data/map_old/05.tmx create mode 100644 data/map_old/06.map create mode 100644 data/map_old/06.tmx create mode 100644 data/map_old/07.map create mode 100644 data/map_old/07.tmx create mode 100644 data/map_old/08.map create mode 100644 data/map_old/08.tmx create mode 100644 data/map_old/09.map create mode 100644 data/map_old/09.tmx create mode 100644 data/map_old/10.map create mode 100644 data/map_old/10.tmx create mode 100644 data/map_old/surface.png create mode 100644 data/map_old/surface.tsx create mode 100644 data/map_old/surface.world rename data/{map => map_old}/volcano.png (100%) diff --git a/data/map/01.ene b/data/map/01.ene index 2040ecb..b5e7409 100644 --- a/data/map/01.ene +++ b/data/map/01.ene @@ -4,11 +4,11 @@ animation=walking_eye.ani width=16 height=16 x=22 -y=20 +y=21 vx=0.4 vy=0 x1=22 -y1=20 +y1=21 x2=27 -y2=20 +y2=21 [/path] \ No newline at end of file diff --git a/data/map/01.tmx b/data/map/01.tmx index 786249f..d484a60 100644 --- a/data/map/01.tmx +++ b/data/map/01.tmx @@ -1,34 +1,65 @@ - + - + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050,2051,2052,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2106,2107,2108,2109,2110,2111,2112,2113,2114,2115,2116,2117,2118,2119,2120,2121,2122,2123,2124,2125,2126,2127,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2181,2182,2183,2184,2185,2186,2187,2188,2189,2190,2191,2192,2193,2194,2195,2196,2197,2198,2199,2200,2201,2202,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2256,2257,2258,2259,2260,2261,2262,2263,2264,2265,2266,2267,2268,2269,2270,2271,2272,2273,2274,2275,2276,2277,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2331,2332,2333,2334,2335,2336,2337,2338,2339,2340,2341,2342,2343,2344,2345,2346,2347,2348,2349,2350,2351,2352,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2406,2407,2408,2409,2410,2411,2412,2413,2414,2415,2416,2417,2418,2419,2420,2421,2422,2423,2424,2425,2426,2427,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2481,2482,2483,2484,2485,2486,2487,2488,2489,2490,2491,2492,2493,2494,2495,2496,2497,2498,2499,2500,2501,2502,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2557,2558,2559,2560,2561,2562,2563,2564,2565,2566,2567,2568,2569,2570,2571,2572,2573,2574,2575,2576,2577,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,1126,1127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1126,1127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,233,234,235,236,0,0,0,0,0,0,0,0,0,0,233,234,235,236,0,0,0,0,0,1351,1352,1353,1354,1355,1356,0,0,0,0,0,0,0,0, +0,0,0,308,309,310,311,0,0,0,0,0,0,0,0,0,0,308,309,310,311,0,0,0,0,0,0,0,461,462,0,0,0,0,0,0,0,0,0,0, +0,0,0,383,384,385,386,0,0,0,0,0,0,0,0,0,0,383,384,385,386,0,0,0,0,0,0,0,461,462,0,0,0,0,0,0,0,0,0,0, +1126,1127,1128,1129,1130,1131,1126,1127,1128,1129,1130,1131,1126,1127,1128,1129,1130,1131,1126,1127,1128,1129,1130,1131,1126,1127,1128,1129,1130,1131,1126,1127,1128,1129,1130,1131,1126,1127,1128,1129, +1201,1202,1203,1204,1205,1206,1201,1202,1203,1204,1205,1206,1201,1202,1203,1204,1205,1206,1201,1202,1203,1204,1205,1206,1201,1202,1203,1204,1205,1206,1201,1202,1203,1204,1205,1206,1201,1202,1203,1204, +1276,1277,1278,1279,1280,1281,1276,1277,1278,1279,1280,1281,1276,1277,1278,1279,1280,1281,1276,1277,1278,1279,1280,1281,1276,1277,1278,1279,1280,1281,1276,1277,1278,1279,1280,1281,1276,1277,1278,1279 + + + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,27,28,29,30,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,61,62,63,64,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,98,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,129,130,131,132,0,0,0,0,0,0, -0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,109,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,445,447,0,0,0,0,0,0,0,0,448,450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,479,481,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,445,447,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,479,481,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,553,554,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,253,254,0,0,0,0,0,105,106,0,0,0,0,0,0,0,0,0,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,448,449,449,450,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,109,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,482,483,483,484,0,0,0,547,548,549,550,551,552,0,0,0,0,0,0,77,78,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,111,112,45,46,7,8,0,0,0,5,6,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,7,8,0,0,0,0,0,0,0,0,0,0,37,38,41,42,0,0,0,39,40,0,0,0,0,0,0, -344,345,0,0,0,0,0,207,208,0,0,0,0,41,42,0,0,0,0,0,0,0,343,344,292,293,294,344,345,0,0,0,105,106,0,0,0,0,0,0, -378,379,0,0,0,0,0,241,242,0,0,0,0,37,38,0,0,343,291,344,291,291,313,314,326,327,328,378,379,0,0,0,37,38,0,0,0,0,0,0, -279,280,291,292,279,280,279,291,292,280,279,280,291,292,279,280,279,280,281,281,282,281,282,281,281,282,281,282,279,280,279,280,291,292,279,280,291,292,279,280, -313,314,325,326,313,314,313,325,326,314,313,314,325,326,313,314,313,314,313,315,316,314,313,314,313,314,313,314,313,314,313,314,325,326,313,314,325,326,313,314 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,5627,5627,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5627,5627,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5628,5628,5628,5628,5628,5628,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627,5627, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/data/map/surface.png b/data/map/surface.png index 6916a3f6e94109dfc64c16bacfd9a590a0b653e9..cb5bee137b936fca034c9d0238211b0bac353a66 100644 GIT binary patch literal 35281 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 XuUd+T>G1ZxyA|b^ujR{R&EEY#-DkeU literal 17784 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 - - + + @@ -33,49 +33,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108,49 +65,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -183,49 +97,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -257,772 +128,901 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/map/tile_class.png b/data/map/tile_class.png new file mode 100644 index 0000000000000000000000000000000000000000..e16dda4b59d3d5ff12d464aa3da644091c79c2a5 GIT binary patch literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^5so=z89ZJ6T-G@yGywp{ C9U6iF literal 0 HcmV?d00001 diff --git a/data/map/tile_class.tsx b/data/map/tile_class.tsx new file mode 100644 index 0000000..a37e46f --- /dev/null +++ b/data/map/tile_class.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/data/map_old/01.ene b/data/map_old/01.ene new file mode 100644 index 0000000..2040ecb --- /dev/null +++ b/data/map_old/01.ene @@ -0,0 +1,14 @@ +[path] +tileset=walking_eye.png +animation=walking_eye.ani +width=16 +height=16 +x=22 +y=20 +vx=0.4 +vy=0 +x1=22 +y1=20 +x2=27 +y2=20 +[/path] \ No newline at end of file diff --git a/data/map_old/01.map b/data/map_old/01.map new file mode 100644 index 0000000..f8e722b --- /dev/null +++ b/data/map_old/01.map @@ -0,0 +1,74 @@ +tileset_img=surface.png +enemy_file=01.ene +bgColor1=234,171,159 +bgColor2=144,225,231 + +room_up=0 +room_down=0 +room_left=04.map +room_right=02.map + +[tilemap] +01.tmx +[/tilemap] + +[actors] + +[moving platform] +tileset=moving_platform.png +animation=moving_platform.ani +width=16 +height=8 +x=9 +y=11 +vx=0.3 +vy=0 +x1=9 +y1=11 +x2=15 +y2=11 +[/moving platform] + +[moving platform] +tileset=moving_platform.png +animation=moving_platform.ani +width=16 +height=8 +x=20 +y=14 +vx=0 +vy=0.3 +x1=20 +y1=14 +x2=20 +y2=21 +[/moving platform] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=1 +y=10 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=24 +y=10 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=25 +y=12 +[/diamond] + +[/actors] \ No newline at end of file diff --git a/data/map_old/01.tmx b/data/map_old/01.tmx new file mode 100644 index 0000000..786249f --- /dev/null +++ b/data/map_old/01.tmx @@ -0,0 +1,34 @@ + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,27,28,29,30,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,61,62,63,64,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,98,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,129,130,131,132,0,0,0,0,0,0, +0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,109,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,445,447,0,0,0,0,0,0,0,0,448,450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,479,481,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,445,447,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,479,481,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,553,554,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,253,254,0,0,0,0,0,105,106,0,0,0,0,0,0,0,0,0,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,448,449,449,450,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,109,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,482,483,483,484,0,0,0,547,548,549,550,551,552,0,0,0,0,0,0,77,78,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,111,112,45,46,7,8,0,0,0,5,6,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,7,8,0,0,0,0,0,0,0,0,0,0,37,38,41,42,0,0,0,39,40,0,0,0,0,0,0, +344,345,0,0,0,0,0,207,208,0,0,0,0,41,42,0,0,0,0,0,0,0,343,344,292,293,294,344,345,0,0,0,105,106,0,0,0,0,0,0, +378,379,0,0,0,0,0,241,242,0,0,0,0,37,38,0,0,343,291,344,291,291,313,314,326,327,328,378,379,0,0,0,37,38,0,0,0,0,0,0, +279,280,291,292,279,280,279,291,292,280,279,280,291,292,279,280,279,280,281,281,282,281,282,281,281,282,281,282,279,280,279,280,291,292,279,280,291,292,279,280, +313,314,325,326,313,314,313,325,326,314,313,314,325,326,313,314,313,314,313,315,316,314,313,314,313,314,313,314,313,314,313,314,325,326,313,314,325,326,313,314 + + + diff --git a/data/map_old/02.ene b/data/map_old/02.ene new file mode 100644 index 0000000..72cf460 --- /dev/null +++ b/data/map_old/02.ene @@ -0,0 +1,14 @@ +[path] +tileset=flying_eye.png +animation=flying_eye.ani +width=16 +height=16 +x=9 +y=12 +vx=0 +vy=0.3 +x1=9 +y1=12 +x2=9 +y2=20 +[/path] \ No newline at end of file diff --git a/data/map_old/02.map b/data/map_old/02.map new file mode 100644 index 0000000..ddcd5ea --- /dev/null +++ b/data/map_old/02.map @@ -0,0 +1,89 @@ +tileset_img=surface.png +enemy_file=02.ene +bgColor1=234,171,159 +bgColor2=144,225,231 + +room_up=0 +room_down=03.map +room_left=01.map +room_right=05.map + +[tilemap] +02.tmx +[/tilemap] + +[actors] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=5 +y=13 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=8 +y=7 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=12 +y=11 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=16 +y=17 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=18 +y=15 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=20 +y=13 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=27 +y=9 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=33 +y=14 +[/diamond] + +[/actors] \ No newline at end of file diff --git a/data/map_old/02.tmx b/data/map_old/02.tmx new file mode 100644 index 0000000..4b5bd7a --- /dev/null +++ b/data/map_old/02.tmx @@ -0,0 +1,34 @@ + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,28,29,30,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,61,62,63,64,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,98,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,129,130,131,132,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,343,446,446,345,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,479,480,480,481,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,54,55,21,22,0,0,0,0,0,0,0,0,0,0,0,0,0,547,548,549,550,551,552,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,87,17,18,55,56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,121,51,52,82,119,280,279,344,345,0,0,0,0,0,0,0,0,0,0,0,105,106,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,85,86,116,82,480,480,480,481,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,445,446,295,447,119,120,82,15,16,89,90,0,0,0,0,0,553,554,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,87,88,17,18,116,115,116,49,50,123,124,0,0,0,0,0,105,106,0,0,0,0,0,75,76,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,121,122,87,88,88,81,82,23,0,0,0,0,0,0,553,554,77,78,11,12,0,0,0,109,110,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,121,122,51,52,116,57,0,0,0,0,0,0,105,106,111,112,45,46,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,85,86,82,23,0,0,0,0,553,554,77,78,11,12,7,8,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,54,115,116,57,0,0,0,0,105,106,111,112,45,46,41,42,0,0,0,37,38,0,0,5,6,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,343,280,293,294,295,345,207,208,0,37,38,5,6,37,38,37,38,0,0,0,7,8,0,0,39,40,0,0,0,5,6,0,0, +0,0,0,0,0,0,0,377,316,327,328,315,379,241,242,0,37,38,39,40,37,38,37,38,0,0,0,41,42,0,0,165,166,0,0,0,39,40,0,0, +446,446,446,446,446,446,446,446,281,281,281,281,446,446,446,446,446,446,446,446,446,446,446,446,446,447,0,37,38,0,445,446,446,446,446,446,446,446,446,446, +480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,481,0,37,38,0,479,480,480,480,480,480,480,480,480,480 + + + diff --git a/data/map_old/03.ene b/data/map_old/03.ene new file mode 100644 index 0000000..445a697 --- /dev/null +++ b/data/map_old/03.ene @@ -0,0 +1,44 @@ +[path] +tileset=walking_eye.png +animation=walking_eye.ani +width=16 +height=16 +x=13 +y=23 +vx=0.4 +vy=0 +x1=3 +y1=23 +x2=18 +y2=23 +[/path] + +[path] +tileset=walking_eye.png +animation=walking_eye.ani +width=16 +height=16 +x=22 +y=13 +vx=0.4 +vy=0 +x1=20 +y1=13 +x2=24 +y2=13 +[/path] + +[path] +tileset=walking_eye.png +animation=walking_eye.ani +width=16 +height=16 +x=27 +y=8 +vx=-0.4 +vy=0 +x1=25 +y1=8 +x2=29 +y2=8 +[/path] \ No newline at end of file diff --git a/data/map_old/03.map b/data/map_old/03.map new file mode 100644 index 0000000..cf6ac1a --- /dev/null +++ b/data/map_old/03.map @@ -0,0 +1,44 @@ +tileset_img=surface.png +enemy_file=03.ene +bgColor1=143,86,59 +bgColor2=69,40,60 + +room_up=02.map +room_down=0 +room_left=0 +room_right=06.map + +[tilemap] +03.tmx +[/tilemap] + +[actors] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=25 +y=19 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=22 +y=12 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=2 +y=22 +[/diamond] + +[/actors] \ No newline at end of file diff --git a/data/map_old/03.tmx b/data/map_old/03.tmx new file mode 100644 index 0000000..0a2e82c --- /dev/null +++ b/data/map_old/03.tmx @@ -0,0 +1,34 @@ + + + + + +381,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,484,0,37,38,0,482,483,483,483,483,483,483,483,483,381, +381,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,380, +381,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,482, +381,0,0,0,0,0,0,0,77,78,11,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0, +381,0,0,0,0,0,0,0,111,112,45,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,553,554,0,0,0,0,0,0,0,0,0,0,0, +381,0,0,0,0,0,0,0,0,0,7,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,105,38,0,0,0,0,0,0,0,0,0,0,0, +311,0,0,0,0,0,0,0,0,0,41,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,276, +310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,381, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,5,6,9,10,11,12,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,381, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,39,40,43,44,45,46,0,0,0,0,0,547,548,549,550,551,552,0,0,0,0,0,0,0,0,381, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,77,78,79,80,75,76,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,311, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,111,112,113,114,109,110,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,381, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,77,78,11,12,0,0,0,0,0,77,78,11,12,0,0,0,0,0,0,0,0,381, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,111,112,45,46,0,0,0,0,0,111,112,45,46,0,0,0,0,0,0,0,0,381, +310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,547,548,549,550,551,552,0,0,0,37,38,0,0,0,0,5,6,0,0,381, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,37,38,0,0,0,0,39,40,0,0,381, +311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,75,76,0,0,9,10,79,80,0,0,381, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,79,80,0,0,0,0,0,109,110,0,0,43,44,113,114,0,0,311, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,114,0,0,0,0,0,547,548,549,550,551,552,0,0,0,0,381, +381,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,37,38,0,0,0,19,20,85,381, +311,21,22,0,0,0,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,75,76,0,0,0,0,0,0,0,0,37,38,0,0,0,53,54,119,311, +381,55,56,0,0,0,39,40,0,0,0,0,0,0,0,0,0,0,0,0,0,109,110,547,548,549,550,551,552,0,0,79,80,0,0,0,85,86,82,381, +381,83,84,0,21,22,75,76,0,0,0,0,0,0,5,6,0,0,0,0,0,7,8,0,0,37,38,0,0,0,37,38,5,6,0,54,119,120,116,381, +381,117,118,116,55,56,109,110,0,0,0,0,0,0,39,40,0,0,0,0,0,41,42,0,0,37,38,0,0,0,37,38,39,40,0,92,81,115,115,381, +381,381,381,381,276,275,381,381,381,381,381,381,381,381,381,381,381,276,381,381,381,381,275,381,381,381,381,381,276,275,381,381,381,276,381,381,381,381,381,381 + + + diff --git a/data/map_old/04.map b/data/map_old/04.map new file mode 100644 index 0000000..f15d98f --- /dev/null +++ b/data/map_old/04.map @@ -0,0 +1,12 @@ +tileset_img=surface.png +bgColor1=234,171,159 +bgColor2=144,225,231 + +room_up=0 +room_down=04.map +room_left=04.map +room_right=01.map + +[tilemap] +04.tmx +[/tilemap] \ No newline at end of file diff --git a/data/map_old/04.tmx b/data/map_old/04.tmx new file mode 100644 index 0000000..754853c --- /dev/null +++ b/data/map_old/04.tmx @@ -0,0 +1,34 @@ + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,27,28,29,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,61,62,63,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,95,96,97,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,129,130,131,132,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,257,258,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,445,446,446,446,446, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,479,480,480,480,480, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/data/map_old/05.map b/data/map_old/05.map new file mode 100644 index 0000000..63098ff --- /dev/null +++ b/data/map_old/05.map @@ -0,0 +1,76 @@ +tileset_img=surface.png +bgColor1=234,171,159 +bgColor2=144,225,231 + +room_up=0 +room_down=06.map +room_left=02.map +room_right=07.map + +[tilemap] +05.tmx +[/tilemap] + +[actors] + +[moving platform] +tileset=moving_platform.png +animation=moving_platform.ani +width=16 +height=8 +x=18 +y=24 +vx=-0.6 +vy=0 +x1=13 +y1=24 +x2=26 +y2=24 +[/moving platform] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=6 +y=6 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=19 +y=10 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=34 +y=15 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=32 +y=2 +[/diamond] + +[diamond] +tileset=diamond.png +animation=diamond.ani +width=16 +height=16 +x=19 +y=21 +[/diamond] + +[/actors] \ No newline at end of file diff --git a/data/map_old/05.tmx b/data/map_old/05.tmx new file mode 100644 index 0000000..9bd8cc8 --- /dev/null +++ b/data/map_old/05.tmx @@ -0,0 +1,37 @@ + + + + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,27,28,29,30,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,61,62,63,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,139,140,0,0,0,0,0,0,0,129,130,131,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,257,258,0,0,0,0,0, +0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,547,548,549,550,551,552,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,105,106,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,10,73,79,80,0,0,0,0,0,0, +0,0,0,0,0,253,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,44,107,113,114,0,0,0,0,0,0, +0,0,0,0,547,548,549,550,551,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,139,140,0, +0,0,0,0,0,0,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,173,174,0, +0,0,0,0,0,0,109,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0,0,0,255,256,0,0,0,0,0,0,75,76,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,77,78,11,12,0,0,0,0,0,0,0,547,548,549,550,551,552,0,0,0,0,0,0,109,110,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,111,112,45,46,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,9,10,79,80,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,9,10,73,79,80,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,43,44,113,114,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,43,44,107,113,114,0,0,0,0,0,0,0,0,0,553,554,0,0,0,0,0,0,37,38,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,77,78,11,12,0,0,0,0,0,0,0,0,0,0,105,106,0,0,0,0,0,0,553,554,0,0,0,253,254,253,254,0,0,0,0, +0,0,0,5,6,111,112,45,46,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,105,106,0,0,0,547,548,549,550,551,552,0,0, +0,0,0,39,40,0,0,7,8,0,0,0,0,0,0,0,0,0,0,37,38,0,0,0,0,0,0,77,78,11,12,0,0,0,105,106,0,0,0,0, +0,0,0,105,106,0,0,41,42,0,0,0,0,0,0,0,0,0,0,77,78,11,12,0,0,0,0,111,112,45,46,0,0,0,105,106,0,0,0,0, +0,0,0,37,38,9,10,79,80,0,0,0,0,0,0,0,0,0,0,111,112,45,46,0,0,0,0,0,0,79,80,0,5,6,7,8,0,0,0,0, +0,0,0,7,8,43,44,5,6,0,0,0,0,0,0,0,0,0,0,9,10,79,80,0,0,0,0,0,75,76,114,0,39,40,41,42,0,0,0,0, +0,253,254,41,42,37,38,39,40,0,0,0,0,0,0,0,0,0,0,43,44,113,114,0,0,0,0,0,109,110,0,0,105,106,105,106,0,257,258,0, +446,446,291,292,293,294,446,446,446,294,345,0,0,0,0,0,0,0,0,75,76,0,0,0,0,0,0,0,77,78,343,446,291,292,446,446,446,291,292,446, +480,480,325,326,327,328,480,480,480,328,481,0,0,0,0,0,0,0,0,109,110,0,0,0,0,0,0,0,111,112,479,480,325,326,480,480,480,325,326,480 + + + diff --git a/data/map_old/06.map b/data/map_old/06.map new file mode 100644 index 0000000..e4dc50a --- /dev/null +++ b/data/map_old/06.map @@ -0,0 +1,12 @@ +tileset_img=surface.png +bgColor1=143,86,59 +bgColor2=69,40,60 + +room_up=05.map +room_down=0 +room_left=03.map +room_right=0 + +[tilemap] +06.tmx +[/tilemap] diff --git a/data/map_old/06.tmx b/data/map_old/06.tmx new file mode 100644 index 0000000..fa4c0f2 --- /dev/null +++ b/data/map_old/06.tmx @@ -0,0 +1,34 @@ + + + + + +277,278,277,278,277,278,277,278,277,278,382,0,0,0,0,0,0,0,0,7,8,0,0,0,0,0,0,0,0,0,380,278,483,483,483,278,277,278,277,278, +311,312,483,483,483,483,483,483,483,483,484,0,0,0,0,0,0,0,0,41,42,0,0,0,0,0,0,0,0,0,482,483,483,483,483,483,483,483,311,312, +483,484,0,0,0,0,0,0,0,77,78,73,11,12,0,9,10,73,73,79,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,277,278, +0,0,0,0,0,0,0,0,0,111,112,107,45,46,0,43,44,107,107,113,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,312, +0,0,0,0,0,0,0,0,0,0,0,0,77,78,73,79,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,277,483, +0,0,0,0,0,0,0,0,0,0,0,0,111,112,107,113,114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,311,312, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,483,278, +449,450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,54,81,82,55,84,0,311,312, +277,382,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,116,115,116,115,116,84,277,278, +311,382,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,126,82,81,82,81,82,81,311,483, +277,382,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,54,115,116,115,116,115,116,115,277,483, +311,382,553,554,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,54,120,86,82,81,82,81,82,81,311,312, +277,382,105,106,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,54,81,82,81,82,119,120,81,82,81,82,81,82,277,278, +311,382,37,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,116,115,116,115,116,115,116,115,116,115,116,115,116,311,312, +277,449,449,450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,54,81,82,81,82,81,82,81,82,17,18,81,82,81,82,483,278, +311,312,311,382,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,92,120,86,116,115,116,115,116,15,50,51,88,18,116,115,116,311,483, +277,278,277,449,449,450,0,0,0,0,0,0,0,0,0,0,19,0,85,54,81,82,81,119,120,82,81,82,81,82,57,0,0,51,52,82,81,82,277,278, +311,312,311,312,311,382,0,0,0,0,0,0,0,0,0,0,0,85,115,116,115,116,115,116,115,116,115,116,115,116,83,84,0,85,115,116,115,116,311,312, +277,278,277,278,277,449,449,450,0,0,0,0,0,0,19,0,85,86,81,82,81,82,81,82,81,82,81,82,81,82,117,118,119,120,81,82,81,82,277,278, +311,312,311,312,311,312,311,382,0,0,0,0,0,0,0,85,119,120,115,116,115,116,115,116,115,116,115,116,115,116,115,116,115,116,115,116,115,116,311,312, +277,278,277,278,277,278,277,449,449,278,277,276,277,278,483,276,277,278,277,278,277,278,276,278,277,278,277,278,277,278,276,278,277,278,277,483,276,278,277,278, +312,312,311,312,311,312,311,312,311,312,311,312,311,312,311,312,311,312,311,312,483,312,311,312,311,312,483,312,311,312,311,312,311,312,311,312,311,312,311,312, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824,823,824, +857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858,857,858 + + + diff --git a/data/map_old/07.map b/data/map_old/07.map new file mode 100644 index 0000000..d72bee8 --- /dev/null +++ b/data/map_old/07.map @@ -0,0 +1,12 @@ +tileset_img=surface.png +bgColor1=234,171,159 +bgColor2=144,225,231 + +room_up=08.map +room_down=0 +room_left=05.map +room_right=0 + +[tilemap] +07.tmx +[/tilemap] \ No newline at end of file diff --git a/data/map_old/07.tmx b/data/map_old/07.tmx new file mode 100644 index 0000000..4ed62d7 --- /dev/null +++ b/data/map_old/07.tmx @@ -0,0 +1,34 @@ + + + + + +281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,282,281,282,281,282, +315,316,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315,316, +281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282, +315,316,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315,316, +281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282, +315,316,315,0,0,0,281,282,281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315,316, +281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282, +315,316,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315,316, +281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282, +315,316,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,0,0,0,0,0,0,315,316,315,316, +281,282,281,281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315,316, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315,316, +0,0,0,0,0,0,0,281,282,281,282,281,282,281,282,281,282,281,282,281,282,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282, +0,0,0,0,0,0,0,315,316,315,316,315,316,315,316,315,316,315,316,315,316,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,315,316,315,316, +0,0,0,0,0,0,0,281,282,281,282,281,282,281,282,281,282,281,282,281,282,0,0,0,0,0,0,0,0,0,0,315,316,315,316,315,281,282,281,282, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,315,316,315,316, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,282,281,282,281,282,281,282, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315,316,315,316,315,316,315,316,315,316, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,282,281,282,281,282,281,282, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,315,316,315,316,315,316,315,316,315,316,315,316, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315,316,315,281,282,281,282,281,282,281,282,281,282,281,282, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,315,316,315,316,315,316,315,316,315,316,315,316, +281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282, +315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316 + + + diff --git a/data/map_old/08.map b/data/map_old/08.map new file mode 100644 index 0000000..8fe0289 --- /dev/null +++ b/data/map_old/08.map @@ -0,0 +1,12 @@ +tileset_img=surface.png +bgColor1=234,171,159 +bgColor2=144,225,231 + +room_up=0 +room_down=07.map +room_left=10.map +room_right=09.map + +[tilemap] +08.tmx +[/tilemap] diff --git a/data/map_old/08.tmx b/data/map_old/08.tmx new file mode 100644 index 0000000..b3a0562 --- /dev/null +++ b/data/map_old/08.tmx @@ -0,0 +1,34 @@ + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,27,28,29,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,61,62,63,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,130,131,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,315,316,315, +281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281, +315,316,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,282,281,282,281,282, +281,282,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,281,282,281,282,281,282,281,282 + + + diff --git a/data/map_old/09.map b/data/map_old/09.map new file mode 100644 index 0000000..a6dd193 --- /dev/null +++ b/data/map_old/09.map @@ -0,0 +1,12 @@ +tileset_img=surface.png +bgColor1=234,171,159 +bgColor2=144,225,231 + +room_up=0 +room_down=0 +room_left=08.map +room_right=0 + +[tilemap] +09.tmx +[/tilemap] diff --git a/data/map_old/09.tmx b/data/map_old/09.tmx new file mode 100644 index 0000000..9af9e0c --- /dev/null +++ b/data/map_old/09.tmx @@ -0,0 +1,34 @@ + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,27,28,29,30,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,61,62,63,64,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,98,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,130,131,132,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +281,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +315,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +281,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +315,315,281,282,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +281,281,315,316,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +315,315,281,282,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +281,281,315,316,281,282,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +315,315,281,282,315,316,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +281,281,315,316,281,282,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282,281,282, +315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316,315,316 + + + diff --git a/data/map_old/10.map b/data/map_old/10.map new file mode 100644 index 0000000..2277471 --- /dev/null +++ b/data/map_old/10.map @@ -0,0 +1,12 @@ +tileset_img=surface.png +bgColor1=234,171,159 +bgColor2=144,225,231 + +room_up=0 +room_down=05.map +room_left=10.map +room_right=08.map + +[tilemap] +10.tmx +[/tilemap] diff --git a/data/map_old/10.tmx b/data/map_old/10.tmx new file mode 100644 index 0000000..d3cdf02 --- /dev/null +++ b/data/map_old/10.tmx @@ -0,0 +1,34 @@ + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,27,28,29,30,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,61,62,63,64,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,96,97,98,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,130,131,132,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,139,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,173,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/data/map_old/surface.png b/data/map_old/surface.png new file mode 100644 index 0000000000000000000000000000000000000000..6916a3f6e94109dfc64c16bacfd9a590a0b653e9 GIT binary patch literal 17784 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/map_old/surface.world b/data/map_old/surface.world new file mode 100644 index 0000000..6283b05 --- /dev/null +++ b/data/map_old/surface.world @@ -0,0 +1,76 @@ +{ + "maps": [ + { + "fileName": "02.tmx", + "height": 208, + "width": 320, + "x": 256, + "y": 0 + }, + { + "fileName": "01.tmx", + "height": 208, + "width": 320, + "x": -64, + "y": 0 + }, + { + "fileName": "03.tmx", + "height": 208, + "width": 320, + "x": 256, + "y": 208 + }, + { + "fileName": "04.tmx", + "height": 208, + "width": 320, + "x": -384, + "y": 0 + }, + { + "fileName": "05.tmx", + "height": 208, + "width": 320, + "x": 576, + "y": 0 + }, + { + "fileName": "06.tmx", + "height": 208, + "width": 320, + "x": 576, + "y": 208 + }, + { + "fileName": "07.tmx", + "height": 208, + "width": 320, + "x": 896, + "y": 0 + }, + { + "fileName": "08.tmx", + "height": 208, + "width": 320, + "x": 896, + "y": -208 + }, + { + "fileName": "09.tmx", + "height": 208, + "width": 320, + "x": 1216, + "y": -208 + }, + { + "fileName": "10.tmx", + "height": 208, + "width": 320, + "x": 576, + "y": -208 + } + ], + "onlyShowAdjacentMaps": false, + "type": "world" +} diff --git a/data/map/volcano.png b/data/map_old/volcano.png similarity index 100% rename from data/map/volcano.png rename to data/map_old/volcano.png diff --git a/source/map.cpp b/source/map.cpp index 78451f6..9c3ca05 100644 --- a/source/map.cpp +++ b/source/map.cpp @@ -7,7 +7,6 @@ Map::Map(std::string file, SDL_Renderer *renderer, Asset *asset, ItemTracker *it tile_size = 8; map_width = 40; map_height = 26; - tileset_width = 34; name = file.substr(file.find_last_of("\\/") + 1); enemy_file = ""; bgColor1 = bgColor2 = {0, 0, 0}; @@ -21,6 +20,7 @@ Map::Map(std::string file, SDL_Renderer *renderer, Asset *asset, ItemTracker *it texture_tile = new LTexture(); load(file); loadTextureFromFile(texture_tile, asset->get(tileset_img), renderer); + tileset_width = texture_tile->getWidth() / tile_size; // Crea la textura para el mapa de tiles de la habitación map_texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT); @@ -75,10 +75,11 @@ bool Map::load(std::string file_path) std::ifstream file2(asset->get(line)); // Abre el fichero tmx if (file2.good()) { - bool data_read = false; + bool map1_read = false; + bool map2_read = false; while (std::getline(file2, line)) // Lee el fichero linea a linea { - if (!data_read) + if (!map1_read) { // Lee lineas hasta que encuentre donde empiezan los datos del mapa int pos = 0; do @@ -89,7 +90,7 @@ bool Map::load(std::string file_path) do { // Se introducen los valores separados por comas en un vector - data_read = true; + map1_read = true; std::getline(file2, line); if (line != "") { @@ -102,6 +103,30 @@ bool Map::load(std::string file_path) } } while (line != ""); } + if (!map2_read) + { // Lee lineas hasta que encuentre donde empiezan los datos del mapa + int pos = 0; + do + { + std::getline(file2, line); + pos = line.find("data encoding"); + } while (pos == std::string::npos); + + do + { // Se introducen los valores separados por comas en un vector + map2_read = true; + std::getline(file2, line); + if (line != "") + { + std::stringstream ss(line); + std::string tmp; + while (getline(ss, tmp, ',')) + { + collisionmap.push_back(std::stoi(tmp)); + } + } + } while (line != ""); + } } } } @@ -424,20 +449,20 @@ e_tile_map Map::getTile(SDL_Point p) const int y = std::max(getPlayArea(b_top), (std::min(p.y, getPlayArea(b_bottom) - 1))); // Calcula el tile - const int tile = tilemap[((y / tile_size) * map_width) + (x / tile_size)]; + const int tile = collisionmap[((y / tile_size) * map_width) + (x / tile_size)]; // Las 8 primeras filas son tiles de fondo - if (tile >= 0 && tile < 8 * tileset_width) + if (tile == 0) { return nothing; } - // De la fila 8 a la 15 hay tiles de muro - else if (tile >= (8 * tileset_width) && tile < 16 * tileset_width) + + else if (tile == 5627) { return wall; } - // A partir de la fila 16 son tiles atravesables - else + + else if (tile == 5628) { return passable; } diff --git a/source/map.h b/source/map.h index f19b3e8..89a663d 100644 --- a/source/map.h +++ b/source/map.h @@ -45,6 +45,7 @@ private: std::string enemy_file; // Fichero con los enemigos para la habitación std::string tileset_img; // Imagen con los graficos para la habitación std::vector tilemap; // Indice de los tiles a dibujar en la habitación + std::vector collisionmap; // Indice con los tipos de tile de la habitación LTexture *texture_tile; // Textura con los graficos de los tiles habitación SDL_Texture *map_texture; // Textura para dibujar el mapa de la habitación std::vector actors; // Listado con los actores de la habitación diff --git a/source/player.cpp b/source/player.cpp index 07a17e6..8bae1c9 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -20,7 +20,7 @@ Player::Player(SDL_Renderer *renderer, Asset *asset, Input *input, Map *map) w = 16; h = 24; x = 3 * 16; - y = 168; + y = 20; vx = 0; vy = 0; lastPosition = {(int)x, (int)y};