diff clojure/com/aurellem/gb/pokemon.clj @ 327:fe6fd2323264

corrected compilation bugs
author Robert McIntyre <rlm@mit.edu>
date Thu, 05 Apr 2012 12:59:30 -0500
parents 8484e6f6db2c
children
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/gb/pokemon.clj	Wed Apr 04 14:55:43 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/pokemon.clj	Thu Apr 05 12:59:30 2012 -0500
     1.3 @@ -389,11 +389,11 @@
     1.4                    (for [move moves]
     1.5                      (cond
     1.6                        (keyword? move)
     1.7 -                      [move {:current-pp (max-pp move 0) :pp-ups 0}]
     1.8 +                      [move {:current-pp (max-pp move 3) :pp-ups 3}]
     1.9                        (vector? move)
    1.10                        [(first move)
    1.11 -                       (merge {:current-pp (max-pp (first move) 0)
    1.12 -                               :pp-ups 0} (second move))]))))))
    1.13 +                       (merge {:current-pp (max-pp (first move) 3)
    1.14 +                               :pp-ups 3} (second move))]))))))
    1.15        ;; The game stores the pokemon's type redundantly
    1.16        ;; along with the species.  If it's not specified
    1.17        ;; then it should default to that species default type.