Skip to content

Add regional form evolution details#1492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Naramsim merged 8 commits into from
Apr 20, 2026
Merged

Add regional form evolution details #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f60bc3a
feat: change base_form to point to Pokemon not PokemonSpecies
jemarq04 Feb 8, 2026
7782404
feat: add/update relevant evolutions with base_form and region requir…
jemarq04 Feb 8, 2026
2a57e3c
fix: update name change everywhere for region and base_form
jemarq04 Feb 8, 2026
32eda5c
test: add region and base_form to tests script
jemarq04 Feb 8, 2026
52673b9
feat: add updated evolutions for kubfu with new scroll items
jemarq04 Feb 8, 2026
0cd851f
merge: Merge branch 'master' of github.com:pokeapi/pokeapi into feat/…
jemarq04 Apr 17, 2026
3d6c7fa
merge: Merge branch 'master' of github.com:pokeapi/pokeapi into feat/…
jemarq04 Apr 18, 2026
557fba8
merge: Merge from upstream/master
jemarq04 Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 44 additions & 20 deletions data/v2/csv/pokemon_evolution.csv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,7 +364,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
364,471,1,,,,640,,,,,,,,,,,,0,0,0,,,,,,
365,476,1,,,,629,,,,,,,,,,,,0,0,0,,,,,,
366,462,1,,,,771,,,,,,,,,,,,0,0,0,,,,,,
367,105,1,,28,,,,night,,,,,,,,,,0,0,0,,,,,,
367,105,1,,28,,,,night,,,,,,,,,,0,0,0,7,,,,,
368,462,1,,,,789,,,,,,,,,,,,0,0,0,,,,,,
369,476,1,,,,771,,,,,,,,,,,,0,0,0,,,,,,
370,476,1,,,,789,,,,,,,,,,,,0,0,0,,,,,,
Expand DownExpand Up@@ -444,26 +444,26 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
445,887,1,,60,,,,,,,,,,,,,,0,0,0,,,,,,
446,892,6,,,,,,,,,,,,,,,,0,0,0,,,,,,
447,892,7,,,,,,,,,,,,,,,,0,0,0,,,,,,
448,28,3,885,,,,,,,,,,,,,,,0,0,0,,,,,,
449,38,3,885,,,,,,,,,,,,,,,0,0,0,,,,,,
450,53,1,,,,,,,,,160,,,,,,,0,0,0,,,,,,
451,863,1,,28,,,,,,,,,,,,,,0,0,0,,,,,,
452,80,3,1633,,,,,,,,,,,,,,,0,0,0,,,,,,
453,199,3,1643,,,,,,,,,,,,,,,0,0,0,,,,,,
454,865,8,,,,,,,,,,,,,,,,0,0,0,,,,,,
455,866,1,,42,,,,,,,,,,,,,,0,0,0,,,,,,
456,864,1,,38,,,,,,,,,,,,,,0,0,0,,,,,,
457,862,1,,35,,,,night,,,,,,,,,,0,0,0,,,,,,
458,555,3,885,,,,,,,,,,,,,,,0,0,0,,,,,,
459,867,9,,,,,,,,,,,,,,,,0,0,0,,,,,,49
448,28,3,885,,,,,,,,,,,,,,,0,0,0,,10101,,,,
449,38,3,885,,,,,,,,,,,,,,,0,0,0,,10103,,,,
450,53,1,,,,,,,,,160,,,,,,,0,0,0,,10107,,,,
451,863,1,,28,,,,,,,,,,,,,,0,0,0,,10161,,,,
452,80,3,1633,,,,,,,,,,,,,,,0,0,0,,10164,,,,
453,199,3,1643,,,,,,,,,,,,,,,0,0,0,,10164,,,,
454,865,8,,,,,,,,,,,,,,,,0,0,0,,10166,,,,
455,866,1,,42,,,,,,,,,,,,,,0,0,0,,10168,,,,
456,864,1,,38,,,,,,,,,,,,,,0,0,0,,10173,,,,
457,862,1,,35,,,,night,,,,,,,,,,0,0,0,,10175,,,,
458,555,3,885,,,,,,,,,,,,,,,0,0,0,,10176,,,,
459,867,9,,,,,,,,,,,,,,,,0,0,0,,10179,,,,49
460,745,1,,25,,,,dusk,,,,,,,,,,0,0,0,,,,,,
461,20,1,,20,,,,night,,,,,,,,,,0,0,0,,,,,,
461,20,1,,20,,,,night,,,,,,,,,,0,0,0,,10091,,,,
462,899,11,,,,,,,,,,,,,,,,0,0,0,,,828,20,,
463,900,3,10001,,,,,,,,,,,,,,,0,0,0,,,,,,
464,901,3,10002,,,,,full-moon,,,,,,,,,,0,0,0,,,,,,
465,902,13,,,,,,,,,,,,,,,,0,0,0,,,,,,294
466,903,1,,,,,303,day,,,,,,,,,,0,0,0,,,,,,
467,904,12,,,,,,,,,,,,,,,,0,0,0,,,839,20,,
465,902,13,,,,,,,,,,,,,,,,0,0,0,,10247,,,,294
466,903,1,,,,,303,day,,,,,,,,,,0,0,0,,10235,,,,
467,904,12,,,,,,,,,,,,,,,,0,0,0,,10234,839,20,,
468,907,1,,16,,,,,,,,,,,,,,0,0,0,,,,,,
469,908,1,,36,,,,,,,,,,,,,,0,0,0,,,,,,
470,910,1,,16,,,,,,,,,,,,,,0,0,0,,,,,,
Expand DownExpand Up@@ -501,7 +501,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
502,972,1,,30,,,,night,,,,,,,,,,0,0,0,,,,,,
503,975,3,885,,,,,,,,,,,,,,,0,0,0,,,,,,
504,979,14,,,,,,,,,,,,,,,,0,0,0,,,889,20,,
505,980,1,,20,,,,,,,,,,,,,,0,0,0,,,,,,
505,980,1,,20,,,,,,,,,,,,,,0,0,0,,10253,,,,
506,981,1,,,,,,,888,,,,,,,,,0,0,0,,,,,,
507,982,1,,,,,,,887,,,,,,,,,0,0,0,,,,,,
508,983,15,,,,,,,,,,,,,,,,0,0,0,,,,,,
Expand All@@ -510,5 +510,29 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
511,1000,16,,,,,,,,,,,,,,,,0,0,0,,,,,,
512,740,3,885,,,,,,,,,,,,,,,0,0,0,,,,,,
514,476,3,83,,,,,,,,,,,,,,,0,0,0,,,,,,
515,904,1,,,,,,,839,,,,,,,,,0,0,0,,,,,,
516,904,14,,,,,,,,,,,,,,,,0,0,0,,,839,20,,
515,904,1,,,,,,,839,,,,,,,,,0,0,0,,10234,,,,
516,904,14,,,,,,,,,,,,,,,,0,0,0,,10234,839,20,,
517,26,3,83,,,,,,,,,,,,,,,0,0,0,7,,,,,
518,51,1,,26,,,,,,,,,,,,,,0,0,0,,10105,,,,
519,75,1,,25,,,,,,,,,,,,,,0,0,0,,10109,,,,
520,76,2,,,,,,,,,,,,,,,,0,0,0,,10110,,,,
521,89,1,,38,,,,,,,,,,,,,,0,0,0,,10112,,,,
522,103,3,85,,,,,,,,,,,,,,,0,0,0,7,,,,,
523,59,3,82,,,,,,,,,,,,,,,0,0,0,,10229,,,,
524,101,3,85,,,,,,,,,,,,,,,0,0,0,,10231,,,,
525,156,1,,17,,,,,,,,,,,,,,0,0,0,9,,,,,
526,157,1,,36,,,,,,,,,,,,,,0,0,0,9,,,,,
527,503,1,,36,,,,,,,,,,,,,,0,0,0,9,,,,,
528,549,3,80,,,,,,,,,,,,,,,0,0,0,9,,,,,
529,571,1,,30,,,,,,,,,,,,,,0,0,0,,10238,,,,
530,628,1,,54,,,,,,,,,,,,,,0,0,0,9,,,,,
531,705,1,,40,,,,,,,,,,,,,,0,0,0,9,,,,,
532,706,1,,50,,,,,,,,,,,,,,1,0,0,,10241,,,,
533,713,1,,37,,,,,,,,,,,,,,0,0,0,9,,,,,
534,724,1,,36,,,,,,,,,,,,,,0,0,0,9,,,,,
535,78,1,,40,,,,,,,,,,,,,,0,0,0,,10162,,,,
536,110,1,,35,,,,,,,,,,,,,,0,0,0,8,,,,,
537,122,1,,,,,,,102,,,,,,,,,0,0,0,8,,,,,
538,264,1,,20,,,,,,,,,,,,,,0,0,0,,10174,,,,
539,892,3,1675,,,,,,,,,,,,,,,0,0,0,,,,,,
540,892,3,1676,,,,,,,,,,,,,,,0,0,0,,,,,,
26 changes: 26 additions & 0 deletions pokemon_v2/migrations/0026_alter_pokemonevolution_base_form.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
# Generated by Django 5.2.10 on 2026-02-08 17:36

