Implemented poison-gas bombs.

Author: Kodiologist

simalq/tile/item.hy

@@ -193,21 +193,15 @@
   :hp-effect -50
   :eat-messages #("You drink a jar of poison. It tastes pretty bad.")
 
+  ; Define the shot effect in terms of poison-gas bombs.
+  :!pb (meth []
+    (get Tile.types "poison-gas bomb"))
   :hook-player-shot (meth []
-    (doc #[f[Explodes in {(burst-size poison-burst.size)} of poison, which does {poison-burst.mon-damage} poison damage to monsters and {poison-burst.player-damage} to you.]f])
-    (burst-damage @pos :damage-type DamageType.Poison
-      :amount (*
-        [poison-burst.mon-damage]
-        (+ 1 poison-burst.size))
-      :color 'moss-green
-      :player-amount poison-burst.player-damage)
+    (doc (.dynadoc (. (@pb) use) (@pb)))
+    (.use (@pb) ((@pb)) @pos)
     (@rm-from-map))
 
   :flavor "I think you're not supposed to drink this.")
-(setv poison-burst (MetaDict
-  :size 2
-  :player-damage 20
-  :mon-damage 3))
 
 ;; --------------------------------------------------------------
 ;; * Miscellany
@@ -575,7 +569,7 @@
     (@rm-from-map)))
 
 (deftile "0 " "a standard bomb" FireBomb
-  :color 'dark-green
+  :color 'brown
   :iq-ix 31  ; Just called a "bomb" in IQ
   :acquirement-points 100
 
@@ -605,6 +599,34 @@
   :flavor "Heavy ordnance. Kills monsters dead, with a bomb pattern that would put a feather in Colonel Cathcart's cap.\n\n    \"Kaboom?\"\n    \"Yes, Rico. Kaboom.\"")
 
 
+(deftile "0 " "a poison-gas bomb" Usable
+  :color 'dark-green
+  :iq-ix 121
+  :acquirement-points 150
+
+  :!player-damage 20
+  :!mon-damage 3
+  :!use-burst-size 3
+  :!shot-burst-size 2
+
+  :!bomb-burst (meth [pos size]
+    (burst-damage pos :damage-type DamageType.Poison
+      :amount (* [@mon-damage] size)
+      :color 'moss-green
+      :player-amount @player-damage))
+
+  :use (meth [target]
+    (doc f"Explodes in {(burst-size @use-burst-size)} of poison, which does {@mon-damage} poison damage to monsters and {@player-damage} to you.")
+    (@bomb-burst target @use-burst-size))
+
+  :hook-player-shot (meth []
+    (doc f"As when applied, but with a smaller {(burst-size @shot-burst-size :article? F)}.")
+    (@bomb-burst @pos @shot-burst-size)
+    (@rm-from-map))
+
+  :flavor "A lot of highly concentrated toxic gas, coupled with an explosive that quickly disperses it. Such poisons are indiscriminate in their death-dealing. Well, that's not true. They discriminate thoroughly in favor of the many poison-proof monsters. They just won't hold back on you.\n\n    Chemical Weapons Convention? More like Chemical Weapons Suggestion.")
+
+
 (deftile "0 " "an earthquake bomb" Usable
   :color 'dark-orange
   :iq-ix 157

simalq/tile/unimplemented.hy

@@ -24,7 +24,6 @@
 (do-mac `(do ~@(gfor [iq-ix stem] [
 
     [106 "wand_of_gating"]
-    [121 "poison_gas_bomb"]
     [129 "archdevil"]
     [130 "exit_mobile"]
     [132 "golem"]

tests/test_item.hy

@@ -137,40 +137,48 @@
 
 
 (defn test-food-shoot []
+  "We also test poison-gas bombs here, because they have the same
+  effect when used as a jar of poison does when shot."
+
   (init [
-    :map "
-      @ % ☠ ██o o
-      ████##██G ██
-      ████o ██████"
-    :map-marks {
-      "% " "snack"
-      "☠ " "jar of poison"
-      "##" ["cracked wall" :hp 2]
-      "o " ["orc" :hp 4]}])
+    :tiles ["snack"]])
   ; Shooting a snack (or most other foods) just destroys it.
   (assert-at 'E "snack")
   (shoot 'E)
   (assert-at 'E 'floor)
-  ; Shooting a jar of poison creates a 5 × 5 cloud of poison, which
-  ; can damage both the player and monsters. It goes through walls.
-  (wk 'E)
-  (assert-at 'E "jar of poison")
-  (assert (= G.player.hp 100))
-  (shoot 'E)
-  (assert-at 'E 'floor)
-  ; The player takes 20 damage.
-  (assert (= G.player.hp 80))
-  ; The two orcs in the blast radius take 3 damage each.
-  (assert-hp [2 0] 1)
-  (assert-hp [4 2] 1)
-  ; The ghost, being undead, takes no damage from poison.
-  (assert-hp [4 1] 1)
-  ; Cracked walls are also immune to poison.
-  (assert-hp [2 1] 2)
-  ; The third orc is outside of the blast radius.
-  (assert-hp [5 2] 4)
-  ; Points are earned for all damage dealt.
-  (assert (= G.score (py "3*3 + 3*3"))))
+
+  (for [use-bomb? [F T]]
+    (init [
+      :map "
+        @ ☠ ██o o
+        ██##██G ██
+        ██o ██████"
+      :map-marks {
+        "☠ " "jar of poison"
+        "##" ["cracked wall" :hp 2]
+        "o " ["orc" :hp 4]}])
+    ; Shooting a jar of poison (or using a poison-gas bomb) creates a
+    ; 5 × 5 cloud of poison, which can damage both the player and
+    ; monsters. It goes through walls.
+    (assert-at 'E "jar of poison")
+    (assert (= G.player.hp 100))
+    (if use-bomb?
+      (use-item "poison-gas bomb" 1 2)
+      (shoot 'E))
+    (assert-at 'E (if use-bomb? "jar of poison" 'floor))
+    ; The player takes 20 damage.
+    (assert (= G.player.hp 80))
+    ; The two orcs in the blast radius take 3 damage each.
+    (assert-hp [1 0] 1)
+    (assert-hp [3 2] 1)
+    ; The ghost, being undead, takes no damage from poison.
+    (assert-hp [3 1] 1)
+    ; Cracked walls are also immune to poison.
+    (assert-hp [1 1] 2)
+    ; The third orc is outside of the blast radius.
+    (assert-hp [4 2] 4)
+    ; Points are earned for all damage dealt.
+    (assert (= G.score (py "3*3 + 3*3")))))
 
 
 (defn test-amulet-of-invulnerability []