Treat the player's starting HP as a rule.

Author: Kodiologist

simalq/game_state.hy

@@ -149,8 +149,10 @@
       ; player in which monsters etc. get to act. It's a square
       ; spanning `(+ (* 2 reality-bubble-size) 1)` map squares on each
       ; side, with the player in the center.
+    player-starting-hp 500
+      ; The HP the player starts with (at least before `player-hp-factor`).
     player-hp-factor (f/ 1)
-      ; Multiplies the player's starting HP and healing.
+      ; Multiplies `player-starting-hp` and all healing to the player.
     poison-factor (f/ 1)
       ; Multiplies all ambient poison rates.
     max-keys 8

simalq/quest.hy

@@ -18,8 +18,6 @@
   :fields [
     name authors title
       ; Textual metadata
-    starting-hp
-      ; An integer
     levels
       ; A tuple of `Level` objects
     rules]
@@ -40,7 +38,7 @@
       (setattr G.rules k v)))
   (.initialize-states G)
   (setv G.player (Player :pos None))
-  (setv G.player.hp (refactor-hp quest.starting-hp)))
+  (setv G.player.hp (refactor-hp G.rules.player-starting-hp)))
 
 
 (defdataclass Level []

simalq/quest_definition/__init__.hy

@@ -52,17 +52,15 @@ quest definitions from other files in this directory."
 (defn mk-quest [
   ; Make a quest.
     #* levels
-    [starting-hp 100]
     [name "Test Quest"]
     [authors "Mitt Lowporch and Cire Whyhall"]
     [title "Test Quest title"]
-    [rules None]]
+    #** rules]
   (pun (Quest
     :!name
     :!authors
     :!title
-    :!starting-hp
-    :rules (or rules (Rules))
+    :rules (Rules #** rules)
     :levels (tuple (gfor
       [i level-args] (enumerate levels)
       (mk-level :n (+ i 1) #** (kwdict level-args)))))))

simalq/quest_definition/tutorial.hy

@@ -13,10 +13,10 @@
   (.replace x "\\n" "\n"))
 
 (setv quest (mk-quest
-  :starting-hp 500
   :name name
   :authors "Kodi B. Arfer"
   :title #[[An instructive introduction to Infinitesimal Quest 2 + ε, inspired by Yves Meynard's "Boot Camp 2".]]
+  :player-starting-hp 500
 
   #* (.values {
 

simalq/un_iq.hy

@@ -97,7 +97,7 @@
 (setv quest-fmt (with-construct (kw-struct
   :n-levels Byte
   (Bytes 261)
-  :starting-hp Int16ub
+  :player-starting-hp Int16ub
   :title (iq-str 256)
   (Bytes 897)
   :levels (Array this.n-levels (kw-struct
@@ -175,8 +175,8 @@
       "Yves and Serge Meynard"
       "Yves Meynard")
     :title data.title
-    :starting-hp data.starting-hp
-    :rules (Rules)
+    :rules (Rules
+      :player-starting-hp data.player-starting-hp)
     :levels (tuple (gfor
       [level-n l] (enumerate data.levels)
       :do (+= level-n 1)

tests/lib.hy

@@ -21,23 +21,21 @@
 
 (defn init [
     #* levels
-    [starting-hp 100]
     #** kwargs]
   "(Re)initialize the global state."
+  (setv rules (dict :player-starting-hp 100))
   ; Extract elements of `kwargs` that correspond to rules.
-  (setv rules (dfor
-    [k v] (list (.items kwargs))
-    :if (in k Rules.__dataclass_fields__)
-    k (.pop kwargs k)))
+  (for [[k v] (list (.items kwargs))]
+    (when (in k Rules.__dataclass_fields__)
+      (setv (get rules k) (.pop kwargs k))))
   (when kwargs
     ; Any remaining `kwargs` should specify the only level, per
     ; `mk-level`, in place of a `levels` argument.
     (assert (not levels)))
   (unless levels
     (setv levels [kwargs]))
   (start-quest
-    :quest (mk-quest #* levels :starting-hp starting-hp)
-    :rules rules)
+    :quest (mk-quest #* levels #** rules))
   (start-level 1))
 
 (defn init-boot-camp [[level-n 1]]

tests/test_basic.hy

@@ -316,7 +316,7 @@
 
 (defn test-player-death []
   (init
-    :starting-hp 20
+    :player-starting-hp 20
     :player-start [1 0]
     :tiles [["Dark Knight" :hp 10] 'floor 'floor "orc"])
   (defn check [state-i player-hp orc-x]

tests/test_monster.hy

@@ -1017,7 +1017,7 @@
 
   ; Lords don't get to summon while attacking the player.
   (init
-    :starting-hp 500
+    :player-starting-hp 500
     :map "@ L .")
   (wait 10)
   (assert (= G.player.hp (- 500 (* 10 15))))
@@ -1156,7 +1156,7 @@
 
 (defn test-dragon []
   (init
-    :starting-hp 10,000
+    :player-starting-hp 10,000
     :tiles ['floor "dragon egg"])
 
   ; It takes a 1-HP dragon egg 4 turns to hatch. The newly created

tests/test_un_iq.hy

@@ -29,7 +29,7 @@
   (setv quest (iq-quest "Boot Camp 2"))
   (assert (= quest.name "Boot Camp 2"))
   (assert (= quest.title "Boot Camp will teach you how to play Infinity Quest II"))
-  (assert (= quest.starting-hp 500))
+  (assert (= quest.rules.player-starting-hp 500))
   (assert (= (len quest.levels) 26)))