Commit graph

922 commits

Author SHA1 Message Date
Andrew Ekstedt b412bfaa8e Add is_mega column to pokemon_forms. 2013-10-28 12:21:58 -07:00
Andrew Ekstedt ab6beabc55 Merge branch 'veekun8' 2013-10-28 10:59:23 -07:00
Lynn "Zhorken" Vaughan d32258b889 Set evolves_from_species_id for Gen VI Pokémon. 2013-10-28 04:08:33 -04:00
Lynn "Zhorken" Vaughan 729fbb0124 Reorder Furfrou's forms.
This is the order they're listed at the Furfrou salon in-game.
2013-10-28 03:30:37 -04:00
Lynn "Zhorken" Vaughan 8bda94c9d4 Refill all the order columns. 2013-10-28 03:21:27 -04:00
Lynn "Zhorken" Vaughan cc99a0e287 Add evolution chains for new Pokémon. 2013-10-28 03:14:56 -04:00
Lynn "Zhorken" Vaughan f6a3ed71e3 Add types for new forms. 2013-10-28 03:14:47 -04:00
Lynn "Zhorken" Vaughan 3a117f8dfd Add identifiers for pokemon and pokemon_forms. 2013-10-28 03:14:36 -04:00
Lynn "Zhorken" Vaughan b5dceff4d1 Add new Pokémon forms and names. 2013-10-28 03:10:31 -04:00
Lynn "Zhorken" Vaughan c36e09089f Move alternate forms to ids 10001+ again. 2013-10-27 22:43:48 -04:00
Andrew Ekstedt 95fec6065f Remove another innerjoin.
Shadow moves have no MoveMeta.
2013-10-27 15:31:20 -07:00
Andrew Ekstedt fdf87cf8ce Remove some innerjoins which no longer hold. 2013-10-19 15:22:16 -07:00
Andrew Ekstedt 8a05436945 Add default forms for XY pokemon. 2013-10-19 10:27:30 -07:00
Andrew Ekstedt d085bd348a Add XY region, generation, version, and dex names. 2013-10-18 19:31:15 -07:00
Andrew Ekstedt 38ce28e48f Drop Generation.canonical_pokedex.
Generation VI doesn't have a canonical pokedex (it has three). We don't
use this anywhere and as far as i can tell we never have. We can revive
it in another form if and when we find we need it.

Conflicts:
	pokedex/data/csv/generations.csv
	pokedex/db/tables.py
2013-10-18 18:58:07 -07:00
Andrew Ekstedt 90b57d2c67 Remove some trailing spaces. 2013-10-18 16:06:47 -07:00
Eevee (Alex Munroe) 56aca8e9c3 XY Pokémon, names, types. 2013-10-11 12:31:27 -07:00
Eevee (Alex Munroe) 55b4eebe9d XY rows. 2013-10-10 23:28:13 -07:00
Eevee (Alex Munroe) d667024937 Force MySQL to NOT auto-inc pokemon_moves.level. 2013-08-12 23:15:03 -07:00
Eevee (Alex Munroe) efc0d0d10c Maybe make the setuptools entry point actually work. 2013-08-09 13:11:54 -07:00
Eevee (Alex Munroe) d022e9a8bf Remove unused imports, incidentally fixing compat with whoosh 2.5. 2013-08-09 13:02:50 -07:00
Eevee (Alex Munroe) bef859632d Make the library work with python -m. 2013-08-09 13:00:37 -07:00
Sanky ef0b9f0f52 Add missing Hoenn locations (from R/S) 2013-08-07 14:32:09 +02: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 f34f6bb72a SmellingSalt uses the target's paralysis, not the user's. 2013-04-06 18:14:00 -04:00
Lynn 8ece3648fc Add short effects for B/W 2 items. 2013-03-20 23:47:32 -04:00
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