# HG changeset patch # User Robert McIntyre # Date 1332480634 18000 # Node ID 5055ec9de2780e9ec0e06673d7eea3f61c6bad66 # Parent 659764a2ea403144be8c7a94019a5f379c84cc50 competed move-table printing component of pokemon printing function. diff -r 659764a2ea40 -r 5055ec9de278 clojure/com/aurellem/gb/moves.clj --- a/clojure/com/aurellem/gb/moves.clj Fri Mar 23 00:14:37 2012 -0500 +++ b/clojure/com/aurellem/gb/moves.clj Fri Mar 23 00:30:34 2012 -0500 @@ -324,111 +324,115 @@ :guillotine 5 :gust 35 :harden 30 - :haze - :headbutt - :hi-jump-kick - :horn-attack - :horn-drill - :hydro-pump - :hyper-beam - :hyper-fang - :hypnosis - :ice-beam - :ice-punch - :jump-kick - :karate-chop - :kinesis - :leech-life - :leech-seed - :leer - :lick - :light-screen - :lovely-kiss - :low-kick - :meditate - :mega-drain - :mega-kick - :mega-punch - :metronome - :mimic - :minimize - :mirror-move - :mist - :night-shade - :pay-day - :peck - :petal-dance - :pin-missle - :poison-gas - :poison-sting - :poisonpowder - :pound - :psybeam - :psychic - :psywave - :quick-attack - :rage - :razor-leaf - :razor-wind - :recover - :reflect - :rest - :roar - :rock-slide - :rock-throw - :rolling-kick - :sand-attack - :scratch - :screech - :seismic-toss - :selfdestruct - :sharpen - :sing - :skull-bash - :sky-attack - :slam - :slash - :sleep-powder - :sludge - :smog - :smokescreen - :softboiled - :solarbeam - :sonicboom - :spike-cannon - :splash - :spore - :stomp - :strength - :string-shot - :struggle - :stun-spore - :submission - :substitute - :super-fang - :supersonic - :surf - :swift - :swords-dance - :tackle - :tail-whip - :take-down - :teleport - :thrash - :thunder - :thunder-wave - :thunderbolt - :thunderpunch - :thundershock - :toxic - :transform - :tri-attack - :twinneedle - :vicegrip - :vine-whip - :water-gun - :waterfall - :whirlwind - :wing-attack - :withdraw - :wrap \ No newline at end of file + :haze 30 + :headbutt 15 + :hi-jump-kick 20 + :horn-attack 25 + :horn-drill 5 + :hydro-pump 5 + :hyper-beam 5 + :hyper-fang 15 + :hypnosis 20 + :ice-beam 10 + :ice-punch 15 + :jump-kick 25 + :karate-chop 25 + :kinesis 15 + :leech-life 15 + :leech-seed 10 + :leer 30 + :lick 30 + :light-screen 30 + :lovely-kiss 10 + :low-kick 20 + :meditate 40 + :mega-drain 10 + :mega-kick 5 + :mega-punch 20 + :metronome 10 + :mimic 10 + :minimize 20 + :mirror-move 20 + :mist 30 + :night-shade 15 + :pay-day 20 + :peck 35 + :petal-dance 20 + :pin-missle 20 + :poison-gas 40 + :poison-sting 35 + :poisonpowder 35 + :pound 35 + :psybeam 20 + :psychic 10 + :psywave 15 + :quick-attack 30 + :rage 20 + :razor-leaf 25 + :razor-wind 10 + :recover 20 + :reflect 20 + :rest 10 + :roar 20 + :rock-slide 10 + :rock-throw 15 + :rolling-kick 15 + :sand-attack 15 + :scratch 30 + :screech 40 + :seismic-toss 20 + :selfdestruct 5 + :sharpen 30 + :sing 15 + :skull-bash 15 + :sky-attack 5 + :slam 20 + :slash 20 + :sleep-powder 15 + :sludge 20 + :smog 20 + :smokescreen 20 + :softboiled 10 + :solarbeam 10 + :sonicboom 20 + :spike-cannon 15 + :splash 40 + :spore 15 + :stomp 20 + :strength 15 + :string-shot 40 + :struggle 1 + :stun-spore 30 + :submission 25 + :substitute 10 + :super-fang 10 + :supersonic 20 + :surf 15 + :swift 20 + :swords-dance 30 + :tackle 35 + :tail-whip 30 + :take-down 20 + :teleport 20 + :thrash 20 + :thunder 10 + :thunder-wave 20 + :thunderbolt 15 + :thunderpunch 15 + :thundershock 30 + :toxic 10 + :transform 10 + :tri-attack 10 + :twinneedle 20 + :vicegrip 30 + :vine-whip 10 + :water-gun 25 + :waterfall 15 + :whirlwind 20 + :wing-attack 35 + :withdraw 40 + :wrap 20}) + +(defn max-pp [name pp-ups] + (int (* (+ 1 (* (/ 1 5) pp-ups)) + (move-name->move-pp name)))) \ No newline at end of file