Divided normal and special exits into separate tile types.

Author: Kodiologist

simalq/tile/__init__.hy

@@ -229,11 +229,16 @@
 ;; ** `deftile`
 ;; --------------------------------------------------------------
 
-(defmacro-kwargs deftile [mapsym name superc #** kwargs]
+(defmacro-kwargs deftile [[mapsym None] [name None] [superc None] #** kwargs]
   "Declare a new concrete and final tile type. Superclasses of other
   tiles not meant to themselves be instantiated should be declared
   with `defclass`."
 
+  ; Although `mapsym` is first of the three named arguments, it's the
+  ; one that's actually optional.
+  (assert (is-not name None))
+  (assert (is-not superc None))
+
   (setv superc (if (isinstance superc hy.models.List)
     superc
     `[~superc]))
@@ -242,6 +247,8 @@
   (setv (get kwargs "stem") (re.sub r"\A(a|an|the|some) "
     (fn [m] (setv (get kwargs "article") (.group m 1)) "")
     name))
+  (when mapsym
+    (setv (get kwargs "mapsym") mapsym))
 
   (defn un! [x]
     (.removeprefix x "hyx_Xexclamation_markX"))
@@ -260,7 +267,7 @@
       :if (!= k (un! k))
       (un! k))))
     ~@(gfor
-      [k v] (.items (dict :mapsym mapsym #** kwargs))
+      [k v] (.items kwargs)
       :setv k (un! k)
       ; Treat `(meth …)` and `(property-meth …)` forms specially.
       (cond

simalq/tile/scenery.hy

@@ -360,15 +360,10 @@
 ;; * Exits
 ;; --------------------------------------------------------------
 
-(deftile :name "an exit" :superc Scenery
-  :field-defaults (dict
-    :level-n None)
-  :color-bg 'lime
-  :iq-ix [
-    7   ; normal exit
-    94] ; special exit
+(defclass Exit [Scenery]
+  (setv color-bg 'lime)
 
-  :mapsym (property-meth []
+  (defmeth [property] mapsym []
     (setv n (- (@effective-level-n) G.level-n))
     (cond
       (< n -1) "<<"
@@ -377,7 +372,10 @@
       (= n 1)  "> "
       True     ">>"))
 
-  :suffix-dict (meth []
+  (defmeth effective-level-n []
+    G.level.next-level)
+
+  (defmeth suffix-dict []
     {
       (.format "{}to" (if (<= (@effective-level-n) G.level-n)
         "back "
@@ -386,24 +384,35 @@
         "victory"
         f"level {(@effective-level-n)}")})
 
-  :blocks-monster T
-  :blocks-player-shots F :blocks-monster-shots F
-
-  :read-tile-extras (classmethod (fn [cls mk-pos v1 v2]
-    (dict :level-n v2)))
-
-  :!effective-level-n (meth []
-    (if (is @level-n None) G.level.next-level @level-n))
+  (setv
+    blocks-monster T
+    blocks-player-shots F  blocks-monster-shots F)
 
-  :hook-player-walked-into (meth []
+  (defmeth hook-player-walked-into []
     (doc f"Takes you to dungeon level {(@effective-level-n)}. If you're already on that level, it's refreshed. If there is no such level, you win the quest.")
 
     (hy.I.simalq/quest.start-level (@effective-level-n))
     (setv G.player.just-exited T)
-    True)
+    True))
+
+(deftile :name "an exit" :superc Exit
+  :iq-ix 7
 
   :flavor "Get me outta here.")
 
+(deftile :name "a special exit" :superc Exit
+  :iq-ix 94
+  :field-defaults (dict
+    :level-n 0)
+
+  :read-tile-extras (classmethod (fn [cls mk-pos v1 v2]
+    (dict :level-n v2)))
+
+  :effective-level-n (meth []
+    @level-n)
+
+  :flavor "What's so special about it? Well, it might take you to a different level from a normal exit. Of course, all exits are special; some are just more special than others.")
+
 ;; --------------------------------------------------------------
 ;; * Disappearing walls
 ;; --------------------------------------------------------------

tests/test_scenery.hy

@@ -204,10 +204,10 @@
     (init
       [
         :map "> @ >1"
-        :map-marks {">1" ["exit" :level-n 1]}]
+        :map-marks {">1" ["special exit" :level-n 1]}]
       [])
     (assert-full-name 'W "an exit (to level 2)")
-    (assert-full-name 'E "an exit (back to level 1)")
+    (assert-full-name 'E "a special exit (back to level 1)")
     (wk (if use-special-exit? 'E 'W))
     (assert (= G.level-n (if use-special-exit? 1 2)))))
 

tests/test_un_iq.hy

@@ -240,9 +240,8 @@
   ; A normal exit
   (setv [t] (get m 10 8))
   (assert (= t.stem "exit"))
-  (assert (is t.level-n None))
 
   ; A special exit
   (setv [t] (get m 7 15))
-  (assert (= t.stem "exit"))
+  (assert (= t.stem "special exit"))
   (assert (= t.level-n 15)))