Commit graph

392 commits

Author SHA1 Message Date
Eevee (Alex Munroe) d667024937 Force MySQL to NOT auto-inc pokemon_moves.level. 2013-08-12 23:15:03 -07:00
Petr Viktorin bbb3ab09e3 Add __tablename__ to translation tables
This makes it easier to write introspection scripts.
2013-08-07 14:13:04 +02:00
Lynn "Zhorken" Vaughan e0beddc573 Add an is_main_series column to abilities. 2013-07-04 03:50:34 -04:00
Lynn "Zhorken" Vaughan 501a5ce74f Ditch server_default in conquest_pokemon_evolution. #96 2013-03-17 02:18:11 -04:00
Eevee 1cee46f0c0 Add a length back to color names; breaks MySQL otherwise. 2013-03-10 13:56:42 -07:00
Eevee 439eeffdd2 Why does color name have a length limit? I am stupid. 2013-02-07 00:47:07 -08:00
Lynn "Zhorken" Vaughan 9c72fe73e0 Add a VersionGroup.pokemon_moves relation. 2012-11-18 16:01:24 -05:00
Eevee 59dfb885e1 Add a couple more pokemon -> ability accessors. 2012-11-17 04:12:54 -08:00
Lynn "Zhorken" Vaughan 7f781db1d7 Change "dream ability" to "hidden ability". 2012-11-04 19:03:11 -05:00
Lynn "Zhorken" Vaughan 1d3e5af093 Switch pokemon_game_indices to version_id; add B/W 2 indices.
version_id rather than version_group_id for the sake of FR/LG Deoxys.
It seems a little silly but magical's on board with this decision too.
2012-11-03 03:51:29 -04:00
Andrew Ekstedt ca5b7a9cbf Add B/W encounter methods and conditions
Spots: it might seem like they should be conditions, but in practice
they behave more like methods. Specifically, conditions typically make
only minor changes to an encounter list. Spots change everything.
So spots are added as methods, with each type of spot as a separate
method. Not exactly ideal, but this causes the least fuss.

Seasons work fine as conditions.

