Mercurial > vba-clojure
comparison clojure/com/aurellem/gb/moves.clj @ 214:62969eb07e04
fixed give-pokemon to give a properly formatted pokemon for pokemon with less than 4 moves.
author | Robert McIntyre <rlm@mit.edu> |
---|---|
date | Fri, 23 Mar 2012 19:25:21 -0500 |
parents | 912496041f98 |
children | 0587f266a735 |
comparison
equal
deleted
inserted
replaced
212:8523faa122b0 | 214:62969eb07e04 |
---|---|
266 | 266 |
267 (defn give-moves-pps | 267 (defn give-moves-pps |
268 ([^SaveState state poke-num moves-pps] | 268 ([^SaveState state poke-num moves-pps] |
269 (let [new-moves | 269 (let [new-moves |
270 (-> state | 270 (-> state |
271 ;; zero out the pp of the pokemon's moves | |
272 (give-pp poke-num 0 0 0) | |
273 (give-pp poke-num 1 0 0) | |
274 (give-pp poke-num 2 0 0) | |
275 (give-pp poke-num 3 0 0) | |
271 (give-moves poke-num (map first moves-pps)))] | 276 (give-moves poke-num (map first moves-pps)))] |
272 (reduce (fn [state move-num] | 277 (reduce (fn [state move-num] |
273 (let [pp (second (nth moves-pps move-num))] | 278 (let [pp (second (nth moves-pps move-num))] |
274 (give-pp state poke-num move-num | 279 (give-pp state poke-num move-num |
275 (:pp-ups pp) | 280 (:pp-ups pp) |