Commit graph

1289 commits

Author SHA1 Message Date
Jonathan Rubin
b7500e92f0 gift-pokemon: CSV file updates
From sqlite:
.headers on
.mode csv
.output $filename
select * from $table
Then remove all the dumb carriage returns in vim
2018-09-19 13:58:25 -04:00
Jonathan Rubin
8694c8464a gift-pokemon: Document empty encounter_slots
I'm going to record gift-pokemon as having no encounter slot, which I
believe is correct by-and-large (since you always get the same mon).

There are a few randomized gift pokemon which do have some type
of encounter slot (eg. Crystal's Odd Egg). Those aren't tracked (yet).
2018-09-19 13:58:25 -04:00
Jonathan Rubin
731cd771d4 gift-pokemon: Add gift encounter method 2018-09-19 13:58:07 -04:00
Andrew Ekstedt
083e43bb93 Add S/M locations
This commit adds Sun & Moon location names from the text dump, for all
official languages: the usual ja, en, fr, it, de, es, ko, and now
zh-Hans (simplified Chinese) and zh-Hant (traditional Chinese).

Fixes #230
Updates #198
2018-09-15 20:01:08 -07:00
Andrew Ekstedt
6d4d129c84 Add subtitle field to Location
Starting in Gen VI, locations have been able to have an optional
subtitle. In-game, the subtitle is displayed on a second line under the
main name.

In X/Y this is used to give some locations an alternate,
flavorful name; for example, Kalos Route 2 is also known as Avance
Trail. In S/M this is mainly used to divide some large locations like
Hau'oli City into separate sections: e.g., the Beachfront, the Shopping
District, and the Marina.

This commit just adds the column; there are no data changes.

I suppose we'll need to go back and re-rip X/Y location names now.
2018-09-15 20:01:08 -07:00
Andrew Ekstedt
f2d03da177 Add OR/AS locations
This commit adds OR/AS location names from the text dump, for all
official languages (ja, en, fr, it, de, ko).

It also updates the names of any pre-existing locations from R/S/E to
use the names from OR/AS. Mostly this only affects the French
translations, which i think were added manually.

"Inside of Truck" was renamed to "???" in all languages, which is dumb,
but whatever.

"Team Magma Hideout" is in fact a different location from the
already-existing "Magma Hideout" - Magma Hideout was from Emerald and
resided in Jagged Pass, while Team Aqua Hideout and Team Magma Hideout
are located outside Lilycove City.

Kalos locations are untouched. I assume they didn't change, but didn't
verify this.

Updates #141
2018-09-15 14:56:53 -07:00
thechief389
f413bf82f0 Fix error when no arguments are specified (#240)
Also, introduce a metavar for the command subparser, since it's currently a bit verbose.
2018-08-22 23:34:27 -07:00
skylar
d17a772b4f Resolve some Python 3 encoding issues on Windows (#244)
When you open a file in Python 3, it defaults to using the system charset to encode the file, which is typically UTF-8 on linux systems (good) but Windows-1251 on Windows (bad).

We need to add explicit encoding=utf-8 arguments to open() calls when we open CSV files for reading or writing. To complicate matters, the csv module works only with byte strings in Python 2, and only with unicode strings in Python 3, so we can't just blindly use `io.open` everywhere.
2018-08-22 23:01:58 -07:00
Andrew Ekstedt
ffb0638ef5 Unbreak SaveFilePokemon slightly
The schema has changed a little in the past, uh, seven years.

Works well enough to parse and display one of my pokemon in the gts
plugin.

Updates veekun/spline-pokedex#72
2018-06-26 23:53:59 -07:00
Dan Keenan
57915f656b Fix TMs 93-100 refer to the wrong item in OR/AS
Fixes #206
2018-04-24 23:02:17 -07:00
Andrew Ekstedt
0c61702213 pass an explicit bind to table.create()
This isn't really necessary, since pokedex.db.connect sets
metadata.bind, but it's better to be explicit.
2018-03-30 15:07:10 -07:00
Andrew Ekstedt
417bd1afa2 fix pypy build
PyPy (>= 3.6) was consistently erroring out during `pokedex load`,
with the error

    OperationalError: (_sqlite3.OperationalError) cannot commit transaction - SQL statements in progress (Background on this error at: http://sqlalche.me/e/e3q8)

It turns out PyPy was not garbage collecting something, causing a
database cursor to be left open. See the giant comment block for
details.
2018-03-30 15:06:34 -07:00
Andrew Ekstedt
56cf0fd29d Squash a bunch of "non-unicode bind param" warnings 2018-03-30 12:14:55 -07:00
Andrew Ekstedt
e1bbe78b72 fix test suite under SQLAlchemy 1.2.x
* SQLAlchemy 1.0 introduced "baked queries" - a way to construct Query
 objects so that they can be cached and reused.

 * SQLAlchemy 1.2 changed lazyloaded columns to use baked queries under the
 hood.

 * Our MultilangQuery class attempts to set _default_language_id right
 before the query is executed by overriding the __iter__ method.

 * Baked queries bypass the __iter__ method and call a lower-level
 method, _execute_and_instances, directly.

 * This caused problems where _default_language_id wouldn't get set
 correctly on lazyloaded columns.

 * To fix, make MultilangQuery override the _execute_and_instances
 method instead of __iter__.

 * This is really just a stopgap: the root cause is that query params
 are not preserved across lazyloads.

Tested with SQLAlchemy 0.9.7, 1.1.18, and 1.2.5.

Updates #236.
2018-03-30 12:01:21 -07:00
Eevee (Lexy Munroe)
a6b7b426c2 Remove some extraneous form names that broke lookup 2017-11-27 09:58:23 -08:00
Eevee (Lexy Munroe)
74e22520db Update Pokémon order 2017-11-25 14:11:46 -08:00
Eevee (Lexy Munroe)
1c982d748f Fix crash when looking up Salazzle 2017-11-25 14:07:25 -08:00
Eevee (Lexy Munroe)
591be9ab8b Populate pokemon_form_generations for USUM 2017-11-25 13:28:36 -08:00
Eevee (Lexy Munroe)
82679b70ea Add Pokémon form names and a couple minor tidbits 2017-11-25 12:07:12 -08:00
Eevee (Lexy Munroe)
45f43231e3 Add Ultra Sun/Ultra Moon data, more or less 2017-11-25 11:30:23 -08:00
Eevee (Lexy Munroe)
73f388ed69 Fix tests, since Farfetch’d got a name change 2017-09-04 10:04:23 -07:00
Eevee (Lexy Munroe)
bf6b2bc646 Populate pokemon_form_generations 2017-09-04 09:04:56 -07:00
Eevee (Lexy Munroe)
a273273823 Updated order columns, identifier Battle Bond Greninja, populated is_battle_only 2017-09-04 03:54:02 -07:00
Eevee (Lexy Munroe)
c3e4f61894 Added SUMO ability effects. 2017-09-02 02:07:16 -07:00
Eevee (Lexy Munroe)
1ef14370f1 Fill in some missing bits and add item effects. 2017-08-29 19:33:20 -07:00
Eevee (Lexy Munroe)
0b81ea0c79 Add SUMO items and Pokémon 2017-08-22 16:23:49 -07:00
Eevee (Lexy Munroe)
7b9aa7de46 Fill in effects for new SUMO moves and a few old XY moves 2017-07-13 21:38:26 -07:00
Eevee (Lexy Munroe)
15c2cb486b Add SUMO moves 2017-07-11 17:27:54 -07:00
Eevee (Lexy Munroe)
3b49944b06 Add a new SUMO ailment; fix gen 6 effect ids to match the games 2017-06-26 21:05:58 -07:00
Eevee (Lexy Munroe)
2af13f4f15 Fix references to "ja" (which is now ja-Hrkt) 2017-06-18 00:15:05 -07:00
Eevee (Lexy Munroe)
329dc81a11 Add SUMO abilities 2017-06-17 23:18:03 -07:00
Eevee (Lexy Munroe)
a33678d8c7 Add Sun/Moon 2017-06-17 23:18:03 -07:00
Eevee (Lexy Munroe)
c3d1b323ac Use script suffixes in lang identifiers; add simplified Chinese 2017-06-17 23:18:03 -07:00
John T. Wodder II
c3f566b2c9 Addressed all of pyflakes3's complaints 2016-11-24 21:29:58 +00:00
Andrew Ekstedt
82335886e1 Merge pull request #196 from GreatWizard/patch-1
Update item_pocket_names with french
2016-11-20 10:57:15 -08:00
Andrew Ekstedt
5e2d073297 Merge pull request #195 from AlexanderZon/patch-2
Update pokemon_move_method_prose.csv Spanish
2016-11-20 10:56:47 -08:00
Andrew Ekstedt
704566cdaa Merge pull request #194 from AlexanderZon/patch-1
Update move_damage_class_prose.csv Spanish
2016-11-20 10:56:15 -08:00
Andrew Ekstedt
dfd13b8f95 Merge pull request #193 from phmatray/master
Add identifiers to item_fling_effects.csv
2016-11-20 10:55:41 -08:00
Develrox
362a9f4e79 corrected a typo 2016-11-20 10:53:25 -08:00
Guillaume Gérard
251f9194fd Update item_pocket_names with french 2016-11-18 23:52:04 +01:00
Alexis Montenegro
05ff52c009 Update pokemon_move_method_prose.csv Spanish
Spanish Translations
2016-11-10 17:28:27 -04:00
Alexis Montenegro
059a225096 Update move_damage_class_prose.csv Spanish
Spanish Translations
2016-11-10 17:26:03 -04:00
Philippe Matray
7612277ee4 Add identifiers to item_fling_effects.csv 2016-10-23 18:56:43 +02:00
Andrew Ekstedt
a967b787b7 Add move changelogs for Gen V→VI
Made by running a script to compare an old version of moves.csv[1] with
the current version.

[1]: cb5276773b

Hidden power changed from variable power to 100.
We can't represent NULLs in the changelog,
so set the power to 1 instead.

A few effect chances changed from NULL to 100.
We can't represent this either, but i don't think it matters.

    leer: effect_chance changed from NULL to 100
    hidden-power: power changed from 1 to 60
    chatter: effect_chance changed from NULL to 100
    v-create: effect_chance changed from NULL to 100

Here's the complete list of changes:

    swords-dance: pp changed from 30 to 20
    whirlwind: accuracy changed from 100 to NULL
    vine-whip: power changed from 35 to 45
    vine-whip: pp changed from 15 to 25
    pin-missile: power changed from 14 to 25
    pin-missile: accuracy changed from 85 to 95
    roar: accuracy changed from 100 to NULL
    flamethrower: power changed from 95 to 90
    hydro-pump: power changed from 120 to 110
    surf: power changed from 95 to 90
    ice-beam: power changed from 95 to 90
    blizzard: power changed from 120 to 110
    submission: pp changed from 25 to 20
    growth: pp changed from 40 to 20
    thunderbolt: power changed from 95 to 90
    thunder: power changed from 120 to 110
    minimize: pp changed from 20 to 10
    barrier: pp changed from 30 to 20
    lick: power changed from 20 to 30
    smog: power changed from 20 to 30
    fire-blast: power changed from 120 to 110
    skull-bash: power changed from 100 to 130
    skull-bash: pp changed from 15 to 10
    glare: accuracy changed from 90 to 100
    poison-gas: accuracy changed from 80 to 90
    bubble: power changed from 20 to 40
    psywave: accuracy changed from 80 to 100
    acid-armor: pp changed from 40 to 20
    crabhammer: power changed from 90 to 100
    struggle: target_id changed from 10 to 8
    thief: power changed from 40 to 60
    thief: pp changed from 10 to 25
    snore: power changed from 40 to 50
    cotton-spore: target_id changed from 10 to 11
    sweet-kiss: type_id changed from 1 to 18
    perish-song: target_id changed from 12 to 14
    charm: type_id changed from 1 to 18
    fury-cutter: power changed from 20 to 40
    heal-bell: target_id changed from 4 to 13
    moonlight: type_id changed from 1 to 18
    hidden-power: power changed from 1 to 60
    future-sight: power changed from 100 to 120
    heat-wave: power changed from 100 to 95
    will-o-wisp: accuracy changed from 75 to 85
    smellingsalt: power changed from 60 to 70
    follow-me: priority changed from 3 to 2
    nature-power: target_id changed from 1 to 10
    knock-off: power changed from 20 to 65
    poison-fang: effect_chance changed from 30 to 50
    meteor-mash: power changed from 100 to 90
    meteor-mash: accuracy changed from 85 to 90
    aromatherapy: target_id changed from 4 to 13
    air-cutter: power changed from 55 to 60
    overheat: power changed from 140 to 130
    rock-tomb: power changed from 50 to 60
    rock-tomb: pp changed from 10 to 15
    rock-tomb: accuracy changed from 80 to 95
    extrasensory: pp changed from 30 to 20
    muddy-water: power changed from 95 to 90
    covet: pp changed from 40 to 25
    wake-up-slap: power changed from 60 to 70
    tailwind: pp changed from 30 to 15
    assurance: power changed from 50 to 60
    psycho-shift: accuracy changed from 90 to 100
    aura-sphere: power changed from 90 to 80
    air-slash: pp changed from 20 to 15
    dragon-pulse: power changed from 90 to 85
    power-gem: power changed from 70 to 80
    energy-ball: power changed from 80 to 90
    draco-meteor: power changed from 140 to 130
    leaf-storm: power changed from 140 to 130
    gunk-shot: accuracy changed from 70 to 80
    chatter: power changed from 60 to 65
    magma-storm: power changed from 120 to 100
    wonder-room: priority changed from -7 to 0
    rage-powder: priority changed from 3 to 2
    magic-room: priority changed from -7 to 0
    storm-throw: power changed from 40 to 60
    synchronoise: power changed from 70 to 120
    synchronoise: pp changed from 15 to 10
    low-sweep: power changed from 60 to 65
    hex: power changed from 50 to 65
    incinerate: power changed from 30 to 60
    water-pledge: power changed from 50 to 80
    fire-pledge: power changed from 50 to 80
    grass-pledge: power changed from 50 to 80
    struggle-bug: power changed from 30 to 50
    frost-breath: power changed from 40 to 60
    sacred-sword: pp changed from 20 to 15
    hurricane: power changed from 120 to 110
    techno-blast: power changed from 85 to 120

Fixes #127
Fixes #136
2016-09-25 13:18:58 -07:00
Andrew Ekstedt
ad73c9d43b Add priority and target columns to the move changelog
In preparation for adding Gen V→VI changelog entries.

No data changes.
2016-09-25 13:18:58 -07:00
Andrew Ekstedt
5d6ac22974 Load/dump dance 2016-09-25 10:59:05 -07:00
Ruben
d2dfc911c3 Add Cosplay Pikachu special moves
Merge pull request #162 from rubendal/master

The Cosplay Pikachu form change mechanic is similar to Rotom:
when it changes form it learns a special move, possibly forgetting
its old special move if it had already changed form.

Renamed the "Rotom Form" pokemon move method to "Form Change"
and updated the description accordingly.
2016-09-25 10:34:41 -07:00
Jerry
10ab743bc2 Fix Cosplay Pikachu heights (#179)
Not sure why they weren't fixed when the height of megas were fixed
2016-09-24 15:38:46 -07:00
Lorenzo Rapetti
625be26239 Fix ORAS HM items (PR #170)
The HMs in OR/AS were pointing at the completely wrong moves.

Fixes #161
2016-09-24 14:36:31 -07:00
jota
d48f1d3617 Fix forms_switchable flag for Primal Pokemon in ORAS (#187)
It was fixed for Megas in #177 but not for Primal Pokemon.
2016-09-24 14:32:14 -07:00
Philippe Matray
65d1a59724 Fix typo in Sandy Wormadam's French name
Merge pull request #189 from phmatray/patch-1

The pokemon_name field in pokemon_form_names is sadly not rippable and has to be created by hand, being an unofficial amalgam of the species name and form name. Looks like Zhorken made a typo when adding the French form names originally.
2016-09-24 14:29:17 -07:00
Andrew Ekstedt
359204effd Fix FR/LG duplicate location areas
Merge pull request #180 from seii/veekun-issue-103

Background: When I originally ripped FR/LG encounters, i gave them
their own set of location areas instead of reusing the ones from R/B/Y.
My reasoning was that location areas aren't really consistent across games,
and we have to name them by hand anyway, so it would be better to take care
of merging them in the presentation layer than the database layer.

The other devs disagreed with me, and all other rips have reused location areas.

This set of commits removes the separate location areas for FR/LG, merging them
with the existing location areas. Mostly straightforward, except:

- My original rip collapsed the three upper floors of the Pokémon Mansion into
  a single unnamed area, since they had the same encounters. But R/B/Y had
  slightly different encounters on each floor, so we have to re-duplicate these
  floors.

- I'm not sure how we ended up with four Victory Roads in Kanto, but we did.
  One of them (kanto-victory-road-1) is the G/S/C victory road, which has a
  completely different layout so it makes sense having its own set of location
  areas. As for the other three, one was used by R/B/Y (kanto-victory-road-2),
  one by FireRed (kanto-victory-road-3), and one by LeafGreen
  (kanto-victory-road-4). We can merge these.

Also, a few locations had inconsistent names:

- Routes 19, 20 & 21 => Sea Routes 19, 20 & 21
- Route 2 unnamed area => Route 2 south, towards Viridan City
- Safari Zone center => Safari Zone middle

Thanks to seii for doing all the hard work.

Fixes #103
Fixes #156
2016-09-24 12:50:55 -07:00
Andrew Ekstedt
ddf987a110 Load/dump dance 2016-09-24 12:44:13 -07:00
Andrew Ekstedt
d70cd810cd Fix Pokémon Mansion encounters.
There was a mix up with B1F and 1F in FireRed and LeafGreen.
Both floors got labeled as 1F during the location area cleanup,
and the B1F encounters were copied to 2F and 3F instead of the 1F
encounters.
2016-09-24 12:31:04 -07:00
Christopher Sidebottom
77af7e9466 Re-add quotes around shape prose including commas
This broke my database import:

```
psycopg2.DataError: extra data after last expected column
CONTEXT:  COPY pokemon_shape_prose, line 21: "6,9,Upright,Sciurine,Pokémon with a bipedal, tailed form"
```
2016-08-20 22:16:24 +01:00
Philippe Matray
8c30801b85 Fix the primary index of Mega Beedrill 2016-08-18 08:42:49 +02:00
Philippe Matray
6082bd953e Fix indexes for french translations 2016-08-18 08:37:20 +02:00
Philippe Matray
2e8476a41f Fix "No newline at end of file" 2016-08-18 08:30:54 +02:00
Philippe Matray
58c06878c3 Add french translations for ROSA's mega-evolution 2016-08-18 08:27:23 +02:00
Philippe Matray
b2fbc36b23 Remove double quote in two descriptions 2016-08-17 14:16:05 +02:00
Philippe Matray
d6d916e281 Add a description of the shape picks from Bulbapédia
Add the french translation for this table
http://bulbapedia.bulbagarden.net/wiki/List_of_Pok%C3%A9mon_by_body_style
2016-08-17 13:18:51 +02:00
Seii
c5b1b5e033 Fix an Encounter mismatch (hopefully the last one) 2016-07-20 14:11:32 -05:00
Seii
f99364fff0 Fix incorrect FR/LG Safari Zone entries 2016-07-20 12:05:25 -05:00
Seii
6978771321 Fix ID duplication in Encounters table 2016-07-19 14:02:09 -05:00
Seii
1e09243b39 Fix location_names 2016-07-19 13:28:12 -05:00
Seii
48bf32299c Merge all separate FR/LG locations back into existing locations 2016-07-19 12:01:04 -05:00
Seii
9ff5609890 Merge victory-road-3 into victory-road-2 2016-07-19 10:04:00 -05:00
Seii
52f5b94a67 Fix Pokemon Mansion encounters in FR/LG 2016-07-19 09:29:48 -05:00
Seii
a9cc46585b Remove redundant FR/LG prose 2016-07-18 15:44:38 -05:00
Seii
be251eb308 Merge FR/LG safari zone entries into existing entries 2016-07-18 15:41:54 -05:00
Seii
5e87d46edd Remove separate Kanto Safari Zone location areas for FR/LG 2016-07-18 15:35:50 -05:00
Seii
f33531aff0 Merge separate FR/LG encounters on Victory Road, merge FR/LG "sea routes"
into existing R/B/Y equivalent routes
2016-07-18 15:30:33 -05:00
Seii
377ad27e3b Merge unique FR/LG references into existing R/B/Y locations 2016-07-18 14:07:24 -05:00
Seii
d1a953399b Remove obsolete Location Area from Location Area Prose 2016-07-18 13:42:14 -05:00
Seii
c21817a3f5 Remove obsolete Locations from Location Areas 2016-07-18 13:37:31 -05:00
Seii
2ebaa0b656 Remove obsolete Locations from Location Names 2016-07-18 13:21:42 -05:00
Seii
d56e04ce0d Remove duplicate locations 2016-07-18 12:52:42 -05:00
Eevee
22bfacb590 Merge pull request #177 from seii/veekun-issue-172
Fix forms_switchable flag for new Mega evolutions in ORAS
2016-07-06 13:48:30 -07:00
Seii
8fb46983b8 Correct 'is_battle_only' flag for Primal Kyogre and Groudon 2016-07-05 21:57:01 -05:00
Seii
b40727821e Fix forms_switchable flag for new Mega evolutions in ORAS 2016-07-05 15:59:18 -05:00
Alexander Lazenby-Catherwood
b5e4038f2d Fix terrifyingly wrong heights.
I have no clue how these went under the radar for so long. .-.'
2016-03-06 22:31:30 +08:00
Eevee (Lexy Munroe)
dd6630368d Allow common CLI arguments to work both before and after the subcommand 2016-02-02 11:01:45 -08:00
Eevee (Lexy Munroe)
59d8a790d1 Stub out a CLI search interface, which can also work with JSON and strings 2016-02-02 10:13:38 -08:00
Eevee (Lexy Munroe)
2dcc3c1aab Port the CLI to argparse 2016-02-02 10:13:38 -08:00
Eevee (Lexy Munroe)
ef03259e0f Little better CLI handling of Unicode in Py2 2016-02-02 10:12:56 -08:00
Andrew Ekstedt
abf8e6372a Add a missing French translation for move meta.
Courtesy of megadrifter-pt.
2015-11-16 17:40:40 -08:00
Konrad Borowski
cae59b2447 Update Brick Break for its BW effect. 2015-11-11 23:13:05 -08:00
megadrifter-pt
c5b0aa8bc7 Add some more French text 2015-11-11 23:06:25 -08:00
megadrifter-pt
20c4a0b792 RSE/BW2 French locations 2015-11-11 23:06:10 -08:00
megadrifter-pt
01f3261e34 HGSS French locations 2015-11-11 23:05:33 -08:00
megadrifter-pt
85317a28d2 Add some more French text 2015-11-11 23:05:02 -08:00
megadrifter-pt
2b6542c2ce Add French prose for both Hoenn Dexes 2015-11-11 22:11:02 -08:00
Andrew Ekstedt
0fb92f33d4 Merge pull request #155 from ncorgan/locations/kanto_fix
Fix region_id for Kanto locations listed as being in Johto
2015-11-04 22:16:56 -08:00
Eevee (Lexy Munroe)
54ea67a804 Fix pokedex dump under Python 2 AND 3, at the same time even 2015-11-04 20:10:27 -08:00
Eevee (Lexy Munroe)
b581c5205a Remove some bogus ORAS egg moves 2015-11-04 20:03:17 -08:00
Eevee (Lexy Munroe)
e0f4d3be7a Fix pokedex dump under Python 2 2015-11-04 20:03:08 -08:00
Nicholas Corgan
c19c818694 locations: Pewter City, Lavender Town, Indigo Plateau, and Saffron City are in Kanto, not Johto 2015-10-29 15:01:27 -07:00
Eevee (Alex Munroe)
0ff24b4dc8 Fix the CLI in py3 2015-10-05 16:29:21 -07:00
Eevee (Alex Munroe)
b76b74e7a6 Compat with Python 3.3+ 2015-10-05 08:12:23 -07:00
Eevee (Alex Munroe)
d0e8f503b8 Eerie Impulse lowers Special Attack, not Attack 2015-10-05 05:27:22 -07:00
Eevee (Alex Munroe)
74c779efe6 Add a missing period to Flower Shield's short effect 2015-10-05 05:09:37 -07:00
Eevee (Alex Munroe)
8fc636a3e6 Shadow Blast is physical
According to Bulbapedia and an email I got, anyway.
2015-10-05 05:04:17 -07:00
Richard Gottschalk
e798d18c4e fixed id for german encounter method prose 2015-09-24 22:08:23 +02:00
Richard Gottschalk
adfbf7514b added german translation for "Walking on rough terrain" 2015-09-24 22:05:24 +02:00
Richard Gottschalk
6ef2e0182e added german translations for encounter method proses 2015-09-24 19:52:56 +02:00
Richard Gottschalk
c5201b12d8 fixed german translation of "Alpha Sapphire" version name 2015-09-24 03:30:15 +02:00
Richard Gottschalk
a626e9aa27 added german translation for shadow type 2015-09-24 03:29:32 +02:00
Richard Gottschalk
54e8cf949a added italian region names 2015-09-23 18:20:07 +02:00
Richard Gottschalk
b0f6cc0bd3 added japanese region names 2015-09-23 18:19:33 +02:00
Richard Gottschalk
a8b4b34c70 added french version names for OR/AS 2015-09-23 18:18:52 +02:00
Richard Gottschalk
e57eedbf18 added italian version names 2015-09-23 18:18:19 +02:00
Konrad Borowski
d467a45354 Add ORAS move methods
This allows comparing Pokemon using ORAS version as reference.
2015-08-23 18:29:17 +02:00
Eevee (Alex Munroe)
a9503c2436 Merge branch 'oras' 2015-08-20 14:36:13 -07:00
Eevee (Alex Munroe)
fdd6995721 ORAS move and ability flavor text. 2015-08-13 00:05:01 -07:00
Eevee (Alex Munroe)
2292b62792 ORAS Pokémon flavor text. 2015-08-13 00:00:59 -07:00
Eevee (Alex Munroe)
b111104869 ORAS move names/stats and the Rayquaza tutor. 2015-08-08 18:22:31 -07:00
Eevee (Alex Munroe)
ccb252932c Oops, remove ORAS tutored moves that aren't actually teachable. 2015-08-08 02:27:00 -07:00
Eevee (Alex Munroe)
1411a7422d ORAS machines. 2015-08-08 00:10:26 -07:00
Eevee (Alex Munroe)
330e294371 ORAS learnsets. 2015-08-07 23:58:38 -07:00
Andrew Ekstedt
a05a298e3f Regenerate pokemon.order and pokemon_forms.order. 2015-06-19 01:05:50 -07:00
Andrew Ekstedt
811eada23b Set form_order for new forms. 2015-06-19 00:59:47 -07:00
Andrew Ekstedt
776210ce0d Add new Pokémon forms from OR/AS.
This is all the Pokémon data except moves and held items, which need to be
ripped separately for all Pokémon.

Note that Cosplay Pikachu and friends are technically in the Undiscovered egg
group, but egg groups are a property of PokemonSpecies so i can't represent
that here.

English names only for now. Still need to add names for old default forms,
e.g., Hoopa Confined.

Still need to regenerate the order columns.

Looks like pokemon_form_generations and pokemon_game_indices haven't been kept
up to date, so i guess i'll have to update those too.

Updates #141.
2015-06-19 00:43:34 -07:00
Andrew Ekstedt
7d1b8cc4f8 Improve table docs w.r.t. ids and game indices.
Went though the table docs and noted which tables have ids that correspond
to game ids, and explained why we sometimes have ids in the 10000s.

Since docs attached to id columns aren't displayed in the web documentation,
these edits all go in the class docstring, and i took the liberty of deleting
the id column docs from every table i touched.

Also: added some words about how to get to the species from pokemon and
pokemon_form.

Also: note that item flags are not official (they are a holdover from
brownkun) and item pockets are sort of kind of official (they originated from
D/P i believe, but i'm not sure how we've been assigning them for newer items).

Pertains to #99.
2015-06-17 16:38:16 -07:00
megadrifter-pt
56e212f09e Add some French translations 2015-06-17 12:06:00 -07:00
Andrew Ekstedt
c3e0c17409 Add new abilities from OR/AS.
Updates #141.
2015-06-13 13:49:07 -07:00
Andrew Ekstedt
b8fc3d83f5 Add OR/AS pokedex numbers.
I probably butchered the German translations, but whatever.
If anyone cares, someone will fix it.

Updates #141.
2015-05-31 13:34:40 -07:00
Andrew Ekstedt
c4f1741a79 Add versions for OR/AS.
Updates #141.
2015-05-31 13:34:29 -07:00
Andrew Ekstedt
93988d966c load: Use COPY FROM STDIN on PostgreSQL.
COPY FROM FILE requires database superuser permissions,
because of the obvious security implications.

COPY FROM STDIN has no such restriction.

Also do some cleanup while we're here.
2015-05-30 22:48:20 -07:00
Andrew Ekstedt
33fab44d0d Add X/Y wild encounters.
The following locations have multiple areas, which have been assigned
placeholder names (Unknown Area ###).

- Frost Cavern
- Glittering Cave
- Reflection Cave
- Terminus Cave
- Victory Road

No horde encounters because i'm not sure how we want to represent them.

No swarm encounters because they aren't in the normal encounter data.

Fixes #146.
2015-05-30 15:00:54 -07:00
Andrew Ekstedt
87ee90c41b Add encounter methods and slots for X/Y.
Updates #146.
2015-05-30 14:41:32 -07:00
Andrew Ekstedt
28b717ce13 Rip X/Y locations and names.
Zhorken added some of these by hand when X/Y first came out, but we never went
back and ripped them once we had the ROM.

Updates #146.
2015-05-30 10:44:44 -07:00
Andrew Ekstedt
9a4683c0c1 Fix the util.order_by_name test, for real this time. 2015-05-28 19:47:24 -07:00
Andrew Ekstedt
68b83c0ec1 Add Japanese version names. 2015-05-25 01:35:24 -07:00
Andrew Ekstedt
76ad6391fc Document Type.target_efficacies and Type.damage_efficacies.
I can't keep them straight.
2015-05-24 23:12:21 -07:00
Andrew Ekstedt
02b1968bc5 "Fix" MultilangQuery.
SQLAlchemy 1.0 sets bindpararms to their default values when loading
lazy-loaded columns. This is in contrast to the 0.9 behaviour of
ignoring our incongruous bindparam alltogether.

So MultilangQuery is still broken, but now it breaks in the same way as before.

While we're here, set the correct param in one of the multilang tests. Not that
it matters.
2015-05-23 18:26:09 -07:00
Andrew Ekstedt
2cfc78edac Fix util.order_by_name test.
Électrik sorts last because it has an accent now.
2015-05-23 18:26:09 -07:00
Andrew Ekstedt
ca0cbc1205 Remove use of Query.yield_per.
SQLAlchemy 1.0 disallows yield_per with eagerloading[1].

Fixes #143.

[1]: http://docs.sqlalchemy.org/en/rel_1_0/changelog/migration_10.html#joined-subquery-eager-loading-explicitly-disallowed-with-yield-per
2015-05-23 18:26:09 -07:00
Bradley Jarvis
1c6106e446 Update Mirror Move Effect ignored moves description to reflect data 2015-04-11 09:23:25 +09:30
Josephvb10
339181032f Added spanish stat names 2014-12-29 16:01:48 +01:00
Andrew Ekstedt
3db5826869 Item effects: Convert lingering reST to markdown.
Birth Island, Navel Rock, and Faraway Island are unlinked because
apparently we don't have those locations.

Fixes #134.
2014-08-26 19:37:51 -07:00
Lynn "Zhorken" Vaughan
58e0783580 Add form difference prose for Kalos Pokémon.
To do:

- Add form prose for Mega Evolutions
- Update old Pokémon's form prose
- Nail down the style a little:
    * Do I want to capitalize the form moniker?  e.g. "Vivillon's
      Pattern depends..." or "Trading [...] does not affect the Pattern
      it will have..."
    * What about when I'm actually writing a form name?  e.g. "The Fancy
      and Poké Ball Patterns..."  (This is what I do at the moment.)
    * Change all remaining instances of "Forms only affect appearance"
      to "Forms only differ in appearance".  It sounds better and fits
      with the other opening sentences better.
2014-08-05 23:01:37 -04:00
Lynn "Zhorken" Vaughan
7ddecd527d Call characteristics "characteristics". #132 2014-07-28 19:01:33 -04:00
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