1.1 --- a/org/types.org	Thu Oct 20 01:12:46 2011 -0700
     1.2 +++ b/org/types.org	Wed Nov 02 05:41:49 2011 -0700
     1.3 @@ -16,22 +16,40 @@
     1.4  Pok\eacute{}mon type system; the number in each cell indicates how
     1.5  effective an attack of the type in the row is against a
     1.6  Pok\eacute{}mon of the type in the column. We call these numbers
     1.7 -/susceptibilities/ because we are interested in the column totals,
     1.8 -which quantify the overall vulnerability of each Pok\eacute{}mon type
     1.9 -(as opposed to the row totals, which quantify the overall
    1.10 -effectiveness of each attack type.)
    1.11 +/susceptibilities/.
    1.12  
    1.13  In the Pok\eacute{}mon games, only four susceptibility values (two,
    1.14  one, one-half, and zero) occur. These numbers indicate particularly
    1.15  high susceptibility, average susceptibility, particularly low
    1.16 -susceptibility, and no susceptibility
    1.17 -(immunity). Here is the entire Pok\eacute{}mon type chart.
    1.18 +susceptibility, and no susceptibility (immunity).
    1.19  
    1.20 + - The suceptability of Flying types /against/ Ground is 0, because Ground
    1.21 +   attacks cannot hurt Flying pok\eacute{}mon at all. The damage that
    1.22 +   a Ground type attack normally does is  /multiplied/ by 0 when it is
    1.23 +   uesd against a Flying type pok\eacute{}mon.
    1.24  
    1.25 + - The susceptability of Fire types against Water attacks
    1.26 +   is 2, because Water type attacks are strong against Fire type
    1.27 +   Pok\eacute{}mon. The damage that a Water type attack normally does
    1.28 +   is doubled when it is used against a Fire type pok\eacute{}mon.
    1.29  
    1.30 -** TODO add the pokemon chart in a pretty form
    1.31 -  
    1.32 -* COMMENT Pokemon Table Data 
    1.33 + - The susceptability of Water types against Water attacks is
    1.34 +   $\frac{1}{2}$, because Water type attacks are strong against Water
    1.35 +   type Pok\eacute{}mon. The damage that a Water type attack normally
    1.36 +   does is halved when it is used against a Water type
    1.37 +   pok\eacute{}mon.
    1.38 +
    1.39 +There are two pok\eacute{}mon type systems in use. The first is the
    1.40 +classic system which was used for the very first pok\eacute{}mon
    1.41 +games, Red, Yellow, and Blue. This old system was used from 1998 to
    1.42 +2000 in America, and is known as the /Generation I Type System/.  The
    1.43 +modern pok\eacute{}mon type system was introduced in 2000 with the
    1.44 +introduction of pok\eacute{}mon Gold and Silver, and has been in use
    1.45 +ever since.  It is called the /Generation II Type System/.
    1.46 +
    1.47 +Here are the the definitions of the two type systems.
    1.48 +
    1.49 +* Pokemon Table Data 
    1.50  
    1.51  #+caption: The rows are attack types, while the columns are defense types.  To see the multiplier for a pokemon attack against a certain type, follow the row for the attack type to the column of the defending type.
    1.52  #+label: pokemon-matchups
    1.53 @@ -603,6 +621,7 @@
    1.54  a different way.
    1.55  
    1.56  
    1.57 +
    1.58  * COMMENT main program
    1.59  #+begin_src clojure :noweb yes :tangle ../src/pokemon/types.clj :exports none
    1.60  <<header>>