From 766f2dedeedf9d2c17be6378be76d40f836baeb2 Mon Sep 17 00:00:00 2001 From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com> Date: Mon, 26 Jun 2023 09:08:45 -0500 Subject: [PATCH] Whoops, too invisible! I fyixed it uwu --- flora-search-aurora.lisp | 6 ----- overworld.tiled.lisp | 31 +++++++++++++------------- res/casino.tmx | 47 +++++++++++++++++++++++----------------- res/map.tmx | 12 +++++----- 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/flora-search-aurora.lisp b/flora-search-aurora.lisp index 444fd99..70cd576 100644 --- a/flora-search-aurora.lisp +++ b/flora-search-aurora.lisp @@ -209,12 +209,6 @@ :face "=w=~")))) - - - - - - ;;; ——————————————————————————————————— ;;; Destitute Gambler arc diff --git a/overworld.tiled.lisp b/overworld.tiled.lisp index 31910b1..f7ba717 100644 --- a/overworld.tiled.lisp +++ b/overworld.tiled.lisp @@ -62,21 +62,22 @@ character-scale world coordinates in plist form." (defun tiled-object->entity (tiled-obj tiled-map) "Convert a Tiled object into an entity plist." - (let ((properties (cl-tiled:properties tiled-obj))) - (when (not (tiled-rectangle-p tiled-obj)) - (list (intern (string-upcase (gethash "id" properties))) - :coords (tiled-coords->world-coords (cl-tiled:object-x tiled-obj) - (cl-tiled:object-y tiled-obj) - tiled-map) - :face (gethash "normal_face" properties) - :normal-face (gethash "normal_face" properties) - :talking-face (gethash "talking_face" properties) - :avatar (gethash "avatar" properties) - :interact (gethash "interact" properties) - :direction (if (gethash "facing_right" properties) - 'right - 'left))))) - + (when (not (tiled-rectangle-p tiled-obj)) + (let ((properties (cl-tiled:properties tiled-obj))) + (append + (list (intern (string-upcase (gethash "id" properties)))) + (loop for key being the hash-keys in properties + for val being the hash-values in properties + collect (intern (string-upcase key) "KEYWORD") + collect val) + (list + :face (gethash "normal-face" properties) + :coords (tiled-coords->world-coords (cl-tiled:object-x tiled-obj) + (cl-tiled:object-y tiled-obj) + tiled-map) + :direction (if (gethash "facing-right" properties) + 'right + 'left)))))) (defun tiled-object->trigger (tiled-obj tiled-map) diff --git a/res/casino.tmx b/res/casino.tmx index de91a87..f534459 100644 --- a/res/casino.tmx +++ b/res/casino.tmx @@ -1,5 +1,5 @@ - + @@ -145,66 +145,73 @@ - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + + + + + + + + diff --git a/res/map.tmx b/res/map.tmx index 010fe02..07713b7 100644 --- a/res/map.tmx +++ b/res/map.tmx @@ -239,20 +239,20 @@ - + - - + + - + - - + +