Rearranged move effect categories by primary key.

diff --git a/pokedex/data/csv/move_effect_categories.csv b/pokedex/data/csv/move_effect_categories.csv
index 3ce5919..904caea 100644 (file)
--- a/pokedex/data/csv/move_effect_categories.csv
+++ b/pokedex/data/csv/move_effect_categories.csv
@@ -7,7 +7,7 @@ id,name,can_affect_user
 6,Critical,0
 7,Ignores type,0
 8,Ignores accuracy modifiers,0
 6,Critical,0
 7,Ignores type,0
 8,Ignores accuracy modifiers,0

-9,Meta (move uses another move, damage based on other damage),0
+9,Meta,1

 10,Multiple turns/hits,0
 11,Charge or recovery turn,0
 12,Heals HP,1
 10,Multiple turns/hits,0
 11,Charge or recovery turn,0
 12,Heals HP,1

diff --git a/pokedex/data/csv/move_effect_category_map.csv b/pokedex/data/csv/move_effect_category_map.csv
index 94e5c04..5a8129b 100644 (file)
--- a/pokedex/data/csv/move_effect_category_map.csv
+++ b/pokedex/data/csv/move_effect_category_map.csv
@@ -28,8 +28,8 @@ move_effect_id,move_effect_category_id,affects_user
 24,26,0
 25,28,0
 26,13,1
 24,26,0
 25,28,0
 26,13,1

-27,10,0

 27,3,0
 27,3,0

+27,10,0

 28,1,0
 28,10,0
 28,34,1
 28,1,0
 28,10,0
 28,34,1


@@ -45,9 +45,9 @@ move_effect_id,move_effect_category_id,affects_user
 37,30,0
 37,31,0
 37,32,0
 37,30,0
 37,31,0
 37,32,0

-38,29,1

 38,12,1
 38,13,1
 38,12,1
 38,13,1

+38,29,1

 39,5,0
 39,8,0
 40,1,0
 39,5,0
 39,8,0
 40,1,0


@@ -138,21 +138,21 @@ move_effect_id,move_effect_category_id,affects_user
 105,2,0
 105,10,0
 106,1,0
 105,2,0
 105,10,0
 106,1,0

-107,36,0

 107,8,0
 107,8,0

+107,36,0

 108,3,0
 108,10,0
 109,27,1
 108,3,0
 108,10,0
 109,27,1

-110,3,1

 110,3,0
 110,3,0

+110,3,1

 110,10,0
 110,10,0

-110,24,1

 110,15,1
 110,17,1
 110,15,1
 110,17,1

+110,24,1

 112,14,1
 112,14,1

-114,28,0
-114,27,0

 114,8,0
 114,8,0

+114,27,0
+114,28,0

 115,5,0
 115,5,1
 115,10,0
 115,5,0
 115,5,1
 115,10,0


@@ -200,8 +200,8 @@ move_effect_id,move_effect_category_id,affects_user
 143,15,1
 145,3,0
 146,1,0
 143,15,1
 145,3,0
 146,1,0

-146,17,1

 146,11,0
 146,11,0

+146,17,1

 147,1,0
 147,35,0
 148,1,0
 147,1,0
 147,35,0
 148,1,0


@@ -216,8 +216,8 @@ move_effect_id,move_effect_category_id,affects_user
 153,1,0
 153,31,0
 155,1,0
 153,1,0
 153,31,0
 155,1,0

-155,10,0

 155,7,0
 155,7,0

+155,10,0

 156,1,0
 156,11,0
 157,17,1
 156,1,0
 156,11,0
 157,17,1


@@ -234,9 +234,9 @@ move_effect_id,move_effect_category_id,affects_user
 167,19,0
 167,34,0
 168,30,0
 167,19,0
 167,34,0
 168,30,0

+169,5,1

 169,16,0
 169,20,0
 169,16,0
 169,20,0

-169,5,1

 170,1,0
 170,4,0
 171,1,0
 170,1,0
 170,4,0
 171,1,0


@@ -249,8 +249,8 @@ move_effect_id,move_effect_category_id,affects_user
 179,8,0
 180,12,1
 181,9,0
 179,8,0
 180,12,1
 181,9,0

-182,36,1

 182,12,1
 182,12,1

+182,36,1

 183,1,0
 183,16,1
 183,18,1
 183,1,0
 183,16,1
 183,18,1


@@ -268,12 +268,12 @@ move_effect_id,move_effect_category_id,affects_user
 197,1,0
 197,2,0
 198,1,0
 197,1,0
 197,2,0
 198,1,0

-198,35,0
-198,31,0

 198,16,0
 198,26,0
 198,29,0
 198,16,0
 198,26,0
 198,29,0

+198,31,0

 198,32,0
 198,32,0

+198,35,0

 199,1,0
 199,3,1
 200,34,0
 199,1,0
 199,3,1
 200,34,0


@@ -301,8 +301,8 @@ move_effect_id,move_effect_category_id,affects_user
 213,15,1
 213,23,1
 215,12,1
 213,15,1
 213,23,1
 215,12,1

-217,28,0

 217,8,0
 217,8,0

+217,28,0

 218,1,0
 218,4,0
 218,13,0
 218,1,0
 218,4,0
 218,13,0


@@ -368,9 +368,9 @@ move_effect_id,move_effect_category_id,affects_user
 261,1,0
 261,32,0
 262,1,0
 261,1,0
 261,32,0
 262,1,0

+262,4,0

 262,10,0
 262,36,0
 262,10,0
 262,36,0

-262,4,0

 263,1,0
 263,3,1
 263,31,0
 263,1,0
 263,3,1
 263,31,0