Commit graph

1166 commits

Author SHA1 Message Date
Eevee
36fa8b7093 Fix a misuse of a set as a dictionary in db loading. 2011-04-10 18:51:03 -07:00
Eevee
b652c49b80 Merge branch '247-item-rewrite' 2011-04-10 18:22:05 -07:00
Eevee
72cfea5723 Dozen or so more item effects rewritten. #247 2011-04-10 18:20:20 -07:00
Eevee
dc75747175 Effects for the remaining B/W items. #247 2011-04-10 16:41:59 -07:00
Eevee
8fd61ad55d Update item effects with English names. Added new stone evos. 2011-04-10 16:41:59 -07:00
Eevee
e8df2c70e5 Remaining B/W item effects, save for some gimmicks and key items. #377 2011-04-10 16:41:58 -07:00
Eevee
ed825f9e23 B/W item effects up through the jewels. #377 2011-04-10 16:41:58 -07:00
Eevee
8d1487781f B/W item effects and mail item effects. #377 2011-04-10 16:41:58 -07:00
Eevee
8dbac07f56 Great Item Effect Rewrite, part 2: up through berries. #247 2011-04-10 16:41:57 -07:00
Eevee
310c618c83 Addressed Zhorken's myriad comments on the item rewrite so far. #247 2011-04-10 16:41:57 -07:00
Eevee
e91246126f Great Item Effect Rewrite, part 1; up through the flutes. #247 2011-04-10 16:41:57 -07:00
Eevee
28d81cc25f Rearranged evolution table; added new B/W evolutions. #378
There are now (well, have been for a while) multiple ways to evolve
a Pokémon from its unique parent, so the current schema wasn't working.
The parent Pokémon has moved back to the main pokemon table, and
pokemon_evolution has grown an artificial primary key.

New evolution methods for Milotic, Leafeon, Glaceon, Magnezone, and
Probopass have been added.
2011-04-10 16:33:18 -07:00
Eevee
08bfd753e0 Fix default language assignment once and for all.
Stop trying to be clever and magical and just make the caller pass in a
damn primary key.
2011-04-10 00:54:14 -07:00
Eevee
f666327fa0 Remove old move effect categories. #389 2011-04-09 22:58:40 -07:00
Eevee
8de33be206 Added identifiers for move meta categories. 2011-04-09 22:22:58 -07:00
Eevee
8e2ad429d9 hurp durp default language 2011-04-05 23:34:28 -07:00
Eevee
905f5b3d13 Merge remote-tracking branch 'origin/encounters-i18n'
Conflicts:
	pokedex/db/__init__.py
2011-04-05 22:32:51 -07:00
Eevee
5b0f290ec5 Unbreak db.connect(), whoops. 2011-04-05 21:46:11 -07:00
Eevee
acf44c63a0 Merge branch 'encukou' 2011-04-05 21:04:32 -07:00
Eevee
9441ffb165 Remove the responsibility of setting a default language from multilang.
Caller now has to do it.  No need to avoid circular deps, no need to do
much of anything at all.
2011-04-05 21:03:41 -07:00
Eevee
ef29dd667c Always joinedload the local_language for a full language map. 2011-04-05 20:48:10 -07:00
a_magical_me
81f384e562 Add FR/LG encounters. #136 2011-04-04 17:48:12 -07:00
a_magical_me
841694f83f Add R/S/E encounters. #136
- They actually have LocationAreaEncounterRates this time!

- Make EncounterSlots.rarity nullable, since my script requires it.
2011-04-04 17:48:10 -07:00
a_magical_me
c9a3ceb88f Rename terrain => method. #375
They aren't actually terrains, and i need that name for another table.
2011-04-04 17:48:05 -07:00
a_magical_me
03813bd765 Add script for adding B/W locations
in the hope that it will be useful in future generations.
2011-04-04 17:47:57 -07:00
a_magical_me
7b7c0addde Add B/W locations. #375
English and Japanese. Woo!

