From e15628b20a82b665985df82f30947cbcaf2f91ea Mon Sep 17 00:00:00 2001 From: Grant Horner Date: Sat, 3 Jan 2026 22:15:42 -0500 Subject: [PATCH] Remove keyword keys to standardize strings as keys convention --- main.lisp | 26 +++++++++++++++----------- spawns.lisp | 10 ++++------ utils.lisp | 3 +-- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/main.lisp b/main.lisp index 8db6637..fb7a05d 100644 --- a/main.lisp +++ b/main.lisp @@ -5,18 +5,22 @@ (defparameter *chronostory-gacha-url-format "https://chronostory.onrender.com/api/gacha-items?gachaId=~a") (comment - (reload-mob-data) + (reload-mob-data) - (defvar foo nil) - (setf foo (serapeum/bundle:random-elt *chronostory-mobs*)) - *chronostory-drops* + (defvar foo nil + (setf foo (serapeum/bundle:random-elt *chronostory-mobs*) + *chronostory-drops* - (filter-map - (lambda (m) - (when (= (parse-integer (gethash "DROPPERID" m)) - (parse-integer (href foo "mob" "mob_id"))) - (gethash "ITEMNAME" m))) - (coerce *chronostory-drops* 'list))) + (reload-item-data + (filter-map + (lambda (m) + (when (= (parse-integer (gethash "DROPPERID" m)) + (parse-integer (href foo "mob" "mob_id"))) + (gethash "ITEMNAME" m)) + (coerce *chronostory-drops* 'list) -; (sb-ext:save-lisp-and-die "my-prog" :toplevel #'show-mobs :executable t) + (hash-table-keys (aref (@ *chronostory-spawns* :el-nath) 0)) + (hash-table-keys (aref *chronostory-drops* 0)))))))) + +;; (sb-ext:save-lisp-and-die "my-prog" :toplevel #'show-mobs :executable t) diff --git a/spawns.lisp b/spawns.lisp index 782be43..1fd402d 100644 --- a/spawns.lisp +++ b/spawns.lisp @@ -62,14 +62,14 @@ separate csvs." (loop for row in csv with mapname = "" for hm = (pairhash keys row (dict)) - when (let ((name (gethash :monster hm))) + when (let ((name (gethash "Monster" hm))) (and (string-not-equal "" name) (string-not-equal "-" name) (string-not-equal "Monster" name))) do (progn - (if (and (string-not-equal mapname "") (string-equal (gethash :mapname hm) "")) - (setf (gethash :mapname hm) mapname) - (setf mapname (gethash :mapname hm))) + (if (and (string-not-equal mapname "") (string-equal (gethash "MapName" hm) "")) + (setf (gethash "MapName" hm) mapname) + (setf mapname (gethash "MapName" hm))) (vector-push-extend hm result))) result)) @@ -113,5 +113,3 @@ separate csvs." (if-not *chronostory-spawns* (reload-spawn-data) *chronostory-spawns*)) - -(refresh-spawn-data) diff --git a/utils.lisp b/utils.lisp index bfb72e0..925bb7e 100644 --- a/utils.lisp +++ b/utils.lisp @@ -18,5 +18,4 @@ (map 'vector func vec)) (defun string-to-hash-table-key (s) - (let ((k2 (string-upcase (string-replace " " s "")))) - (intern k2 :keyword))) + (string-replace " " s ""))