Refactor Pokemon evolution fields in models and serializers

- Renamed `region_restriction` to `region` and `base_form_required` to `base_form` in the PokemonEvolution model for clarity.
- Updated corresponding fields in the serializers and CSV to reflect the new naming conventions.
- Adjusted foreign key constraints in the metadata YAML files to match the updated field names.
This commit is contained in:
joereg4 2025-09-28 09:10:18 -05:00
parent 9014375cd3
commit bfe1e5b1b0
7 changed files with 21 additions and 21 deletions

View File

@ -2073,8 +2073,8 @@ def _build_pokemons():
trade_species_id=int(info[17]) if info[17] != "" else None, trade_species_id=int(info[17]) if info[17] != "" else None,
needs_overworld_rain=bool(int(info[18])), needs_overworld_rain=bool(int(info[18])),
turn_upside_down=bool(int(info[19])), turn_upside_down=bool(int(info[19])),
region_restriction_id=int(info[20]) if info[20] != "" else None, region_id=int(info[20]) if info[20] != "" else None,
base_form_required_id=int(info[21]) if info[21] != "" else None, base_form_id=int(info[21]) if info[21] != "" else None,
) )
build_generic((PokemonEvolution,), "pokemon_evolution.csv", csv_record_to_objects) build_generic((PokemonEvolution,), "pokemon_evolution.csv", csv_record_to_objects)

View File

@ -1,4 +1,4 @@
id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_id,location_id,held_item_id,time_of_day,known_move_id,known_move_type_id,minimum_happiness,minimum_beauty,minimum_affection,relative_physical_stats,party_species_id,party_type_id,trade_species_id,needs_overworld_rain,turn_upside_down,region_restriction,base_form_required id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_id,location_id,held_item_id,time_of_day,known_move_id,known_move_type_id,minimum_happiness,minimum_beauty,minimum_affection,relative_physical_stats,party_species_id,party_type_id,trade_species_id,needs_overworld_rain,turn_upside_down,region_id,base_form_id
1,2,1,,16,,,,,,,,,,,,,,0,0,, 1,2,1,,16,,,,,,,,,,,,,,0,0,,
2,3,1,,32,,,,,,,,,,,,,,0,0,, 2,3,1,,32,,,,,,,,,,,,,,0,0,,
3,5,1,,16,,,,,,,,,,,,,,0,0,, 3,5,1,,16,,,,,,,,,,,,,,0,0,,

1 id evolved_species_id evolution_trigger_id trigger_item_id minimum_level gender_id location_id held_item_id time_of_day known_move_id known_move_type_id minimum_happiness minimum_beauty minimum_affection relative_physical_stats party_species_id party_type_id trade_species_id needs_overworld_rain turn_upside_down region_restriction region_id base_form_required base_form_id
2 1 2 1 16 0 0
3 2 3 1 32 0 0
4 3 5 1 16 0 0

View File

@ -37,10 +37,10 @@ object_relationships:
foreign_key_constraint_on: known_move_type_id foreign_key_constraint_on: known_move_type_id
- name: pokemon_v2_region - name: pokemon_v2_region
using: using:
foreign_key_constraint_on: region_restriction_id foreign_key_constraint_on: region_id
- name: pokemon_v2_pokemonspecy_by_base_form_required - name: pokemon_v2_pokemonspecy_by_base_form_id
using: using:
foreign_key_constraint_on: base_form_required_id foreign_key_constraint_on: base_form_id
select_permissions: select_permissions:
- role: anon - role: anon
permission: permission:

View File

@ -42,10 +42,10 @@ object_relationships:
foreign_key_constraint_on: known_move_type_id foreign_key_constraint_on: known_move_type_id
- name: region - name: region
using: using:
foreign_key_constraint_on: region_restriction_id foreign_key_constraint_on: region_id
- name: baseformrequired - name: baseformid
using: using:
foreign_key_constraint_on: base_form_required_id foreign_key_constraint_on: base_form_id
select_permissions: select_permissions:
- role: anon - role: anon
permission: permission:

View File

@ -12,7 +12,7 @@ class Migration(migrations.Migration):
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name="pokemonevolution", model_name="pokemonevolution",
name="region_restriction", name="region",
field=models.ForeignKey( field=models.ForeignKey(
blank=True, blank=True,
null=True, null=True,
@ -23,7 +23,7 @@ class Migration(migrations.Migration):
), ),
migrations.AddField( migrations.AddField(
model_name="pokemonevolution", model_name="pokemonevolution",
name="base_form_required", name="base_form",
field=models.ForeignKey( field=models.ForeignKey(
blank=True, blank=True,
null=True, null=True,

View File

@ -1695,7 +1695,7 @@ class PokemonEvolution(HasEvolutionTrigger, HasGender):
turn_upside_down = models.BooleanField(default=False) turn_upside_down = models.BooleanField(default=False)
# Regional evolution fields # Regional evolution fields
region_restriction = models.ForeignKey( region = models.ForeignKey(
"Region", "Region",
blank=True, blank=True,
null=True, null=True,
@ -1703,7 +1703,7 @@ class PokemonEvolution(HasEvolutionTrigger, HasGender):
help_text="Region where this evolution can occur (null = any region)", help_text="Region where this evolution can occur (null = any region)",
) )
base_form_required = models.ForeignKey( base_form = models.ForeignKey(
"PokemonSpecies", "PokemonSpecies",
blank=True, blank=True,
null=True, null=True,

View File

@ -5518,8 +5518,8 @@ class PokemonEvolutionSerializer(serializers.ModelSerializer):
trade_species = PokemonSpeciesSummarySerializer() trade_species = PokemonSpeciesSummarySerializer()
location = LocationSummarySerializer() location = LocationSummarySerializer()
trigger = EvolutionTriggerSummarySerializer(source="evolution_trigger") trigger = EvolutionTriggerSummarySerializer(source="evolution_trigger")
region_restriction = RegionSummarySerializer() region_id = RegionSummarySerializer(source="region")
base_form_required = PokemonSpeciesSummarySerializer() base_form_id = PokemonSpeciesSummarySerializer(source="base_form")
class Meta: class Meta:
model = PokemonEvolution model = PokemonEvolution
@ -5542,8 +5542,8 @@ class PokemonEvolutionSerializer(serializers.ModelSerializer):
"time_of_day", "time_of_day",
"trade_species", "trade_species",
"turn_upside_down", "turn_upside_down",
"region_restriction", "region_id",
"base_form_required", "base_form_id",
) )
@ -5596,8 +5596,8 @@ class EvolutionChainDetailSerializer(serializers.ModelSerializer):
"trade_species", "trade_species",
"trigger", "trigger",
"turn_upside_down", "turn_upside_down",
"region_restriction", "region_id",
"base_form_required", "base_form_id",
], ],
"properties": { "properties": {
"gender": { "gender": {
@ -5726,7 +5726,7 @@ class EvolutionChainDetailSerializer(serializers.ModelSerializer):
}, },
}, },
"turn_upside_down": {"type": "boolean"}, "turn_upside_down": {"type": "boolean"},
"region_restriction": { "region_id": {
"type": "object", "type": "object",
"nullable": True, "nullable": True,
"required": ["name", "url"], "required": ["name", "url"],
@ -5738,7 +5738,7 @@ class EvolutionChainDetailSerializer(serializers.ModelSerializer):
}, },
}, },
}, },
"base_form_required": { "base_form_id": {
"type": "object", "type": "object",
"nullable": True, "nullable": True,
"required": ["name", "url"], "required": ["name", "url"],