Well, as well as time-of-day.
2012-09-28 23:00:53 -07:00
Andrew Ekstedt c5fee20ef1 Make Encounter.condition_values a relationship(). 2012-09-27 12:59:16 -07:00
Lynn "Zhorken" Vaughan c3f2919ef3 Minor cleanup in tables.py to make tests pass. 2012-09-25 21:18:53 -04:00
Lynn "Zhorken" Vaughan 765be26405 Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
Lynn "Zhorken" Vaughan ac3aee12ee Add innerjoin=True and add/remove lazy='joined' on a bunch of relationships. 2012-08-07 00:14:22 -04:00
Lynn "Zhorken" Vaughan f11058dd2f Toss the capacity column now that it's a stat. 2012-08-07 00:13:00 -04:00
Lynn "Zhorken" Vaughan 95422bc985 Only markdownify $target if move.range exists. 2012-08-06 14:10:36 -04:00
Lynn "Zhorken" Vaughan b3ade1ecf1 De-convolute my attempt at broadening MoveEffectProperty. 2012-08-05 20:39:03 -04:00
Lynn "Zhorken" Vaughan 0596032d00 Flesh out move effects some more. 2012-08-04 23:50:39 -04:00
Lynn "Zhorken" Vaughan 789a1bdc0e Add target counts for Conquest move ranges. 2012-08-04 19:55:55 -04:00
Lynn "Zhorken" Vaughan 14232f0e74 Add prose for most things move-related. 2012-08-03 20:37:28 -04:00
Lynn "Zhorken" Vaughan 707b34fb8f Add Conquest move info. 2012-08-03 13:03:56 -04:00
Lynn "Zhorken" Vaughan 3c76c08042 Add and tweak more relationships. 2012-07-31 23:44:02 -04:00
Lynn "Zhorken" Vaughan 47410a9e9c Add generic warrior archetypes. 2012-07-29 17:58:30 -04:00
Lynn "Zhorken" Vaughan d3693319f1 Add Conquest gallery order. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan 0d1818002e Add a bunch of relationships for Conquest stuff. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan f2441a3f80 Add warriors' stats. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan 4597b970b0 Use gender symbols in the player characters' names.
I spent longer than I should have deliberating, but in the end, it came
down to the fact that searching for "Player" won't fuzzy-match the long
versions.
2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan 22a079390d Add Conquest Pokémon abilities and moves. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan 2dbd5da8e2 Add Conquest Pokémon stats. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan 7e1a71bc8c Separate Conquest stats from main-series stats. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan 3700b78ba2 Add an ID column to warrior ranks. 2012-07-28 11:04:02 -04:00
Lynn "Zhorken" Vaughan b119844bd1 Add Conquest warriors and a bunch of data on them. 2012-07-28 11:04:01 -04:00
Lynn "Zhorken" Vaughan cd4dfcf4f4 Turn gender into a table. 2012-07-28 11:03:52 -04:00
Lynn "Zhorken" Vaughan 543419afcd Add Conquest kingdoms and Pokémon evolution. 2012-07-23 17:34:44 -04:00
Lynn "Zhorken" Vaughan bf8d94ef08 Order Pokemon.items() by rarity descending. 2012-06-22 23:18:56 -04:00
Lynn "Zhorken" Vaughan 13e2709668 Merge branch 'generated-order' 2012-06-21 14:07:22 -04: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 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 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 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 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
Andrew Ekstedt 48c3eff597 Turn PalPark.area Enum into a table. 2012-06-02 00:17:53 -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
Lynn "Zhorken" Vaughan 12b87852c6 Add game indices for the main six stats. 2012-03-20 03:33:18 -04: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 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 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
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
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 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 111394315e Fix the indiscriminate display of Pokémon with their form names. 2012-01-24 00:24:02 -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 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
Eevee a11261e529 Fix a stupid closure-in-loop problem. #654 #655 2011-09-11 17:27:58 -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
Eevee 3a59ef1fe0 Update us to SQLAlchemy 0.7. #582 2011-09-04 23:19:56 -07: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
Eevee 10ce391098 Nicer docstrings for the three "pokemon" tables we have now. 2011-08-29 20:36:06 -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 3034c04d59 Allow missing Markdown translation rows (for species' form descriptions) 2011-05-06 12:26:16 +03:00
Petr Viktorin dd0d225228 Pokemon species split: utilities.
Remove 'simple' altogether, as pokémon are now sane by default!
2011-05-06 12:26:16 +03:00
Petr Viktorin d0c01810be Pokemon species split: Lookup & Markdown 2011-05-06 12:26:16 +03:00
Petr Viktorin 8309b316f2 Add is_default to Pokemon. Revise forms' is_default accordingly. 2011-05-06 12:26:16 +03:00
Petr Viktorin bc244aeb53 Pokemon species split: DB metadata changes 2011-05-06 12:26:16 +03:00
Petr Viktorin 280c90b966 Pokemon species split: Schema changes 2011-05-06 12:26:16 +03:00
Eevee 349fbb2d94 Merge remote-tracking branch 'origin/encukou-markdown' 2011-04-28 19:40:20 -07:00
Petr Viktorin 7d7fcc74c8 Don't set autoincrement for ids with zeroes. Test included. #580 2011-04-28 23:45:43 +03:00
Petr Viktorin b711edd511 Port the Markdown value tests from spline-pokedex. Fix remaining strings. 2011-04-28 23:43:54 +03:00
Petr Viktorin f7a9c28e60 Rename MoveFlagType/MoveFlag to MoveFlag/MoveFlagMap. #591 2011-04-28 23:43:54 +03:00
Petr Viktorin 85d779ba83 Move Markdown handling to the translation classes
- the Session has a `pokedex_link_maker` property, whose `object_url`
  method is used to make URLs in Markdown
- pokemon.names_table.name is now an ordinary Unicode column
- pokemon.name is a MarkdownString that is aware of the session and the
  language the string is in
- pokemon.name_map is a dict-like association_proxy of the above
- move.effect works similarly, with transparent $effect_chance substitution
  as before
2011-04-28 23:42:56 +03:00
Petr Viktorin 059f7dfc55 Autofill empty labels in Markdown links
- as_text() is now a function that takes the session as an argument
- likewise as_html(), which also takes URL makers and the language
- since there should be only one link extension, it is registered by
  setting default_link_extension, not appending to markdown_extensions.
  This only affects the __html__ attribute.
2011-04-28 23:42:56 +03:00
Petr Viktorin 051d6563a4 Don't try to replace the $effect_chance in missing effect translations 2011-04-28 23:42:56 +03:00
Petr Viktorin 98dcc613e2 Use relationship() instead of the deprecated relation(). #596 2011-04-28 23:31:38 +03:00
Petr Viktorin 3c17720a1c order_by_name: properly fall back to the specified languages, or identifier
Sometimes, translations are incomplete. Handle this gracefully by allowing
fallback languages. If there are none, fall back to the identifier to get
at least some order.
2011-04-28 23:31:38 +03:00
Eevee b2db58afc7 Fix discrepancy between media-accessors branches. 2011-04-17 22:35:24 -07:00