Commit graph

783 commits

Author SHA1 Message Date
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
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
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
Petr Viktorin
391fd1c1ac Support association proxies 2012-02-12 23:43:14 +01:00
Petr Viktorin
ef3fb2f536 Move relationships to _add_relationships calls: Pokemon 2012-02-12 23:43:14 +01:00
Petr Viktorin
949ff883ea Autodoc for backrefs 2012-02-12 22:45:10 +01:00
Petr Viktorin
34481e9a11 Add Sphinx documentation 2012-02-12 22:45:01 +01:00
Petr Viktorin
0cb1f8a1b8 Make the table schema a bit more introspectable
This solves two problems: first, the relationships are now defined in
the class they apply to, rather than in a separate section of the module,
and second, their metadata -- both creation arguments and extra info such
as `description` (or, later, possibly, info for API properties) -- is
stored.
2012-02-12 16:19:09 +01:00
Petr Viktorin
96499fae30 Allow ordering and filtering on translated texts, e.g. Move.name 2012-02-12 09:50:04 +01:00
Petr Viktorin
50b08d94d9 Make a few __get__ methods work properly on their class
Automatic doc generation requires this.
2012-02-11 22:54:46 +01:00
Petr Viktorin
81f2c83ad5 Allow ordering and filtering on translated texts, e.g. Move.name 2012-02-11 21:05:52 +01:00
Lynn "Zhorken" Vaughan
d3fa2891c8 Mention a couple of oddities with Struggle's recoil. #13 2012-02-11 12:17:36 -05:00
Lynn "Zhorken" Vaughan
7b2246d854 Little fixes for Magnitude and Crush Grip/Wring Out. #39 #40 2012-02-11 12:02:47 -05:00
Petr Viktorin
1d76ba7587 Move effect prose: Link mechanic:drain 2012-02-11 16:54:40 +01:00
Petr Viktorin
1c6023cd04 Move effect prose: Link fixes 2012-02-11 16:54:40 +01:00
Petr Viktorin
53abbacb2a Move effect prose: Link the “fail” mechanic 2012-02-11 16:54:40 +01:00
Petr Viktorin
5b7e13892a Add pokemon_form_generations, with internal game indices
Fixes #63
2012-02-11 13:08:54 +01:00
Petr Viktorin
216e4c8462 Typo fix 2012-02-11 09:12:17 +01:00
Lynn "Zhorken" Vaughan
677cd8f19e Mark Zen Darmanitan as battle-only. 2012-02-10 16:33:05 -05:00
Eevee
897c6f1de1 Merge pull request #64 from veekun/zhorken
Fixes some move data issues and form bugs.
2012-02-05 21:29:22 -08:00
Petr Viktorin
48f3957aab Add the VersionGroupPokemonMoveMethod table 2012-02-06 00:43:47 +01:00
Petr Viktorin
e15b1a257a Put XD between Colosseum and FRLG. It is related to Colosseum more.
Also it should collapse better in the spline-pokedex tables.
2012-01-30 21:22:42 +01:00
Petr Viktorin
d4b7a29182 XD fix: Add order for the level-up moves 2012-01-30 20:25:13 +01:00
Petr Viktorin
73cf9c036c Use VersionGroup.order in a bunch of relationships 2012-01-30 18:17:00 +01:00
Petr Viktorin
1134415e13 Introduce an order column for version groups
Some code in spline-pokedex orders by `id`, which has worse consequences
than it may seem (e.g. instead of defaulting to most recent games, the
comparifier defaults to XD). This is the first step to fixing that.
2012-01-30 14:09:05 +01:00
Lynn "Zhorken" Vaughan
a6f9b47ae4 Copy the red Basculin's egg moves to the blue one. #575 2012-01-24 00:25:06 -05:00
Lynn "Zhorken" Vaughan
eb7c26b621 Add Keldeo's Secret Sword tutor. 2012-01-24 00:24:02 -05:00
Lynn "Zhorken" Vaughan
111394315e Fix the indiscriminate display of Pokémon with their form names. 2012-01-24 00:24:02 -05:00
Lynn "Zhorken" Vaughan
871f9aa58b Add French Pokémon form names. 2012-01-24 00:23:53 -05:00
Lynn "Zhorken" Vaughan
1309659ec3 Update the move changelog after that rerip.
I actually reripped all the D/P data, too, and compared them myself just
to be sure, but those four were all there was.  (The other move from the
last commit was Poison Gas—we had its old accuracy right, remember.)
2012-01-19 03:00:36 -05:00
Lynn "Zhorken" Vaughan
cb5276773b Rerip B/W power, accuracy, and PP for all moves. 2012-01-19 01:52:17 -05:00
Petr Viktorin
3607b9b3e1 Let MoveEffectProperty be None if the move_effect is None
MoveChangelog.move_effect is None if there is no effect change.
Its .effect should just be None as well.
2011-11-14 21:17:12 +02:00
Petr Viktorin
fd402d74e6 Move effect link fixes 2011-11-14 21:15:52 +02:00
Petr Viktorin
edd7efed29 Add XD tutor moves from ete's list, #588, and XD/Colosseum level-up moves. 2011-10-29 17:01:07 +03:00
Petr Viktorin
144ff0a58e Add Colosseum and XD as versions. Prepare to add XD tutors from ete's list. #588 2011-10-29 17:01:06 +03:00
Lynn "Zhorken" Vaughan
6f8a0bdc2e Pirouette Meloetta is battle only; Overcast Cherrim is not. 2011-10-12 20:34:25 -04:00
Lynn "Zhorken" Vaughan
8ae79f8898 Tweak a couple Pokémon form names. 2011-10-12 20:24:32 -04:00
Lynn "Zhorken" Vaughan
44569700ae Switch the Magic Coat and Role Play HG/SS tutor lists.
We apparently had them reversed somehow.
2011-10-01 01:55:09 -04:00
Petr Viktorin
b96b5aa956 Fix Magnitude percentages. #555 2011-09-24 18:56:12 +03:00
Petr Viktorin
28c39263df Load/dump dance 2011-09-22 16:39:40 +03:00
Petr Viktorin
ebab8c6e43 Try importing markdown utilities from markdown.util
etree and AtomicString will be moved in python-markdown 2.1

