# HG changeset patch # User Robert McIntyre # Date 1332488482 18000 # Node ID 1e2aa688e6e4378058b33b7f54ce6f1cfaa1a3ca # Parent d4e673d09181153949daa6fabf1546a867deb7f6 pokemon printing complete. diff -r d4e673d09181 -r 1e2aa688e6e4 clojure/com/aurellem/gb/pokemon.clj --- a/clojure/com/aurellem/gb/pokemon.clj Fri Mar 23 00:32:44 2012 -0500 +++ b/clojure/com/aurellem/gb/pokemon.clj Fri Mar 23 02:41:22 2012 -0500 @@ -231,7 +231,7 @@ :moves (mapv vector moves moves-pp) ;; ephemerial - :satus status + :status status :stats stats :experience experience })) @@ -308,12 +308,18 @@ (.substring (str name) 1) current-pp (max-pp name pp-ups) pp-ups))) - (println "+------------------+----+--------+--------+") + (println "+------------------+----+--------+--------+\n") - - - - )) + (println "Total Experience:" (:main-exp (:experience info))) + (if (not= (:species info) (:species2 info)) + (println "\nThis pokemon has a secondary species" + (str + "(" + (.substring (str (:species2 info)) 1) ")\n") + "that does not match it's primary species.")) + (if (not= :normal (:status info)) + (println "\nThis pokemon is currently" + (.substring (str (:status info) ".") 1))))) ([poke-num] (print-pokemon @current-state poke-num)))