Commit graph

1179 commits

Author SHA1 Message Date
Andrew Ekstedt
ee1a1983c0 try only disabling PRAGMA journal_mode=OFF 2018-03-30 13:20:36 -07:00
Andrew Ekstedt
48655ce39d try only disabling PRAGMA synchronous = OFF 2018-03-30 13:18:19 -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