From f862f00f0bd46827a63a50513ff17c218af4db50 Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Wed, 11 Oct 2023 09:46:41 +0100 Subject: [PATCH] fixes up farlooking - sprite, etc. --- resources/atlas.json | 442 ++++++++++++++++++++++--------------------- resources/atlas.png | Bin 5014 -> 5032 bytes src/consts/mod.rs | 2 +- src/gui/farlook.rs | 29 +-- src/gui/mod.rs | 29 +++ src/main.rs | 2 +- src/map/mod.rs | 1 + 7 files changed, 275 insertions(+), 230 deletions(-) diff --git a/resources/atlas.json b/resources/atlas.json index 0ad4d09..1f10ce2 100644 --- a/resources/atlas.json +++ b/resources/atlas.json @@ -146,7 +146,7 @@ }, { "filename": "back (3)", - "frame": {"x":0,"y":24,"w":16,"h":24}, + "frame": {"x":272,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -154,7 +154,7 @@ }, { "filename": "back (4)", - "frame": {"x":16,"y":24,"w":16,"h":24}, + "frame": {"x":288,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -162,7 +162,7 @@ }, { "filename": "back (5)", - "frame": {"x":32,"y":24,"w":16,"h":24}, + "frame": {"x":304,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -170,7 +170,7 @@ }, { "filename": "back (6)", - "frame": {"x":48,"y":24,"w":16,"h":24}, + "frame": {"x":320,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -178,7 +178,7 @@ }, { "filename": "back (7)", - "frame": {"x":64,"y":24,"w":16,"h":24}, + "frame": {"x":336,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -186,7 +186,7 @@ }, { "filename": "bars", - "frame": {"x":80,"y":24,"w":16,"h":24}, + "frame": {"x":352,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -194,7 +194,7 @@ }, { "filename": "beartrap", - "frame": {"x":96,"y":24,"w":16,"h":24}, + "frame": {"x":368,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -202,7 +202,7 @@ }, { "filename": "bed", - "frame": {"x":112,"y":24,"w":16,"h":24}, + "frame": {"x":384,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -210,7 +210,7 @@ }, { "filename": "blood-7", - "frame": {"x":128,"y":24,"w":16,"h":24}, + "frame": {"x":400,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -218,7 +218,7 @@ }, { "filename": "blood-8", - "frame": {"x":144,"y":24,"w":16,"h":24}, + "frame": {"x":416,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -226,7 +226,7 @@ }, { "filename": "blood-9", - "frame": {"x":160,"y":24,"w":16,"h":24}, + "frame": {"x":432,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -234,7 +234,7 @@ }, { "filename": "blood-10", - "frame": {"x":176,"y":24,"w":16,"h":24}, + "frame": {"x":448,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -242,7 +242,7 @@ }, { "filename": "blood-11", - "frame": {"x":192,"y":24,"w":16,"h":24}, + "frame": {"x":464,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -250,7 +250,7 @@ }, { "filename": "blood-12", - "frame": {"x":208,"y":24,"w":16,"h":24}, + "frame": {"x":480,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -258,7 +258,7 @@ }, { "filename": "blood-13", - "frame": {"x":224,"y":24,"w":16,"h":24}, + "frame": {"x":496,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -266,7 +266,7 @@ }, { "filename": "blood1", - "frame": {"x":240,"y":24,"w":16,"h":24}, + "frame": {"x":512,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -274,7 +274,7 @@ }, { "filename": "blood2", - "frame": {"x":256,"y":24,"w":16,"h":24}, + "frame": {"x":528,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -282,7 +282,7 @@ }, { "filename": "blood3", - "frame": {"x":0,"y":48,"w":16,"h":24}, + "frame": {"x":544,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -290,7 +290,7 @@ }, { "filename": "blood4", - "frame": {"x":16,"y":48,"w":16,"h":24}, + "frame": {"x":560,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -298,7 +298,7 @@ }, { "filename": "blood5", - "frame": {"x":32,"y":48,"w":16,"h":24}, + "frame": {"x":576,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -306,7 +306,7 @@ }, { "filename": "blood6", - "frame": {"x":48,"y":48,"w":16,"h":24}, + "frame": {"x":592,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -314,7 +314,7 @@ }, { "filename": "blood7", - "frame": {"x":64,"y":48,"w":16,"h":24}, + "frame": {"x":608,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -322,7 +322,7 @@ }, { "filename": "body (1)", - "frame": {"x":80,"y":48,"w":16,"h":24}, + "frame": {"x":624,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -330,7 +330,7 @@ }, { "filename": "body (3)", - "frame": {"x":96,"y":48,"w":16,"h":24}, + "frame": {"x":640,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -338,7 +338,7 @@ }, { "filename": "body (4)", - "frame": {"x":112,"y":48,"w":16,"h":24}, + "frame": {"x":656,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -346,7 +346,7 @@ }, { "filename": "body (5)", - "frame": {"x":128,"y":48,"w":16,"h":24}, + "frame": {"x":672,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -354,7 +354,7 @@ }, { "filename": "body (6)", - "frame": {"x":144,"y":48,"w":16,"h":24}, + "frame": {"x":688,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -362,7 +362,7 @@ }, { "filename": "body (7)", - "frame": {"x":160,"y":48,"w":16,"h":24}, + "frame": {"x":704,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -370,7 +370,7 @@ }, { "filename": "body (8)", - "frame": {"x":176,"y":48,"w":16,"h":24}, + "frame": {"x":720,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -378,7 +378,7 @@ }, { "filename": "body (9)", - "frame": {"x":192,"y":48,"w":16,"h":24}, + "frame": {"x":736,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -386,7 +386,7 @@ }, { "filename": "body (10)", - "frame": {"x":208,"y":48,"w":16,"h":24}, + "frame": {"x":752,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -394,7 +394,7 @@ }, { "filename": "body_leather", - "frame": {"x":224,"y":48,"w":16,"h":24}, + "frame": {"x":768,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -402,7 +402,7 @@ }, { "filename": "candelabra", - "frame": {"x":240,"y":48,"w":16,"h":24}, + "frame": {"x":784,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -410,7 +410,7 @@ }, { "filename": "cat", - "frame": {"x":256,"y":48,"w":16,"h":24}, + "frame": {"x":800,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -418,7 +418,7 @@ }, { "filename": "cat_large", - "frame": {"x":0,"y":72,"w":16,"h":24}, + "frame": {"x":816,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -426,7 +426,7 @@ }, { "filename": "caterpillar", - "frame": {"x":16,"y":72,"w":16,"h":24}, + "frame": {"x":832,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -434,7 +434,7 @@ }, { "filename": "chair_r", - "frame": {"x":32,"y":72,"w":16,"h":24}, + "frame": {"x":848,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -442,7 +442,7 @@ }, { "filename": "cracked", - "frame": {"x":48,"y":72,"w":16,"h":24}, + "frame": {"x":864,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -450,7 +450,7 @@ }, { "filename": "dagger", - "frame": {"x":64,"y":72,"w":16,"h":24}, + "frame": {"x":880,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -458,7 +458,7 @@ }, { "filename": "dog", - "frame": {"x":80,"y":72,"w":16,"h":24}, + "frame": {"x":896,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -466,7 +466,7 @@ }, { "filename": "door", - "frame": {"x":96,"y":72,"w":16,"h":24}, + "frame": {"x":912,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -474,7 +474,7 @@ }, { "filename": "door_open", - "frame": {"x":112,"y":72,"w":16,"h":24}, + "frame": {"x":928,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -482,7 +482,7 @@ }, { "filename": "dot", - "frame": {"x":128,"y":72,"w":16,"h":24}, + "frame": {"x":944,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -490,7 +490,7 @@ }, { "filename": "dwarf", - "frame": {"x":144,"y":72,"w":16,"h":24}, + "frame": {"x":960,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -498,7 +498,7 @@ }, { "filename": "feet (1)", - "frame": {"x":160,"y":72,"w":16,"h":24}, + "frame": {"x":976,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -506,7 +506,7 @@ }, { "filename": "feet (2)", - "frame": {"x":176,"y":72,"w":16,"h":24}, + "frame": {"x":992,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -514,7 +514,7 @@ }, { "filename": "feet (3)", - "frame": {"x":192,"y":72,"w":16,"h":24}, + "frame": {"x":1008,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -522,7 +522,7 @@ }, { "filename": "feet (4)", - "frame": {"x":208,"y":72,"w":16,"h":24}, + "frame": {"x":1024,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -530,7 +530,7 @@ }, { "filename": "feet (5)", - "frame": {"x":224,"y":72,"w":16,"h":24}, + "frame": {"x":1040,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -538,7 +538,7 @@ }, { "filename": "feet (6)", - "frame": {"x":240,"y":72,"w":16,"h":24}, + "frame": {"x":1056,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -546,7 +546,7 @@ }, { "filename": "feet (7)", - "frame": {"x":256,"y":72,"w":16,"h":24}, + "frame": {"x":1072,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -554,7 +554,7 @@ }, { "filename": "fence", - "frame": {"x":0,"y":96,"w":16,"h":24}, + "frame": {"x":1088,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -562,7 +562,7 @@ }, { "filename": "fluff", - "frame": {"x":16,"y":96,"w":16,"h":24}, + "frame": {"x":1104,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -570,7 +570,7 @@ }, { "filename": "fluff2", - "frame": {"x":32,"y":96,"w":16,"h":24}, + "frame": {"x":1120,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -578,7 +578,7 @@ }, { "filename": "general-0", - "frame": {"x":48,"y":96,"w":16,"h":24}, + "frame": {"x":1136,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -586,7 +586,7 @@ }, { "filename": "general-1", - "frame": {"x":64,"y":96,"w":16,"h":24}, + "frame": {"x":1152,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -594,7 +594,7 @@ }, { "filename": "general-3", - "frame": {"x":80,"y":96,"w":16,"h":24}, + "frame": {"x":1168,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -602,7 +602,7 @@ }, { "filename": "general-4", - "frame": {"x":96,"y":96,"w":16,"h":24}, + "frame": {"x":1184,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -610,7 +610,7 @@ }, { "filename": "general-5", - "frame": {"x":128,"y":72,"w":16,"h":24}, + "frame": {"x":944,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -618,7 +618,7 @@ }, { "filename": "general-6", - "frame": {"x":112,"y":96,"w":16,"h":24}, + "frame": {"x":1200,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -626,7 +626,7 @@ }, { "filename": "general-7", - "frame": {"x":128,"y":96,"w":16,"h":24}, + "frame": {"x":1216,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -634,7 +634,7 @@ }, { "filename": "general-8", - "frame": {"x":128,"y":72,"w":16,"h":24}, + "frame": {"x":944,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -642,7 +642,7 @@ }, { "filename": "general-9", - "frame": {"x":144,"y":96,"w":16,"h":24}, + "frame": {"x":1232,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -650,7 +650,7 @@ }, { "filename": "general-10", - "frame": {"x":160,"y":96,"w":16,"h":24}, + "frame": {"x":1248,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -658,7 +658,7 @@ }, { "filename": "general-11", - "frame": {"x":128,"y":72,"w":16,"h":24}, + "frame": {"x":944,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -666,7 +666,7 @@ }, { "filename": "general-12", - "frame": {"x":176,"y":96,"w":16,"h":24}, + "frame": {"x":1264,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -674,7 +674,7 @@ }, { "filename": "general-13", - "frame": {"x":192,"y":96,"w":16,"h":24}, + "frame": {"x":1280,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -682,7 +682,7 @@ }, { "filename": "general-14", - "frame": {"x":208,"y":96,"w":16,"h":24}, + "frame": {"x":1296,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -690,7 +690,7 @@ }, { "filename": "general-18", - "frame": {"x":224,"y":96,"w":16,"h":24}, + "frame": {"x":1312,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -698,7 +698,7 @@ }, { "filename": "general-19", - "frame": {"x":240,"y":96,"w":16,"h":24}, + "frame": {"x":1328,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -706,7 +706,7 @@ }, { "filename": "general-20", - "frame": {"x":256,"y":96,"w":16,"h":24}, + "frame": {"x":1344,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -714,7 +714,7 @@ }, { "filename": "general-21", - "frame": {"x":0,"y":120,"w":16,"h":24}, + "frame": {"x":1360,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -722,7 +722,7 @@ }, { "filename": "general-22", - "frame": {"x":16,"y":120,"w":16,"h":24}, + "frame": {"x":1376,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -730,7 +730,7 @@ }, { "filename": "general-23", - "frame": {"x":32,"y":120,"w":16,"h":24}, + "frame": {"x":1392,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -738,7 +738,7 @@ }, { "filename": "general-24", - "frame": {"x":48,"y":120,"w":16,"h":24}, + "frame": {"x":1408,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -746,7 +746,7 @@ }, { "filename": "general-25", - "frame": {"x":64,"y":120,"w":16,"h":24}, + "frame": {"x":1424,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -754,7 +754,7 @@ }, { "filename": "general-26", - "frame": {"x":80,"y":120,"w":16,"h":24}, + "frame": {"x":1440,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -762,7 +762,7 @@ }, { "filename": "general-27", - "frame": {"x":96,"y":120,"w":16,"h":24}, + "frame": {"x":1456,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -770,7 +770,7 @@ }, { "filename": "general-28", - "frame": {"x":112,"y":120,"w":16,"h":24}, + "frame": {"x":1472,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -778,7 +778,7 @@ }, { "filename": "general-29", - "frame": {"x":128,"y":120,"w":16,"h":24}, + "frame": {"x":1488,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -786,7 +786,7 @@ }, { "filename": "general-30", - "frame": {"x":144,"y":120,"w":16,"h":24}, + "frame": {"x":1504,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -794,7 +794,7 @@ }, { "filename": "general-31", - "frame": {"x":160,"y":120,"w":16,"h":24}, + "frame": {"x":1520,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -802,7 +802,7 @@ }, { "filename": "general-32", - "frame": {"x":176,"y":120,"w":16,"h":24}, + "frame": {"x":1536,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -810,7 +810,7 @@ }, { "filename": "general-33", - "frame": {"x":192,"y":120,"w":16,"h":24}, + "frame": {"x":1552,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -818,7 +818,7 @@ }, { "filename": "general-34", - "frame": {"x":208,"y":120,"w":16,"h":24}, + "frame": {"x":1568,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -826,7 +826,7 @@ }, { "filename": "general-35", - "frame": {"x":224,"y":120,"w":16,"h":24}, + "frame": {"x":1584,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -834,7 +834,7 @@ }, { "filename": "general-36", - "frame": {"x":240,"y":120,"w":16,"h":24}, + "frame": {"x":1600,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -842,7 +842,7 @@ }, { "filename": "general-37", - "frame": {"x":256,"y":120,"w":16,"h":24}, + "frame": {"x":1616,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -850,7 +850,7 @@ }, { "filename": "general-38", - "frame": {"x":0,"y":144,"w":16,"h":24}, + "frame": {"x":1632,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -858,7 +858,7 @@ }, { "filename": "general-39", - "frame": {"x":16,"y":144,"w":16,"h":24}, + "frame": {"x":1648,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -866,7 +866,7 @@ }, { "filename": "general-40", - "frame": {"x":32,"y":144,"w":16,"h":24}, + "frame": {"x":1664,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -874,7 +874,7 @@ }, { "filename": "general-41", - "frame": {"x":48,"y":144,"w":16,"h":24}, + "frame": {"x":1680,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -882,7 +882,7 @@ }, { "filename": "general-42", - "frame": {"x":64,"y":144,"w":16,"h":24}, + "frame": {"x":1696,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -890,7 +890,7 @@ }, { "filename": "general-43", - "frame": {"x":80,"y":144,"w":16,"h":24}, + "frame": {"x":1712,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -898,7 +898,7 @@ }, { "filename": "general-44", - "frame": {"x":96,"y":144,"w":16,"h":24}, + "frame": {"x":1728,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -906,7 +906,7 @@ }, { "filename": "general-45", - "frame": {"x":112,"y":144,"w":16,"h":24}, + "frame": {"x":1744,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -914,7 +914,7 @@ }, { "filename": "general-46", - "frame": {"x":128,"y":144,"w":16,"h":24}, + "frame": {"x":1760,"y":0,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -922,7 +922,7 @@ }, { "filename": "general-47", - "frame": {"x":144,"y":144,"w":16,"h":24}, + "frame": {"x":0,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -930,7 +930,7 @@ }, { "filename": "general-48", - "frame": {"x":160,"y":144,"w":16,"h":24}, + "frame": {"x":16,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -938,7 +938,7 @@ }, { "filename": "general-49", - "frame": {"x":176,"y":144,"w":16,"h":24}, + "frame": {"x":32,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -946,7 +946,7 @@ }, { "filename": "general-50", - "frame": {"x":192,"y":144,"w":16,"h":24}, + "frame": {"x":48,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -954,7 +954,7 @@ }, { "filename": "general-51", - "frame": {"x":208,"y":144,"w":16,"h":24}, + "frame": {"x":64,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -962,7 +962,7 @@ }, { "filename": "general-52", - "frame": {"x":224,"y":144,"w":16,"h":24}, + "frame": {"x":80,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -970,7 +970,7 @@ }, { "filename": "general-53", - "frame": {"x":240,"y":144,"w":16,"h":24}, + "frame": {"x":96,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -978,7 +978,7 @@ }, { "filename": "general-54", - "frame": {"x":256,"y":144,"w":16,"h":24}, + "frame": {"x":112,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -986,7 +986,7 @@ }, { "filename": "general-55", - "frame": {"x":0,"y":168,"w":16,"h":24}, + "frame": {"x":128,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -994,7 +994,7 @@ }, { "filename": "gnome", - "frame": {"x":16,"y":168,"w":16,"h":24}, + "frame": {"x":144,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1002,7 +1002,7 @@ }, { "filename": "goblin", - "frame": {"x":32,"y":168,"w":16,"h":24}, + "frame": {"x":160,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1010,7 +1010,7 @@ }, { "filename": "goblin_c", - "frame": {"x":48,"y":168,"w":16,"h":24}, + "frame": {"x":176,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1018,7 +1018,7 @@ }, { "filename": "grass", - "frame": {"x":64,"y":168,"w":16,"h":24}, + "frame": {"x":192,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1026,7 +1026,7 @@ }, { "filename": "grass_flower", - "frame": {"x":80,"y":168,"w":16,"h":24}, + "frame": {"x":208,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1034,7 +1034,7 @@ }, { "filename": "grass_small", - "frame": {"x":96,"y":168,"w":16,"h":24}, + "frame": {"x":224,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1042,7 +1042,7 @@ }, { "filename": "handaxe", - "frame": {"x":112,"y":168,"w":16,"h":24}, + "frame": {"x":240,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1050,7 +1050,7 @@ }, { "filename": "head (1)", - "frame": {"x":128,"y":168,"w":16,"h":24}, + "frame": {"x":256,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1058,7 +1058,7 @@ }, { "filename": "head (2)", - "frame": {"x":144,"y":168,"w":16,"h":24}, + "frame": {"x":272,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1066,7 +1066,7 @@ }, { "filename": "head (3)", - "frame": {"x":160,"y":168,"w":16,"h":24}, + "frame": {"x":288,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1074,7 +1074,7 @@ }, { "filename": "head (4)", - "frame": {"x":176,"y":168,"w":16,"h":24}, + "frame": {"x":304,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1082,7 +1082,7 @@ }, { "filename": "head (5)", - "frame": {"x":192,"y":168,"w":16,"h":24}, + "frame": {"x":320,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1090,7 +1090,7 @@ }, { "filename": "head (6)", - "frame": {"x":208,"y":168,"w":16,"h":24}, + "frame": {"x":336,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1098,7 +1098,7 @@ }, { "filename": "head (7)", - "frame": {"x":224,"y":168,"w":16,"h":24}, + "frame": {"x":352,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1106,7 +1106,7 @@ }, { "filename": "head (8)", - "frame": {"x":240,"y":168,"w":16,"h":24}, + "frame": {"x":368,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1114,7 +1114,7 @@ }, { "filename": "head (9)", - "frame": {"x":256,"y":168,"w":16,"h":24}, + "frame": {"x":384,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1122,7 +1122,7 @@ }, { "filename": "head (10)", - "frame": {"x":0,"y":192,"w":16,"h":24}, + "frame": {"x":400,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1130,7 +1130,7 @@ }, { "filename": "horse", - "frame": {"x":16,"y":192,"w":16,"h":24}, + "frame": {"x":416,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1138,7 +1138,7 @@ }, { "filename": "kobold", - "frame": {"x":32,"y":192,"w":16,"h":24}, + "frame": {"x":432,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1146,7 +1146,7 @@ }, { "filename": "kobold_captain", - "frame": {"x":48,"y":192,"w":16,"h":24}, + "frame": {"x":448,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1154,7 +1154,7 @@ }, { "filename": "kobold_large", - "frame": {"x":64,"y":192,"w":16,"h":24}, + "frame": {"x":464,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1162,7 +1162,7 @@ }, { "filename": "legs (1)", - "frame": {"x":80,"y":192,"w":16,"h":24}, + "frame": {"x":480,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1170,7 +1170,7 @@ }, { "filename": "legs (2)", - "frame": {"x":96,"y":192,"w":16,"h":24}, + "frame": {"x":496,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1178,7 +1178,7 @@ }, { "filename": "legs (3)", - "frame": {"x":112,"y":192,"w":16,"h":24}, + "frame": {"x":512,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1186,7 +1186,7 @@ }, { "filename": "legs (4)", - "frame": {"x":128,"y":192,"w":16,"h":24}, + "frame": {"x":528,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1194,7 +1194,7 @@ }, { "filename": "legs (5)", - "frame": {"x":144,"y":192,"w":16,"h":24}, + "frame": {"x":544,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1202,7 +1202,7 @@ }, { "filename": "magic_trap", - "frame": {"x":160,"y":192,"w":16,"h":24}, + "frame": {"x":560,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1210,7 +1210,7 @@ }, { "filename": "meat", - "frame": {"x":176,"y":192,"w":16,"h":24}, + "frame": {"x":576,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1218,7 +1218,7 @@ }, { "filename": "minimine", - "frame": {"x":192,"y":192,"w":16,"h":24}, + "frame": {"x":592,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1226,7 +1226,7 @@ }, { "filename": "neck", - "frame": {"x":208,"y":192,"w":16,"h":24}, + "frame": {"x":608,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1234,7 +1234,7 @@ }, { "filename": "ogre", - "frame": {"x":224,"y":192,"w":16,"h":24}, + "frame": {"x":624,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1242,7 +1242,7 @@ }, { "filename": "orc", - "frame": {"x":240,"y":192,"w":16,"h":24}, + "frame": {"x":640,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1250,7 +1250,7 @@ }, { "filename": "planks", - "frame": {"x":256,"y":192,"w":16,"h":24}, + "frame": {"x":656,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1258,7 +1258,7 @@ }, { "filename": "planks_missing", - "frame": {"x":0,"y":216,"w":16,"h":24}, + "frame": {"x":672,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1266,7 +1266,7 @@ }, { "filename": "planks_missing2", - "frame": {"x":16,"y":216,"w":16,"h":24}, + "frame": {"x":688,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1274,7 +1274,7 @@ }, { "filename": "plants", - "frame": {"x":32,"y":216,"w":16,"h":24}, + "frame": {"x":704,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1282,7 +1282,7 @@ }, { "filename": "potion", - "frame": {"x":48,"y":216,"w":16,"h":24}, + "frame": {"x":720,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1290,7 +1290,7 @@ }, { "filename": "potion_beaker", - "frame": {"x":64,"y":216,"w":16,"h":24}, + "frame": {"x":736,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1298,7 +1298,7 @@ }, { "filename": "potion_conical", - "frame": {"x":80,"y":216,"w":16,"h":24}, + "frame": {"x":752,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1306,7 +1306,7 @@ }, { "filename": "potion_large", - "frame": {"x":96,"y":216,"w":16,"h":24}, + "frame": {"x":768,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1314,7 +1314,7 @@ }, { "filename": "projectiles-0", - "frame": {"x":112,"y":216,"w":16,"h":24}, + "frame": {"x":784,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1322,7 +1322,7 @@ }, { "filename": "projectiles-1", - "frame": {"x":128,"y":216,"w":16,"h":24}, + "frame": {"x":800,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1330,7 +1330,7 @@ }, { "filename": "projectiles-2", - "frame": {"x":144,"y":216,"w":16,"h":24}, + "frame": {"x":816,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1338,7 +1338,7 @@ }, { "filename": "projectiles-3", - "frame": {"x":160,"y":216,"w":16,"h":24}, + "frame": {"x":832,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1346,7 +1346,7 @@ }, { "filename": "projectiles-4", - "frame": {"x":176,"y":216,"w":16,"h":24}, + "frame": {"x":848,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1354,7 +1354,7 @@ }, { "filename": "projectiles-5", - "frame": {"x":192,"y":216,"w":16,"h":24}, + "frame": {"x":864,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1362,7 +1362,7 @@ }, { "filename": "projectiles-6", - "frame": {"x":208,"y":216,"w":16,"h":24}, + "frame": {"x":880,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1370,7 +1370,7 @@ }, { "filename": "projectiles-7", - "frame": {"x":224,"y":216,"w":16,"h":24}, + "frame": {"x":896,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1378,7 +1378,7 @@ }, { "filename": "projectiles-8", - "frame": {"x":240,"y":216,"w":16,"h":24}, + "frame": {"x":912,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1386,7 +1386,7 @@ }, { "filename": "projectiles-9", - "frame": {"x":256,"y":216,"w":16,"h":24}, + "frame": {"x":928,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1394,7 +1394,7 @@ }, { "filename": "projectiles-10", - "frame": {"x":0,"y":240,"w":16,"h":24}, + "frame": {"x":944,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1402,7 +1402,7 @@ }, { "filename": "projectiles-11", - "frame": {"x":16,"y":240,"w":16,"h":24}, + "frame": {"x":960,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1410,7 +1410,7 @@ }, { "filename": "projectiles-12", - "frame": {"x":32,"y":240,"w":16,"h":24}, + "frame": {"x":976,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1418,7 +1418,7 @@ }, { "filename": "projectiles-13", - "frame": {"x":48,"y":240,"w":16,"h":24}, + "frame": {"x":992,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1426,7 +1426,7 @@ }, { "filename": "projectiles-14", - "frame": {"x":64,"y":240,"w":16,"h":24}, + "frame": {"x":1008,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1434,7 +1434,7 @@ }, { "filename": "projectiles-15", - "frame": {"x":80,"y":240,"w":16,"h":24}, + "frame": {"x":1024,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1442,7 +1442,7 @@ }, { "filename": "projectiles-16", - "frame": {"x":96,"y":240,"w":16,"h":24}, + "frame": {"x":1040,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1450,7 +1450,7 @@ }, { "filename": "projectiles-17", - "frame": {"x":112,"y":240,"w":16,"h":24}, + "frame": {"x":1056,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1458,7 +1458,7 @@ }, { "filename": "projectiles-18", - "frame": {"x":128,"y":240,"w":16,"h":24}, + "frame": {"x":1072,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1466,7 +1466,7 @@ }, { "filename": "projectiles-19", - "frame": {"x":144,"y":240,"w":16,"h":24}, + "frame": {"x":1088,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1474,7 +1474,7 @@ }, { "filename": "projectiles-20", - "frame": {"x":160,"y":240,"w":16,"h":24}, + "frame": {"x":1104,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1482,7 +1482,7 @@ }, { "filename": "projectiles-21", - "frame": {"x":160,"y":240,"w":16,"h":24}, + "frame": {"x":1104,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1490,7 +1490,7 @@ }, { "filename": "projectiles-22", - "frame": {"x":160,"y":240,"w":16,"h":24}, + "frame": {"x":1104,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1498,7 +1498,7 @@ }, { "filename": "projectiles-23", - "frame": {"x":160,"y":240,"w":16,"h":24}, + "frame": {"x":1104,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1506,7 +1506,7 @@ }, { "filename": "projectiles-24", - "frame": {"x":160,"y":240,"w":16,"h":24}, + "frame": {"x":1104,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1514,7 +1514,7 @@ }, { "filename": "projectiles-25", - "frame": {"x":176,"y":240,"w":16,"h":24}, + "frame": {"x":1120,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1522,7 +1522,7 @@ }, { "filename": "projectiles-26", - "frame": {"x":176,"y":240,"w":16,"h":24}, + "frame": {"x":1120,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1530,7 +1530,7 @@ }, { "filename": "projectiles-27", - "frame": {"x":176,"y":240,"w":16,"h":24}, + "frame": {"x":1120,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1538,7 +1538,7 @@ }, { "filename": "projectiles-28", - "frame": {"x":176,"y":240,"w":16,"h":24}, + "frame": {"x":1120,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1546,7 +1546,7 @@ }, { "filename": "projectiles-29", - "frame": {"x":176,"y":240,"w":16,"h":24}, + "frame": {"x":1120,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1554,7 +1554,7 @@ }, { "filename": "rat", - "frame": {"x":192,"y":240,"w":16,"h":24}, + "frame": {"x":1136,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1562,7 +1562,7 @@ }, { "filename": "rat_large", - "frame": {"x":208,"y":240,"w":16,"h":24}, + "frame": {"x":1152,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1570,7 +1570,7 @@ }, { "filename": "scimitar", - "frame": {"x":224,"y":240,"w":16,"h":24}, + "frame": {"x":1168,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1578,7 +1578,7 @@ }, { "filename": "scroll", - "frame": {"x":240,"y":240,"w":16,"h":24}, + "frame": {"x":1184,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1586,7 +1586,15 @@ }, { "filename": "scroll_writing", - "frame": {"x":256,"y":240,"w":16,"h":24}, + "frame": {"x":1200,"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": "select1", + "frame": {"x":1216,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1594,7 +1602,7 @@ }, { "filename": "shield_large", - "frame": {"x":0,"y":264,"w":16,"h":24}, + "frame": {"x":1232,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1602,7 +1610,7 @@ }, { "filename": "shield_round", - "frame": {"x":16,"y":264,"w":16,"h":24}, + "frame": {"x":1248,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1610,7 +1618,7 @@ }, { "filename": "shield_small", - "frame": {"x":32,"y":264,"w":16,"h":24}, + "frame": {"x":1264,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1618,7 +1626,7 @@ }, { "filename": "shortsword", - "frame": {"x":48,"y":264,"w":16,"h":24}, + "frame": {"x":1280,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1626,7 +1634,7 @@ }, { "filename": "slash1", - "frame": {"x":64,"y":264,"w":16,"h":24}, + "frame": {"x":1296,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1634,7 +1642,7 @@ }, { "filename": "slash2", - "frame": {"x":80,"y":264,"w":16,"h":24}, + "frame": {"x":1312,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1642,7 +1650,7 @@ }, { "filename": "slash3", - "frame": {"x":96,"y":264,"w":16,"h":24}, + "frame": {"x":1328,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1650,7 +1658,7 @@ }, { "filename": "spider", - "frame": {"x":112,"y":264,"w":16,"h":24}, + "frame": {"x":1344,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1658,7 +1666,7 @@ }, { "filename": "spider_large", - "frame": {"x":128,"y":264,"w":16,"h":24}, + "frame": {"x":1360,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1666,7 +1674,7 @@ }, { "filename": "stair_down", - "frame": {"x":144,"y":264,"w":16,"h":24}, + "frame": {"x":1376,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1674,7 +1682,7 @@ }, { "filename": "stair_up", - "frame": {"x":160,"y":264,"w":16,"h":24}, + "frame": {"x":1392,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1682,7 +1690,7 @@ }, { "filename": "statue", - "frame": {"x":176,"y":264,"w":16,"h":24}, + "frame": {"x":1408,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1690,7 +1698,7 @@ }, { "filename": "stones", - "frame": {"x":192,"y":264,"w":16,"h":24}, + "frame": {"x":1424,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1698,7 +1706,7 @@ }, { "filename": "table", - "frame": {"x":208,"y":264,"w":16,"h":24}, + "frame": {"x":1440,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1706,7 +1714,7 @@ }, { "filename": "table_l_chair", - "frame": {"x":224,"y":264,"w":16,"h":24}, + "frame": {"x":1456,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1714,7 +1722,7 @@ }, { "filename": "table_r", - "frame": {"x":240,"y":264,"w":16,"h":24}, + "frame": {"x":1472,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1722,7 +1730,7 @@ }, { "filename": "tiles", - "frame": {"x":256,"y":264,"w":16,"h":24}, + "frame": {"x":1488,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1730,7 +1738,7 @@ }, { "filename": "tiles2", - "frame": {"x":0,"y":288,"w":16,"h":24}, + "frame": {"x":1504,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1738,7 +1746,7 @@ }, { "filename": "tiles3", - "frame": {"x":16,"y":288,"w":16,"h":24}, + "frame": {"x":1520,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1746,7 +1754,7 @@ }, { "filename": "tiles4", - "frame": {"x":32,"y":288,"w":16,"h":24}, + "frame": {"x":1536,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1754,7 +1762,7 @@ }, { "filename": "tiles_missing", - "frame": {"x":48,"y":288,"w":16,"h":24}, + "frame": {"x":1552,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1762,7 +1770,7 @@ }, { "filename": "tiles_missing2", - "frame": {"x":64,"y":288,"w":16,"h":24}, + "frame": {"x":1568,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1770,7 +1778,7 @@ }, { "filename": "tiles_missing3", - "frame": {"x":80,"y":288,"w":16,"h":24}, + "frame": {"x":1584,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1778,7 +1786,7 @@ }, { "filename": "tiles_missing4", - "frame": {"x":96,"y":288,"w":16,"h":24}, + "frame": {"x":1600,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1786,7 +1794,7 @@ }, { "filename": "tiles_missing5", - "frame": {"x":112,"y":288,"w":16,"h":24}, + "frame": {"x":1616,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1794,7 +1802,7 @@ }, { "filename": "tiles_missing6", - "frame": {"x":128,"y":288,"w":16,"h":24}, + "frame": {"x":1632,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1802,7 +1810,7 @@ }, { "filename": "trapdoor", - "frame": {"x":144,"y":288,"w":16,"h":24}, + "frame": {"x":1648,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1810,7 +1818,7 @@ }, { "filename": "trapdoor_open", - "frame": {"x":160,"y":288,"w":16,"h":24}, + "frame": {"x":1664,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1818,7 +1826,7 @@ }, { "filename": "trident", - "frame": {"x":176,"y":288,"w":16,"h":24}, + "frame": {"x":1680,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1826,7 +1834,7 @@ }, { "filename": "wall", - "frame": {"x":192,"y":288,"w":16,"h":24}, + "frame": {"x":1696,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1834,7 +1842,7 @@ }, { "filename": "wall_b", - "frame": {"x":208,"y":288,"w":16,"h":24}, + "frame": {"x":1712,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1842,7 +1850,7 @@ }, { "filename": "wall_b_cracked", - "frame": {"x":224,"y":288,"w":16,"h":24}, + "frame": {"x":1728,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1850,7 +1858,7 @@ }, { "filename": "water", - "frame": {"x":240,"y":288,"w":16,"h":24}, + "frame": {"x":1744,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1858,7 +1866,7 @@ }, { "filename": "water2", - "frame": {"x":256,"y":288,"w":16,"h":24}, + "frame": {"x":1760,"y":24,"w":16,"h":24}, "rotated": false, "trimmed": false, "spriteSourceSize": {"x":0,"y":0,"w":16,"h":24}, @@ -1869,8 +1877,8 @@ "version": "1.0", "image": "atlas.png", "format": "RGBA8888", - "size": {"w":272,"h":312}, + "size": {"w":1776,"h":48}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:b7a7dab3cef0dc663cf3764b68e914db:1ae1f8b2ac3e9eea50616f5300211637:cbce6b53f0f49e0bf15173c25c41f876$" + "smartupdate": "$TexturePacker:SmartUpdate:fd16d00f63ad5efff2a8369d469daa64:6efd3d3d31e2ef7389221fe30073fbfb:cbce6b53f0f49e0bf15173c25c41f876$" } } diff --git a/resources/atlas.png b/resources/atlas.png index 044805122d3811c1bae2e7f3f96b59b18e287bfb..5956df8d0ed285e96d2bbe92947ddf23ba39a4be 100644 GIT binary patch delta 5018 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 G2~7Y|n>!)^ diff --git a/src/consts/mod.rs b/src/consts/mod.rs index 9b58095..cb80d4d 100644 --- a/src/consts/mod.rs +++ b/src/consts/mod.rs @@ -21,7 +21,7 @@ pub struct Spritesize { pub const TILESIZE: Spritesize = Spritesize { x: 16.0, - y: 24.0, + y: 16.0, sprite_x: 16.0 * ZOOM_FACTOR, sprite_y: 24.0 * ZOOM_FACTOR, }; diff --git a/src/gui/farlook.rs b/src/gui/farlook.rs index 3841a38..2f21317 100644 --- a/src/gui/farlook.rs +++ b/src/gui/farlook.rs @@ -1,8 +1,9 @@ -use super::{ State, RunState, tooltip::draw_tooltips, camera::get_offset, VIEWPORT_H, VIEWPORT_W }; +use super::{ State, RunState, World, tooltip::draw_tooltips, camera::get_offset }; use bracket_lib::prelude::*; use notan::prelude::*; use notan::draw::{ Draw, DrawImages }; use std::collections::HashMap; +use crate::consts::visuals::{ TILES_IN_VIEWPORT_H, TILES_IN_VIEWPORT_W }; use crate::consts::TILESIZE; #[derive(PartialEq, Copy, Clone)] @@ -16,10 +17,9 @@ pub enum FarlookResult { pub fn show_farlook(gs: &mut State, ctx: &mut App) -> FarlookResult { let runstate = gs.ecs.fetch::(); - let offsets = get_offset(); if let RunState::Farlook { x, y } = *runstate { - let x = x.clamp(offsets.x, offsets.x - 1 + VIEWPORT_W); - let y = y.clamp(offsets.y, offsets.y - 1 + VIEWPORT_H); + let x = x.clamp(0, TILES_IN_VIEWPORT_W - 1); + let y = y.clamp(0, TILES_IN_VIEWPORT_H - 1); let key = &ctx.keyboard; // Movement for keycode in key.pressed.iter() { @@ -56,14 +56,21 @@ pub fn show_farlook(gs: &mut State, ctx: &mut App) -> FarlookResult { } return FarlookResult::NoResponse { x, y }; } else { - let ppos = gs.ecs.fetch::(); - return FarlookResult::NoResponse { x: ppos.x + offsets.x, y: ppos.x + offsets.y }; + return FarlookResult::NoResponse { x: TILES_IN_VIEWPORT_W / 2, y: TILES_IN_VIEWPORT_H / 2 }; } } -pub fn draw_farlook(x: i32, y: i32, draw: &mut Draw, atlas: &HashMap) { - draw.image(atlas.get("ui_select_c1").unwrap()).position( - (x as f32) * TILESIZE.x, - (y as f32) * TILESIZE.x - ); +pub fn draw_farlook( + ecs: &World, + x: i32, + y: i32, + draw: &mut Draw, + atlas: &HashMap +) { + let placement = super::viewport_tile_to_px(x, y); + draw.image(atlas.get("select1").unwrap()) + .position(placement.x, placement.y) + .size(TILESIZE.sprite_x, TILESIZE.sprite_y); + let _idx = super::viewport_tile_to_map_idx(ecs, x, y); + // Get tooltip for idx, etc. } diff --git a/src/gui/mod.rs b/src/gui/mod.rs index 979e638..891645c 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -1880,3 +1880,32 @@ pub fn with_article(name: &String) -> String { } format!("a {}", name) } + +/// Returns the map index of a tile in the viewport. +pub fn viewport_tile_to_map_idx(ecs: &World, x: i32, y: i32) -> usize { + let bounds = crate::camera::get_screen_bounds(ecs, false); + let x = x + bounds.min_x; + let y = y + bounds.min_y; + return ecs.fetch::().xy_idx(x, y); +} + +/// Denotes a pixel location on the screen. +pub struct Px { + x: f32, + y: f32, +} + +impl Px { + pub fn new(x: f32, y: f32) -> Self { + Self { x, y } + } +} + +/// Returns the pixel location of a tile in the viewport. +pub fn viewport_tile_to_px(x: i32, y: i32) -> Px { + let offsets = crate::camera::get_offset(); + Px::new( + (x as f32) * TILESIZE.sprite_x + (offsets.x as f32) * TILESIZE.x, + (y as f32) * TILESIZE.sprite_y + (offsets.y as f32) * TILESIZE.y + ) +} diff --git a/src/main.rs b/src/main.rs index 5a469c1..7d94437 100644 --- a/src/main.rs +++ b/src/main.rs @@ -542,7 +542,7 @@ fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) { } match runstate { RunState::Farlook { x, y } => { - gui::draw_farlook(x, y, &mut draw, &gs.atlas); + gui::draw_farlook(&gs.ecs, x, y, &mut draw, &gs.atlas); //draw_tooltips(&gs.ecs, ctx, Some((x, y))); TODO: Put this in draw loop } RunState::ShowCheatMenu => { diff --git a/src/map/mod.rs b/src/map/mod.rs index 527cd87..d33ac00 100644 --- a/src/map/mod.rs +++ b/src/map/mod.rs @@ -1,4 +1,5 @@ use bracket_lib::prelude::*; +use specs::prelude::*; use serde::{ Deserialize, Serialize }; use std::collections::{ HashSet, HashMap }; mod tiletype;