Mercurial > vba-clojure

diff clojure/com/aurellem/gb/pokemon.clj @ 210:565f5d17f90a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed minor bug in give-pokemon
author Robert McIntyre <rlm@mit.edu>
date Fri, 23 Mar 2012 05:58:04 -0500
parents 912496041f98
children 8523faa122b0
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 05:45:56 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 05:58:04 2012 -0500
     1.3 @@ -415,7 +415,7 @@
     1.4                    (for [move moves]
     1.5                      (cond
     1.6                        (keyword? move)
     1.7 -                      [move {:current-pp (max-pp move) :pp-ups 0}]
     1.8 +                      [move {:current-pp (max-pp move 0) :pp-ups 0}]
     1.9                        (vector? move)
    1.10                        [(first move)
    1.11                         (merge {:current-pp (max-pp (first move) 0)