See commit https://github.com/waylan/Python-Markdown/commit/89a4f3d0829a7 :
    Cleaned up markdown namespace. This may be a backward incompatible
    change for some extensions. They should be importing from
    markdown.util
2011-09-22 00:51:59 +03:00
Petr Viktorin
719c32de0b Make MarkdownString.as_html() accept an extension object, not class
No reason to instantiate every time as_html's called, is there?

Also, sessions use a markdown_extension attribute instead of
markdown_extension_class. The latter is only used to set the former when
the session is created (unless another markdown_extension_class is given,
of course).
2011-09-22 00:51:59 +03:00
Petr Viktorin
928eaca4a4 Make bad links in Markdown not fail
Links such as []{pokemon:mewthree} can come from users, so they should not
crash the parser.
So, when an object is not found (or more than one is found), call
identifier_url() directly, instead of failing to get the object for
object_url(). Essentially, treat the link as having an unknown category
(like mechanic:, currently).

The test that check the pokédex descriptions updated so that only
links to known objects and "mechanic:" are allowed.
2011-09-22 00:51:59 +03:00
Petr Viktorin
cdac374eed Allow links to Pokémon forms in Markdown. Fixes #465
Linked-to objects aren't required to have identifiers now, so object_url()
in custom extensions might need to be changed.
The one in the test did, for example.
2011-09-22 00:51:59 +03:00
Petr Viktorin
d8d32a0176 Use identifiers in Pokemon.stat 2011-09-22 00:51:59 +03:00
Petr Viktorin
2a73d371f7 Typo fix in Light Screen effect 2011-09-22 00:51:59 +03:00
Lynn "Zhorken" Vaughan
c9ae5f9688 A bit of ability prose cleanup related to the last commit. #561 2011-09-21 17:38:56 -04:00
Lynn "Zhorken" Vaughan
aa0119f4c6 A bunch of improvements to ability effects and changelogs. #561 2011-09-21 16:28:46 -04:00
Lynn "Zhorken" Vaughan
36dfe7555e Fix curly endquotes/apostrophes in B/W flavour text. 2011-09-21 16:28:46 -04:00
Eevee
a11261e529 Fix a stupid closure-in-loop problem. #654 #655 2011-09-11 17:27:58 -07:00
Eevee
eb6cae4bf3 Fix whoosh result sorting.
Now results are sorted by is-this-your-language (times levenshtein
distance, if appropriate), then by rough class of result (Pokémon, then
moves, then abilities, etc.) and finally by name.

This fixes a couple issues:

- If both a foreign name and a local name matched a wildcard lookup,
  you'll see the local name.  Before, you'd see whichever happened to be
  first alphabetically.

