Commit graph

804 commits

Author SHA1 Message Date
SimplyBLGDev
e61049558f Add missing encounters Gen 3 edition
Added encounter methods and slots for:
- Squirt Bottle
- Wailmer Pail

Added missing locations and their areas where applicable:
- Two island
- Three island
- Three isle path
- Six island
- Seven island
- Birth island
- Navel rock
- Faraway island
- Hoenn Battle Frontier

Added missing encounters:
- Deoxis in Birth Island (FR LG & E)
- Lugia and Ho-Oh in Navel Rock (FR LG & E)
- Mew in Faraway island (E)
- Sudowoodo in Johto Route 36 (G S C HG & SS)
- Sudowoodo in Hoenn Battle Frontier (E)
2021-03-11 19:41:29 -03:00
Alessandro Pezzè
27fb1eb160 fix: use correct folder 2021-03-09 20:58:43 +01:00
Alessandro Pezzè
3a4711ce90 Merge branch 'master' into graphql 2021-03-09 20:55:39 +01:00
Alessandro Pezzè
4df64375ce
Merge pull request #589 from SimplyBLGDev/Fix-erroneous-data 2021-03-09 20:54:33 +01:00
SimplyBLGDev
2102fa319f Fix encounter slots for crystal's Pokémon encounters
Some wrong encoutner slots ID were being used bby Pokémon crystal's headbutt encounters, this resulted in erroneous chances which didn't add up to 100% in an area.
2021-03-09 18:28:21 +00:00
SimplyBLGDev
f5f3d508a5 Encounter corrections
Due to an error the headbutt importer script used the wrong tables for gold and silver, this commit re-run this tool with the correct data and solved the inconsistencies that were present in the previous commits.

- Replaced all headbutt encounters with their correct counterparts
- Relocated some encounter's IDs
- Created location area Bell Tower 1f
- Moved Pokémon Crystal's Suicune encounter from Bell Tower Roof to Bell Tower 1f (it's correct position)
2021-03-09 17:49:41 +00:00
Alessandro Pezzè
aefce08042
Merge pull request #583 from SimplyBLGDev/Missing_encounters_fixes 2021-03-08 23:09:39 +01:00
Alessandro Pezzè
13c0712178 chore: add hasura make commands 2021-03-08 22:50:19 +01:00
Alessandro Pezzè
0a2a72f1ea feat: add hasura/examples/configuration 2021-03-08 22:48:16 +01:00
Simply BLG
682b362983
Typo corrections on encounter_methods 2021-03-07 23:32:42 -03:00
Simply BLG
79841f2358
Typo corrections for encounter_method_prose 2021-03-07 23:32:06 -03:00
SimplyBLGDev
8b11fda6f8 Add missing special encounters
- Snorlax in GSC, HGSS
- Groudon, Kyogre and Rayquaza in RSE
- Removed unused Goldenrod city area location area
- Changed location area prose to some areas to correct duplicate location name in display
- Added proper default values for story-progress condition
- Added new condition 'other' for weirder conditions
- Added missing areas for legendary encounters in Hoenn
- Added missing locations for legendary encounters in Hoenn
2021-03-08 01:51:18 +00:00
SimplyBLGDev
13a36e6b9e Add heabutt encounters
Add:
- Encounter methods: Headbutt low encounter rate tree, Headbutt normal encounter rate tree, Headbutt high encounter rate tree
- Location: Azalea Town and it's area (Required for headbutt encounters)
- Encounter Slots: Encounter slots for heabutt low, normal and high for Gold, Silver and Crystal, along with their respective and correct chances
- Encounters: 1682 new encounters corresponding to every missing headbutt encounter from Pokémon Gold Silver and Crystal

