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 6916a3f..cb5bee1 100644 Binary files a/data/map/surface.png and b/data/map/surface.png differ diff --git a/data/map/surface.tsx b/data/map/surface.tsx index 854194b..ab296ca 100644 --- a/data/map/surface.tsx +++ b/data/map/surface.tsx @@ -1,6 +1,6 @@ - - + + @@ -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 0000000..e16dda4 Binary files /dev/null and b/data/map/tile_class.png differ 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 0000000..6916a3f Binary files /dev/null and b/data/map_old/surface.png differ diff --git a/data/map_old/surface.tsx b/data/map_old/surface.tsx new file mode 100644 index 0000000..854194b --- /dev/null +++ b/data/map_old/surface.tsx @@ -0,0 +1,1028 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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};