Skip to content

Commit a683fc8

Browse files
authored
Merge pull request #1358 from jemarq04/update_pokemon_evolutions
Update and add Pokemon evolutions
2 parents 42ba394 + 0d1548c commit a683fc8

12 files changed

Lines changed: 694 additions & 515 deletions

File tree

data/v2/build.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,8 +2102,13 @@ def csv_record_to_objects(info):
21022102
trade_species_id=int(info[17]) if info[17] != "" else None,
21032103
needs_overworld_rain=bool(int(info[18])),
21042104
turn_upside_down=bool(int(info[19])),
2105-
region_id=int(info[20]) if info[20] != "" else None,
2106-
base_form_id=int(info[21]) if info[21] != "" else None,
2105+
needs_multiplayer=bool(int(info[20])),
2106+
region_id=int(info[21]) if info[21] != "" else None,
2107+
base_form_id=int(info[22]) if info[22] != "" else None,
2108+
used_move_id=int(info[23]) if info[23] != "" else None,
2109+
min_move_count=int(info[24]) if info[24] != "" else None,
2110+
min_steps=int(info[25]) if info[25] != "" else None,
2111+
min_damage_taken=int(info[26]) if info[26] != "" else None,
21072112
)
21082113

21092114
build_generic((PokemonEvolution,), "pokemon_evolution.csv", csv_record_to_objects)

data/v2/csv/evolution_trigger_prose.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ evolution_trigger_id,local_language_id,name
1717
8,9,Land three critical hits in a battle
1818
9,9,Go somewhere after taking damage
1919
10,9,Other
20+
14,9,Use move
21+
15,9,Defeat three Bisharp that hold a Leader's Crest
22+
16,9,Collect 999 Gimmighoul Coins

data/v2/csv/evolution_triggers.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ id,identifier
1212
11,agile-style-move
1313
12,strong-style-move
1414
13,recoil-damage
15+
14,use-move
16+
15,three-defeated-bisharp
17+
16,gimmmighoul-coins

0 commit comments

Comments
 (0)