1.1 --- a/clojure/com/aurellem/gb/types.clj	Fri Mar 23 04:19:38 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/types.clj	Fri Mar 23 04:25:17 2012 -0500
     1.3 @@ -56,176 +56,309 @@
     1.4    ([poke-num]
     1.5       (read-type @current-state poke-num)))
     1.6  
     1.7 +(def pokemon->type
     1.8 +  {:abra            [:psychic]               
     1.9 +   :aerodactyl      [:rock :flying]          
    1.10 +   :alakazam        [:psychic]               
    1.11 +   :arbok           [:poison]                
    1.12 +   :arcanine        [:fire]                  
    1.13 +   :articuno        [:ice :flying]           
    1.14 +   :beedrill        [:bug :poison]           
    1.15 +   :bellsprout      [:grass :poison]         
    1.16 +   :blastoise       [:water]                 
    1.17 +   :bulbasaur       [:grass :poison]         
    1.18 +   :butterfree      [:bug :flying]           
    1.19 +   :caterpie        [:bug]                   
    1.20 +   :chansey         [:normal]                
    1.21 +   :charizard       [:fire :flying]          
    1.22 +   :charmander      [:fire]                  
    1.23 +   :charmeleon      [:fire]                  
    1.24 +   :clefable        [:normal]                
    1.25 +   :clefairy        [:normal]                
    1.26 +   :cloyster        [:water :ice]            
    1.27 +   :cubone          [:ground]                
    1.28 +   :dewgong         [:water :ice]            
    1.29 +   :diglett         [:ground]                
    1.30 +   :ditto           [:normal]                
    1.31 +   :dodrio          [:normal :flying]        
    1.32 +   :doduo           [:normal :flying]        
    1.33 +   :dragonair       [:dragon]                
    1.34 +   :dragonite       [:dragon :flying]        
    1.35 +   :dratini         [:dragon]                
    1.36 +   :drowzee         [:psychic]               
    1.37 +   :dugtrio         [:ground]                
    1.38 +   :eevee           [:normal]                
    1.39 +   :ekans           [:poison]                
    1.40 +   :electabuzz      [:electric]              
    1.41 +   :electrode       [:electric]              
    1.42 +   :exeggcute       [:grass :psychic]        
    1.43 +   :exeggutor       [:grass :psychic]        
    1.44 +   :farfetchd       [:normal :flying]        
    1.45 +   :fearow          [:normal :flying]        
    1.46 +   :flareon         [:fire]                  
    1.47 +   :gastly          [:ghost :poison]         
    1.48 +   :gengar          [:ghost :poison]         
    1.49 +   :geodude         [:rock :ground]          
    1.50 +   :gloom           [:grass :poison]         
    1.51 +   :golbat          [:poison :flying]        
    1.52 +   :goldeen         [:water]                 
    1.53 +   :golduck         [:water]                 
    1.54 +   :golem           [:rock :ground]          
    1.55 +   :graveler        [:rock :ground]          
    1.56 +   :grimer          [:poison]                
    1.57 +   :growlithe       [:fire]                  
    1.58 +   :gyarados        [:water :flying]         
    1.59 +   :haunter         [:ghost :poison]         
    1.60 +   :hitmonchan      [:fighting]              
    1.61 +   :hitmonlee       [:fighting]              
    1.62 +   :horsea          [:water]                 
    1.63 +   :hypno           [:psychic]               
    1.64 +   :ivysaur         [:grass :poison]         
    1.65 +   :jigglypuff      [:normal]                
    1.66 +   :jolteon         [:electric]              
    1.67 +   :jynx            [:ice :psychic]          
    1.68 +   :kabuto          [:rock :water]           
    1.69 +   :kabutops        [:rock :water]           
    1.70 +   :kadabra         [:psychic]               
    1.71 +   :kakuna          [:bug :poison]           
    1.72 +   :kangaskhan      [:normal]                
    1.73 +   :kingler         [:water]                 
    1.74 +   :koffing         [:poison]                
    1.75 +   :krabby          [:water]                 
    1.76 +   :lapras          [:water :ice]            
    1.77 +   :lickitung       [:normal]                
    1.78 +   :machamp         [:fighting]              
    1.79 +   :machoke         [:fighting]              
    1.80 +   :machop          [:fighting]              
    1.81 +   :magikarp        [:water]                 
    1.82 +   :magmar          [:fire]                  
    1.83 +   :magnemite       [:electric]              
    1.84 +   :magneton        [:electric]              
    1.85 +   :mankey          [:fighting]              
    1.86 +   :marowak         [:ground]                
    1.87 +   :meowth          [:normal]                
    1.88 +   :metapod         [:bug]                   
    1.89 +   :mew             [:psychic]               
    1.90 +   :mewtwo          [:psychic]               
    1.91 +   :moltres         [:fire :flying]          
    1.92 +   :mr-mime         [:psychic]               
    1.93 +   :muk             [:poison]                
    1.94 +   :nidoking        [:poison :ground]        
    1.95 +   :nidoqueen       [:poison :ground]        
    1.96 +   :nidoran-female  [:poison]                
    1.97 +   :nidoran-male    [:poison]                
    1.98 +   :nidorina        [:poison]                
    1.99 +   :nidorino        [:poison]                
   1.100 +   :ninetails       [:fire]                  
   1.101 +   :oddish          [:grass :poison]         
   1.102 +   :omanyte         [:rock :water]           
   1.103 +   :omastar         [:rock :water]           
   1.104 +   :onix            [:rock :ground]          
   1.105 +   :paras           [:bug :grass]            
   1.106 +   :parasect        [:bug :grass]            
   1.107 +   :persian         [:normal]                
   1.108 +   :pidgeot         [:normal :flying]        
   1.109 +   :pidgeotto       [:normal :flying]        
   1.110 +   :pidgey          [:normal :flying]        
   1.111 +   :pikachu         [:electric]              
   1.112 +   :pinsir          [:bug]                   
   1.113 +   :poliwag         [:water]                 
   1.114 +   :poliwhirl       [:water]                 
   1.115 +   :poliwrath       [:water :fighting]       
   1.116 +   :ponyta          [:fire]                  
   1.117 +   :porygon         [:normal]                
   1.118 +   :primeape        [:fighting]              
   1.119 +   :psyduck         [:water]                 
   1.120 +   :raichu          [:electric]              
   1.121 +   :rapidash        [:fire]                  
   1.122 +   :raticate        [:normal]                
   1.123 +   :rattata         [:normal]                
   1.124 +   :rhydon          [:ground :rock]          
   1.125 +   :rhyhorn         [:ground :rock]          
   1.126 +   :sandshrew       [:ground]                
   1.127 +   :sandslash       [:ground]                
   1.128 +   :scyther         [:bug :flying]           
   1.129 +   :seaking         [:water]                 
   1.130 +   :sedra           [:water]                 
   1.131 +   :seel            [:water]                 
   1.132 +   :shellder        [:water]                 
   1.133 +   :slowbro         [:water :psychic]        
   1.134 +   :slowpoke        [:water :psychic]        
   1.135 +   :snorlax         [:normal]                
   1.136 +   :spearow         [:normal :flying]        
   1.137 +   :squirtle        [:water]                 
   1.138 +   :starmie         [:water :psychic]        
   1.139 +   :staryu          [:water]                 
   1.140 +   :tangela         [:grass]                 
   1.141 +   :tauros          [:normal]                
   1.142 +   :tentacool       [:water :poison]         
   1.143 +   :tentacruel      [:water :poison]         
   1.144 +   :vaporeon        [:water]                 
   1.145 +   :venomoth        [:bug :poison]           
   1.146 +   :venonat         [:bug :poison]           
   1.147 +   :venusaur        [:grass :poison]         
   1.148 +   :victreebel      [:grass :poison]         
   1.149 +   :vileplume       [:grass :poison]         
   1.150 +   :voltorb         [:electric]              
   1.151 +   :vulpix          [:fire]                  
   1.152 +   :wartortle       [:water]                 
   1.153 +   :weedle          [:bug :poison]           
   1.154 +   :weepenbell      [:grass :poison]         
   1.155 +   :wheezing        [:poison]                
   1.156 +   :wigglytuff      [:normal]                
   1.157 +   :zapdos          [:electric :flying]      
   1.158 +   :zubat           [:poison :flying]})
   1.159  
   1.160  
   1.161 -:normal   nor
   1.162 -:fighting fig
   1.163 -:flying   fly
   1.164 -:poision  poi
   1.165 -:ground   gro
   1.166 -:rock     roc
   1.167 -:bug      bug
   1.168 -:ghost    gho
   1.169 -:fire     fir
   1.170 -:water    wat
   1.171 -:grass    gra
   1.172 -:electric ele
   1.173 -:psychic  psy
   1.174 -:ice      ice
   1.175 -:dragon   dra
   1.176  
   1.177  
   1.178  
   1.179 -(def pokemon->type
   1.180 -  {
   1.181 -   :abra            psy
   1.182 -   :aerodactyl      rck fly
   1.183 -   :alakazam        psy
   1.184 -   :arbok           poi
   1.185 -   :arcanine        fir
   1.186 -   :articuno        ice fly
   1.187 -   :beedrill        bug poi
   1.188 -   :bellsprout      gra poi
   1.189 -   :blastoise       wat
   1.190 -   :bulbasaur       gra poi
   1.191 -   :butterfree      bug fly
   1.192 -   :caterpie        bug
   1.193 -   :chansey         nor
   1.194 -   :charizard       fir fly
   1.195 -   :charmander      fir
   1.196 -   :charmeleon      fir
   1.197 -   :clefable        nor
   1.198 -   :clefairy        nor
   1.199 -   :cloyster        wat ice
   1.200 -   :cubone          gro
   1.201 -   :dewgong         wat ice
   1.202 -   :diglett         gro
   1.203 -   :ditto           nor
   1.204 -   :dodrio          nor fly
   1.205 -   :doduo           nor fly
   1.206 -   :dragonair       drg
   1.207 -   :dragonite       drg fly
   1.208 -   :dratini         drg
   1.209 -   :drowzee         psy
   1.210 -   :dugtrio         gro
   1.211 -   :eevee           nor
   1.212 -   :ekans           poi
   1.213 -   :electabuzz      ele
   1.214 -   :electrode       ele
   1.215 -   :exeggcute       gra psy
   1.216 -   :exeggutor       gra psy
   1.217 -   :farfetchd       nor fly
   1.218 -   :fearow          nor fly
   1.219 -   :flareon         fir
   1.220 -   :gastly          gho poi
   1.221 -   :gengar          gho poi
   1.222 -   :geodude         rck gro
   1.223 -   :gloom           gra poi
   1.224 -   :golbat          poi fly
   1.225 -   :goldeen         wat
   1.226 -   :golduck         wat
   1.227 -   :golem           rck gro
   1.228 -   :graveler        rck gro
   1.229 -   :grimer          poi
   1.230 -   :growlithe       fir
   1.231 -   :gyarados        wat fly
   1.232 -   :haunter         gho poi
   1.233 -   :hitmonchan      fgt
   1.234 -   :hitmonlee       fgt
   1.235 -   :horsea          wat
   1.236 -   :hypno           psy
   1.237 -   :ivysaur         gra poi
   1.238 -   :jigglypuff      nor
   1.239 -   :jolteon         ele
   1.240 -   :jynx            ice psy
   1.241 -   :kabuto          rck wat
   1.242 -   :kabutops        rck wat
   1.243 -   :kadabra         psy
   1.244 -   :kakuna          bug poi
   1.245 -   :kangaskhan      nor
   1.246 -   :kingler         wat
   1.247 -   :koffing         poi
   1.248 -   :krabby          wat
   1.249 -   :lapras          wat ice
   1.250 -   :lickitung       nor
   1.251 -   :machamp         fgt
   1.252 -   :machoke         fgt
   1.253 -   :machop          fgt
   1.254 -   :magikarp        wat
   1.255 -   :magmar          fir
   1.256 -   :magnemite       ele
   1.257 -   :magneton        ele
   1.258 -   :mankey          fgt
   1.259 -   :marowak         gro
   1.260 -   :meowth          nor
   1.261 -   :metapod         bug
   1.262 -   :mew             psy
   1.263 -   :mewtwo          psy
   1.264 -   :moltres         fir fly
   1.265 -   :mr-mime         psy
   1.266 -   :muk             poi
   1.267 -   :nidoking        poi gro
   1.268 -   :nidoqueen       poi gro
   1.269 -   :nidoran-female  poi
   1.270 -   :nidoran-male    poi
   1.271 -   :nidorina        poi
   1.272 -   :nidorino        poi
   1.273 -   :ninetails       fir
   1.274 -   :oddish          gra poi
   1.275 -   :omanyte         rck wat
   1.276 -   :omastar         rck wat
   1.277 -   :onix            rck gro
   1.278 -   :paras           bug gra
   1.279 -   :parasect        bug gra
   1.280 -   :persian         nor
   1.281 -   :pidgeot         nor fly
   1.282 -   :pidgeotto       nor fly
   1.283 -   :pidgey          nor fly
   1.284 -   :pikachu         ele
   1.285 -   :pinsir          bug
   1.286 -   :poliwag         wat
   1.287 -   :poliwhirl       wat
   1.288 -   :poliwrath       wat fgt
   1.289 -   :ponyta          fir
   1.290 -   :porygon         nor
   1.291 -   :primeape        fgt
   1.292 -   :psyduck         wat
   1.293 -   :raichu          ele
   1.294 -   :rapidash        fir
   1.295 -   :raticate        nor
   1.296 -   :rattata         nor
   1.297 -   :rhydon          gro rck
   1.298 -   :rhyhorn         gro rck
   1.299 -   :sandshrew       gro
   1.300 -   :sandslash       gro
   1.301 -   :scyther         bug fly
   1.302 -   :seaking         wat
   1.303 -   :sedra           wat
   1.304 -   :seel            wat
   1.305 -   :shellder        wat
   1.306 -   :slowbro         wat psy
   1.307 -   :slowpoke        wat psy
   1.308 -   :snorlax         nor
   1.309 -   :spearow         nor fly
   1.310 -   :squirtle        wat
   1.311 -   :starmie         wat psy
   1.312 -   :staryu          wat
   1.313 -   :tangela         gra
   1.314 -   :tauros          nor
   1.315 -   :tentacool       wat poi
   1.316 -   :tentacruel      wat poi
   1.317 -   :vaporeon        wat
   1.318 -   :venomoth        bug poi
   1.319 -   :venonat         bug poi
   1.320 -   :venusaur        gra poi
   1.321 -   :victreebel      gra poi
   1.322 -   :vileplume       gra poi
   1.323 -   :voltorb         ele
   1.324 -   :vulpix          fir
   1.325 -   :wartortle       wat
   1.326 -   :weedle          bug poi
   1.327 -   :weepenbell      gra poi
   1.328 -   :wheezing        poi
   1.329 -   :wigglytuff      nor
   1.330 -   :zapdos          ele fly
   1.331 -   :zubat           poi fly
   1.332 \ No newline at end of file
   1.333 +
   1.334 +
   1.335 +
   1.336 +
   1.337 +
   1.338 +
   1.339 +
   1.340 +
   1.341 +
   1.342 +
   1.343 +
   1.344 +
   1.345 +
   1.346 +
   1.347 +
   1.348 +
   1.349 +
   1.350 +
   1.351 +
   1.352 +
   1.353 +
   1.354 +
   1.355 +
   1.356 +
   1.357 +
   1.358 +
   1.359 +
   1.360 +
   1.361 +
   1.362 +
   1.363 +
   1.364 +
   1.365 +
   1.366 +
   1.367 +
   1.368 +
   1.369 +
   1.370 +
   1.371 +
   1.372 +
   1.373 +
   1.374 +
   1.375 +
   1.376 +
   1.377 +
   1.378 +
   1.379 +
   1.380 +
   1.381 +
   1.382 +
   1.383 +
   1.384 +
   1.385 +
   1.386 +
   1.387 +
   1.388 +
   1.389 +
   1.390 +
   1.391 +
   1.392 +
   1.393 +
   1.394 +
   1.395 +
   1.396 +
   1.397 +
   1.398 +
   1.399 +
   1.400 +
   1.401 +
   1.402 +
   1.403 +
   1.404 +
   1.405 +
   1.406 +
   1.407 +
   1.408 +
   1.409 +
   1.410 +
   1.411 +
   1.412 +
   1.413 +
   1.414 +
   1.415 +
   1.416 +
   1.417 +
   1.418 +
   1.419 +
   1.420 +
   1.421 +
   1.422 +
   1.423 +
   1.424 +
   1.425 +
   1.426 +
   1.427 +
   1.428 +
   1.429 +
   1.430 +
   1.431 +
   1.432 +
   1.433 +
   1.434 +
   1.435 +
   1.436 +
   1.437 +
   1.438 +
   1.439 +
   1.440 +
   1.441 +
   1.442 +
   1.443 +
   1.444 +
   1.445 +
   1.446 +
   1.447 +
   1.448 +
   1.449 +
   1.450 +
   1.451 +
   1.452 +
   1.453 +
   1.454 +
   1.455 +
   1.456 +
   1.457 +
   1.458 +
   1.459 +
   1.460 +
   1.461 +
   1.462 +
   1.463 +
   1.464 +
   1.465 +
   1.466 +
   1.467 +
   1.468 +
   1.469 +
   1.470 +
   1.471 +
   1.472 +
   1.473 +
   1.474 +
   1.475 +
   1.476 +
   1.477 +
   1.478 +
   1.479 +
   1.480 +
   1.481 +