Shuffled item categories.

diff --git a/pokedex/data/csv/item_categories.csv b/pokedex/data/csv/item_categories.csv
index e77dee3..4f0947e 100644 (file)
--- a/pokedex/data/csv/item_categories.csv
+++ b/pokedex/data/csv/item_categories.csv
@@ -1,5 +1,5 @@
 id,pocket_id,name
 id,pocket_id,name

-1,7,
+1,7,Stat boosts

 2,5,Effort drop
 3,5,Medicine
 4,5,Other
 2,5,Effort drop
 3,5,Medicine
 4,5,Other


@@ -7,32 +7,32 @@ id,pocket_id,name
 6,5,Picky healing
 7,5,Type protection
 8,5,Baking only
 6,5,Picky healing
 7,5,Type protection
 8,5,Baking only

-9,1,
-10,1,
-11,1,
-12,1,
-13,1,
-14,1,
-15,1,
-16,1,
-17,1,
-18,1,
-19,1,
+9,1,Collectibles
+10,1,Evolution
+11,1,Training
+12,1,Held items
+13,1,Choice
+14,1,Effort training
+15,1,Bad held items
+16,1,Training
+17,1,Plates
+18,1,Species-specific
+19,1,Type enhancement

 20,8,Event items
 21,8,Gameplay
 22,8,Plot advancement
 23,8,Unused
 24,1,Loot
 25,6,
 20,8,Event items
 21,8,Gameplay
 22,8,Plot advancement
 23,8,Unused
 24,1,Loot
 25,6,

-26,2,
-27,2,
-28,2,
-29,2,
-30,2,
-31,1,
+26,2,Vitamins
+27,2,Healing
+28,2,PP recovery
+29,2,Revival
+30,2,Status cures

 32,1,Mulch
 33,3,Special balls
 34,3,Standard balls
 32,1,Mulch
 33,3,Special balls
 34,3,Standard balls

-35,1,
-36,1,
+35,1,Dex completion
+36,1,Scarves

 37,4,
 37,4,

+38,7,Flutes

diff --git a/pokedex/data/csv/items.csv b/pokedex/data/csv/items.csv
index 047427d..279bf04 100644 (file)
--- a/pokedex/data/csv/items.csv
+++ b/pokedex/data/csv/items.csv
@@ -61,11 +61,11 @@ id,name,category_id,cost,fling_power,fling_effect_id,flavor_text,effect,is_under
 60,X Accuracy,1,950,30,,An item that raises the accuracy of a Pokémon in battle. It wears off if the Pokémon is withdrawn.,In battle: Raises one Pokémon's Accuracy.  Raises that Pokémon's Happiness by 1/1/0.,0,0,1,0,0
 61,X Special,1,350,30,,An item that raises the Sp. Atk stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.,In battle: Raises one Pokémon's Special Attack.  Raises that Pokémon's Happiness by 1/1/0.,0,0,1,0,0
 62,X Sp. Def,1,350,30,,An item that raises the Sp. Def stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.,In battle: Raises one Pokémon's Special Defense.  Raises that Pokémon's Happiness by 1/1/0.,0,0,1,0,0
 60,X Accuracy,1,950,30,,An item that raises the accuracy of a Pokémon in battle. It wears off if the Pokémon is withdrawn.,In battle: Raises one Pokémon's Accuracy.  Raises that Pokémon's Happiness by 1/1/0.,0,0,1,0,0
 61,X Special,1,350,30,,An item that raises the Sp. Atk stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.,In battle: Raises one Pokémon's Special Attack.  Raises that Pokémon's Happiness by 1/1/0.,0,0,1,0,0
 62,X Sp. Def,1,350,30,,An item that raises the Sp. Def stat of a Pokémon in battle. It wears off if the Pokémon is withdrawn.,In battle: Raises one Pokémon's Special Defense.  Raises that Pokémon's Happiness by 1/1/0.,0,0,1,0,0

-63,Poké Doll,31,1000,30,,A doll that attracts Pokémon. Use it to flee from any battle with a wild Pokémon.,In wild battles: Ends the battle.,0,0,0,0,0
-64,Fluffy Tail,31,1000,30,,An item that attracts Pokémon. Use it to flee from any battle with a wild Pokémon.,In wild battles: Ends the battle.,0,0,0,0,0
-65,Blue Flute,30,100,30,,A blue flute made from blown glass. Its melody awakens a single Pokémon from sleep.,Awakens one Pokémon.  Reusable.,0,0,0,0,0
-66,Yellow Flute,30,200,30,,A yellow flute made from blown glass. Its melody snaps a single Pokémon out of confusion.,Cures one Pokémon of Confusion.  Reusable.,0,0,0,0,0
-67,Red Flute,30,300,30,,A red flute made from blown glass. Its melody snaps a single Pokémon out of infatuation.,Cures one Pokémon of Attraction.  Reusable.,0,0,0,0,0
+63,Poké Doll,11,1000,30,,A doll that attracts Pokémon. Use it to flee from any battle with a wild Pokémon.,In wild battles: Ends the battle.,0,0,0,0,0
+64,Fluffy Tail,11,1000,30,,An item that attracts Pokémon. Use it to flee from any battle with a wild Pokémon.,In wild battles: Ends the battle.,0,0,0,0,0
+65,Blue Flute,38,100,30,,A blue flute made from blown glass. Its melody awakens a single Pokémon from sleep.,Awakens one Pokémon.  Reusable.,0,0,0,0,0
+66,Yellow Flute,38,200,30,,A yellow flute made from blown glass. Its melody snaps a single Pokémon out of confusion.,Cures one Pokémon of Confusion.  Reusable.,0,0,0,0,0
+67,Red Flute,38,300,30,,A red flute made from blown glass. Its melody snaps a single Pokémon out of infatuation.,Cures one Pokémon of Attraction.  Reusable.,0,0,0,0,0

 68,Black Flute,11,400,30,,A black flute made from blown glass. Its melody makes wild Pokémon less likely to appear.,Makes wild encounters less frequent.  Reusable.,0,0,0,0,0
 69,White Flute,11,500,30,,A white flute made from blown glass. Its melody makes wild Pokémon more likely to appear.,Makes wild encounters more frequent.  Reusable.,0,0,0,0,0
 70,Shoal Salt,9,20,30,,Pure salt that was discovered deep inside the Shoal Cave. It is extremely salty.,No effect.,0,0,0,0,0
 68,Black Flute,11,400,30,,A black flute made from blown glass. Its melody makes wild Pokémon less likely to appear.,Makes wild encounters less frequent.  Reusable.,0,0,0,0,0
 69,White Flute,11,500,30,,A white flute made from blown glass. Its melody makes wild Pokémon more likely to appear.,Makes wild encounters more frequent.  Reusable.,0,0,0,0,0
 70,Shoal Salt,9,20,30,,Pure salt that was discovered deep inside the Shoal Cave. It is extremely salty.,No effect.,0,0,0,0,0