Commit graph

799 commits

Author SHA1 Message Date
Lynn "Zhorken" Vaughan 481ba51948 I guess we're going with "regular form" instead of "usual form". 2012-06-21 15:13:19 -04:00
Lynn "Zhorken" Vaughan 963934b123 Run the order-setting script for the new forms. 2012-06-21 14:54:24 -04:00
Lynn "Zhorken" Vaughan 1787d89baa Add Keldeo's resolution form.
I'm calling it "form" instead of "forme" because it's sugata, not forumu.
2012-06-21 14:53:25 -04:00
Lynn "Zhorken" Vaughan b8ece53720 Merge master branch into branch 'black-and-white-2'
Conflicts:
	pokedex/data/csv/pokemon_forms.csv
	pokedex/data/csv/pokemon_species.csv
2012-06-21 14:21:11 -04:00
Lynn "Zhorken" Vaughan 13e2709668 Merge branch 'generated-order' 2012-06-21 14:07:22 -04:00
Lynn "Zhorken" Vaughan 3917774931 Fix curly endquotes/apostrophes in French B/W flavour text. 2012-06-16 18:21:34 -04:00
Lynn Vaughan 9f567be76f Merge pull request #77 from MaT-PT/master
Add various French flavour text from B/W.
2012-06-16 14:49:24 -07:00
M@T 04ea17f276 Added French item descriptions for B/W. 2012-06-16 22:17:41 +02:00
M@T 800a778009 Added French Pokémon descriptions for B/W. 2012-06-16 21:33:25 +02:00
M@T 80275e47cf Added French ability descriptions for B/W. 2012-06-16 21:09:20 +02:00
M@T 0c3f383296 Added French move descriptions. 2012-06-16 19:45:45 +02:00
Andrew Ekstedt b69a338138 Add a test for main-tables.rst 2012-06-10 15:46:50 -07:00
Andrew Ekstedt bfd414a4cd Add Sphinx crap to .gitignore 2012-06-10 14:46:08 -07:00
Andrew Ekstedt 5ddb7911a2 Improve PalPark table docs slightly.
Also add format='identifier' to PalParkArea.identifier, which was
causing a failure in test_schema.
2012-06-09 03:06:06 -07:00
Andrew Ekstedt 2af1d5f428 Merge branch 'doc' 2012-06-08 23:32:43 -07:00
Andrew Ekstedt f4c51c845d Sort relationship docs alphabetically.
Creation order wasn't that big of a win and didn't play nicely with
backrefs.
2012-06-08 23:31:35 -07:00
Andrew Ekstedt 527b3ce056 Remove _add_relationships.
Back out all the _add_relationships functions. This leaves tables.py
almost unchanged from before their addition, except for some added
documentation.
2012-06-08 23:31:35 -07:00
Andrew Ekstedt e07e64dfa5 Display primary keys in table docs. 2012-06-08 23:31:35 -07:00
Andrew Ekstedt 739c6fdd7c Sort relationships by creation order.
Also:

- Split association proxies into their own section.

- Remove relationship_info.
2012-06-08 23:31:35 -07:00
Andrew Ekstedt 04b941755a Introspect relationships directly.
Possibly more fragile, but this way we don't need _set_relationships.

