Commit graph

1097 commits

Author SHA1 Message Date
Lynn "Zhorken" Vaughan
c4d55a8bc8 Update characteristics to match X/Y. #131
We still need to deal with the actual change, but having the newer text
for now seems more useful.

I ripped these from the text, just to be sure.
2014-07-26 22:57:49 -04:00
Lynn "Zhorken" Vaughan
dc2565648e Add form names (without pokemon_name) for missing languages.
Notes:

- Unown, Arceus, and Genesect are just given names like "One form" in
  X/Y.  I consulted Pokédex 3D Pro for Unown and Arceus, and named
  Genesect's forms after their drives (since they don't have official
  names).

- Names for Spiky-eared Pichu are missing, since it's missing from X/Y
  and Pokédex 3D Pro.

- Korean names for Arceus are missing; we have type names, but I don't
  know how to say "____ type", or whether it would be better to just
  use the type name like the French and German localizers for Pokédex
  3D Pro did.

- Eternal Floette is just "Éternelle" in the French text file, rather
  than "Fleur Éternelle", but I think that's silly so I ignored it.

  It does raise the question of whether I should really have typed
  "Floette Éternel" though — the official convention seems to be
  "Pokémon species names are masculine, even for all-female species",
  but... they seem not to be going with that here, possibly because
  this is a specific Floette?  Or, more likely, because they just
  didn't think about it that hard.
2014-07-14 23:21:47 -04:00
Petr Viktorin
df945eb601 Fix drain/recoil name in MoveMeta
The column was named recoil, but positive values meant
drain.
Rename the column, and introduce a hybrid property for
recoil.
2014-07-09 10:47:36 -07:00
Andrew Ekstedt
0094e9584c Modernize our use of py.test
This commit updates the tests to take advantage of some of py.test's
newer features.  Requires py.test 2.3 or newer.  Tested with 2.3.0 and
2.5.2.

Tests which were parametrized now use py.test's built-in
parametrization[1].

The session and lookup objects are now implemented as fixtures[2].
The media root is a fixture as well.  Fixtures are automatically passed
to any function that expects them.

Since the session is now created in one place, it is now possible to
provide an engine URI on the command line when running py.test.  Ditto
for the index directory.  (But the environment variables still work of
course.)

Slow tests are now marked as such and not run unless the --all option is
given.

A couple media tests are marked as xfail (expected to fail) because they
are broken.

[1]: http://pytest.org/latest/parametrize.html
[2]: http://pytest.org/latest/fixture.html
2014-07-06 21:45:05 -07:00
Andrew Ekstedt
29824c73f4 Tweak Pokemon width/height docstrings 2014-07-06 12:17:11 -07:00
Andrew Ekstedt
5f54b3057d Fix PokemonForm.form_order docstring 2014-07-06 12:17:11 -07:00
Andrew Ekstedt
e71043ae14 Er, fix tabledoc 2014-07-06 12:17:02 -07:00
Andrew Ekstedt
19d7335399 Remove some lies about encounter slots 2014-07-05 16:50:43 -07:00
Andrew Ekstedt
159eea093a Address some XXX comments 2014-07-05 16:50:24 -07:00
Andrew Ekstedt
cd04629404 PEP 257, yo
Put the closing quote of single-line docstrings on the same line, and
end with a period.

Just tables.py for now.
2014-07-05 16:48:58 -07:00
Andrew Ekstedt
6f5abb9540 Put column descriptions where they belong
The Column class accepts a 'doc' argument. Use it.

And while we're at it, make them all unicode strings.

