1.1 --- a/org/types.org	Wed Nov 02 07:01:49 2011 -0700
     1.2 +++ b/org/types.org	Wed Nov 02 07:35:57 2011 -0700
     1.3 @@ -8,16 +8,15 @@
     1.4  * The Pok\eacute{}mon Type System
     1.5    
     1.6  The Pok\eacute{}mon type system consists of seventeen different
     1.7 -\ldquo{}types\rdquo{} (Rock, Grass, Ice, Psychic, Ground, Bug, Flying,
     1.8 -Fire, Fighting, Dark, Dragon, Poison, Water, Ghost, Normal, Electric,
     1.9 -and Steel) that interact like an extended version of
    1.10 -Rock-Paper-Scissors: for example, the Fire type is strong against the
    1.11 -Grass type but weak against the Water type. In the table below, we've
    1.12 -recorded the relative strengths of each of the types in the
    1.13 -Pok\eacute{}mon type system; the number in each cell indicates how
    1.14 -effective an attack of the type in the row is against a
    1.15 -Pok\eacute{}mon of the type in the column. We call these numbers
    1.16 -/susceptibilities/.
    1.17 +/types/ (Rock, Grass, Ice, Psychic, Ground, Bug, Flying, Fire,
    1.18 +Fighting, Dark, Dragon, Poison, Water, Ghost, Normal, Electric, and
    1.19 +Steel) that interact like an extended version of Rock-Paper-Scissors:
    1.20 +for example, the Fire type is strong against the Grass type but weak
    1.21 +against the Water type. In the table below, we've recorded the
    1.22 +relative strengths of each of the types in the Pok\eacute{}mon type
    1.23 +system; the number in each cell indicates how effective an attack of
    1.24 +the type in the row is against a Pok\eacute{}mon of the type in the
    1.25 +column. We call these numbers /susceptibilities/.
    1.26  
    1.27  In the Pok\eacute{}mon games, only four susceptibility values (two,
    1.28  one, one-half, and zero) occur. These numbers indicate particularly
    1.29 @@ -48,7 +47,7 @@
    1.30  introduction of pok\eacute{}mon Gold and Silver, and has been in use
    1.31  ever since.  It is called the /Generation II Type System/.
    1.32  
    1.33 -Here are the the definitions of the two type systems.
    1.34 +The definitions of the two Type Systems are included below. 
    1.35  
    1.36  * Generation I and II Type System Data 
    1.37  
    1.38 @@ -112,10 +111,13 @@
    1.39     Generation II).
    1.40   - Ice is normally effective against Fire, (not-very-effective in
    1.41     Generation II).
    1.42 - - Ghost is completely ineffective against Psychic. This is considered
    1.43 -   to be a programning glitch.
    1.44 -
    1.45 -
    1.46 + - Ghost is completely ineffective against Psychic, even though the
    1.47 +   pok\eacute{}mon anime ran [[http://bulbapedia.bulbagarden.net/wiki/EP022][a three-part series]] about how Ghost
    1.48 +   pok\eacute{}mon are the best way to defeat Psychic pok\eacute{}mon,
    1.49 +   and the Red, Blue, and Yellow games each have a character who
    1.50 +   states "The only thing Psychic pok\eacute{}mon fear are Bugs and
    1.51 +   Ghosts!" This is considered to be a programning glitch. Ghost is
    1.52 +   super-effective against Psychic in Generation II.
    1.53  
    1.54  * Representing the Data
    1.55  
    1.56 @@ -233,13 +235,13 @@
    1.57  * Interfacing with the Data
    1.58  
    1.59  In the pok\eacute{}mon games, a pok\eacute{}mon can have up to two
    1.60 -types at the same time.  For example, Zapdos, the fearsome legendary
    1.61 -that can control lightning, has both the Electric and Flying types. A
    1.62 -pok\eacute{}mon with more than one type gains the advantages and
    1.63 -disadvanteags of both types.  The suceptibilitys of each type are
    1.64 +types at the same time.  For example, [[http://bulbapedia.bulbagarden.net/wiki/Zapdos][Zapdos]], the fearsome legendary
    1.65 +bird that can control lightning, has both the Electric and Flying
    1.66 +types. A pok\eacute{}mon with more than one type gains the advantages
    1.67 +and disadvanteags of both types.  The suceptibilitys of each type are
    1.68  multiplied together to produce the hybrid type's susceptibilities. For
    1.69  example, Electric is weak to Ground (susceptibility of 2), but Flying
    1.70 -is immune to Ground (suceptibility of 0). Zapdos' type,
    1.71 +is immune to Ground (suceptibility of 0). [[http://bulbapedia.bulbagarden.net/wiki/Zapdos][Zapdos']] type,
    1.72  Electrig/Flying, is immune to Ground because $2 \times 0 = 0$.
    1.73  
    1.74  #+srcname: types
    1.75 @@ -270,7 +272,7 @@
    1.76    (reduce + (map #(expt % 2) (vals (susceptibility types)))))
    1.77  #+end_src
    1.78  
    1.79 -Now we can work out the suceptability of Zapdos automatically.
    1.80 +Now we can work out the suceptability of [[http://bulbapedia.bulbagarden.net/wiki/Zapdos][Zapdos]] automatically.
    1.81  
    1.82  Electric is weak to Ground.
    1.83  #+begin_src clojure :exports both
    1.84 @@ -440,14 +442,15 @@
    1.85  : [:dark :ghost]
    1.86  
    1.87  Dark and Ghost, which additionally has the property of having no
    1.88 - weaknesses to any other type, is the best type combo in terms of
    1.89 - susceptance.
    1.90 +weaknesses to any other type, is the best type combo in terms of
    1.91 +susceptance.
    1.92  
    1.93  The Dark and Steel types were introduced many years after
    1.94  pok\eacute{}mon started. In addition to the additional types, the
    1.95  pok\eacute{}mon games gained a few new rules concerning some of the
    1.96 -matchups of the original types. Therefore, it's also interesting to see what
    1.97 -type combination was most powerful before those types and new rules were introduced.
    1.98 +matchups of the original types. Therefore, it's also interesting to
    1.99 +see what type combination was most powerful before those types and new
   1.100 +rules were introduced.
   1.101  
   1.102  The easiest way to do this with my setup is to just rebind the
   1.103  =pokemon-gen-two= table to the =pokemon-gen-one= table. Since
   1.104 @@ -584,9 +587,10 @@
   1.105  Electric and Normal are among the best types with which to start the
   1.106  game, since they have the fewest weaknesses among all the types.
   1.107  
   1.108 -At the beginning of the pok\eacute{}mon games, players are given a choice
   1.109 -between the Fire pok\eacute{}mon Charmander, the Water pok\eacute{}mon Squirtle, or
   1.110 -the Grass/Poison pok\eacute{}mon Bulbasaur.
   1.111 +At the beginning of the pok\eacute{}mon games, players are given a
   1.112 +choice between the Fire pok\eacute{}mon [[http://bulbapedia.bulbagarden.net/wiki/Charmander][Charmander]], the Water
   1.113 +pok\eacute{}mon [[http://bulbapedia.bulbagarden.net/wiki/Squirtle][Squirtle]], or the Grass/Poison pok\eacute{}mon
   1.114 +[[http://bulbapedia.bulbagarden.net/wiki/Bulbasaur][Bulbasaur]].
   1.115  
   1.116  #+begin_src clojure :exports both :results verbatim
   1.117  (sort-by pokemon.types/susceptance [[:fire] [:water] [:grass :poison]])
   1.118 @@ -595,7 +599,7 @@
   1.119  #+results:
   1.120  : ([:water] [:fire] [:grass :poison])
   1.121  
   1.122 -As can be seen, the Water pok\eacute{}mon Squirtle is the most solid
   1.123 +As can be seen, the Water pok\eacute{}mon [[http://bulbapedia.bulbagarden.net/wiki/Squirtle][Squirtle]] is the most solid
   1.124  choice starting out, insofar as susceptance is concerned.
   1.125  
   1.126  ** The Worst Pok\eacute{}mon Types
   1.127 @@ -703,8 +707,6 @@
   1.128  In the [[./lpsolve.org][next installment]], I'll use =lp_solve= to solve this problem in
   1.129  a different way.
   1.130  
   1.131 -
   1.132 -
   1.133  * COMMENT main program
   1.134  #+begin_src clojure :noweb yes :tangle ../src/pokemon/types.clj :exports none
   1.135  <<header>>