Commit graph

1045 commits

Author SHA1 Message Date
Lynn "Zhorken" Vaughan 08c5c3d47b Note that Soundproof does not block Yawn. #71 2013-03-19 00:58:32 -04:00
Lynn "Zhorken" Vaughan 421cd8ce35 Fix Black Kyurem's index...
Whoops.

I'm quite sure putting White Kyurem before Black Kyurem is the correct
thing, though.  The games' guts are pretty consistent about that.
2013-03-18 01:59:45 -04:00
Lynn "Zhorken" Vaughan 3e95ea32ec Add indices for Kyurems/genies in pokemon_form_generations. #90 2013-03-18 00:48:22 -04:00
Lynn "Zhorken" Vaughan 501a5ce74f Ditch server_default in conquest_pokemon_evolution. #96 2013-03-17 02:18:11 -04:00
Lynn "Zhorken" Vaughan fb6076dba3 Add TMs (and fake HMs, ugh) for Colosseum & XD. #72 2013-03-17 02:04:33 -04:00
Eevee 1cee46f0c0 Add a length back to color names; breaks MySQL otherwise. 2013-03-10 13:56:42 -07:00
Andrew Ekstedt a33d0fe3f3 Add Keldeo's resolute form to pokemon_form_generations 2013-02-09 22:02:18 -08:00
Eevee 439eeffdd2 Why does color name have a length limit? I am stupid. 2013-02-07 00:47:07 -08:00
Eevee d2277f23a0 Fix a couple typos in berry short effects. 2013-02-07 00:41:19 -08:00
valepert e71bfba357 Merge pull request #1 from valepert/patch-2
Update pokedex/data/csv/stat_names.csv
2012-12-25 12:10:22 -08:00
valepert 615117bed3 Update pokedex/data/csv/stat_names.csv
italian names
2012-12-25 21:09:42 +01:00
valepert 6dc7027f8f Update pokedex/data/csv/pokemon_color_names.csv
italian colors
2012-12-25 21:06:04 +01:00
Lynn "Zhorken" Vaughan 31de765d60 Explain move shenanigans better in Pokémon form prose. 2012-12-06 23:55:18 -05:00
Lynn "Zhorken" Vaughan dcf9ef23e7 Copy Castform's B/W 2 egg moves over, too.
This commit originally included Basculin, too, but then magical dealt
with that before I pushed.  Anyway, the query I used should have caught
any other similar cases, too:

insert into pokemon_moves select p.id, 14, pm.move_id, 2, 0, null from
    pokemon_moves pm
join pokemon p on pm.pokemon_id=p.species_id and p.is_default=false
where pm.version_group_id=14 and pm.pokemon_move_method_id=2;

