From d1fe86f645a5e489790363187d623ef94cd49fad Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Sat, 14 Oct 2023 21:06:28 +0100 Subject: [PATCH] draw equipped items on player avatar - framework --- raws/items.json | 3 + resources/atlas.json | 1438 ++++++++++++++++++++++++++++---------- resources/atlas.png | Bin 5045 -> 6029 bytes src/components.rs | 11 + src/main.rs | 56 +- src/raws/item_structs.rs | 1 + src/raws/rawmaster.rs | 3 + src/saveload_system.rs | 2 + 8 files changed, 1129 insertions(+), 385 deletions(-) diff --git a/raws/items.json b/raws/items.json index 4a9da31..e2a3d63 100644 --- a/raws/items.json +++ b/raws/items.json @@ -148,6 +148,7 @@ "id": "equip_shortsword", "name": { "name": "shortsword", "plural": "shortswords" }, "renderable": { "glyph": ")", "sprite": "shortsword", "fg": "#C0C0C0", "order": 4 }, + "avatar": "a_shortsword", "class": "weapon", "weight": 2, "value": 10, @@ -198,6 +199,7 @@ "id": "equip_longsword", "name": { "name": "longsword", "plural": "longswords" }, "renderable": { "glyph": ")", "sprite": "longsword", "fg": "#FFF8DC", "order": 4 }, + "avatar": "a_longsword", "class": "weapon", "weight": 3, "value": 15, @@ -228,6 +230,7 @@ "id": "equip_mediumshield", "name": { "name": "medium shield", "plural": "medium shields" }, "renderable": { "glyph": "[", "sprite": "shield_round", "fg": "#C0C0C0", "order": 4 }, + "avatar": "a_medshield", "class": "armour", "weight": 6, "value": 10, diff --git a/resources/atlas.json b/resources/atlas.json index e6ec36b..6895a1b 100644 --- a/resources/atlas.json +++ b/resources/atlas.json @@ -1,7 +1,7 @@ {"frames": [ { - "filename": "altar", + "filename": "a_buckler", "frame": {"x":0,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -9,7 +9,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "ant", + "filename": "a_cloak", "frame": {"x":16,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -17,7 +17,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-0", + "filename": "a_crucifix", "frame": {"x":32,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -25,7 +25,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-2", + "filename": "a_dagger", "frame": {"x":48,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -33,7 +33,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-3", + "filename": "a_dagger2", "frame": {"x":64,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -41,7 +41,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-4", + "filename": "a_dagger_curved", "frame": {"x":80,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -49,7 +49,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-5", + "filename": "a_dagger_curved2", "frame": {"x":96,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -57,7 +57,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-6", + "filename": "a_dagger_jagged", "frame": {"x":112,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -65,15 +65,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-7", - "frame": {"x":32,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "Avatar-8", + "filename": "a_glaive", "frame": {"x":128,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -81,7 +73,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-9", + "filename": "a_halberd", "frame": {"x":144,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -89,7 +81,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-10", + "filename": "a_longsword", "frame": {"x":160,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -97,7 +89,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-11", + "filename": "a_medshield", "frame": {"x":176,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -105,7 +97,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-12", + "filename": "a_quarterstaff", "frame": {"x":192,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -113,7 +105,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "Avatar-13", + "filename": "a_scimitar", "frame": {"x":208,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -121,7 +113,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "avatar", + "filename": "a_scimitar2", "frame": {"x":224,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -129,7 +121,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "back (1)", + "filename": "a_scythe", "frame": {"x":240,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -137,7 +129,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "back (2)", + "filename": "a_shortsword", "frame": {"x":256,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -145,7 +137,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "back (3)", + "filename": "a_spear", "frame": {"x":272,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -153,7 +145,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "back (4)", + "filename": "a_staff", "frame": {"x":288,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -161,7 +153,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "back (5)", + "filename": "a_staff_spiked", "frame": {"x":304,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -169,7 +161,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "back (6)", + "filename": "a_staff_wood", "frame": {"x":320,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -177,7 +169,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "back (7)", + "filename": "a_staff_wood2", "frame": {"x":336,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -185,7 +177,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "bars", + "filename": "altar", "frame": {"x":352,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -193,7 +185,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "beartrap", + "filename": "ant", "frame": {"x":368,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -201,7 +193,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "bed", + "filename": "Avatar-0", "frame": {"x":384,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -209,7 +201,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood-7", + "filename": "Avatar-2", "frame": {"x":400,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -217,7 +209,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood-8", + "filename": "Avatar-3", "frame": {"x":416,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -225,7 +217,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood-9", + "filename": "Avatar-4", "frame": {"x":432,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -233,7 +225,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood-10", + "filename": "Avatar-5", "frame": {"x":448,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -241,7 +233,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood-11", + "filename": "Avatar-6", "frame": {"x":464,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -249,7 +241,15 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood-12", + "filename": "Avatar-7", + "frame": {"x":384,"y":0,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "Avatar-8", "frame": {"x":480,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -257,7 +257,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood-13", + "filename": "Avatar-9", "frame": {"x":496,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -265,7 +265,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood1", + "filename": "Avatar-10", "frame": {"x":512,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -273,7 +273,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood2", + "filename": "Avatar-11", "frame": {"x":528,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -281,7 +281,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood3", + "filename": "Avatar-12", "frame": {"x":544,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -289,7 +289,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood4", + "filename": "Avatar-13", "frame": {"x":560,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -297,7 +297,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood5", + "filename": "avatar", "frame": {"x":576,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -305,7 +305,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood6", + "filename": "Avatar_Equipment-9", "frame": {"x":592,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -313,7 +313,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "blood7", + "filename": "Avatar_Equipment-10", "frame": {"x":608,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -321,7 +321,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (1)", + "filename": "Avatar_Equipment-11", "frame": {"x":624,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -329,7 +329,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (3)", + "filename": "Avatar_Equipment-12", "frame": {"x":640,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -337,7 +337,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (4)", + "filename": "Avatar_Equipment-13", "frame": {"x":656,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -345,7 +345,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (5)", + "filename": "Avatar_Equipment-14", "frame": {"x":672,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -353,7 +353,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (6)", + "filename": "Avatar_Equipment-15", "frame": {"x":688,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -361,7 +361,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (7)", + "filename": "Avatar_Equipment-16", "frame": {"x":704,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -369,7 +369,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (8)", + "filename": "Avatar_Equipment-17", "frame": {"x":720,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -377,7 +377,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (9)", + "filename": "Avatar_Equipment-18", "frame": {"x":736,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -385,7 +385,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body (10)", + "filename": "Avatar_Equipment-19", "frame": {"x":752,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -393,7 +393,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "body_leather", + "filename": "Avatar_Equipment-20", "frame": {"x":768,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -401,7 +401,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "candelabra", + "filename": "Avatar_Equipment-21", "frame": {"x":784,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -409,7 +409,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "cat", + "filename": "Avatar_Equipment-23", "frame": {"x":800,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -417,7 +417,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "cat_large", + "filename": "Avatar_Equipment-33", "frame": {"x":816,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -425,7 +425,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "caterpillar", + "filename": "Avatar_Equipment-34", "frame": {"x":832,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -433,7 +433,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "chair_r", + "filename": "Avatar_Equipment-35", "frame": {"x":848,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -441,7 +441,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "cracked", + "filename": "Avatar_Equipment-36", "frame": {"x":864,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -449,7 +449,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "dagger", + "filename": "Avatar_Equipment-37", "frame": {"x":880,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -457,7 +457,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "dog", + "filename": "Avatar_Equipment-38", "frame": {"x":896,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -465,7 +465,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "door", + "filename": "Avatar_Equipment-39", "frame": {"x":912,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -473,7 +473,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "door_open", + "filename": "Avatar_Equipment-40", "frame": {"x":928,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -481,7 +481,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "dot", + "filename": "Avatar_Equipment-41", "frame": {"x":944,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -489,7 +489,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "dwarf", + "filename": "Avatar_Equipment-42", "frame": {"x":960,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -497,7 +497,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "explode1", + "filename": "Avatar_Equipment-44", "frame": {"x":976,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -505,7 +505,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "explode2", + "filename": "Avatar_Equipment-46", "frame": {"x":992,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -513,7 +513,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "explode3", + "filename": "Avatar_Equipment-47", "frame": {"x":1008,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -521,7 +521,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "feet (1)", + "filename": "Avatar_Equipment-48", "frame": {"x":1024,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -529,7 +529,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "feet (2)", + "filename": "Avatar_Equipment-49", "frame": {"x":1040,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -537,7 +537,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "feet (3)", + "filename": "Avatar_Equipment-50", "frame": {"x":1056,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -545,7 +545,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "feet (4)", + "filename": "Avatar_Equipment-51", "frame": {"x":1072,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -553,7 +553,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "feet (5)", + "filename": "Avatar_Equipment-52", "frame": {"x":1088,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -561,7 +561,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "feet (6)", + "filename": "Avatar_Equipment-53", "frame": {"x":1104,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -569,7 +569,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "feet (7)", + "filename": "Avatar_Equipment-54", "frame": {"x":1120,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -577,7 +577,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "fence", + "filename": "Avatar_Equipment-55", "frame": {"x":1136,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -585,7 +585,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "fluff", + "filename": "Avatar_Equipment-56", "frame": {"x":1152,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -593,7 +593,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "fluff2", + "filename": "Avatar_Equipment-57", "frame": {"x":1168,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -601,7 +601,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-0", + "filename": "Avatar_Equipment-58", "frame": {"x":1184,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -609,7 +609,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-1", + "filename": "Avatar_Equipment-59", "frame": {"x":1200,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -617,7 +617,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-3", + "filename": "Avatar_Equipment-60", "frame": {"x":1216,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -625,7 +625,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-4", + "filename": "Avatar_Equipment-61", "frame": {"x":1232,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -633,15 +633,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-5", - "frame": {"x":944,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-6", + "filename": "Avatar_Equipment-62", "frame": {"x":1248,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -649,7 +641,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-7", + "filename": "Avatar_Equipment-63", "frame": {"x":1264,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -657,15 +649,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-8", - "frame": {"x":944,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-9", + "filename": "Avatar_Equipment-64", "frame": {"x":1280,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -673,7 +657,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-10", + "filename": "Avatar_Equipment-65", "frame": {"x":1296,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -681,15 +665,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-11", - "frame": {"x":944,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-12", + "filename": "Avatar_Equipment-66", "frame": {"x":1312,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -697,7 +673,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-13", + "filename": "Avatar_Equipment-67", "frame": {"x":1328,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -705,7 +681,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-14", + "filename": "Avatar_Equipment-68", "frame": {"x":1344,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -713,7 +689,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-21", + "filename": "Avatar_Equipment-69", "frame": {"x":1360,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -721,7 +697,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-22", + "filename": "Avatar_Equipment-70", "frame": {"x":1376,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -729,7 +705,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-23", + "filename": "Avatar_Equipment-71", "frame": {"x":1392,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -737,7 +713,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-24", + "filename": "Avatar_Equipment-72", "frame": {"x":1408,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -745,7 +721,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-25", + "filename": "Avatar_Equipment-73", "frame": {"x":1424,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -753,7 +729,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-26", + "filename": "Avatar_Equipment-74", "frame": {"x":1440,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -761,7 +737,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-27", + "filename": "Avatar_Equipment-76", "frame": {"x":1456,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -769,7 +745,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-28", + "filename": "Avatar_Equipment-77", "frame": {"x":1472,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -777,7 +753,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-29", + "filename": "Avatar_Equipment-78", "frame": {"x":1488,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -785,7 +761,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-30", + "filename": "Avatar_Equipment-79", "frame": {"x":1504,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -793,7 +769,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-31", + "filename": "Avatar_Equipment-80", "frame": {"x":1520,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -801,7 +777,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-32", + "filename": "Avatar_Equipment-81", "frame": {"x":1536,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -809,7 +785,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-33", + "filename": "Avatar_Equipment-82", "frame": {"x":1552,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -817,7 +793,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-34", + "filename": "Avatar_Equipment-83", "frame": {"x":1568,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -825,7 +801,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-35", + "filename": "back (1)", "frame": {"x":1584,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -833,7 +809,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-36", + "filename": "back (2)", "frame": {"x":1600,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -841,7 +817,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-37", + "filename": "back (3)", "frame": {"x":1616,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -849,79 +825,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-38", - "frame": {"x":1632,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-39", - "frame": {"x":1648,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-40", - "frame": {"x":1664,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-41", - "frame": {"x":1680,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-42", - "frame": {"x":1696,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-43", - "frame": {"x":1712,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-44", - "frame": {"x":1728,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-45", - "frame": {"x":1744,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-46", - "frame": {"x":1760,"y":0,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "general-47", + "filename": "back (4)", "frame": {"x":0,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -929,7 +833,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-48", + "filename": "back (5)", "frame": {"x":16,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -937,7 +841,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-49", + "filename": "back (6)", "frame": {"x":32,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -945,7 +849,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-50", + "filename": "back (7)", "frame": {"x":48,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -953,7 +857,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-51", + "filename": "bars", "frame": {"x":64,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -961,7 +865,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-52", + "filename": "beartrap", "frame": {"x":80,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -969,7 +873,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-53", + "filename": "bed", "frame": {"x":96,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -977,7 +881,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-54", + "filename": "blood-7", "frame": {"x":112,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -985,7 +889,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "general-55", + "filename": "blood-8", "frame": {"x":128,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -993,7 +897,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "gnome", + "filename": "blood-9", "frame": {"x":144,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1001,7 +905,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "goblin", + "filename": "blood-10", "frame": {"x":160,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1009,7 +913,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "goblin_c", + "filename": "blood-11", "frame": {"x":176,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1017,7 +921,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "grass", + "filename": "blood-12", "frame": {"x":192,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1025,7 +929,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "grass_flower", + "filename": "blood-13", "frame": {"x":208,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1033,7 +937,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "grass_small", + "filename": "blood1", "frame": {"x":224,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1041,7 +945,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "handaxe", + "filename": "blood2", "frame": {"x":240,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1049,7 +953,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (1)", + "filename": "blood3", "frame": {"x":256,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1057,7 +961,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (2)", + "filename": "blood4", "frame": {"x":272,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1065,7 +969,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (3)", + "filename": "blood5", "frame": {"x":288,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1073,7 +977,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (4)", + "filename": "blood6", "frame": {"x":304,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1081,7 +985,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (5)", + "filename": "blood7", "frame": {"x":320,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1089,7 +993,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (6)", + "filename": "body (1)", "frame": {"x":336,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1097,7 +1001,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (7)", + "filename": "body (3)", "frame": {"x":352,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1105,7 +1009,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (8)", + "filename": "body (4)", "frame": {"x":368,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1113,7 +1017,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (9)", + "filename": "body (5)", "frame": {"x":384,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1121,7 +1025,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "head (10)", + "filename": "body (6)", "frame": {"x":400,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1129,7 +1033,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "horse", + "filename": "body (7)", "frame": {"x":416,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1137,7 +1041,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "kobold", + "filename": "body (8)", "frame": {"x":432,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1145,7 +1049,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "kobold_captain", + "filename": "body (9)", "frame": {"x":448,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1153,7 +1057,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "kobold_large", + "filename": "body (10)", "frame": {"x":464,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1161,7 +1065,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "legs (1)", + "filename": "body_leather", "frame": {"x":480,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1169,7 +1073,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "legs (2)", + "filename": "candelabra", "frame": {"x":496,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1177,7 +1081,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "legs (3)", + "filename": "cat", "frame": {"x":512,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1185,7 +1089,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "legs (4)", + "filename": "cat_large", "frame": {"x":528,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1193,7 +1097,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "legs (5)", + "filename": "caterpillar", "frame": {"x":544,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1201,7 +1105,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "magic_trap", + "filename": "chair_r", "frame": {"x":560,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1209,7 +1113,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "meat", + "filename": "cracked", "frame": {"x":576,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1217,7 +1121,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "minimine", + "filename": "dagger", "frame": {"x":592,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1225,7 +1129,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "neck", + "filename": "dog", "frame": {"x":608,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1233,7 +1137,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "ogre", + "filename": "door", "frame": {"x":624,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1241,7 +1145,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "orc", + "filename": "door_open", "frame": {"x":640,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1249,7 +1153,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "planks", + "filename": "dot", "frame": {"x":656,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1257,7 +1161,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "planks_missing", + "filename": "dwarf", "frame": {"x":672,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1265,7 +1169,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "planks_missing2", + "filename": "explode1", "frame": {"x":688,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1273,7 +1177,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "plants", + "filename": "explode2", "frame": {"x":704,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1281,7 +1185,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "potion", + "filename": "explode3", "frame": {"x":720,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1289,7 +1193,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "potion_beaker", + "filename": "feet (1)", "frame": {"x":736,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1297,7 +1201,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "potion_conical", + "filename": "feet (2)", "frame": {"x":752,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1305,7 +1209,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "potion_large", + "filename": "feet (3)", "frame": {"x":768,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1313,7 +1217,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-0", + "filename": "feet (4)", "frame": {"x":784,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1321,7 +1225,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-1", + "filename": "feet (5)", "frame": {"x":800,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1329,7 +1233,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-2", + "filename": "feet (6)", "frame": {"x":816,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1337,7 +1241,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-3", + "filename": "feet (7)", "frame": {"x":832,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1345,7 +1249,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-4", + "filename": "fence", "frame": {"x":848,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1353,7 +1257,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-5", + "filename": "fluff", "frame": {"x":864,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1361,7 +1265,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-6", + "filename": "fluff2", "frame": {"x":880,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1369,7 +1273,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-7", + "filename": "general-0", "frame": {"x":896,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1377,7 +1281,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-8", + "filename": "general-1", "frame": {"x":912,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1385,7 +1289,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-9", + "filename": "general-3", "frame": {"x":928,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1393,7 +1297,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-10", + "filename": "general-4", "frame": {"x":944,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1401,7 +1305,15 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-11", + "filename": "general-5", + "frame": {"x":656,"y":24,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "general-6", "frame": {"x":960,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1409,7 +1321,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-12", + "filename": "general-7", "frame": {"x":976,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1417,7 +1329,15 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-13", + "filename": "general-8", + "frame": {"x":656,"y":24,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "general-9", "frame": {"x":992,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1425,7 +1345,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-14", + "filename": "general-10", "frame": {"x":1008,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1433,7 +1353,15 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-15", + "filename": "general-11", + "frame": {"x":656,"y":24,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "general-12", "frame": {"x":1024,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1441,7 +1369,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-16", + "filename": "general-13", "frame": {"x":1040,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1449,7 +1377,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-17", + "filename": "general-14", "frame": {"x":1056,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1457,7 +1385,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-18", + "filename": "general-21", "frame": {"x":1072,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1465,7 +1393,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-19", + "filename": "general-22", "frame": {"x":1088,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1473,7 +1401,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-20", + "filename": "general-23", "frame": {"x":1104,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1481,39 +1409,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-21", - "frame": {"x":1104,"y":24,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "projectiles-22", - "frame": {"x":1104,"y":24,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "projectiles-23", - "frame": {"x":1104,"y":24,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "projectiles-24", - "frame": {"x":1104,"y":24,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "projectiles-25", + "filename": "general-24", "frame": {"x":1120,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1521,39 +1417,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "projectiles-26", - "frame": {"x":1120,"y":24,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "projectiles-27", - "frame": {"x":1120,"y":24,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "projectiles-28", - "frame": {"x":1120,"y":24,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "projectiles-29", - "frame": {"x":1120,"y":24,"w":16,"h":24}, - "rotated": false, - "trimmed": false, - "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, - "sourceSize": {"w":16,"h":24} -}, -{ - "filename": "rat", + "filename": "general-25", "frame": {"x":1136,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1561,7 +1425,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "rat_large", + "filename": "general-26", "frame": {"x":1152,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1569,7 +1433,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "scimitar", + "filename": "general-27", "frame": {"x":1168,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1577,7 +1441,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "scroll", + "filename": "general-28", "frame": {"x":1184,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1585,7 +1449,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "scroll_writing", + "filename": "general-29", "frame": {"x":1200,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1593,7 +1457,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "select1", + "filename": "general-30", "frame": {"x":1216,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1601,7 +1465,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "shield_large", + "filename": "general-31", "frame": {"x":1232,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1609,7 +1473,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "shield_round", + "filename": "general-32", "frame": {"x":1248,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1617,7 +1481,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "shield_small", + "filename": "general-33", "frame": {"x":1264,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1625,7 +1489,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "shortsword", + "filename": "general-34", "frame": {"x":1280,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1633,7 +1497,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "slash1", + "filename": "general-35", "frame": {"x":1296,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1641,7 +1505,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "slash2", + "filename": "general-36", "frame": {"x":1312,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1649,7 +1513,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "slash3", + "filename": "general-37", "frame": {"x":1328,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1657,7 +1521,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "spider", + "filename": "general-38", "frame": {"x":1344,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1665,7 +1529,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "spider_large", + "filename": "general-39", "frame": {"x":1360,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1673,7 +1537,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "stair_down", + "filename": "general-40", "frame": {"x":1376,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1681,7 +1545,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "stair_up", + "filename": "general-41", "frame": {"x":1392,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1689,7 +1553,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "statue", + "filename": "general-42", "frame": {"x":1408,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1697,7 +1561,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "stones", + "filename": "general-43", "frame": {"x":1424,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1705,7 +1569,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "table", + "filename": "general-44", "frame": {"x":1440,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1713,7 +1577,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "table_l_chair", + "filename": "general-45", "frame": {"x":1456,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1721,7 +1585,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "table_r", + "filename": "general-46", "frame": {"x":1472,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1729,7 +1593,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles", + "filename": "general-47", "frame": {"x":1488,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1737,7 +1601,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles2", + "filename": "general-48", "frame": {"x":1504,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1745,7 +1609,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles3", + "filename": "general-49", "frame": {"x":1520,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1753,7 +1617,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles4", + "filename": "general-50", "frame": {"x":1536,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1761,7 +1625,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles_missing", + "filename": "general-51", "frame": {"x":1552,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1769,7 +1633,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles_missing2", + "filename": "general-52", "frame": {"x":1568,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1777,7 +1641,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles_missing3", + "filename": "general-53", "frame": {"x":1584,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1785,7 +1649,7 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles_missing4", + "filename": "general-54", "frame": {"x":1600,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, @@ -1793,16 +1657,824 @@ "sourceSize": {"w":16,"h":24} }, { - "filename": "tiles_missing5", + "filename": "general-55", "frame": {"x":1616,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, "sourceSize": {"w":16,"h":24} }, +{ + "filename": "gnome", + "frame": {"x":0,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "goblin", + "frame": {"x":16,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "goblin_c", + "frame": {"x":32,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "grass", + "frame": {"x":48,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "grass_flower", + "frame": {"x":64,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "grass_small", + "frame": {"x":80,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "handaxe", + "frame": {"x":96,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (1)", + "frame": {"x":112,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (2)", + "frame": {"x":128,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (3)", + "frame": {"x":144,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (4)", + "frame": {"x":160,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (5)", + "frame": {"x":176,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (6)", + "frame": {"x":192,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (7)", + "frame": {"x":208,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (8)", + "frame": {"x":224,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (9)", + "frame": {"x":240,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "head (10)", + "frame": {"x":256,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "horse", + "frame": {"x":272,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "kobold", + "frame": {"x":288,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "kobold_captain", + "frame": {"x":304,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "kobold_large", + "frame": {"x":320,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "legs (1)", + "frame": {"x":336,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "legs (2)", + "frame": {"x":352,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "legs (3)", + "frame": {"x":368,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "legs (4)", + "frame": {"x":384,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "legs (5)", + "frame": {"x":400,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "magic_trap", + "frame": {"x":416,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "meat", + "frame": {"x":432,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "minimine", + "frame": {"x":448,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "neck", + "frame": {"x":464,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "ogre", + "frame": {"x":480,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "orc", + "frame": {"x":496,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "planks", + "frame": {"x":512,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "planks_missing", + "frame": {"x":528,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "planks_missing2", + "frame": {"x":544,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "plants", + "frame": {"x":560,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "potion", + "frame": {"x":576,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "potion_beaker", + "frame": {"x":592,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "potion_conical", + "frame": {"x":608,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "potion_large", + "frame": {"x":624,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-0", + "frame": {"x":640,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-1", + "frame": {"x":656,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-2", + "frame": {"x":672,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-3", + "frame": {"x":688,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-4", + "frame": {"x":704,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-5", + "frame": {"x":720,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-6", + "frame": {"x":736,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-7", + "frame": {"x":752,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-8", + "frame": {"x":768,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-9", + "frame": {"x":784,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-10", + "frame": {"x":800,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-11", + "frame": {"x":816,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-12", + "frame": {"x":832,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-13", + "frame": {"x":848,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-14", + "frame": {"x":864,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-15", + "frame": {"x":880,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-16", + "frame": {"x":896,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-17", + "frame": {"x":912,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-18", + "frame": {"x":928,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-19", + "frame": {"x":944,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-20", + "frame": {"x":960,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-21", + "frame": {"x":960,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-22", + "frame": {"x":960,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-23", + "frame": {"x":960,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-24", + "frame": {"x":960,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-25", + "frame": {"x":976,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-26", + "frame": {"x":976,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-27", + "frame": {"x":976,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-28", + "frame": {"x":976,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "projectiles-29", + "frame": {"x":976,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "rat", + "frame": {"x":992,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "rat_large", + "frame": {"x":1008,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "scimitar", + "frame": {"x":1024,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "scroll", + "frame": {"x":1040,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "scroll_writing", + "frame": {"x":1056,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "select1", + "frame": {"x":1072,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "shield_large", + "frame": {"x":1088,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "shield_round", + "frame": {"x":1104,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "shield_small", + "frame": {"x":1120,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "shortsword", + "frame": {"x":1136,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "slash1", + "frame": {"x":1152,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "slash2", + "frame": {"x":1168,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "slash3", + "frame": {"x":1184,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "spider", + "frame": {"x":1200,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "spider_large", + "frame": {"x":1216,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "stair_down", + "frame": {"x":1232,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "stair_up", + "frame": {"x":1248,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "statue", + "frame": {"x":1264,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "stones", + "frame": {"x":1280,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "table", + "frame": {"x":1296,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "table_l_chair", + "frame": {"x":1312,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "table_r", + "frame": {"x":1328,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles", + "frame": {"x":1344,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles2", + "frame": {"x":1360,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles3", + "frame": {"x":1376,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles4", + "frame": {"x":1392,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles_missing", + "frame": {"x":1408,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles_missing2", + "frame": {"x":1424,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles_missing3", + "frame": {"x":1440,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles_missing4", + "frame": {"x":1456,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, +{ + "filename": "tiles_missing5", + "frame": {"x":1472,"y":48,"w":16,"h":24}, + "rotated": false, + "trimmed": false, + "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, + "sourceSize": {"w":16,"h":24} +}, { "filename": "tiles_missing6", - "frame": {"x":1632,"y":24,"w":16,"h":24}, + "frame": {"x":1488,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1810,7 +2482,7 @@ }, { "filename": "trapdoor", - "frame": {"x":1648,"y":24,"w":16,"h":24}, + "frame": {"x":1504,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1818,7 +2490,7 @@ }, { "filename": "trapdoor_open", - "frame": {"x":1664,"y":24,"w":16,"h":24}, + "frame": {"x":1520,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1826,7 +2498,7 @@ }, { "filename": "trident", - "frame": {"x":1680,"y":24,"w":16,"h":24}, + "frame": {"x":1536,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1834,7 +2506,7 @@ }, { "filename": "wall", - "frame": {"x":1696,"y":24,"w":16,"h":24}, + "frame": {"x":1552,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1842,7 +2514,7 @@ }, { "filename": "wall_b", - "frame": {"x":1712,"y":24,"w":16,"h":24}, + "frame": {"x":1568,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1850,7 +2522,7 @@ }, { "filename": "wall_b_cracked", - "frame": {"x":1728,"y":24,"w":16,"h":24}, + "frame": {"x":1584,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1858,7 +2530,7 @@ }, { "filename": "water", - "frame": {"x":1744,"y":24,"w":16,"h":24}, + "frame": {"x":1600,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1866,7 +2538,7 @@ }, { "filename": "water2", - "frame": {"x":1760,"y":24,"w":16,"h":24}, + "frame": {"x":1616,"y":48,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1877,8 +2549,8 @@ "version": "1.0", "image": "atlas.png", "format": "RGBA8888", - "size": {"w":1776,"h":48}, + "size": {"w":1632,"h":72}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:b1eb58473092737ca14b8a94d167c56e:73ad4edad30f8b775d99c5028a8b814c:cbce6b53f0f49e0bf15173c25c41f876$" + "smartupdate": "$TexturePacker:SmartUpdate:c374bf5911369e72338caa541920625e:27c0f39076e478374d6d24a0d676685f:cbce6b53f0f49e0bf15173c25c41f876$" } } diff --git a/resources/atlas.png b/resources/atlas.png index 6dedc282572e144317ce8853604012c687dc8bcc..9e66c0cb3b6c368a3884f26b5afb384764489a01 100644 GIT binary patch delta 6024 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 delta 5032 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 xZONSY=aZF9lZJm Self { + Self { sprite } + } +} + #[derive(Component, Debug, Serialize, Deserialize, Clone)] pub struct Bleeds { pub colour: RGB, diff --git a/src/main.rs b/src/main.rs index 1ad708b..faefcd7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -76,6 +76,7 @@ fn setup(app: &mut App, gfx: &mut Graphics) -> State { gs.ecs.register::(); gs.ecs.register::(); gs.ecs.register::(); + gs.ecs.register::(); gs.ecs.register::(); gs.ecs.register::(); gs.ecs.register::(); @@ -183,8 +184,11 @@ fn setup(app: &mut App, gfx: &mut Graphics) -> State { } const ASCII_MODE: bool = false; // Change this to config setting const SHOW_BOUNDARIES: bool = false; // Config setting + +#[derive(PartialEq)] enum DrawType { None, + Player, Visible, Telepathy, } @@ -205,7 +209,7 @@ fn draw_entities( ecs: &World, draw: &mut Draw, atlas: &HashMap, - font: &Fonts + _font: &Fonts ) { { let bounds = crate::camera::get_screen_bounds(ecs, false); @@ -218,6 +222,7 @@ fn draw_entities( let minds = ecs.read_storage::(); let pools = ecs.read_storage::(); let entities = ecs.entities(); + let player = ecs.read_storage::(); let data = (&positions, &renderables, &entities, !&hidden).join().collect::>(); let mut to_draw: HashMap = HashMap::new(); for (pos, render, e, _h) in data.iter() { @@ -234,7 +239,11 @@ fn draw_entities( { let draw_type = if map.visible_tiles[idx] { // If it's anything else, just draw it. - DrawType::Visible + if player.get(*e).is_some() { + DrawType::Player + } else { + DrawType::Visible + } } else if map.telepath_tiles[idx] { let has_mind = minds.get(*e); if has_mind.is_some() { @@ -297,12 +306,55 @@ fn draw_entities( } } } + DrawType::Player => { + let (x_pos, y_pos) = ( + (entry.0.x as f32) * TILESIZE.sprite_x + offset_x, + (entry.0.y as f32) * TILESIZE.sprite_y + offset_y, + ); + let textures = get_avatar_textures(ecs, atlas); + for (tex, col) in textures.iter() { + draw.image(tex) + .position(x_pos, y_pos) + .color(*col) + .size(TILESIZE.sprite_x, TILESIZE.sprite_y); + } + } _ => {} } } } } +fn get_avatar_textures(ecs: &World, atlas: &HashMap) -> Vec<(Texture, Color)> { + let player = ecs.fetch::(); + let renderables = ecs.read_storage::(); + let equipped = ecs.read_storage::(); + let has_avatar = ecs.read_storage::(); + let mut avis = Vec::new(); + if let Some(renderables) = renderables.get(*player) { + if let Some(sprite) = atlas.get(&renderables.sprite) { + avis.push(( + sprite.clone(), + Color::from_rgb(renderables.fg.r, renderables.fg.g, renderables.fg.b), + )); + } else { + panic!("No player sprite found for ID: {}", &renderables.sprite); + } + } else { + panic!("No player renderable found!"); + } + for (_e, a, r) in (&equipped, &has_avatar, &renderables) + .join() + .filter(|item| item.0.owner == *player) { + if let Some(sprite) = atlas.get(&a.sprite) { + avis.push((sprite.clone(), Color::from_rgb(r.fg.r, r.fg.g, r.fg.b))); + } else { + panic!("No avatar sprite found for ID: {}", &a.sprite); + } + } + avis +} + // Draws a HP bar LINE_WIDTH pixels thick centered above the entity. fn draw_entity_hp(x: f32, y: f32, hp: &Pools, draw: &mut Draw) { const LINE_WIDTH: f32 = 3.0; diff --git a/src/raws/item_structs.rs b/src/raws/item_structs.rs index 57b8995..742863a 100644 --- a/src/raws/item_structs.rs +++ b/src/raws/item_structs.rs @@ -6,6 +6,7 @@ pub struct Item { pub id: String, pub name: Name, pub renderable: Option, + pub avatar: Option, pub class: String, pub weight: Option, pub value: Option, diff --git a/src/raws/rawmaster.rs b/src/raws/rawmaster.rs index 28229d6..d612da7 100644 --- a/src/raws/rawmaster.rs +++ b/src/raws/rawmaster.rs @@ -311,6 +311,9 @@ pub fn spawn_named_item( if let Some(renderable) = &item_template.renderable { eb = eb.with(get_renderable_component(renderable)); } + if let Some(avatar) = &item_template.avatar { + eb = eb.with(Avatar::new(avatar.clone())); + } // BEATITUDE let buc = if let Some(buc_status) = buc { buc_status diff --git a/src/saveload_system.rs b/src/saveload_system.rs index 4011145..1712add 100644 --- a/src/saveload_system.rs +++ b/src/saveload_system.rs @@ -70,6 +70,7 @@ pub fn save_game(ecs: &mut World) { AOE, ArmourClassBonus, Attributes, + Avatar, Beatitude, Bleeds, Blind, @@ -208,6 +209,7 @@ pub fn load_game(ecs: &mut World) { AOE, ArmourClassBonus, Attributes, + Avatar, Beatitude, Bleeds, Blind,