mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #207 from taweko/master

Browse Source 
Update PokemonTypes.json
This commit is contained in:
Master Kwoth 2016-04-11 00:00:14 +02:00
commit ccb2d2a187
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
NadekoBot/bin/Debug/data/PokemonTypes.json
View File

@ -116,7 +116,7 @@
}, },
{ {
"Type": "GRASS", "Type": "GRASS",
"Multiplication": 2 "Multiplication": 0.5
}, },
{ {
"Type": "GROUND", "Type": "GROUND",
@ -148,23 +148,23 @@
}, },
{ {
"Type": "WATER", "Type": "WATER",
"Multiplication": 0.5 "Multiplication": 2
}, },
{ {
"Type": "GRASS", "Type": "GRASS",
"Multiplication": 2 "Multiplication": 0.5
}, },
{ {
"Type": "ICE", "Type": "ICE",
"Multiplication": 2 "Multiplication": 0.5
}, },
{ {
"Type": "BUG", "Type": "BUG",
"Multiplication": 2 "Multiplication": 0.5
}, },
{ {
"Type": "ROCK", "Type": "ROCK",
"Multiplication": 0.5 "Multiplication": 2
}, },
{ {
"Type": "DRAGON", "Type": "DRAGON",
@ -172,6 +172,14 @@
}, },
{ {
"Type": "STEEL", "Type": "STEEL",
"Multiplication": 0.5
},
{
"Type": "POISON",
"Multiplication": 0.5
},
{
"Type": "GROUND",
"Multiplication": 2 "Multiplication": 2
} }
], ],
@ -340,7 +348,7 @@
}, },
{ {
"Type": "POISON", "Type": "POISON",
"Multiplication": 0.5 "Multiplication": 2
}, },
{ {
"Type": "FLYING", "Type": "FLYING",
@ -545,10 +553,6 @@
{ {
"Type": "DARK", "Type": "DARK",
"Multiplication": 0.5 "Multiplication": 0.5
},
{
"Type": "STEEL",
"Multiplication": 0.5
} }
], ],
"Moves": [ "Moves": [
@ -603,10 +607,6 @@
"Type": "DARK", "Type": "DARK",
"Multiplication": 0.5 "Multiplication": 0.5
}, },
{
"Type": "STEEL",
"Multiplication": 0.5
},
{ {
"Type": "FAIRY", "Type": "FAIRY",
"Multiplication": 0.5 "Multiplication": 0.5
@ -646,6 +646,10 @@
{ {
"Type": "STEEL", "Type": "STEEL",
"Multiplication": 0.5 "Multiplication": 0.5
},
{
"Type": "FAIRY",
"Multiplication": 2
} }
], ],
"Moves": [ "Moves": [
@ -669,7 +673,7 @@
}, },
{ {
"Type": "DARK", "Type": "DARK",
"Multiplication": 0.5 "Multiplication": 2
}, },
{ {
"Type": "POISON", "Type": "POISON",
@ -677,7 +681,7 @@
}, },
{ {
"Type": "STEEL", "Type": "STEEL",
"Multiplication": 2 "Multiplication": 0.5
}, },
{ {
"Type": "DRAGON", "Type": "DRAGON",
@ -692,4 +696,4 @@
], ],
"Icon": "💫" "Icon": "💫"
} }
] ]