1.1 --- a/org/types.org	Wed Nov 02 05:41:49 2011 -0700
     1.2 +++ b/org/types.org	Wed Nov 02 05:53:43 2011 -0700
     1.3 @@ -49,9 +49,9 @@
     1.4  
     1.5  Here are the the definitions of the two type systems.
     1.6  
     1.7 -* Pokemon Table Data 
     1.8 +* The Pok\eacute{}mon Type Systems 
     1.9  
    1.10 -#+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.11 +** Generation II Type System
    1.12  #+label: pokemon-matchups
    1.13  #+tblname: pokemon-table-gen-two
    1.14  |          | normal | fire | water | electric | grass | ice | fighting | poison | ground | flying | psychic | bug | rock | ghost | dragon | dark | steel |
    1.15 @@ -74,9 +74,12 @@
    1.16  | dark     |      1 |    1 |     1 |        1 |     1 |   1 |       .5 |      1 |      1 |      1 |       2 |   1 |    1 |     2 |      1 |   .5 |    .5 |
    1.17  | steel    |      1 |   .5 |    .5 |       .5 |     1 |   2 |        1 |      1 |      1 |      1 |       1 |   1 |    2 |     1 |      1 |    1 |    .5 |
    1.18  
    1.19 -#+caption: this is the old table from generation 1. The differences are: dark and ghost are missing, Bus is super against Poison, Poison is super against Bug, Bug is regularly effective against Ghost, and Ice is normally effective against Fire. Ghost is not effective against psychic.
    1.20 -#+label: pokemon-matchups-gen-1
    1.21 -#+tblname: pokemon-table-gen-one
    1.22 +The rows are attack types, while the columns are defense types.  To
    1.23 +see the multiplier for a pokemon attack against a certain type, follow
    1.24 +the row for the attack type to the column of the defending type.
    1.25 +
    1.26 +** Generation I Type System
    1.27 +#+label: pokemon-matchups-gen-1 +tblname: pokemon-table-gen-one
    1.28  |          | normal | fire | water | electric | grass | ice | fighting | poison | ground | flying | psychic | bug | rock | ghost | dragon |
    1.29  |----------+--------+------+-------+----------+-------+-----+----------+--------+--------+--------+---------+-----+------+-------+--------|
    1.30  | normal   |      1 |    1 |     1 |        1 |     1 |   1 |        1 |      1 |      1 |      1 |       1 |   1 |   .5 |     0 |      1 |
    1.31 @@ -95,6 +98,21 @@
    1.32  | ghost    |      0 |    1 |     1 |        1 |     1 |   1 |        1 |      1 |      1 |      1 |       0 |   1 |    1 |     2 |      1 |
    1.33  | dragon   |      1 |    1 |     1 |        1 |     1 |   1 |        1 |      1 |      1 |      1 |       1 |   1 |    1 |     1 |      2 |
    1.34  
    1.35 +
    1.36 +This is the old table from Generation I. The differences from
    1.37 +Generation II are: 
    1.38 + - Dark and Steel are missing.
    1.39 + - Bug is super-effective against Poison.
    1.40 + - Poison is super-effective against Bug.
    1.41 + - Bug is regularly effective against Ghost (instead of
    1.42 +   super-effective like in Generation II).
    1.43 + - Ice is normally effective against Fire, (it's not-very-effective in
    1.44 +   Generation II).
    1.45 + - Ghost is completely ineffective against Psychic. This is considered
    1.46 +   to be a programning glitch.
    1.47 +
    1.48 +
    1.49 +
    1.50  * Representing the Data
    1.51  
    1.52  After creating the Pok\eacute{}mon types namespace, we store the table