The text dump contained a bunch of duplicate location names (possibly
for the Entralink?).  I've merged them in the locations table, but
location_game_indices still has the duplicates—that is, a location can
now have multiple game_index values in one generation (necessitating a
small schema change).
2011-04-04 17:09:11 -07:00
Petr Viktorin
4291c33c00 Make MultilangSession's language class configurable 2011-04-04 21:51:35 +03:00
Petr Viktorin
9fdb8e1bd0 Make session.default_language set/get work 2011-04-04 04:18:37 +03:00
a_magical_me
dbb293e727 Add identifier_from_name() function.
Adapted from name2ident() in scripts/migration-i18n.py.
2011-04-03 15:32:11 -07:00
a_magical_me
2e7fdf7d10 Re-add scripts/migration-i18n.py.
Believe it or not, i actually needed to refer to this.
And it was an *absolute pain* to find.
2011-04-03 15:21:35 -07:00
a_magical_me
34a888cc16 Revert "Added a bunch of autoincrement=False."
This reverts commit e68f43a5aee1b8fe145c416df6fa0015b54efd5c,
because it was a bloody terrible idea.
2011-04-03 15:20:53 -07:00
Petr Viktorin
8cddfefc4c Add __repr__ to mapped classes
This makes string representations of lists, tuples, dicts, etc. with the
DB objects make sense
2011-04-03 21:18:37 +03:00
Petr Viktorin
a06498cb39 Make a bunch of text columns nullable to support missing translations 2011-04-03 20:08:05 +03:00
Petr Viktorin
6f36907341 Enable nullable MarkdownColumns 2011-04-03 20:08:04 +03:00
Petr Viktorin
105d9422ca Change item short effect format to markdown 2011-04-03 19:34:18 +03:00
a_magical_me
bbb7cb9907 Make load.py more idiomatic.
Also snuck an idiom into db/__init__.py.
2011-04-03 04:26:45 -07:00
a_magical_me
b9a54c63d8 Add usage text for --safe. 2011-04-03 03:21:54 -07:00
a_magical_me
9340f24ae4 load: Add --recursive option.
Helps somewhat with #526 (`pokedex load` is slow) by making it easier to
load only the tables you're interested in.
2011-04-03 03:17:08 -07:00
a_magical_me
ff1c4b530d Alter some identifiers. #207
As per http://bugs.veekun.com/projects/pokedex/wiki/Identifiers?version=3.

- The following tables were handled in commit "2090e34 Move English
  texts to language-specific tables": berry_firmness, item_categories,
  move_battle_styles, move_damage_classes, move_effect_categories,
  pokeathlon_stats, pokemon_colors, pokemon_habitats, regions, types,
  versions.

- These tables are skipped, pending further discussion:
  generations, growth_rates, move_targets, stats.

- Deviations from the wiki:
    - egg_groups: 'no-eggs' is not changed to 'noeggs'
    - encounter_terrains: the 'old-rod' alternative is used.
    - types: 'unknown' is not changed to '???'
    - pokemon_move_methods:
        - 'level-up' is not changed to 'level'
        - 'colosseum-purification' and 'xd-purification' are left alone,
          because colosseum and xd have not yet been added as versions.
        - 'xd-shadow' is left alone for consistency with 'xd-purificaiton'.
2011-04-03 03:17:06 -07:00
a_magical_me
bc0b4acb84 Add MarkdownString.__html__(). 2011-04-03 03:17:04 -07:00
a_magical_me
b924a82236 Remove all uses of str.format().
For Python 2.5 compatibility.
2011-04-03 03:16:52 -07:00
a_magical_me
e7c40a08af Speed up import pokedex.db slightly.
Importing pokedex can take several seconds due to its rather large
dependencies—in particular, sqlalchemy, whoosh, and pkg_resources seem
to be the largest offenders. Normally, it would be possible to import
only the submodules one needs (pokedex.db, say), but pokedex.__init__
brings in all the submodules, for use by the command-line interface.

The fix is rather obvious:

- Move the command-line stuff into pokedex.main.

  Note: because the submodules are no longer imported by default, any
  script which expects `import pokedex` to be useful will likely break.

  Note: the `pokedex` command will not work until you re-run `python
  setup.py develop`, to update entry_points.txt.

- Don't import pkg_resources until necessary.
2011-04-03 03:13:07 -07:00
Eevee
629d99885c Change item short effects to markdown. 2011-04-03 02:16:15 -07:00
Eevee
721b07084f Random lookup algorithm is now more naive, but less broken. 2011-04-03 01:56:27 -07:00
Eevee
c519a4c824 Added a truckload of innerjoins and joinedloads.
Also reformatted the relationship definitions.  Now less of a clusterfuck.
2011-04-03 01:26:55 -07:00
Eevee
d90db39d43 Fix the i18n test; now uses multilang's session subclasses. 2011-04-03 01:26:31 -07:00
Eevee
50b3adf949 Split up MoveEffectProperty; don't detect dict proxies.
(It didn't work anyway!)
2011-04-03 01:25:59 -07:00
Eevee
adbd3b628f Fix pokedex load with empty tables. 2011-04-03 01:23:48 -07:00
Eevee
702b99666e Added a bunch of autoincrement=False. 2011-04-01 17:59:42 -07:00
Eevee
42a3989dc6 Merge branch 'encukou' 2011-04-01 17:10:13 -07:00