1.1 --- a/clojure/com/aurellem/gb/moves.clj	Fri Mar 23 00:14:37 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/moves.clj	Fri Mar 23 00:30:34 2012 -0500
     1.3 @@ -324,111 +324,115 @@
     1.4     :guillotine     5
     1.5     :gust          35
     1.6     :harden        30
     1.7 -   :haze          
     1.8 -   :headbutt      
     1.9 -   :hi-jump-kick  
    1.10 -   :horn-attack   
    1.11 -   :horn-drill    
    1.12 -   :hydro-pump    
    1.13 -   :hyper-beam    
    1.14 -   :hyper-fang    
    1.15 -   :hypnosis      
    1.16 -   :ice-beam      
    1.17 -   :ice-punch     
    1.18 -   :jump-kick     
    1.19 -   :karate-chop   
    1.20 -   :kinesis       
    1.21 -   :leech-life    
    1.22 -   :leech-seed    
    1.23 -   :leer          
    1.24 -   :lick          
    1.25 -   :light-screen  
    1.26 -   :lovely-kiss   
    1.27 -   :low-kick      
    1.28 -   :meditate      
    1.29 -   :mega-drain    
    1.30 -   :mega-kick     
    1.31 -   :mega-punch    
    1.32 -   :metronome     
    1.33 -   :mimic         
    1.34 -   :minimize      
    1.35 -   :mirror-move   
    1.36 -   :mist          
    1.37 -   :night-shade   
    1.38 -   :pay-day       
    1.39 -   :peck          
    1.40 -   :petal-dance   
    1.41 -   :pin-missle    
    1.42 -   :poison-gas    
    1.43 -   :poison-sting  
    1.44 -   :poisonpowder  
    1.45 -   :pound         
    1.46 -   :psybeam       
    1.47 -   :psychic       
    1.48 -   :psywave       
    1.49 -   :quick-attack  
    1.50 -   :rage          
    1.51 -   :razor-leaf    
    1.52 -   :razor-wind    
    1.53 -   :recover       
    1.54 -   :reflect       
    1.55 -   :rest          
    1.56 -   :roar          
    1.57 -   :rock-slide    
    1.58 -   :rock-throw    
    1.59 -   :rolling-kick  
    1.60 -   :sand-attack   
    1.61 -   :scratch       
    1.62 -   :screech       
    1.63 -   :seismic-toss  
    1.64 -   :selfdestruct  
    1.65 -   :sharpen       
    1.66 -   :sing          
    1.67 -   :skull-bash    
    1.68 -   :sky-attack    
    1.69 -   :slam          
    1.70 -   :slash         
    1.71 -   :sleep-powder  
    1.72 -   :sludge        
    1.73 -   :smog          
    1.74 -   :smokescreen   
    1.75 -   :softboiled    
    1.76 -   :solarbeam     
    1.77 -   :sonicboom     
    1.78 -   :spike-cannon  
    1.79 -   :splash        
    1.80 -   :spore         
    1.81 -   :stomp         
    1.82 -   :strength      
    1.83 -   :string-shot   
    1.84 -   :struggle      
    1.85 -   :stun-spore    
    1.86 -   :submission    
    1.87 -   :substitute    
    1.88 -   :super-fang    
    1.89 -   :supersonic    
    1.90 -   :surf          
    1.91 -   :swift         
    1.92 -   :swords-dance  
    1.93 -   :tackle        
    1.94 -   :tail-whip     
    1.95 -   :take-down     
    1.96 -   :teleport      
    1.97 -   :thrash        
    1.98 -   :thunder       
    1.99 -   :thunder-wave  
   1.100 -   :thunderbolt   
   1.101 -   :thunderpunch  
   1.102 -   :thundershock  
   1.103 -   :toxic         
   1.104 -   :transform     
   1.105 -   :tri-attack    
   1.106 -   :twinneedle    
   1.107 -   :vicegrip      
   1.108 -   :vine-whip     
   1.109 -   :water-gun     
   1.110 -   :waterfall     
   1.111 -   :whirlwind     
   1.112 -   :wing-attack   
   1.113 -   :withdraw      
   1.114 -   :wrap          
   1.115 \ No newline at end of file
   1.116 +   :haze          30
   1.117 +   :headbutt      15
   1.118 +   :hi-jump-kick  20
   1.119 +   :horn-attack   25
   1.120 +   :horn-drill     5
   1.121 +   :hydro-pump     5
   1.122 +   :hyper-beam     5
   1.123 +   :hyper-fang    15
   1.124 +   :hypnosis      20
   1.125 +   :ice-beam      10
   1.126 +   :ice-punch     15
   1.127 +   :jump-kick     25
   1.128 +   :karate-chop   25
   1.129 +   :kinesis       15
   1.130 +   :leech-life    15
   1.131 +   :leech-seed    10
   1.132 +   :leer          30
   1.133 +   :lick          30
   1.134 +   :light-screen  30
   1.135 +   :lovely-kiss   10
   1.136 +   :low-kick      20
   1.137 +   :meditate      40
   1.138 +   :mega-drain    10
   1.139 +   :mega-kick      5
   1.140 +   :mega-punch    20
   1.141 +   :metronome     10
   1.142 +   :mimic         10
   1.143 +   :minimize      20
   1.144 +   :mirror-move   20
   1.145 +   :mist          30
   1.146 +   :night-shade   15
   1.147 +   :pay-day       20
   1.148 +   :peck          35
   1.149 +   :petal-dance   20
   1.150 +   :pin-missle    20
   1.151 +   :poison-gas    40
   1.152 +   :poison-sting  35
   1.153 +   :poisonpowder  35
   1.154 +   :pound         35
   1.155 +   :psybeam       20
   1.156 +   :psychic       10
   1.157 +   :psywave       15
   1.158 +   :quick-attack  30
   1.159 +   :rage          20
   1.160 +   :razor-leaf    25
   1.161 +   :razor-wind    10
   1.162 +   :recover       20
   1.163 +   :reflect       20
   1.164 +   :rest          10
   1.165 +   :roar          20
   1.166 +   :rock-slide    10
   1.167 +   :rock-throw    15
   1.168 +   :rolling-kick  15
   1.169 +   :sand-attack   15
   1.170 +   :scratch       30
   1.171 +   :screech       40
   1.172 +   :seismic-toss  20
   1.173 +   :selfdestruct   5
   1.174 +   :sharpen       30
   1.175 +   :sing          15
   1.176 +   :skull-bash    15
   1.177 +   :sky-attack     5
   1.178 +   :slam          20
   1.179 +   :slash         20
   1.180 +   :sleep-powder  15
   1.181 +   :sludge        20
   1.182 +   :smog          20
   1.183 +   :smokescreen   20
   1.184 +   :softboiled    10
   1.185 +   :solarbeam     10
   1.186 +   :sonicboom     20
   1.187 +   :spike-cannon  15
   1.188 +   :splash        40
   1.189 +   :spore         15
   1.190 +   :stomp         20
   1.191 +   :strength      15
   1.192 +   :string-shot   40
   1.193 +   :struggle       1
   1.194 +   :stun-spore    30
   1.195 +   :submission    25
   1.196 +   :substitute    10
   1.197 +   :super-fang    10
   1.198 +   :supersonic    20
   1.199 +   :surf          15
   1.200 +   :swift         20
   1.201 +   :swords-dance  30
   1.202 +   :tackle        35
   1.203 +   :tail-whip     30
   1.204 +   :take-down     20
   1.205 +   :teleport      20
   1.206 +   :thrash        20
   1.207 +   :thunder       10
   1.208 +   :thunder-wave  20
   1.209 +   :thunderbolt   15
   1.210 +   :thunderpunch  15
   1.211 +   :thundershock  30
   1.212 +   :toxic         10
   1.213 +   :transform     10
   1.214 +   :tri-attack    10
   1.215 +   :twinneedle    20
   1.216 +   :vicegrip      30
   1.217 +   :vine-whip     10
   1.218 +   :water-gun     25
   1.219 +   :waterfall     15
   1.220 +   :whirlwind     20
   1.221 +   :wing-attack   35
   1.222 +   :withdraw      40
   1.223 +   :wrap          20})
   1.224 +
   1.225 +(defn max-pp [name pp-ups]
   1.226 +  (int (* (+ 1 (* (/ 1 5) pp-ups))
   1.227 +          (move-name->move-pp name))))
   1.228 \ No newline at end of file