Performed by the following sed script:

   s/info=dict(description=u\?\("[^"]*"\))/doc=u\1/
   s/info=dict(description=u\?\('[^']*'\))/doc=u\1/
   s/\(\s*\)info=dict(description=u\?\("[^"]*"\), /\1doc=u\2,\n\1info=dict(/
   s/\(\s*\)info=dict(description=u\?\('[^']*'\), /\1doc=u\2,\n\1info=dict(/

   /info=dict(description=u\?\('[^']*'\),$/ {
       s//doc=u\1,/
       n
       s/^\s*/&info=dict(/
   }
2014-07-05 16:46:37 -07:00
Andrew Ekstedt
181ae0fe19 Remove an unused regexp 2014-07-04 12:48:19 -07:00
Andrew Ekstedt
195cdd2ea2 Fix typos in table docs
Also, remove a stray detail=True from an info dict.
2014-07-04 12:43:03 -07:00
Andrew Ekstedt
16c1d2c278 Fix natures.game_index 2014-07-03 17:25:26 -07:00
Andrew Ekstedt
341f6bbc83 Add internal IDs for types 2014-07-03 16:55:33 -07:00
Lynn "Zhorken" Vaughan
b2c809e2ae Rerip nature names from X.
In previous gens, Spanish nature names only ever appeared in the
feminine form, so that's what we had.  Now it looks like the isolated
nature names default to masculine — they're still feminine on the status
screen, but in the box you get "Naturaleza:   [adjective]" and I guess
the adjective is considered to be on its own rather than modifying
naturaleza.

Italian doesn't follow suit so I guess it gets to be the one special
snowflake language where we don't have the default dictionary form for
natures.
2014-06-22 13:07:04 -04:00
Lynn "Zhorken" Vaughan
f4b73bcd5a Clarify that natures.game_index is 1-indexed.
Given that nature was determined by pid % 25 for a long time, I think
this is important to note.
2014-06-21 22:50:12 -04:00
Lynn "Zhorken" Vaughan
a71e4a2c13 Add game indices for natures.
I'm assuming (and I'm 99% sure I'm right) that the internal order for
natures has never changed.
2014-06-21 22:27:56 -04:00
Lynn "Zhorken" Vaughan
8cba4ac996 Add flavour text for Hoopa and Volcanion.
I knew I was forgetting something.
2014-06-13 15:41:35 -04:00
Lynn "Zhorken" Vaughan
f525152993 Set order columns to accomodate new Pokémon. 2014-06-13 14:10:26 -04:00
Lynn "Zhorken" Vaughan
ae74f19e0b Add unreleased Pokémon. 2014-06-13 14:09:38 -04:00
Lynn "Zhorken" Vaughan
dcb1aa2d60 Add unreleased moves.
I also changed Celebrate's effect to "unknown", which I meant to commit
separately but it got caught up in this one.  It has a unique effect ID,
and we don't know for sure that it does nothing.  Also, Splash's effect
(which it was sharing) says that the move is disabled by Gravity, which
isn't true of Celebrate.
2014-06-12 23:23:04 -04:00
Lynn "Zhorken" Vaughan
7286ba0254 Delete all the blank rows in pokemon_form_names.
All the tests still pass and everything.  We literally did not need them
after that innerjoin=True got commented out.
2014-06-11 22:22:32 -04:00
Lynn "Zhorken" Vaughan
ba87b16017 Update Natural Furfrou's identifiers. 2014-06-10 23:46:48 -04:00
Lynn "Zhorken" Vaughan
4ae6632b2b Give Furfrou's default form a name.
This is what it is in the text file full of form names (#5).
2014-06-10 23:41:43 -04:00
Lynn "Zhorken" Vaughan
02608b6e38 Load/dump dance. 2014-06-01 19:46:12 -04:00
Lynn "Zhorken" Vaughan
63dac87a40 Dump translations for official languages by default.
I don't really like this but ehhhhhhh, the system for prose
translations seems to be to keep them in csv/translations/, and I can't
figure out how you're supposed to DO that, plus judging by the age of
the single file that's in there, that seems to be where translations go
to die.
2014-06-01 19:44:32 -04:00
Lynn "Zhorken" Vaughan
684f230d66 CSV fixups for those German translations. 2014-06-01 11:04:53 -04:00
RichardGottschalk
1dbad42c26 Some german translations
Translated manually
2014-06-01 10:49:19 -04:00
Andrew Ekstedt
4e56c036c1 Delete erroneous "Vermillion City" location.
Typo from when FRLG encounters were first imported.
The correct spelling is, of course, "vermilion".
2014-05-27 20:22:28 -07:00
Lynn "Zhorken" Vaughan
dbe8495fa8 Rip type names. 2014-05-20 00:52:40 -04:00
Andrew Ekstedt
8d42445ae0 Fix typo in Machine.machine_number docstring. 2014-05-19 21:31:58 -07:00
Lynn "Zhorken" Vaughan
37fb1ad237 Fix private use characters in French flavour text.
Whoops.
2014-05-19 23:51:57 -04:00
Lynn "Zhorken" Vaughan
162479d144 Rip remaining X/Y move/ability/item flavour text.
Same as before, two commits for nicer diffs.

Also I don't think I ever mentioned, but the only missing items are
unused and spoiler items, so I never added them.

Also ALSO I remembered the U+200B ZERO WIDTH SPACE in the flavour
text for Thick Fat and the Adamant/Lustrous Orbs.
2014-05-19 23:47:06 -04:00
Lynn "Zhorken" Vaughan
0dbd24cd15 Rerip existing X/Y move/ability/item flavour. 2014-05-19 23:36:10 -04:00
Lynn "Zhorken" Vaughan
8fc75067a6 Update the "status" damage class's identifier. 2014-05-19 22:40:17 -04:00
Lynn "Zhorken" Vaughan
6efd25d31d Add a better ordering to languages.
This is kind of arbitrary, but here's my reasoning:

- Japanese goes first, because it's the original language.
- ja-kanji and roomaji follow because obviously we don't want to split
  Japanese up.
- Korean and Chinese go next to keep Asian languages together.
- Then English, because it's the main language other than Japanese.
- Then French and German, because they translate their Pokémon names???
  idk it feels intuitive to me.  Plus I guess their IDs are next.
- Then Spanish and Italian, because they're the only official languages
  left.
- Czech goes last because it's unofficial.
2014-05-19 22:11:13 -04:00
Lynn "Zhorken" Vaughan
c13ba0e58a Rerip move stats.
Notes:

- I left all the flags surskitty added alone (powder, bite, pulse,
  ballistics, and mental) because they don't seem to be in with the
  other move flags.  The only new flags are the Sky Battle one that I
  added, and a mystery one, which I didn't add —
  http://pastebin.com/K27Vk95J

- move_meta_* is a mess and I don't like it but X/Y seem to have all the
  same move meta as B/W did so I updated it for the time being

- I didn't update effect_id because I'd have to sort out all the new
  effects that I added manually and that sounds like a bigger endeavour
2014-05-19 22:10:09 -04:00
Lynn "Zhorken" Vaughan
2626cf6304 Use null power instead of 0/1 power.
<Zhorken> I'd like to motion (again) that 0 and 1 power both be stored
    as null
<Zhorken> and — or * be displayed based on damage class
<Zhorken> which is what determines 0 vs 1 anyway, with the arbitrary
    who-fucking-cares exception of Me First
<eevee> the ayes have it
<Zhorken> awesome
<eevee> that's a good idea i don't remember its being motioned the
    first time
<Zhorken> I definitely remember arguing it when B/W released
2014-05-19 21:37:48 -04:00
Lynn "Zhorken" Vaughan
82b66c1842 Add internal item IDs for X/Y. 2014-05-19 14:33:15 -04:00
Lynn "Zhorken" Vaughan
35ca74ea1d Update the identifiers of abilities and items whose names changed. #117 2014-05-19 14:33:15 -04:00
Lynn "Zhorken" Vaughan
4d83e8e183 Add missing genuses and move/ability/item names.
I'm following magical's lead and making this a separate commit because
it's nice to have separate diffs for actual changes and brand-new rows.
2014-05-19 14:32:14 -04:00
Lynn "Zhorken" Vaughan
c222dc807c Rerip existing genuses and move/ability/item names. #117 2014-05-19 14:10:09 -04:00
Andrew Ekstedt
0d171accad Replace non-breaking space with narrow non-breaking space.
More correct.
2014-05-18 18:03:34 -07:00
Andrew Ekstedt
0c9617be16 Rip missing Pokédex flavor text from Y. 2014-05-18 14:51:48 -07:00
Andrew Ekstedt
1a107105aa Rip Pokédex flavor text from Y. 2014-05-18 14:45:11 -07:00
Andrew Ekstedt
b58f4afcf0 Rip missing Pokédex flavor text from X. 2014-05-18 14:40:36 -07:00
Andrew Ekstedt
91588bd7bf Rip Pokédex flavor text from X. 2014-05-18 14:32:27 -07:00
Lynn "Zhorken" Vaughan
2a8f7fa28d Rerip Korean Pokémon names.
I reripped all the other languages, but Korean was the only one with any
mistakes or missing names.

I'll add all the other text later if nobody else does.
2014-05-18 11:47:18 -04:00
Andrew Ekstedt
99184a6fde Knock Unicode(256) down to Unicode(79)
MySQL again. Indexed keys have a maximum length of 767 bytes and unicode
is stored as 3 bytes per character. Since 256*3 = 768, that pushes us
just past the limit. Could lower the length to 255 characters, but let's
go further - currently only names and identifers have a length limit,
and if a name or identifier doesn't fit in a terminal then i don't want
to see it.

Fixes issue #123.
2014-05-13 23:26:07 -07:00
Andrew Ekstedt
12368ddca8 Whoosh 2.5 performance quickfix
In Whoosh 2.5, fields that can be sorted on need to specify
sortable=True or else take a large performance hit because whoosh
completely dumped its old method of speeding up sorting (automatic
caching) in favor of this brand new one.

These probably don't *all* need to be sortable, but hey.

Note that we now require Whoosh>=2.5 because the sortable keyword arg
didn't exist in exist in earlier versions.
2014-05-13 23:06:19 -07:00
Lynn "Zhorken" Vaughan
ee297aad45 Rip X/Y level-up and egg moves. 2014-05-12 14:00:50 -04:00
Lynn "Zhorken" Vaughan
4b2455cf62 Update new egg group names to match Pokédex 3D Pro.
Also, a lot of them had spaces on the end fsr.
2014-05-03 14:48:53 -04:00
Pyrox
066827017f Added languages for egg groups 2014-05-03 19:25:26 +02:00
Lynn "Zhorken" Vaughan
bb6d8cf552 Rip EVERYTHING available in the X/Y base stats structure. 2014-04-16 01:21:52 -04:00
Lynn "Zhorken" Vaughan
aa869dc68c Count Volt Tackle as its usual method in X/Y, rather than an egg move. 2014-04-15 16:04:55 -04:00
Lynn "Zhorken" Vaughan
934ae1003f Add Rotom's form moves for X/Y. #120 2014-04-15 16:04:48 -04:00
Lynn "Zhorken" Vaughan
7f92a05003 Match Parental Bond and Aerilate's ids to their internal ids.
Thanks to Kaphotics of Project Pokémon.
2014-04-14 19:43:34 -04:00
valepert
3819a2619f PS = HP
PS (Punti Salute) = HP (Hit Points)
2014-03-17 15:58:36 +01:00
Lynn "Zhorken" Vaughan
10863c55e1 Change Shadow moves' target to the usual "Selected Pokémon" rather than Me First's. 2014-03-16 22:09:55 -04:00
Lynn "Zhorken" Vaughan
955b48c17a Give Me First's move target a unique identifier. 2014-03-16 22:09:36 -04:00
Lynn "Zhorken" Vaughan
de05d211ae Add remaining English X/Y ability flavour. 2014-03-14 16:28:58 -04:00
Lynn "Zhorken" Vaughan
329312a546 Sync Pokémon stats with Showdown. 2014-03-13 19:04:02 -04:00
Andrew Ekstedt
9e3bfd7971 Use Unicode(256) for names and identifiers.
MySQL requires that text columns that are indexed or used as keys be
given a maximum length.

256 bytes should be enough for anyone.
2014-03-13 00:29:49 -07:00
Lynn "Zhorken" Vaughan
7462c0fc1b Put short_effect before effect in ability_prose.
This way it matches /all the other prose tables/.  Relatedly, all the
abilities I recently expanded on had short_effect and effect swapped,
so I fixed that too.
2014-03-12 12:18:37 -04:00
Lynn "Zhorken" Vaughan
2632454829 Set form_name=pokemon_name for Mega Evolutions. 2014-03-12 11:17:05 -04:00
Lynn "Zhorken" Vaughan
3fe999db89 Add a dummy pokemon_form_names row for Diancie.
Apparently PokemonForm.name requires this row, so the tests weren't
passing. 9_6
2014-03-11 20:36:06 -04:00
Lynn "Zhorken" Vaughan
efa41be984 Fix a typo in a move flag description so the tests pass again. 2014-03-11 20:23:02 -04:00
Lynn "Zhorken" Vaughan
308f5f4ed9 Use UnicodeText for all text columns. 2014-03-11 20:15:16 -04:00
Lynn "Zhorken" Vaughan
d344e8b5f0 Strip some trailing whitespace in X/Y flavour text. 2014-03-11 18:31:41 -04:00
Lynn "Zhorken" Vaughan
d74b55fbad Add zero-width space to Thick Fat's flavour text as needed. 2014-03-11 18:22:51 -04:00
Lynn "Zhorken" Vaughan
cb1523e296 Add everything remaining from the spreadsheet. 2014-03-11 18:20:41 -04:00
Lynn "Zhorken" Vaughan
df449280b7 Add a separate fucking language for kanji. 2014-03-11 16:49:08 -04:00
Lynn "Zhorken" Vaughan
5770a3ea7d Add Spanish and Italian Pokémon names.
We decided a while back to just give up and include these separately,
even though they're really just the English names.  Now I actually need
them, because genus.
2014-03-11 16:14:59 -04:00
Lynn "Zhorken" Vaughan
5625b8274d Add national dex #, dex entries, name for Diancie. 2014-03-10 16:13:47 -04:00
Lynn "Zhorken" Vaughan
7cd9f36e24 Improve effects for new moves and abilities a little. 2014-03-09 20:53:53 -04:00
Lynn "Zhorken" Vaughan
8edb9329dc Add Diancie to the Undiscovered egg group. 2014-03-07 12:32:32 -05:00
Lynn "Zhorken" Vaughan
4b11c70231 Fix Diamond Storm's type. 2014-03-07 12:32:22 -05:00
Lynn "Zhorken" Vaughan
d91a2e5e13 Sync moves with Showdown. #116 2014-03-07 12:28:12 -05:00
Lynn "Zhorken" Vaughan
21fd51bb0b Add Hold Back and Diamond Storm. 2014-03-07 11:18:14 -05:00
Lynn "Zhorken" Vaughan
f71e1521a9 Load/dump dance. 2014-03-07 11:18:14 -05:00
Lynn "Zhorken" Vaughan
9cb44f56e5 Add Diancie. 2014-03-07 11:18:03 -05:00
Lynn "Zhorken" Vaughan
b8630cb076 Correct the descriptions for the Razor Claw and Razor Fang. 2014-03-04 13:50:19 -05:00
Lynn "Zhorken" Vaughan
5ddbee886f Update the docstring on rewrite_long_table_names. 2014-02-21 17:59:52 -05:00
Lynn "Zhorken" Vaughan
0c8aadc53c Merge branch 'oracle'. #109 2014-02-21 17:51:46 -05:00
Lynn "Zhorken" Vaughan
f54a4caaca General code tidying for this Oracle fix. 2014-02-21 17:48:19 -05:00
Lynn "Zhorken" Vaughan
5b759feaa2 Sort out all the non-nullable columns with empty values. 2014-02-21 17:48:19 -05:00
Epithumia
7b2743be75 Dynamically mangle long table names for Oracle; Unicode → UnicodeText. 2014-02-21 17:47:55 -05:00
Lynn Vaughan
80838793d5 Merge pull request #100 from valepert/patch-3
Merge valepert's Italian names for B/W 2 items. #100
2014-02-06 15:33:10 -05:00
Lynn "Zhorken" Vaughan
a9bce8f5a3 Add ability changes for Feebas, Milotic, and Zapdos. 2014-01-06 13:12:43 -05:00
Lynn "Zhorken" Vaughan
61b5032519 Put the hyphen back in Lock-On's name.
Showdown's data files said "Lock On" in a bunch of places, so I assumed
it had changed.  I was wrong!  Oops.  Thanks to Chispy for confirming
that it hadn't.
2014-01-04 08:07:02 -05:00
Lynn "Zhorken" Vaughan
3fbe98c93a Sync move stats with Showdown. 2014-01-03 20:24:18 -05:00
Lynn "Zhorken" Vaughan
0ad40dee14 Sync Pokémon moves with Showdown. 2014-01-03 20:00:47 -05:00
Lynn "Zhorken" Vaughan
befea028ca Correct Japanese names for a few Kalos Pokémon.
I double-checked against http://wiki.ポケモン.com/wiki/ポケモン一覧 .
(Apologies for the likely-unclickable URL but it was really really long
otherwise.)

Flabébé was using hiragana べ instead of katakana ベ.  Those were the
only hiragana in the csv.
2013-12-20 20:28:06 -05:00
Lynn "Zhorken" Vaughan
bf2c79879d Add Happy Hour and Celebrate. 2013-12-11 14:20:14 -05:00
Lynn "Zhorken" Vaughan
fb06d85e1e Keldeo can switch forms. 2013-12-05 16:41:22 -05:00
Lynn "Zhorken" Vaughan
199feadce6 Fix a typo in Combusken's X entry. 2013-12-02 22:49:23 -05:00
Lynn "Zhorken" Vaughan
489b0dca9b Add all the remaining heights and weights.
I got these all from pokemonxy.com, along with most of the last batch.
I'll double-check them in-game when I can.
2013-11-23 10:14:28 -05:00
Lynn "Zhorken" Vaughan
5bba8d9ca9 Remove flags for nonexistent moves. 2013-11-23 09:42:09 -05:00
Lynn "Zhorken" Vaughan
79acc09c4f Correct Eerie Impulse's effect. 2013-11-23 09:30:40 -05:00