import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("pokemon_v2", "0025_pokemonstatpast"),
]

operations = [
migrations.AlterField(
model_name="pokemonevolution",
name="base_form",
field=models.ForeignKey(
blank=True,
help_text="Specific form required for evolution (null = any form)",
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="base_form_evolutions",
to="pokemon_v2.pokemon",
),
),
]
2 changes: 1 addition & 1 deletion pokemon_v2/models.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1706,7 +1706,7 @@ class PokemonEvolution(HasEvolutionTrigger, HasGender):
)

base_form = models.ForeignKey(
"PokemonSpecies",
"Pokemon",
blank=True,
null=True,
related_name="base_form_evolutions",
Expand Down
2 changes: 1 addition & 1 deletion pokemon_v2/serializers.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5638,7 +5638,7 @@ class PokemonEvolutionSerializer(serializers.ModelSerializer):
location = LocationSummarySerializer()
trigger = EvolutionTriggerSummarySerializer(source="evolution_trigger")
region = RegionSummarySerializer()
base_form = PokemonSpeciesSummarySerializer()
base_form = PokemonSummarySerializer()
used_move = MoveSummarySerializer()

class Meta:
Expand Down
4 changes: 4 additions & 0 deletions pokemon_v2/tests.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1861,6 +1861,8 @@ def setup_pokemon_evolution_data(
relative_physical_stats=0,
needs_overworld_rain=False,
turn_upside_down=False,
region=None,
base_form=None,
needs_multiplayer=False,
used_move=None,
min_move_count=None,
Expand DownExpand Up@@ -1895,6 +1897,8 @@ def setup_pokemon_evolution_data(
trade_species=trade_species,
needs_overworld_rain=needs_overworld_rain,
turn_upside_down=turn_upside_down,
region=region,
base_form=base_form,
needs_multiplayer=needs_multiplayer,
used_move=used_move,
min_move_count=min_move_count,
Expand Down
Loading