From e26986218bc055a95ad57bf39f2bf766bd63b214 Mon Sep 17 00:00:00 2001
From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com>
Date: Sun, 2 Jul 2023 12:05:29 -0500
Subject: [PATCH] =?UTF-8?q?Rename=20FLORA-SEARCH-AURORA.UI=20=E2=86=92=20[?=
 =?UTF-8?q?=E2=80=A6].MENU?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flora-search-aurora.asd | 3 +--
 ui.lisp => menu.lisp    | 4 +---
 packages.lisp           | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename ui.lisp => menu.lisp (97%)

diff --git a/flora-search-aurora.asd b/flora-search-aurora.asd
index 413e588..d94c64d 100644
--- a/flora-search-aurora.asd
+++ b/flora-search-aurora.asd
@@ -2,13 +2,12 @@
   :depends-on ("alexandria" "assoc-utils" "cl-charms" "str")
   :build-operation "program-op"
   :build-pathname "flora-search-aurora"
-
   :entry-point "flora-search-aurora:main"
   :components ((:file "packages")
                (:file "util")
                (:file "display")
                (:file "input")
-               (:file "ui")
+               (:file "menu")
                (:file "inventory")
                (:file "intermission")
                (:file "overworld.util")
diff --git a/ui.lisp b/menu.lisp
similarity index 97%
rename from ui.lisp
rename to menu.lisp
index 5f6e8a9..6280b37 100644
--- a/ui.lisp
+++ b/menu.lisp
@@ -17,7 +17,7 @@
 ;;;; Generic menu-making, displaying, and management.
 ;;;; Let's get to it, we're on a deadline!
 
-(in-package :flora-search-aurora.ui)
+(in-package :flora-search-aurora.menu)
 
 
 ;;; ———————————————————————————————————
@@ -40,8 +40,6 @@ A state-function for use with the #'state-loop."
 (defun menu-state-draw (matrix menu-alist)
   "Render a menu in menu-alist format to the given matrix.
 A core part of #'menu-state."
-  ;;  (intermission::render-clock-base matrix (list :x 0 :y 0))
-  (✎:render-string matrix "daddy is dead anmd I hate him" '(:x 20 :y 10) :width 15 :char-count 18)
   (render-menu-strip matrix menu-alist 0 0))
 
 
diff --git a/packages.lisp b/packages.lisp
index 68b2925..b63bf3d 100644
--- a/packages.lisp
+++ b/packages.lisp
@@ -43,8 +43,8 @@
            #:render-fill-rectangle
            #:hide-cursor #:show-cursor #:clear-screen))
 
-(defpackage :flora-search-aurora.ui
-  (:nicknames :fsa.u :ui :📋)
+(defpackage :flora-search-aurora.menu
+  (:nicknames :fsa.men :menu :📋)
   (:use :cl)
   (:export #:menu-state #:make-menu-state
            :label :selection :selected))
@@ -101,4 +101,4 @@
   (:use :cl
    :flora-search-aurora.input :flora-search-aurora.display
    :flora-search-aurora.overworld :flora-search-aurora.dialogue
-   :flora-search-aurora.ui))
+   :flora-search-aurora.menu))