The join condition is cheating a little, but it does happen to work; it
joins a pokemon_move to all non-default forms of the same Pokémon.  If
being default and having id=species_id didn't go hand-in-hand, I'm
pretty sure it'd require two joins to pokemon.
2012-12-06 23:41:34 -05:00
Andrew Ekstedt 4ad4fba921 Copy over Basculin's egg moves in B/W 2. 2012-12-06 18:38:33 -08:00
Andrew Ekstedt 4d84fec42e Update some URLs to point to github.com 2012-12-02 17:14:08 -08:00
Lynn "Zhorken" Vaughan 2bf44191da Rerip all the Gen IV tutors. :D #27 #82
LOOK AT THAT DIFF :D
2012-12-01 05:17:31 -05:00
Lynn "Zhorken" Vaughan 05d06f96e3 Use Pokédex 3D's egg group names. 2012-11-18 16:01:24 -05:00
Lynn "Zhorken" Vaughan 9c72fe73e0 Add a VersionGroup.pokemon_moves relation. 2012-11-18 16:01:24 -05:00
Eevee 9a1f38a76d Japanese damage class names. Hokey at best, but. 2012-11-17 04:12:54 -08:00
Eevee b1626f290b Japanese language names. 2012-11-17 04:12:54 -08:00
Eevee 4d25cc1d9a Fix order of stat names; add Japanese color names. 2012-11-17 04:12:54 -08:00
Eevee 59dfb885e1 Add a couple more pokemon -> ability accessors. 2012-11-17 04:12:54 -08:00
Eevee 97975e8214 Add Japanese stat names. 2012-11-17 04:12:54 -08:00
Lynn "Zhorken" Vaughan 2ea50b575a Update the short item effects, thanks to JulesLetters. 2012-11-16 14:00:31 -05:00
Lynn "Zhorken" Vaughan 3d20afaa15 Restore the "e" on Deoxys's Formes.
I'm not sure where it went, or why Normal Forme stayed intact.
2012-11-12 18:34:51 -05:00
Lynn "Zhorken" Vaughan e74d5e28bd Give Colosseum Normal Deoxys instead of Speed, too.
I'm not so sure about XD anymore, but I'm surer about this one.
2012-11-12 18:15:42 -05:00
Lynn "Zhorken" Vaughan 12beb420d9 Give XD level-up moves for Normal Deoxys, not Speed.
I'm 90% sure this is correct.
2012-11-12 17:31:08 -05:00
Lynn "Zhorken" Vaughan 833fedafe1 Fix the XD tutors based on the Emerald tutors.
I'm assuming Normal Deoxys learns tutors based on Speed Deoxys's list,
given that Attack and Defense Deoxys have all the same tutors, and Speed
Deoxys has all those same tutors too while only gaining tutors unique to
Emerald.  So in other words, it looks like Deoxys's Forme doesn't matter
for tutor compatibility in Gen III.
2012-11-12 17:19:41 -05:00
Lynn "Zhorken" Vaughan e478bb8c3f Rerip Gen III tutors. #27 #81
I AM SUCH A BADASS
2012-11-12 17:09:59 -05:00
Lynn "Zhorken" Vaughan f1455f922e Use official full form names from Pokédex 3D Pro.
Notes:

- The removal of "Type" in ??? Arceus's French name follows all its
  other types, even though ??? Arceus obviously doesn't appear in
  Pokédex 3D Pro.  (The English names do retain "Type".)
- Meloetta and Genesect are locked until passwords are revealed for
  them.  Meloetta is pretty unambiguously "Forme", but Genesect's forms
  being named after their drives is still our (my) invention.
- Spiky-eared Pichu is also absent from Pokédex 3D, but I remember
  having good reason for not including "Form" or anything.  I just don't
  don't remember what it was.  Probably just that nothing's official,
  afaik, and it's not really a "form" like the others, in that it's a
  specific individual and a very small variation.  "-eared" with a
  lowercase "e" is definitely what the games say, though.
- I can put other foreign form names in later, although I won't know how
  to do pokemon_name for other languages.
2012-11-12 15:00:28 -05:00
Lynn "Zhorken" Vaughan c976197785 Er, give Keldeo Secret Sword and Meloetta Relic Song, not vice versa.
Also worth noting: I gave the alternate forms their respective moves
even though they technically learn them specifically in their default
forms.  It seems weird to say that only one form gets the move,
especially when learning Secret Sword immediately causes Keldeo to /not/
be its default form.  Also, Pirouette Meloetta already has TMs and other
tutors even though it's battle-only.
2012-11-04 21:30:06 -05:00
Lynn "Zhorken" Vaughan a3b68f9cf2 Add various special moves for B/W 2. #83
Add the following:
- Rotom form moves
- Volt Tackle Pichu
- Secret Sword and Relic Song tutors
2012-11-04 21:02:43 -05:00
Lynn "Zhorken" Vaughan 9fffb2a401 Change the is_dream header to is_hidden in pokemon_abilities.csv.
Whoops.  grep says this is the only remaining instance of is_dream,
though.
2012-11-04 19:37:10 -05:00
Lynn "Zhorken" Vaughan 7f781db1d7 Change "dream ability" to "hidden ability". 2012-11-04 19:03:11 -05:00
Lynn "Zhorken" Vaughan 76a4666cc9 Update the Pokémon form descriptions. 2012-11-04 19:03:06 -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 c5418ea344 Fix "Fiery Path" location name 2012-10-26 23:55:21 -07:00
Andrew Ekstedt 48e0b9a605 Fix Pattern Bush identifier 2012-10-26 23:51:51 -07:00
Eevee ddfd6dcb46 Merge pull request #84 from matchu/master
Fix typo on location "Pattern Bush"
2012-10-26 21:52:26 -07:00
Eevee ea59278f01 Merge pull request #80 from coyotte508/master
Adds specific level moves to kyurem formes
2012-10-26 21:51:42 -07:00
Lynn "Zhorken" Vaughan c77c32d99b Add B/W 2 item flavour text.
I remembered to add the zero width spaces on the Adamant and Lustrous
Orbs' text, too! :D
2012-10-19 21:49:22 -04:00
Lynn "Zhorken" Vaughan 17d1c0e9c3 Add B/W 2 items. 2012-10-19 21:22:59 -04:00
Lynn "Zhorken" Vaughan 33f227d4cd The S.S. Ticket and Magma Stone are no longer unused. 2012-10-19 21:09:28 -04:00
Lynn "Zhorken" Vaughan 1cd419b19a Disperse the "B/W unknown" item category. 2012-10-19 21:01:46 -04:00
Lynn "Zhorken" Vaughan a1fb616cfc Add B/W 2 flavour text. 2012-10-18 17:23:26 -04:00
Lynn "Zhorken" Vaughan 63c2693054 Fix the language ID on English B/W move/ability/item flavour text. 2012-10-17 21:43:34 -04:00
Lynn "Zhorken" Vaughan aee71712f9 Add form names for Keldeo; do "forme" → "Form" for Kyurem.
Note that "Form" isn't actaully official for Kyurem; it's just "Kyurem",
"Black Kyurem", and "White Kyurem", but we do the same with Rotom and
some other cases like this.
2012-10-06 21:29:59 -04:00
Andrew Ekstedt 32d88bf97f Add B/W 2 encounters
- Victory Road, Giant Chasm, and Reversal Mountain have unknown area
  names. The others are hopefully accurate.

