From 55a22887568996779956d407b3bf270b7294db62 Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Fri, 8 Jun 2012 16:31:58 -0700 Subject: [PATCH] Combine Nidoran and Volbeat/Illumise families. gh #21 Leaves a couple holes in pokemon_families but there were some already. --- pokedex/data/csv/pokemon_families.csv | 2 -- pokedex/data/csv/pokemon_family_prose.csv | 2 ++ pokedex/data/csv/pokemon_species.csv | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pokedex/data/csv/pokemon_families.csv b/pokedex/data/csv/pokemon_families.csv index 7119143..54f786e 100644 --- a/pokedex/data/csv/pokemon_families.csv +++ b/pokedex/data/csv/pokemon_families.csv @@ -11,7 +11,6 @@ id,baby_trigger_item_id 10, 11, 12, -13, 14, 15, 16, @@ -155,7 +154,6 @@ id,baby_trigger_item_id 154, 155, 156, -157, 158,295 159, 160, diff --git a/pokedex/data/csv/pokemon_family_prose.csv b/pokedex/data/csv/pokemon_family_prose.csv index d944f84..237c035 100644 --- a/pokedex/data/csv/pokemon_family_prose.csv +++ b/pokedex/data/csv/pokemon_family_prose.csv @@ -1,6 +1,8 @@ pokemon_family_id,local_language_id,description 10,9,"Spiky-eared Pichu can only be received by taking the shiny Pichu from an official promotion to []{pokemon:celebi}'s shrine in []{location:ilex-forest}. Spiky-eared Pichu is always female, cannot evolve, and cannot be taken into the Wi-Fi Club or the Union Room, but is otherwise a normal Pichu." +12,9,Nidoran♀ produces both Nidoran♂ and Nidoran♀ eggs. Neither Nidorina nor Nidoqueen can breed. 99,9,Forms only affect appearance. A form is determined at random before a wild encounter and cannot be changed. +156,9,Illumise produces both Volbeat and Illumise eggs. 179,9,"Form changes along with type to match the [weather]{mechanic:weather} in battle, due to []{ability:forecast}. Castform is always in its normal form outside of battle, regardless of weather." 202,9,"Forms have different stats and movepools. In Generation III, Deoxys's form depends on the game: Normal Forme in Ruby and Sapphire, Attack Forme in FireRed, Defense Forme in LeafGreen, and Speed Forme in Emerald. In Generation IV, every form exists: form is preserved when transferring via []{location:pal-park}, and meteorites in the southeast corner of []{location:veilstone-city} or at the west end of []{location:unova-route-3} can be used to switch between forms." 213,9,"Burmy: Forms only affect appearance, although they become permanent upon evolution. Wild and newly-hatched Burmy are always in a Plant Cloak. Burmy's cloak changes to match the terrain after a battle it participated in: Plant Cloak by default; Sandy Cloak in sandy or rocky areas, such as beaches, caves, and trails; and Trash Cloak in buildings. diff --git a/pokedex/data/csv/pokemon_species.csv b/pokedex/data/csv/pokemon_species.csv index 597e13c..7bd7988 100644 --- a/pokedex/data/csv/pokemon_species.csv +++ b/pokedex/data/csv/pokemon_species.csv @@ -30,9 +30,9 @@ id,identifier,generation_id,evolves_from_species_id,family_id,color_id,shape_id, 29,nidoran-f,1,,12,2,8,3,8,235,70,0,20,0,4,0 30,nidorina,1,29,12,2,8,3,8,120,70,0,20,0,4,0 31,nidoqueen,1,30,12,2,6,3,8,45,70,0,20,0,4,0 -32,nidoran-m,1,,13,7,8,3,0,235,70,0,20,0,4,0 -33,nidorino,1,32,13,7,8,3,0,120,70,0,20,0,4,0 -34,nidoking,1,33,13,7,6,3,0,45,70,0,20,0,4,0 +32,nidoran-m,1,,12,7,8,3,0,235,70,0,20,0,4,0 +33,nidorino,1,32,12,7,8,3,0,120,70,0,20,0,4,0 +34,nidoking,1,33,12,7,6,3,0,45,70,0,20,0,4,0 35,clefairy,1,173,14,6,6,4,6,150,140,0,10,0,3,0 36,clefable,1,35,14,6,6,4,6,25,140,0,10,0,3,0 37,vulpix,1,,15,3,8,3,6,190,70,0,20,0,2,0 @@ -312,7 +312,7 @@ id,identifier,generation_id,evolves_from_species_id,family_id,color_id,shape_id, 311,plusle,3,,154,10,6,3,4,200,70,0,20,0,2,0 312,minun,3,,155,10,6,3,4,200,70,0,20,0,2,0 313,volbeat,3,,156,4,6,2,0,150,70,0,15,0,5,0 -314,illumise,3,,157,7,12,2,8,150,70,0,15,0,6,0 +314,illumise,3,,156,7,12,2,8,150,70,0,15,0,6,0 315,roselia,3,406,158,5,12,3,4,150,70,0,20,1,4,0 316,gulpin,3,,159,5,4,3,4,225,70,0,20,1,6,0 317,swalot,3,316,159,7,4,3,4,75,70,0,20,1,6,0