SQLAlchemy version bump for AssociationProxy.remote_attr.
2012-06-08 23:29:44 -07:00
Lynn "Zhorken" Vaughan 5bbf7b1cea Copy wild held items, B/W egg moves, and Colo/XD moves for Castform. 2012-06-08 23:10:05 -04:00
Lynn "Zhorken" Vaughan 65b891575d Copy Gen III/IV moves for Castform. 2012-06-08 22:57:23 -04:00
Lynn "Zhorken" Vaughan 6e103af3e0 Order PokemonEggGroup.species by Pokémon *species* order. 2012-06-07 02:07:29 -04:00
Lynn "Zhorken" Vaughan 4aa637caf2 Fix form_order's description in tables.py. 2012-06-07 02:05:10 -04:00
Lynn "Zhorken" Vaughan cc3d0b60d3 Simplify the explanation of species order. 2012-06-07 02:01:44 -04:00
Lynn "Zhorken" Vaughan b30974cd43 Clarify a comment. 2012-06-07 01:00:51 -04:00
Lynn "Zhorken" Vaughan 57c71a86f4 Uh... actually add the script. 2012-06-07 00:54:17 -04:00
Lynn "Zhorken" Vaughan f3b19d8181 Add and run an SQL script to generate pokemon{,_species,_forms}.order.
A bunch of things were previously set to have arbitrary order when they
shouldn't have.
2012-06-07 00:51:11 -04:00
Lynn "Zhorken" Vaughan ec048f3221 Add and populate pokemon_species.order. 2012-06-06 23:32:10 -04:00
Lynn "Zhorken" Vaughan 649162e79e Add and populate pokemon_forms.form_order. 2012-06-06 23:28:30 -04:00
Lynn "Zhorken" Vaughan 1f6191ca51 Add new forms with dummy types and stats. 2012-06-06 21:24:21 -04:00
Lynn "Zhorken" Vaughan 573294c4e5 Add B/W 2 and related infrastructure. 2012-06-06 13:34:45 -04:00
Andrew Ekstedt 50630ab376 Merge branch 'pal-park' 2012-06-02 00:52:58 -07:00
Andrew Ekstedt 48c3eff597 Turn PalPark.area Enum into a table. 2012-06-02 00:17:53 -07:00
Andrew Ekstedt 07d5335ddf Remove a stray csv file.
PokemonFormGroup was removed in the species split.
2012-06-01 18:54:09 -07:00
Andrew Ekstedt d33ea7b6da Add a script to reset PostgreSQL sequences. 2012-06-01 18:49:45 -07:00
Andrew Ekstedt 6e2f7af7b2 Add Pal Park data. 2012-06-01 18:14:23 -07:00
Eevee 3511bf3076 Ahem, ACTUALLY drop types when loading. 2012-03-31 21:30:05 -07:00
Eevee 987116f662 Fix duplicate type errors when loading into postgresql. 2012-03-30 23:33:48 -07:00
Eevee 5338d44272 Merge pull request #69 from encukou/i18n
Allow ordering and filtering on translatable texts, e.g. `Move.name`
2012-03-25 01:22:39 -07:00
Eevee 891ad311d2 Merge pull request #68 from encukou/prosaic
Improve mechanic links in move effect prose
2012-03-25 01:21:21 -07:00
Lynn "Zhorken" Vaughan 12b87852c6 Add game indices for the main six stats. 2012-03-20 03:33:18 -04:00
Lynn "Zhorken" Vaughan eee9806184 Update version_group_pokemon_move_methods with regards to Volt Tackle. 2012-03-20 03:33:18 -04:00
Andrew Ekstedt 14d9b6ead7 Fix test_media.py.
- Add --media-root option (was half-supported already, but not accepted
  on the command line).

- Don't test for Colosseum and XD graphics, since we have none.

- Acknowledge *-beta sprites.
2012-03-16 12:37:47 -07:00
Lynn "Zhorken" Vaughan 61ed3c4ccb Add a VersionGroup.machines relationship. 2012-02-29 00:33:03 -05:00
Lynn "Zhorken" Vaughan cdf052555b Eagerload Pokemon.forms.
This fixes all those spline-pokedex tests that broke when I fixed
Pokémon name display.
2012-02-28 21:28:58 -05:00
Eevee 75287587a2 Merge pull request #66 from encukou/internal-ids
Add internal IDs to forms
2012-02-28 17:14:43 -08:00
Eevee 0e766d309c Merge pull request #65 from encukou/xd-tutor
Add the VersionGroupPokemonMoveMethod table
2012-02-23 19:42:31 -08:00
Lynn "Zhorken" Vaughan 60a128c12f Pichu doesn't get Volt Tackle in R/S or FR/LG. 2012-02-16 11:37:04 -05:00
Lynn "Zhorken" Vaughan 2073fa5089 Support null regional Pokédex for Colosseum/XD. #70 2012-02-16 11:37:04 -05:00