PS: The source of all this data is the Pokémon decompilations by pret on github (https://github.com/pret/pokecrystal)[Pokémon Crystal decompilation], (https://github.com/pret/pokegold)[Pokémon Gold and Pokémon Silver Decompilation]
The data is as accurate as these decompilations are.
2021-03-08 00:11:03 +00:00
SimplyBLGDev
94869bcd65 Add missing special encounters to GSC, RSE, FRLG, HGSS
Added:
- Encounter conditions for beat elite four, beat elite four round 2
- Added locations and areas for roaming Pokémon (One for each region)
- Added area for Bell Tower Roof
- Added encounters for Lugia, Ho-Oh, Articuno, Zapdos, Moltres, Mewtwo, Raikou, Entei, Suicune, Latios and Latias to GSC, HGSS, FRLG and RSE where applicable.
- Bound encounter conditions where applicable.
2021-03-07 00:13:20 +00:00
SimplyBLGDev
9489eaff88 Add special encounters for Gold Silver Crystal
Added encounters for Lugia, Ho-Oh and Suicune in GSC.
2021-03-06 22:45:05 +00:00
SimplyBLGDev
04a1f5848c Add special encounter for Fire Red/Leaf Green
Added encounters for Electrode, Snorlax, Articuno, Zapdos, Moltres and Mewtwo for FR/LG.
2021-03-06 21:44:46 +00:00
SimplyBLGDev
01827cd63c Add special encounters for Red/Blue/Yellow
Added encounters method "Only One" and "Pokéflute".
Added encounters for Voltorb, Electrode, Snorlax, Articuno, Zapdos, Moltres and Mewtwo for Red/Blue and yellow versions.
2021-03-06 21:29:40 +00:00
SimplyBLGDev
8a0f5a7a5d Added encounter methods, encounter methods values for new encounters 2021-03-06 20:19:53 +00:00
Simply BLG
055ec02f67
Merge pull request #1 from PokeAPI/master
Sync with upstream
2021-03-06 19:55:02 +00:00
Alessandro Pezzè
c37e9c8c1e sync: update sprites https://github.com/PokeAPI/sprites/pull/44 2021-02-25 21:22:01 +01:00
Julian Lawrance
2445fc4792 Regenerate DB migration for past type efficacies 2021-02-24 15:37:00 +00:00
Julian Lawrance
44f14a0118 Merge remote-tracking branch 'upstream/master' into feature/past-type-efficacy 2021-02-24 13:41:20 +00:00
Alessandro Pezzè
a33d08539d
Merge pull request #571 from phrasmotica/feature/pokemon-form-types 2021-02-23 18:21:40 +01:00
Julian Lawrance
48c27bb8b6 Merge remote-tracking branch 'upstream/master' into feature/pokemon-form-types 2021-02-21 12:20:56 +00:00
Alessandro Pezzè
6f79bf0e0e sync: update sprites from https://github.com/PokeAPI/sprites/pull/43 2021-02-19 21:34:41 +01:00
Julian Lawrance
9a03a7da42 Merge branch 'feature/pokemon-form-types' of https://github.com/phrasmotica/pokeapi into feature/pokemon-form-types 2021-02-19 14:33:54 +00:00
Julian Lawrance
49072e9c45 Format source code 2021-02-19 14:25:39 +00:00
Julian Lawrance
85027ff7f9 Populate Pokemon form types field with types from parent Pokemon if the form has no types of its own 2021-02-19 14:25:14 +00:00
Julian Lawrance
d48e51686c Recreate Pokemon form type DB migration 2021-02-19 14:24:33 +00:00
Julian Lawrance
bbc8cbdf2b Merge remote-tracking branch 'origin' into feature/pokemon-form-types 2021-02-18 20:36:13 +00:00
Julian Lawrance
eabd20988d Update README Type model example response with Ghost type data 2021-02-13 22:43:26 +00:00
Julian Lawrance
55e280b149 Add requirements changes that got lost in a merge 2021-02-13 22:34:55 +00:00
Julian Lawrance
10fec5ad1c Recreate past type efficacy data migration 2021-02-13 22:33:39 +00:00
Julian Lawrance
0aeb047677 Merge branch 'master' into feature/past-type-efficacy 2021-02-13 22:22:41 +00:00
Julian Lawrance
1e30dac6ea Change README Pokemon form example response to that of Arceus' bug form 2021-02-13 21:50:42 +00:00
Julian Lawrance
88a0cfb999 Remove Pokemon form type data for all default forms 2021-02-13 21:38:21 +00:00
Julian Lawrance
6d9a020cb2 Update Pokemon form docs in README 2021-02-13 21:18:59 +00:00
Julian Lawrance
535ba86f71 Re-create new migration for Pokemon form types 2021-02-13 20:44:50 +00:00
Julian Lawrance
a159550aed Merge remote-tracking branch 'upstream/master' into feature/pokemon-form-types 2021-02-13 18:51:47 +00:00
Alessandro Pezzè
cf1a2d4f51 chore: update sprites/add make command to destroy the db
fix: run flush non interactively
2021-02-13 19:27:58 +01:00
Alessandro Pezzè
e2e43d8bda
Merge pull request #457 from phrasmotica/past-pokemon-types 2021-02-12 21:47:21 +01:00
Alessandro Pezzè
b5f014af82
Merge branch 'master' into past-pokemon-types 2021-02-10 20:41:02 +01:00
Alessandro Pezzè
4f4d124148
Merge pull request #568 from PokeAPI/staging 2021-02-09 20:59:24 +01:00
Alessandro Pezzè
ffea952902 refactor: change var names 2021-02-08 19:56:35 +01:00
Alessandro Pezzè
84b5a1874a fix: use string name when not default 2021-02-08 19:54:08 +01:00
Julian Lawrance
39856de97b Format source code again 2021-02-06 22:15:12 +00:00
Julian Lawrance
c513fa5b56 Recreate past types migration again 2021-02-06 22:03:47 +00:00
Julian Lawrance
91f39138bd Format source code 2021-02-06 22:02:36 +00:00
Julian L
c273a42f98
Merge branch 'master' into past-pokemon-types 2021-02-06 21:56:50 +00:00
Julian Lawrance
76ba2ae00e Format source code 2021-02-06 21:52:36 +00:00