Mercurial > vba-clojure

changeset 200:1e2aa688e6e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pokemon printing complete.
author Robert McIntyre <rlm@mit.edu>
date Fri, 23 Mar 2012 02:41:22 -0500
parents d4e673d09181
children 53a74450dc8a
files clojure/com/aurellem/gb/pokemon.clj
diffstat 1 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 00:32:44 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/pokemon.clj	Fri Mar 23 02:41:22 2012 -0500
     1.3 @@ -231,7 +231,7 @@
     1.4          :moves (mapv vector moves moves-pp)
     1.5  
     1.6          ;; ephemerial
     1.7 -        :satus status
     1.8 +        :status status
     1.9          :stats stats
    1.10          :experience experience
    1.11          }))
    1.12 @@ -308,12 +308,18 @@
    1.13             (.substring (str name) 1)
    1.14             current-pp (max-pp name pp-ups) pp-ups)))
    1.15  
    1.16 -       (println "+------------------+----+--------+--------+")
    1.17 +       (println "+------------------+----+--------+--------+\n")
    1.18         
    1.19 -       
    1.20 -
    1.21 -     
    1.22 -     ))
    1.23 +       (println "Total Experience:" (:main-exp (:experience info)))
    1.24 +       (if (not= (:species info) (:species2 info))
    1.25 +         (println "\nThis pokemon has a secondary species"
    1.26 +                  (str
    1.27 +                   "("
    1.28 +                   (.substring (str (:species2 info)) 1) ")\n")
    1.29 +                  "that does not match it's primary species."))
    1.30 +       (if (not= :normal (:status info))
    1.31 +         (println "\nThis pokemon is currently"
    1.32 +                  (.substring (str (:status info) ".") 1)))))
    1.33    ([poke-num]
    1.34       (print-pokemon @current-state poke-num)))
    1.35