From 763fb6afc5f7c98569427eb2a23ad94035d59a7d Mon Sep 17 00:00:00 2001 From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com> Date: Sat, 15 Jul 2023 01:21:54 -0500 Subject: [PATCH] Fix sheriff-trigger bug --- flora-search-aurora.lisp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/flora-search-aurora.lisp b/flora-search-aurora.lisp index 39acb54..621a4d2 100644 --- a/flora-search-aurora.lisp +++ b/flora-search-aurora.lisp @@ -673,11 +673,11 @@ avoid triggering this." (defun sheriff-trigger (map &optional trigger-plist) (declare (ignore trigger-plist)) - (when (not (getf-act map :sheriff-met)) - (setf (getf-act map :sheriff-met) 't) - (make-dialogue-state - map - (sheriff-trigger-dialogue map)))) + (if (not (getf-act map :sheriff-met)) + (progn + (setf (getf-act map :sheriff-met) 't) + (make-dialogue-state map (sheriff-trigger-dialogue map))) + (list :parameters (list :map map)))) @@ -1208,9 +1208,8 @@ Initializes the current instance of the game, and such." (defparameter *flashback-casino-map* (🌍:plist->map (metacopy:copy-thing *flashback-casino-map-plist*))) (defparameter *flashback-school-map* (🌍:plist->map (metacopy:copy-thing *flashback-school-map-plist*))) (defparameter *outdoors-map* (🌍:plist->map (metacopy:copy-thing *outdoors-map-plist*))) - (make-flashback-state (third (flashbacks))))) ;; (make-flashback-state (alexandria:random-elt (flashbacks))))) -;; (make-overworld-state *base-map*))) + (make-overworld-state *outdoors-map*))) (defun main-menu ()