From 2fdf16620ba5b3e888f70cee2bc1f6832814913d Mon Sep 17 00:00:00 2001 From: Indrajith K L Date: Mon, 21 Mar 2022 21:41:57 +0530 Subject: Player, Enemy Animations Collision Changes --- assets/maps/level1.lua | 338 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 312 insertions(+), 26 deletions(-) (limited to 'assets/maps') diff --git a/assets/maps/level1.lua b/assets/maps/level1.lua index fc68b04..12f04ef 100644 --- a/assets/maps/level1.lua +++ b/assets/maps/level1.lua @@ -8,8 +8,8 @@ return { height = 32, tilewidth = 16, tileheight = 16, - nextlayerid = 7, - nextobjectid = 47, + nextlayerid = 8, + nextobjectid = 73, properties = {}, tilesets = { { @@ -105,10 +105,75 @@ return { } }, tilecount = 1024, - tiles = {} + tiles = { + { + id = 8, + animation = { + { + tileid = 8, + duration = 1000 + }, + { + tileid = 9, + duration = 1000 + } + } + } + } } }, layers = { + { + type = "tilelayer", + x = 0, + y = 0, + width = 32, + height = 32, + id = 7, + name = "water", + visible = true, + opacity = 1, + offsetx = 0, + offsety = 0, + parallaxx = 1, + parallaxy = 1, + properties = {}, + encoding = "lua", + data = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, 0, 0, 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, 9, 9, 9, 9, 0, 0, 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, 9, 9, 9, 9, 9, 0, 0, 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, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 0, 0, 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, 9, 9, 9, 9, 9, 9, 9, 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, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 9, 9, 9, 0, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 0, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + }, { type = "tilelayer", x = 0, @@ -132,29 +197,29 @@ return { 6, 7, 7, 6, 0, 0, 7, 6, 6, 6, 0, 0, 8, 8, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 7, 7, 6, 163, 165, 6, 6, 6, 6, 6, 0, 0, 7, 7, 0, 163, 165, 8, 8, 0, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, 6, 195, 197, 6, 6, 6, 7, 6, 6, 0, 8, 7, 0, 195, 197, 8, 8, 0, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 6, - 6, 7, 6, 6, 195, 197, 0, 6, 6, 6, 8, 8, 8, 8, 7, 7, 195, 197, 0, 8, 8, 7, 7, 7, 7, 7, 7, 8, 0, 8, 0, 6, - 6, 6, 0, 0, 195, 197, 8, 7, 7, 8, 8, 8, 8, 7, 0, 7, 195, 197, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 8, 8, 0, 6, - 6, 6, 6, 0, 195, 197, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 195, 197, 0, 8, 8, 8, 8, 8, 7, 8, 8, 8, 8, 8, 0, 6, - 6, 6, 6, 7, 195, 193, 165, 0, 8, 8, 7, 7, 7, 7, 7, 0, 195, 197, 7, 7, 8, 8, 8, 8, 8, 8, 8, 7, 8, 0, 7, 6, - 6, 6, 6, 6, 227, 162, 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 195, 197, 8, 7, 7, 8, 8, 8, 8, 8, 7, 7, 8, 7, 7, 6, - 6, 6, 7, 0, 0, 195, 193, 164, 164, 164, 164, 164, 164, 164, 164, 164, 194, 197, 8, 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 6, - 6, 6, 7, 7, 7, 227, 228, 228, 228, 228, 162, 161, 228, 228, 228, 228, 228, 229, 7, 7, 8, 7, 8, 8, 0, 7, 0, 8, 8, 7, 0, 6, - 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 195, 197, 8, 6, 6, 8, 8, 8, 7, 7, 8, 7, 8, 7, 7, 7, 7, 7, 7, 7, 7, 6, - 6, 0, 7, 7, 7, 7, 163, 164, 165, 7, 195, 197, 6, 6, 6, 6, 6, 6, 7, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 6, 0, 7, 7, 6, 163, 194, 196, 197, 6, 195, 197, 6, 6, 6, 6, 6, 6, 163, 164, 164, 165, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 6, 0, 7, 6, 6, 195, 196, 196, 193, 165, 195, 197, 6, 6, 6, 6, 163, 164, 194, 196, 196, 193, 165, 7, 7, 0, 0, 0, 0, 7, 7, 6, - 6, 7, 7, 6, 6, 227, 162, 196, 196, 193, 194, 193, 164, 164, 164, 164, 194, 196, 196, 196, 196, 196, 197, 7, 7, 0, 0, 0, 0, 0, 6, 6, - 6, 7, 7, 7, 7, 163, 194, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 161, 229, 7, 7, 7, 7, 7, 7, 7, 6, 6, - 6, 7, 7, 7, 6, 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 193, 165, 7, 7, 7, 7, 7, 0, 0, 6, 6, - 6, 7, 7, 7, 6, 227, 228, 162, 196, 161, 162, 196, 196, 196, 196, 196, 196, 196, 196, 196, 161, 228, 229, 7, 0, 7, 7, 0, 0, 6, 6, 6, - 6, 7, 7, 7, 7, 7, 7, 227, 228, 229, 227, 228, 228, 228, 228, 228, 228, 228, 228, 228, 229, 7, 7, 7, 7, 7, 7, 7, 6, 6, 0, 6, - 6, 7, 7, 7, 7, 6, 7, 7, 6, 6, 6, 7, 6, 6, 6, 6, 0, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 6, 6, 7, 6, - 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 0, 7, 7, 7, 0, 7, 7, 7, 7, 6, 6, 0, 0, 6, - 7, 7, 7, 7, 7, 7, 7, 0, 7, 6, 6, 0, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 7, 6, 7, 0, 0, 6, - 0, 0, 6, 6, 7, 6, 6, 6, 0, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 6, 7, 0, 0, 0, 6, - 7, 7, 0, 7, 7, 8, 8, 6, 7, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 6, 7, 7, 7, 0, 6, - 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 6, - 7, 8, 8, 8, 7, 7, 7, 8, 8, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 7, 6, + 6, 7, 6, 6, 195, 197, 0, 6, 6, 6, 8, 8, 8, 8, 7, 7, 195, 197, 0, 8, 8, 163, 164, 165, 7, 7, 7, 8, 0, 8, 0, 6, + 6, 6, 0, 0, 195, 197, 8, 7, 7, 8, 8, 8, 8, 7, 0, 7, 195, 197, 8, 8, 8, 195, 196, 193, 164, 165, 7, 7, 8, 8, 0, 6, + 6, 6, 6, 0, 195, 197, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 195, 197, 0, 8, 163, 194, 196, 161, 162, 193, 165, 8, 8, 8, 0, 6, + 6, 6, 6, 7, 195, 193, 165, 0, 8, 8, 7, 7, 7, 7, 7, 0, 195, 197, 7, 163, 194, 161, 162, 197, 227, 162, 197, 7, 8, 0, 7, 6, + 6, 6, 6, 6, 227, 162, 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 195, 193, 164, 194, 161, 229, 195, 197, 8, 195, 197, 7, 8, 7, 7, 6, + 6, 6, 7, 0, 0, 195, 193, 164, 164, 164, 164, 164, 164, 164, 164, 164, 194, 196, 196, 196, 193, 165, 227, 229, 165, 195, 197, 7, 7, 7, 7, 6, + 6, 6, 7, 7, 7, 227, 228, 228, 228, 228, 162, 161, 228, 228, 228, 228, 162, 196, 196, 196, 196, 193, 164, 194, 193, 194, 197, 8, 8, 7, 0, 6, + 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 195, 197, 8, 6, 6, 8, 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, 197, 7, 7, 7, 7, 6, + 6, 0, 7, 7, 7, 7, 163, 164, 165, 7, 195, 197, 6, 6, 6, 6, 227, 228, 162, 196, 196, 196, 196, 196, 196, 196, 197, 7, 7, 7, 7, 7, + 6, 0, 7, 7, 6, 163, 194, 196, 197, 6, 195, 197, 6, 6, 6, 163, 164, 164, 194, 196, 196, 161, 228, 228, 162, 196, 197, 7, 7, 7, 7, 7, + 6, 0, 7, 6, 6, 195, 196, 196, 193, 165, 195, 197, 6, 6, 163, 194, 196, 196, 196, 196, 196, 193, 165, 7, 195, 196, 193, 165, 0, 7, 7, 6, + 6, 7, 7, 6, 6, 227, 162, 196, 196, 193, 194, 193, 164, 164, 194, 196, 196, 196, 196, 196, 196, 196, 193, 164, 194, 196, 196, 197, 0, 0, 6, 6, + 6, 7, 7, 7, 163, 164, 194, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 197, 7, 7, 6, 6, + 6, 7, 7, 7, 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 161, 228, 228, 228, 229, 0, 0, 6, 6, + 6, 7, 7, 7, 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 197, 0, 7, 7, 0, 0, 6, 6, 6, + 6, 7, 7, 7, 195, 196, 196, 196, 196, 196, 161, 228, 228, 162, 196, 161, 228, 228, 228, 162, 196, 196, 196, 197, 7, 7, 7, 7, 6, 6, 0, 6, + 6, 7, 7, 7, 195, 196, 196, 196, 196, 196, 197, 7, 6, 195, 196, 197, 0, 7, 163, 194, 196, 196, 196, 197, 7, 7, 7, 7, 6, 6, 7, 6, + 6, 7, 7, 7, 195, 196, 196, 196, 196, 196, 193, 164, 164, 194, 196, 193, 164, 164, 194, 196, 161, 162, 161, 229, 7, 7, 7, 6, 6, 0, 0, 6, + 7, 7, 7, 7, 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 197, 227, 229, 0, 0, 0, 7, 6, 7, 0, 0, 6, + 0, 0, 6, 6, 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 197, 7, 0, 0, 0, 0, 6, 7, 0, 0, 0, 6, + 7, 7, 0, 7, 227, 162, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 161, 229, 7, 0, 7, 7, 7, 6, 7, 7, 7, 0, 6, + 7, 7, 0, 7, 7, 227, 228, 228, 228, 228, 228, 162, 196, 161, 228, 228, 228, 228, 228, 229, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 6, + 7, 8, 8, 8, 7, 7, 7, 8, 8, 7, 7, 227, 228, 229, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 7, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 0, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 0, 0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 @@ -529,6 +594,227 @@ return { rotation = 0, visible = true, properties = {} + }, + { + id = 55, + name = "", + type = "", + shape = "rectangle", + x = 346.75, + y = 155, + width = 11, + height = 40.25, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 56, + name = "", + type = "", + shape = "rectangle", + x = 330.75, + y = 170.75, + width = 14.25, + height = 8.5, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 57, + name = "", + type = "", + shape = "rectangle", + x = 358.75, + y = 186.75, + width = 26.5, + height = 9, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 58, + name = "", + type = "", + shape = "rectangle", + x = 379.25, + y = 140.5, + width = 8.25, + height = 36.75, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 59, + name = "", + type = "", + shape = "rectangle", + x = 387.75, + y = 155, + width = 15, + height = 23, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 60, + name = "", + type = "", + shape = "rectangle", + x = 395, + y = 178.5, + width = 8.5, + height = 16.5, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 61, + name = "", + type = "", + shape = "rectangle", + x = 379.5, + y = 178, + width = 5, + height = 7.75, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 62, + name = "", + type = "", + shape = "rectangle", + x = 188.909, + y = 203.818, + width = 36.1818, + height = 70.5455, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 64, + name = "", + type = "", + shape = "rectangle", + x = 225.818, + y = 203.455, + width = 16.7273, + height = 55.0909, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 65, + name = "", + type = "", + shape = "rectangle", + x = 242.909, + y = 203.636, + width = 16, + height = 39.6364, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 66, + name = "", + type = "", + shape = "rectangle", + x = 260.182, + y = 234.727, + width = 30.9091, + height = 8.90909, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 67, + name = "", + type = "", + shape = "rectangle", + x = 173, + y = 346.333, + width = 36, + height = 23, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 68, + name = "", + type = "", + shape = "rectangle", + x = 253, + y = 347, + width = 36.3333, + height = 23.3333, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 69, + name = "", + type = "", + shape = "rectangle", + x = 290.333, + y = 348, + width = 16.6667, + height = 7.33333, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 70, + name = "", + type = "", + shape = "rectangle", + x = 347.636, + y = 250.727, + width = 40.7273, + height = 7.81818, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 71, + name = "", + type = "", + shape = "rectangle", + x = 363.455, + y = 259.636, + width = 24.7273, + height = 15.0909, + rotation = 0, + visible = true, + properties = {} + }, + { + id = 72, + name = "", + type = "", + shape = "rectangle", + x = 182, + y = 356.364, + width = 14.3636, + height = 3.63636, + rotation = 0, + visible = true, + properties = {} } } } -- cgit v1.2.3