       (rw/assoc-current-state :normal)))
     (do (log/info "Drinking nonpotable water")
     (-> state
-      (assoc-in [:world :popover-message] "This water is not potable. Are you sure?\n \n[<color fg=\"highlight\">y</color>]es [<color fg=\"highlight\">n</color>]o")
+      (assoc-in [:world :popover-message] quaff-popover-message)
       (assoc-in [:world :quaff-pos] (rc/xy->pos x y))
       (rw/assoc-current-state :quaff-popover))))))
 

    (log/info "player-adj-xys" (rw/player-adjacent-xys state))
    (update-in state [:world :player :thirst] (fn [thirst] (min 0 (- thirst water))))))

(defn quaff-select
  "Select the next state depending on what quaffable items are available."
  [state]

        (quaff-only-adjacent-cell state)
      (and (= num-adjacent-dangerous-quaffable-cells 1)
           (zero? num-adjacent-quaffable-cells))
        (-> state
          (assoc-in [:world :popover-message] quaff-popover-message)
          (rw/assoc-current-state :quaff-popover))
      (or (> num-adjacent-quaffable-cells 1)
          (> num-adjacent-dangerous-quaffable-cells 1))
        (-> state
