From 87ee90c41b110ba6cd84464d37e195b09e40daeb Mon Sep 17 00:00:00 2001
From: Andrew Ekstedt <andrew.ekstedt@gmail.com>
Date: Sat, 30 May 2015 14:41:32 -0700
Subject: [PATCH] Add encounter methods and slots for X/Y.

Updates #146.
---
 pokedex/data/csv/encounter_method_prose.csv |  4 ++
 pokedex/data/csv/encounter_methods.csv      | 20 +++---
 pokedex/data/csv/encounter_slots.csv        | 79 +++++++++++++++++++++
 3 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/pokedex/data/csv/encounter_method_prose.csv b/pokedex/data/csv/encounter_method_prose.csv
index 6312bf7..6023cf4 100644
--- a/pokedex/data/csv/encounter_method_prose.csv
+++ b/pokedex/data/csv/encounter_method_prose.csv
@@ -25,3 +25,7 @@ encounter_method_id,local_language_id,name
 12,9,Fishing in dark spots
 13,6,An dunklen stellen surfen
 13,9,Surfing in dark spots
+14,9,Walking in yellow flowers
+15,9,Walking in purple flowers
+16,9,Walking in red flowers
+17,9,Walking on rough terrain
diff --git a/pokedex/data/csv/encounter_methods.csv b/pokedex/data/csv/encounter_methods.csv
index b32bff4..18be59a 100644
--- a/pokedex/data/csv/encounter_methods.csv
+++ b/pokedex/data/csv/encounter_methods.csv
@@ -1,14 +1,18 @@
 id,identifier,order
 1,walk,1
-2,old-rod,6
-3,good-rod,7
-4,super-rod,8
-5,surf,10
-6,rock-smash,12
-7,headbutt,13
+2,old-rod,10
+3,good-rod,11
+4,super-rod,12
+5,surf,14
+6,rock-smash,16
+7,headbutt,17
 8,dark-grass,5
 9,grass-spots,2
 10,cave-spots,3
 11,bridge-spots,4
-12,super-rod-spots,9
-13,surf-spots,11
+12,super-rod-spots,13
+13,surf-spots,15
+14,yellow-flowers,6
+15,purple-flowers,7
+16,red-flowers,8
+17,rough-terrain,9
diff --git a/pokedex/data/csv/encounter_slots.csv b/pokedex/data/csv/encounter_slots.csv
index 96ad606..dc8549f 100644
--- a/pokedex/data/csv/encounter_slots.csv
+++ b/pokedex/data/csv/encounter_slots.csv
@@ -409,3 +409,82 @@ id,version_group_id,encounter_method_id,slot,rarity
 408,14,11,10,4
 409,14,11,11,1
 410,14,11,12,1
+411,15,1,0,10
+412,15,1,1,10
+413,15,1,2,10
+414,15,1,3,10
+415,15,1,4,10
+416,15,1,5,10
+417,15,1,6,10
+418,15,1,7,10
+419,15,1,8,10
+420,15,1,9,5
+421,15,1,10,4
+422,15,1,11,1
+423,15,14,0,10
+424,15,14,1,10
+425,15,14,2,10
+426,15,14,3,10
+427,15,14,4,10
+428,15,14,5,10
+429,15,14,6,10
+430,15,14,7,10
+431,15,14,8,10
+432,15,14,9,5
+433,15,14,10,4
+434,15,14,11,1
+435,15,15,0,10
+436,15,15,1,10
+437,15,15,2,10
+438,15,15,3,10
+439,15,15,4,10
+440,15,15,5,10
+441,15,15,6,10
+442,15,15,7,10
+443,15,15,8,10
+444,15,15,9,5
+445,15,15,10,4
+446,15,15,11,1
+447,15,16,0,10
+448,15,16,1,10
+449,15,16,2,10
+450,15,16,3,10
+451,15,16,4,10
+452,15,16,5,10
+453,15,16,6,10
+454,15,16,7,10
+455,15,16,8,10
+456,15,16,9,5
+457,15,16,10,4
+458,15,16,11,1
+459,15,17,0,10
+460,15,17,1,10
+461,15,17,2,10
+462,15,17,3,10
+463,15,17,4,10
+464,15,17,5,10
+465,15,17,6,10
+466,15,17,7,10
+467,15,17,8,10
+468,15,17,9,5
+469,15,17,10,4
+470,15,17,11,1
+471,15,5,0,50
+472,15,5,1,30
+473,15,5,2,15
+474,15,5,3,4
+475,15,5,4,1
+476,15,6,0,50
+477,15,6,1,30
+478,15,6,2,15
+479,15,6,3,4
+480,15,6,4,1
+481,15,2,0,60
+482,15,2,1,35
+483,15,2,2,5
+484,15,3,0,60
+485,15,3,1,35
+486,15,3,2,5
+487,15,4,0,60
+488,15,4,1,35
+489,15,4,2,5