vba-clojure: clojure/com/aurellem/gb/pokemon.clj comparison

augmented print-pokemon to report inconsistent types; fixed error in give-type

comparison

equal deleted inserted replaced

-:28d35c9e3ab6
+:32ac21c9a30d
 (if (not= (:species info) (:species2 info))
 (println "\n* This pokemon has a secondary species"
 (str
 "("
 (.substring (str (:species2 info)) 1) ")\n")
-"  that does not match its primary species."))))
+"  that does not match its primary species."))
+(if (not= (:type info) (pokemon->type (:species info)))
+(println "\n* This pokemon has a type"
+(str (:type info))
+"which \n"
+"  is inconsistent with the default type for its"
+"species."))))
 ([poke-num]
 (print-pokemon @current-state poke-num)))
 (defn print-team []
 (dorun (map print-pokemon (range (party-number)))))
 [move {:pp (max-pp move) :pp-up 0}]
 (vector? move)
 [(first move)
 (merge {:pp (max-pp (first move))
 :pp-up 0} (second move))]))))))
+;; The game stores the pokemon's type redundantly
+;; along with the species.  If it's not specified
+;; then it should default to that species default type.
+((fn [pokemon]
+(if (nil? (:type pokemon))
+(assoc pokemon :type
+(pokemon->type (:species pokemon)))
+pokemon)))
 ))

Mercurial > vba-clojure