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

comparison clojure/com/aurellem/gb/pokemon.clj @ 209:912496041f98

give pokemon appears to work.

author	Robert McIntyre <rlm@mit.edu>
date	Fri, 23 Mar 2012 05:45:56 -0500
parents	45f1376b578c
children	565f5d17f90a

comparison

equal deleted inserted replaced

-:45f1376b578c
+:912496041f98
 ([] (original-trainers @current-state)))
 (defn read-OT-name
 ([^SaveState state poke-num]
 (nth (original-trainers state) poke-num))
-([poke-num] (read-OT @current-state poke-num)))
+([poke-num] (read-OT-name @current-state poke-num)))
 (defn set-OT-name
 "Set the OT name for a pokemon.
 Note that a pokemon is still considered 'yours' if
 the OT ID is the same as your own."
 (set-memory-range
 state
 (+ (* poke-num name-width) OT-start)
 (concat (str->character-codes new-name) [end-of-name-marker])))
 ([n new-name]
-(set-original-trainer @current-state n new-name)))
+(set-OT-name @current-state n new-name)))
 (def OT-ID-addresses [0xD176 0xD1A2 0xD1CE 0xD1FA 0xD226 0xD252])
 (defn read-OT-id
 ([^SaveState state poke-num]
 (set-memory-range
 state
 (OT-ID-addresses poke-num)
 (disect-bytes-2 new-OT-num)))
 ([poke-num new-OT-num]
-(set-pokemon-id @current-state poke-num new-OT-num)))
+(set-OT-id @current-state poke-num new-OT-num)))
 (def unknown "[[[UNKNOWN]]]")
 (def unknown "")
 ([pokemon-num]
 (print-pokemon-record @current-state pokemon-num)))
 (def mint-berry-item-code-gsc 0x54)
-(defn pokemon-info
+(defn pokemon
 ([^SaveState state poke-num]
 (assert (<= 0 poke-num 5))
 (let [dv-values (read-DV state poke-num)
 type (read-type state poke-num)
 species (read-species state poke-num)
 :status status
 :stats stats
 :experience experience
 }))
 ([poke-num]
-(pokemon-info @current-state poke-num)))
+(pokemon @current-state poke-num)))
 (def status-message
 {:sleep-6 "sleeping. It will wake in six turns."
 :sleep-5 "sleeping. It will wake in five turns."
 :sleep-4 "sleeping. It will wake in four turns."
 :paralyzed "paralyzed."})
 (defn print-pokemon
 ([^SaveState state poke-num]
-(let [info (pokemon-info state poke-num)]
+(let [info (pokemon state poke-num)]
 (printf
 (str
 "##################################"
 "##################################\n"
 "#                                 "
 :speed-exp 0xFFFF
 :special-exp 0xFFFF
 :hp-exp 0xFFFF}
 :stats
-;; TODO recalculate these from a real ditto
 {:level 7
-:current-hp 50
+:current-hp 30
-:hp 50
+:hp 30
-:attack 50
+:attack 18
-:defense 50
+:defense 18
-:speed 50
+:speed 18
-:special 50}
+:special 18}
-:moves [[:transform {:pp-up 3 :pp 5}]]})
+:moves [[:transform {:pp-ups 3 :current-pp 5}]]})
 (defn expand-pokemon
 "Given a map describing a pokemon, fill in any missing
 values based on the ones already present."
 [pokemon]
 pokemon)))
 ;; species2 should almost always just be the
 ;; same as species.
 ((fn [pokemon]
 (if (nil? (:species2 pokemon))
-(assoc pokemon :species2 (:species pokemon)))))
+(assoc pokemon :species2 (:species pokemon))
+pokemon)))
 ;; enable the date in :moves to be any combo of
 ;; [:move-1 :move-2]
 ;; [[:move-1 {:pp 20}] :move-2]
 ;; [[:move-1 {:pp 20 :pp-up 3}] :move-2]
 (let [moves (:moves pokemon)]
 (assoc pokemon :moves
 (for [move moves]
 (cond
 (keyword? move)
-[move {:pp (max-pp move) :pp-up 0}]
+[move {:current-pp (max-pp move) :pp-ups 0}]
 (vector? move)
 [(first move)
-(merge {:pp (max-pp (first move) 0)
+(merge {:current-pp (max-pp (first move) 0)
-:pp-up 0} (second move))]))))))
+:pp-ups 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)))))
+(defn give-pokemon
+([^SaveState state poke-num pokemon]
+(let [pokemon* (expand-pokemon pokemon)]
+(-> state
+;; expand roster if necessary
+((fn [state]
+(if (< (dec (party-number state)) poke-num)
+(set-party-number state (inc poke-num)) state)))
+(rename-pokemon poke-num (:name pokemon*))
+(give-DV poke-num (:dv pokemon*))
+(give-type poke-num (:type pokemon*))
+(set-species poke-num (:species pokemon*))
+(set-species2 poke-num (:species2 pokemon*))
+(set-OT-id poke-num (:ID pokemon*))
+(set-OT-name poke-num (:original-trainer pokemon*))
+(give-moves-pps poke-num (:moves pokemon*))
+(give-status poke-num (:status pokemon*))
+(give-stats  poke-num (:stats  pokemon*))
+(give-experience poke-num (:experience pokemon*)))))
+([poke-num pokemon]
+(give-pokemon @current-state poke-num pokemon)))

Mercurial > vba-clojure

comparison clojure/com/aurellem/gb/pokemon.clj @ 209:912496041f98