afcbcecb1fc9

Fix arrows
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Fri, 20 Jan 2017 14:35:28 +0000
parents e18d61e9aaa0
children 0959bec6eaa2
branches/tags (none)
files magitek.asd package.lisp src/robots/rpg-shopkeeper.lisp

Changes

--- a/magitek.asd	Fri Jan 20 11:48:56 2017 +0000
+++ b/magitek.asd	Fri Jan 20 14:35:28 2017 +0000
@@ -10,7 +10,6 @@
 
                :chancery
                :chirp
-               :cl-arrows
                :clss
                :drakma
                :fare-quasiquote
--- a/package.lisp	Fri Jan 20 11:48:56 2017 +0000
+++ b/package.lisp	Fri Jan 20 14:35:28 2017 +0000
@@ -2,7 +2,6 @@
   (:use
     :cl
     :iterate
-    :cl-arrows
     :losh
     :magitek.quickutils)
   (:export
@@ -29,7 +28,6 @@
     :cl
     :losh
     :iterate
-    :cl-arrows
     :magitek.quickutils)
   (:export
     :build-markov-generator
@@ -40,7 +38,6 @@
   (:use
     :cl
     :iterate
-    :cl-arrows
     :losh
     :chancery
     :magitek.quickutils)
@@ -50,9 +47,7 @@
   (:use
     :cl
     :iterate
-    :cl-arrows
     :losh
-    :trivia
     :chancery
     :magitek.quickutils)
   (:export :random-string))
@@ -61,7 +56,6 @@
   (:use
     :cl
     :iterate
-    :cl-arrows
     :losh
     :magitek.quickutils)
   (:export :random-string))
@@ -71,7 +65,6 @@
   (:use
     :cl
     :iterate
-    :cl-arrows
     :losh
     :magitek.twitter
     :magitek.database
--- a/src/robots/rpg-shopkeeper.lisp	Fri Jan 20 11:48:56 2017 +0000
+++ b/src/robots/rpg-shopkeeper.lisp	Fri Jan 20 14:35:28 2017 +0000
@@ -244,7 +244,7 @@
 
 
 (defun enchanted-armor-description (base enchantment)
-  (ematch enchantment
+  (trivia:ematch enchantment
     (`(:protection ,monster)
      (format nil "~A of protection from ~A" base (monster-plural monster)))
     (`(:resistance (,element ,_))
@@ -253,7 +253,7 @@
      (format nil "+~D ~A" val base))))
 
 (defun enchanted-weapon-description (base enchantment)
-  (ematch enchantment
+  (trivia:ematch enchantment
     (`(:slaying ,monster)
      (format nil "~A of ~A-slaying" base (monster-singular monster)))
     (`(:element (,_ ,element))