From 9a2ddf24f4ce2dd123fa41673d973f29c61ed9a0 Mon Sep 17 00:00:00 2001 From: taweko Date: Sun, 10 Apr 2016 13:57:16 -0700 Subject: [PATCH] Update PokemonTypes.json Updated Pokemon types to reflect Bulbapedia's Gen VI type effectiveness chart. (Fixed errors due to missing commas) --- NadekoBot/bin/Debug/data/PokemonTypes.json | 40 ++++++++++++---------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/NadekoBot/bin/Debug/data/PokemonTypes.json b/NadekoBot/bin/Debug/data/PokemonTypes.json index 750044f1..9a737dd1 100644 --- a/NadekoBot/bin/Debug/data/PokemonTypes.json +++ b/NadekoBot/bin/Debug/data/PokemonTypes.json @@ -116,7 +116,7 @@ }, { "Type": "GRASS", - "Multiplication": 2 + "Multiplication": 0.5 }, { "Type": "GROUND", @@ -148,23 +148,23 @@ }, { "Type": "WATER", - "Multiplication": 0.5 + "Multiplication": 2 }, { "Type": "GRASS", - "Multiplication": 2 + "Multiplication": 0.5 }, { "Type": "ICE", - "Multiplication": 2 + "Multiplication": 0.5 }, { "Type": "BUG", - "Multiplication": 2 + "Multiplication": 0.5 }, { "Type": "ROCK", - "Multiplication": 0.5 + "Multiplication": 2 }, { "Type": "DRAGON", @@ -172,6 +172,14 @@ }, { "Type": "STEEL", + "Multiplication": 0.5 + } + { + "Type": "POISON", + "Multiplication": 0.5 + }, + { + "Type": "GROUND", "Multiplication": 2 } ], @@ -340,7 +348,7 @@ }, { "Type": "POISON", - "Multiplication": 0.5 + "Multiplication": 2 }, { "Type": "FLYING", @@ -545,10 +553,6 @@ { "Type": "DARK", "Multiplication": 0.5 - }, - { - "Type": "STEEL", - "Multiplication": 0.5 } ], "Moves": [ @@ -603,10 +607,6 @@ "Type": "DARK", "Multiplication": 0.5 }, - { - "Type": "STEEL", - "Multiplication": 0.5 - }, { "Type": "FAIRY", "Multiplication": 0.5 @@ -646,6 +646,10 @@ { "Type": "STEEL", "Multiplication": 0.5 + }, + { + "Type": "FAIRY", + "Multiplication": 2 } ], "Moves": [ @@ -669,7 +673,7 @@ }, { "Type": "DARK", - "Multiplication": 0.5 + "Multiplication": 2 }, { "Type": "POISON", @@ -677,7 +681,7 @@ }, { "Type": "STEEL", - "Multiplication": 2 + "Multiplication": 0.5 }, { "Type": "DRAGON", @@ -692,4 +696,4 @@ ], "Icon": "💫" } -] \ No newline at end of file +]