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

saving progress

comparison

equal deleted inserted replaced

-:32ac21c9a30d
+:45f1376b578c
 :original-trainer "RLM"
 :ID 5195
 :status :normal
 :experience
 {:main-exp 500
-:attack-exp 0xFF
+:attack-exp 0xFFFF
-:defense-exp 0xFF
+:defense-exp 0xFFFF
-:speed-exp 0xFF
+:speed-exp 0xFFFF
-:special-exp 0xFF
+:special-exp 0xFFFF
-:hp-exp 0xFF}
+:hp-exp 0xFFFF}
 :stats
 ;; TODO recalculate these from a real ditto
 {:level 7
 :current-hp 50
 :hp 50
 :attack 50
 :defense 50
 :speed 50
 :special 50}
+:moves [[:transform {:pp-up 3 :pp 5}]]})
-:moves [[:transform {:pp-up 3 :pp 5}]]})
 (defn expand-pokemon
 "Given a map describing a pokemon, fill in any missing
 values based on the ones already present."
 [pokemon]
 (cond
 (keyword? move)
 [move {:pp (max-pp move) :pp-up 0}]
 (vector? move)
 [(first move)
-(merge {:pp (max-pp (first move))
+(merge {:pp (max-pp (first move) 0)
 :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)))
+pokemon)))))
-))

Mercurial > vba-clojure