Cleaned up rule assignments in tests.

Author: Kodiologist

tests/test_basic.hy

@@ -61,8 +61,8 @@
 
 (defn test-shoot []
   (init
+    :reality-bubble-size 4
     :tiles ['floor 'floor 'floor 'floor ["orc" :hp 2]])
-  (setv G.rules.reality-bubble-size 4)
 
   (assert (= G.turn-n 0))
   (shoot 'E)

tests/test_item.hy

@@ -580,10 +580,10 @@
 
 (defn test-wand-webs []
   (init
+    :reality-bubble-size 7
     :height 1
     :tiles ['floor "pile of gold" 'floor "wall" "giant spider" "wall" 'floor 'floor])
 
-  (setv G.rules.reality-bubble-size 7)
   (use-item "wand of webs")
   ; Every free square in the reality bubble gets a web.
   ; (The wand doesn't add a web under the spider, but the spider makes
@@ -684,6 +684,7 @@
 
 (defn test-wand-remote-action []
   (init
+    :reality-bubble-size Inf
     :width 30 :height 1
     :tiles [
       "pile of gold" "wall generator (west)"
@@ -693,7 +694,6 @@
       "cracked wall" "orc"])
   (defn remote [x]
     (use-item "wand of remote action" [x 0]))
-  (setv G.rules.reality-bubble-size 20)
   (setv nothing "There isn't anything you can affect there.")
 
   ; Wands of remote action can do lots of things.

tests/test_monster.hy

@@ -156,10 +156,9 @@
 (defn test-nondainty []
   (for [dainty [F T]]
     (init
+      :dainty-monsters dainty
       :height 1
       :tiles ["pile of gold" "orc" "wall" "orc" "orc"])
-    (when (not dainty)
-      (setv G.rules.dainty-monsters F))
 
     (if dainty
       ; By default, normal monsters will only step on plain floor.
@@ -253,12 +252,12 @@
 
 (defn test-generator-reality-bubble []
   (init
+    :reality-bubble-size 4
     :height 1
     :tiles [
       'floor 'floor "wall" 'floor
       ["generator" :summon-class "orc" :summon-frequency (f/ 1)]
       'floor])
-  (setv G.rules.reality-bubble-size 4)
 
   ; Outside the reality bubble, generators do nothing.
   (wait 10)
@@ -278,6 +277,7 @@
     ; monster (`gen-west T`) and farther (`gen-west F`).
 
     (init
+      :dainty-monsters F
       :map "
         . . $ $
         @ . a b
@@ -287,7 +287,6 @@
           :summon-class "orc"
           :summon-frequency (f/ 1 4)]
         (if gen-west "b " "a ") 'floor})
-    (setv G.rules.dainty-monsters F)
 
     (defn check [orc-at-p1 orc-at-p2]
       (setv p1 (if gen-west (Pos G.map 3 1) (Pos G.map 2 1)))
@@ -336,12 +335,13 @@
   ; A wandering bat will eventually cover the reality bubble, if
   ; it can't attack the player. It can't leave the reality bubble
   ; on its own.
-  (init :map "
-    . . . . .
-    . . b . .
-    ██. . . .
-    @ ██. . .")
-  (setv G.rules.reality-bubble-size 3)
+  (init
+    :reality-bubble-size 3
+    :map "
+      . . . . .
+      . . b . .
+      ██. . . .
+      @ ██. . .")
   (assert (= G.player.hp 100))
   (setv seen-at (dfor
     x (range G.map.width)
@@ -884,8 +884,8 @@
 
 (defn test-siren []
   (init
+    :reality-bubble-size Inf
     :tiles (+ (* ['floor] 10) ["siren"]))
-  (setv G.rules.reality-bubble-size 20)
 
   ; The siren needs to build up shot power before it can paralyze.
   (assert-at [11 0] "siren")
@@ -954,14 +954,14 @@
 (defn test-umber-hulk []
 
   (init
+    :reality-bubble-size Inf
     :map "
       @ ▒▒| ##U █1^█++██◀▶██"
     :map-marks {
       "▒▒" "Void"
       "##" "cracked wall"
       "█1" "trapped wall"
       "++" "door"})
-  (setv G.rules.reality-bubble-size 20)
 
   ; Umber hulks can destroy somewhat more tiles than IQ's kroggs. Not
   ; everything, though.
@@ -1092,9 +1092,10 @@
     (fn [self state] #(Direction.E state)))
 
   ; Upon wandering onto an item, a snitch will pick it up.
-  (init :map "
-     @ . . . . n $ . . . . . . .")
-  (setv G.rules.reality-bubble-size 20)
+  (init
+    :reality-bubble-size Inf
+    :map "
+      @ . . . . n $ . . . . . . .")
   (wait 1)
   (assert-at [6 0] "snitch")
   ; The snitch holds the item for 5 turns before losing interest.
@@ -1108,11 +1109,11 @@
   ; When a snitch holding an item picks up a new one, it drops the old
   ; one on its previous square.
   (init
+    :reality-bubble-size Inf
     :map "
       @ . . . . n / . $ . . ."
     :map-marks {
       "/ " "wand of nothing"})
-  (setv G.rules.reality-bubble-size 20)
   (wait 3)
   (assert-at [7 0] "wand of nothing")
   (assert-at [8 0] "snitch")

tests/test_scenery.hy

@@ -279,14 +279,14 @@
     "| " "breakable wall (meridional)"
     "- " "breakable wall (zonal)"})
   (init
+    :reality-bubble-size 2
+      ; Destruction propogates outside the reality bubble.
     :map "
       . | | | .
       . | | | .
       . | | | .
       @ - - | -"
     :map-marks marks)
-  (setv G.rules.reality-bubble-size 2)
-    ; Destruction propogates outside the reality bubble.
 
   (wk 'E)
   (assert-textmap :map-marks marks :text "
@@ -352,12 +352,12 @@
     "o " "phasing wall (out of phase)"
     "| " "phase trigger"})
   (init
+    :reality-bubble-size 1
+      ; Phasing occurs across the whole level.
     :map "
       X X X | X X o
       o X o @ X o o "
     :map-marks marks)
-  (setv G.rules.reality-bubble-size 1)
-    ; Phasing occurs across the whole level.
 
   ; Phase triggers can be triggered by sword or by arrow.
   (wk 'N)
@@ -389,14 +389,14 @@
 
 (defn test-explosive-wall []
   (init
+    :reality-bubble-size 1
     :map "
       @ X█o X█K X███X█
       X█X█X███X█X███X█
       T T T T T T T T"
     :map-marks {
       "T " ["thorn tree" :hp 100]
       "K " ["Dark Knight" :hp 100]})
-  (setv G.rules.reality-bubble-size 1)
 
   ; Hit one of the explosive walls, setting off a chain reaction
   ; (which can extend past the reality bubble).
@@ -448,10 +448,10 @@
 
 (defn test-wall-generator []
   (init
+    :reality-bubble-size 2
     :map "
       . →|. . o . . .
       @ →|. . . . . .")
-  (setv G.rules.reality-bubble-size 2)
 
   ; Wall generators aren't limited by the reality bubble.
   (wk 'E)
@@ -573,9 +573,9 @@
   ; target square need not be.
   (for [size [2 3]]
     (init
+      :reality-bubble-size size
       :height 1
       :tiles ["teleporter" "wall" "wall" "teleporter"])
-    (setv G.rules.reality-bubble-size size)
     (wk 'E)
     (assert-player-at (if (= size 2) 1 5) 0))
 
@@ -656,6 +656,8 @@
 
 (defn test-wallfall-trap []
   (init
+    :reality-bubble-size 0
+      ; Wallfall traps are unaffected by the reality bubble.
     :map "
       @ t1t0t2
       . t1t0t2
@@ -670,9 +672,6 @@
   (assert-full-name 'E "a wallfall trap (type 1)")
   (assert-full-name [3 0] "a trapped wall (type 2)")
 
-  (setv G.rules.reality-bubble-size 0)
-    ; Wallfall traps are unaffected by the reality bubble.
-
   (defn check [text]
     (assert-textmap text {
       "t " "wallfall trap"