- Wildcard results are more likely to have useful stuff at the top,
  rather than being dominated by foreign junk and names of obscure
  locations.

This also updates our usage of the whoosh API, which was old and busted
as of 2.0 or so.
2011-09-09 22:31:38 -07:00
Eevee
514ac79216 Improve multilingual support in lookup.
Language identifiers are stored and retrieved, rather than English
names.

Language weighting biases towards the current language, rather than to
English.

Language is no longer considered nullable to indicate English.

Duplicate names in other languages are no longer omitted from the index.
2011-09-08 20:58:29 -07:00
Eevee
66988fb070 Merge remote-tracking branch 'origin/encukou-whoosh'
Conflicts:
	setup.py
2011-09-06 23:33:08 -07:00
Eevee
25ab674c7c Fix this markdown extension nonsense.
Previously, every single spline-pokedex request tacked another markdown
extension onto a global list in spline, making markdown processing just
a little bit slower over time.  This is terrible.

Now we do something a little less crazy and a little more global.  Wait,
is that less crazy or more?
2011-09-06 21:52:27 -07:00
Petr Viktorin
bb1a164a34 Capitalization fix for Sunshine Cherrim 2011-09-05 11:21:19 +03:00
Petr Viktorin
46e924e821 Order Unown and Pichu forms 2011-09-05 11:21:19 +03:00
Petr Viktorin
3dc8a4cbd0 Add a sanity check for PokemonForm.order 2011-09-05 11:20:16 +03:00
Eevee
3a59ef1fe0 Update us to SQLAlchemy 0.7. #582 2011-09-04 23:19:56 -07:00
Petr Viktorin
21641d6fd0 Correct Italian names for Shadow Panic and Shadow type
See http://wiki.pokemoncentral.it/Ombrapanico_(mossa)
Qwilava (an admin at that wiki) confirms
2011-09-02 20:56:30 +03:00
Petr Viktorin
af8215535e Use the new Whoosh API for spelling. May help #181. 2011-08-30 23:17:20 +03:00
Petr Viktorin
bb49a6bc39 Fix a Unicode docstring 2011-08-30 23:05:28 +03:00
Petr Viktorin
41a168a0e2 Add a missing import, remove some unused ones 2011-08-30 23:05:22 +03:00
Petr Viktorin
f764a90439 Add missing gen.3 tutors (found by Eric the Espeon)
Glalie:Defense Curl in Emerald
Gengar:Double-Edge in Emerald & FRLG (confirmed by Moo)
Glalie:Rollout in Emerald
2011-08-30 14:15:54 +03:00
Eevee
10ce391098 Nicer docstrings for the three "pokemon" tables we have now. 2011-08-29 20:36:06 -07:00
Eevee
339d5d7da6 Merge branch 'encukou-species-split' 2011-08-29 20:00:58 -07:00
Eevee
6410c35141 Try to clarify this Judgment/Techno Blast thing. #644 2011-08-29 19:33:45 -07:00
Eevee
690a64cbf7 Scary Face changed from 90% to 100% accuracy in B/W. 2011-08-29 19:25:50 -07:00
Eevee
29324e39af Weezing can be tutored Rollout in Pt/HG/SS. #641 2011-08-29 19:21:13 -07:00
Eevee
2e5d4afe01 Glaciate lowers Speed by one, not two. #629 2011-08-29 19:15:20 -07:00
Petr Viktorin
dd668febe7 Make id lookup util.get use query.get, avoiding queries for dupe lookups 2011-05-06 12:40:44 +03:00
Petr Viktorin
332647c362 Switch to py.test #604 2011-05-06 12:40:44 +03:00
Petr Viktorin
c710457717 Pokemon species split: media accessors 2011-05-06 12:26:17 +03:00
Petr Viktorin
ab2baaa759 Update media accessors wrt repo split
All accessors now take a `root` arg, the root of the media tree.
Alternatively `root` can be a custom MediaFile subclass, which should allow
neat tricks like:
- Checking some kind of manifest to prevent stat() calls
- Custom properties of the file objects (e.g. for HTML <img> tags)
- Downloading the media on demand

Tests assume media is at pokedex/data/media, skip otherwise.
2011-05-06 12:26:17 +03:00
Petr Viktorin
134f5a00ff Add Pichu's Volt Tackle and Rotom's form moves for B/W 2011-05-06 12:26:16 +03:00
Petr Viktorin
11a65761e7 Oops, forgot to normalize the CSVs with a load/dump 2011-05-06 12:26:16 +03:00