From 16dd9d8ac11b990125eb836d4d3f7b62c4b1c712 Mon Sep 17 00:00:00 2001 From: a_magical_me Date: Sat, 2 Apr 2011 17:30:08 -0700 Subject: [PATCH] Alter some identifiers. #207 As per http://bugs.veekun.com/projects/pokedex/wiki/Identifiers?version=3. - The following tables were handled in commit "2090e34 Move English texts to language-specific tables": berry_firmness, item_categories, move_battle_styles, move_damage_classes, move_effect_categories, pokeathlon_stats, pokemon_colors, pokemon_habitats, regions, types, versions. - These tables are skipped, pending further discussion: generations, growth_rates, move_targets, stats. - Deviations from the wiki: - egg_groups: 'no-eggs' is not changed to 'noeggs' - encounter_terrains: the 'old-rod' alternative is used. - types: 'unknown' is not changed to '???' - pokemon_move_methods: - 'level-up' is not changed to 'level' - 'colosseum-purification' and 'xd-purification' are left alone, because colosseum and xd have not yet been added as versions. - 'xd-shadow' is left alone for consistency with 'xd-purificaiton'. --- pokedex/data/csv/egg_groups.csv | 6 ++--- pokedex/data/csv/encounter_condition_values.csv | 30 ++++++++++++------------- pokedex/data/csv/encounter_conditions.csv | 6 ++--- pokedex/data/csv/encounter_terrain.csv | 14 ++++++------ pokedex/data/csv/pokemon_move_methods.csv | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pokedex/data/csv/egg_groups.csv b/pokedex/data/csv/egg_groups.csv index 46b701b..87b5907 100644 --- a/pokedex/data/csv/egg_groups.csv +++ b/pokedex/data/csv/egg_groups.csv @@ -1,16 +1,16 @@ id,identifier 1,monster -2,water-1 +2,water1 3,bug 4,flying 5,ground 6,fairy 7,plant 8,humanshape -9,water-3 +9,water3 10,mineral 11,indeterminate -12,water-2 +12,water2 13,ditto 14,dragon 15,no-eggs diff --git a/pokedex/data/csv/encounter_condition_values.csv b/pokedex/data/csv/encounter_condition_values.csv index 83482a6..9db234a 100644 --- a/pokedex/data/csv/encounter_condition_values.csv +++ b/pokedex/data/csv/encounter_condition_values.csv @@ -1,17 +1,17 @@ id,encounter_condition_id,identifier,is_default -1,1,during-a-swarm,0 -2,1,not-during-a-swarm,1 -3,2,in-the-morning,0 -4,2,during-the-day,1 -5,2,at-night,0 -6,3,using-pokeradar,0 -7,3,not-using-pokeradar,1 -8,4,no-game-in-slot-2,1 -9,4,ruby-in-slot-2,0 -10,4,sapphire-in-slot-2,0 -11,4,emerald-in-slot-2,0 -12,4,firered-in-slot-2,0 -13,4,leafgreen-in-slot-2,0 +1,1,swarm-yes,0 +2,1,swarm-no,1 +3,2,time-morning,0 +4,2,time-day,1 +5,2,time-night,0 +6,3,radar-on,0 +7,3,radar-off,1 +8,4,slot2-none,1 +9,4,slot2-ruby,0 +10,4,slot2-sapphire,0 +11,4,slot2-emerald,0 +12,4,slot2-firered,0 +13,4,slot2-leafgreen,0 14,5,radio-off,1 -15,5,hoenn-radio,0 -16,5,sinnoh-radio,0 +15,5,radio-hoenn,0 +16,5,radio-sinnoh,0 diff --git a/pokedex/data/csv/encounter_conditions.csv b/pokedex/data/csv/encounter_conditions.csv index 43457a0..29a7d40 100644 --- a/pokedex/data/csv/encounter_conditions.csv +++ b/pokedex/data/csv/encounter_conditions.csv @@ -1,6 +1,6 @@ id,identifier 1,swarm -2,time-of-day -3,pokeradar -4,gen-3-game-in-slot-2 +2,time +3,radar +4,slot2 5,radio diff --git a/pokedex/data/csv/encounter_terrain.csv b/pokedex/data/csv/encounter_terrain.csv index 1c53ddd..268d0fd 100644 --- a/pokedex/data/csv/encounter_terrain.csv +++ b/pokedex/data/csv/encounter_terrain.csv @@ -1,8 +1,8 @@ id,identifier -1,walking-in-tall-grass-or-a-cave -2,fishing-with-an-old-rod -3,fishing-with-a-good-rod -4,fishing-with-a-super-rod -5,surfing -6,smashing-rocks -7,headbutting-trees +1,walk +2,old-rod +3,good-rod +4,super-rod +5,surf +6,rock-smash +7,headbutt diff --git a/pokedex/data/csv/pokemon_move_methods.csv b/pokedex/data/csv/pokemon_move_methods.csv index 322233b..dece385 100644 --- a/pokedex/data/csv/pokemon_move_methods.csv +++ b/pokedex/data/csv/pokemon_move_methods.csv @@ -4,8 +4,8 @@ id,identifier 3,tutor 4,machine 5,stadium-surfing-pikachu -6,volt-tackle-pichu +6,light-ball-egg 7,colosseum-purification 8,xd-shadow 9,xd-purification -10,rotom-form +10,form-change -- 2.7.4