# HG changeset patch # User Steve Losh # Date 1484922928 0 # Node ID afcbcecb1fc98625dc116613a75d8cb4de409f93 # Parent e18d61e9aaa0e6c5bc7305bc53c03f0d5838b357 Fix arrows diff -r e18d61e9aaa0 -r afcbcecb1fc9 magitek.asd --- 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 diff -r e18d61e9aaa0 -r afcbcecb1fc9 package.lisp --- 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 diff -r e18d61e9aaa0 -r afcbcecb1fc9 src/robots/rpg-shopkeeper.lisp --- 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))