- Swarms are, again, not present. Neither are Hidden Grove encounters.
2012-09-29 00:03:40 -07:00
Andrew Ekstedt 84f34dee42 Add B/W 2 locations
Most of the English names are official; the remaining few were
translated by Guested.

B/W 2 adds another Victory Road—this is a new location, distinct from
the previous one. The name remains the same, but our identifier is
unova-victory-road-2.
2012-09-28 23:58:03 -07:00
Andrew Ekstedt 7d9381699a Add B/W encounters
- Victory Road still has unknown area names

- Swarms don't work like normal encounters so are not present
2012-09-28 23:50:04 -07: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 442ba27943 Delete unused conquest move effects and renumber effect 0 to 1. 2012-09-25 21:35:59 -04: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 cb3740a7e5 Merge branch 'conquest'
Conflicts:
	pokedex/data/csv/pokemon_dex_numbers.csv
2012-09-25 21:00:02 -04:00
Lynn "Zhorken" Vaughan 765be26405 Add episodes and warrior transformation info. 2012-08-17 01:50:09 -04:00
Lynn "Zhorken" Vaughan 108c4243da More move effect tweaking... 2012-08-17 01:49:31 -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 c00bc4cad2 Remove Mega Drain's "effect chance".
Effect chance shares seven bits with draining moves' drain percentage
(always 50) and Dragon Rage's set damage (40) in Conquest's guts.
2012-08-05 20:54:29 -04:00
Lynn "Zhorken" Vaughan b3ade1ecf1 De-convolute my attempt at broadening MoveEffectProperty. 2012-08-05 20:39:03 -04:00
Lynn "Zhorken" Vaughan d689bd3de3 Give Splash its own effect. 2012-08-05 00:52:50 -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 ec5b138162 Add warrior skills to the lookup. 2012-08-01 11:29:27 -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 39aa729e0a Add all 48 400 max links from Pokémon Conquest.
Apparently I already committed the table class.
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 dc5279cd7a Add Conquest kingdoms and warriors to the lookup. 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
matchu 6a0c8dbb3d fix typo on location name "Pattern Bush" 2012-07-16 15:11:05 -03:00
coyotte508 f8c23de132 Adds specific level moves to kyurem formes
Adds Ice burn, Fusion flare, Fusion Bolt, and freeze shock that the kyurem formes learn at level 43/50.
2012-07-04 23:45:07 +02:00
Andrew Ekstedt e263c42e6c Add Pokedex numbers for B/W 2. 2012-06-22 20:24:08 -07:00
Lynn "Zhorken" Vaughan bf8d94ef08 Order Pokemon.items() by rarity descending. 2012-06-22 23:18:56 -04:00
Lynn "Zhorken" Vaughan 6e9bab427a Add wild held items from B/W 2. 2012-06-22 23:14:56 -04:00
Lynn "Zhorken" Vaughan 9bc5628d89 Update base exp yield for B/W 2.
No more awful Gen IV/V mix!
2012-06-22 21:09:16 -04:00
Lynn "Zhorken" Vaughan 4422cfc0e7 Copy base forms' B/W 2 level-up moves for new forms.
I DON'T KNOW WHY THIS IS NECESSARY but I ripped level-up moves and those
ones were missing.  Old forms' moves weren't!  Just these ones.
2012-06-22 20:54:25 -04:00
Lynn "Zhorken" Vaughan d3cc785719 Add tutor moves from B/W 2. 2012-06-22 20:39:28 -04:00
Lynn "Zhorken" Vaughan 533b36a971 Add level-up and egg moves from B/W 2. 2012-06-22 18:02:08 -04:00
Lynn "Zhorken" Vaughan 35e5d3179c Add TM/HM moves for B/W 2. 2012-06-22 17:07:13 -04:00
Lynn "Zhorken" Vaughan b97727486e Add types, stats, abilities, misc info for new forms. 2012-06-22 16:32:36 -04:00
Lynn "Zhorken" Vaughan 04b710791f Official forme names for the genies. 2012-06-22 16:22:37 -04:00
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
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 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 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
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 bc7e9128e8 Pokemon species split: Tests 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
Petr Viktorin be3e224cad Pokemon species split: Other data changes 2011-05-06 12:26:16 +03:00
Petr Viktorin 24b0862c32 Pokemon species split: Automatic data changes 2011-05-02 01:12:03 +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 5a6ff3d27b Fix some move short effects 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 733bedd602 Remove explicit labels that match the target's name from Markdown links 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 4a9a4bfc62 Fix names of evolution triggers 2011-04-28 23:31:38 +03:00
Petr Viktorin 7767d546ac Don't recreate the lookup index in tests 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
Petr Viktorin 247f7ead43 Add __init__.py to pokedex/util 2011-04-28 23:31:38 +03:00
Lynn "Zhorken" Vaughan 4b5de689f8 Give Rotom's forms an explicit order.
The in-game Pokédex actually lists them in this order now, rather than
whatever order you see them in.
2011-04-27 14:25:57 -04:00
Eevee b2db58afc7 Fix discrepancy between media-accessors branches. 2011-04-17 22:35:24 -07:00
Petr Viktorin 69140a88f5 Move the rest of pokedex.util.get to pokedex.db.util 2011-04-17 22:34:05 -07:00
Petr Viktorin f271812cf7 Break "simple" query functions out of pokedex.util.get 2011-04-17 22:34:05 -07:00
Petr Viktorin 2f014411e1 Add pokedex.util.get: helpers to get stuff out of the DB easily 2011-04-17 22:34:04 -07:00
Petr Viktorin 1f2df80a00 Make Pokemon.form an actual relation 2011-04-17 22:34:03 -07:00
Petr Viktorin 4cd68fb5e3 Typo: multilang docstring was wrong 2011-04-17 22:34:02 -07:00
Petr Viktorin dd89c811b8 Move util.py to compatibility.py 2011-04-17 22:30:37 -07:00
Petr Viktorin 7292ede94a Test media accessors, and the media organization itself
A few tests of the accessors, along with a very dumb, long-running script
to ensure everything is in its proper place, and there's nothing but the
proper things.

For now it still finds some beta form cruft for Burmy, Pichu and Cherrim.
2011-04-17 20:55:58 -07:00
Petr Viktorin 11c0c4778b Add media accessors 2011-04-17 20:55:57 -07:00
Petr Viktorin 9edec64de5 Add 'underground' flag to Iron Ball and Light Clay 2011-04-17 20:55:25 -07:00
Petr Viktorin 0f7feab591 Make PokemonForm.pokemon an actual relation 2011-04-17 17:45:10 -07:00
Petr Viktorin 27d33556d4 Load local_language lazily 2011-04-17 17:45:10 -07:00
Eevee 8e1bbe0004 Merge remote-tracking branch 'origin/encukou-translations' 2011-04-17 17:43:42 -07:00
Eevee 47d4d9d334 Fixed some missed markdown identifier conversions. 2011-04-14 08:49:04 -07:00