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

Fix defaultmoves

Browse Source
This commit is contained in:
appelemac 2016-03-26 20:23:05 +01:00
parent 6a0f7a46cf
commit 1cd7a0cdeb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NadekoBot/Modules/Pokegame/Pokegame.cs
View File

@ -173,7 +173,7 @@ namespace NadekoBot.Modules.pokegame
.Do(async e => .Do(async e =>
{ {
//Implement NadekoFlowers???? //Implement NadekoFlowers????
string newMove = e.GetArg("move"); string newMove = e.GetArg("move").ToLowerInvariant();
var newType = PokemonTypes.stringToPokeType(e.GetArg("type").ToUpperInvariant()); var newType = PokemonTypes.stringToPokeType(e.GetArg("type").ToUpperInvariant());
int typeNum = newType.getNum(); int typeNum = newType.getNum();
var db = DbHandler.Instance.GetAllRows<PokeMoves>().Select(x => x.move); var db = DbHandler.Instance.GetAllRows<PokeMoves>().Select(x => x.move);
@ -276,7 +276,6 @@ namespace NadekoBot.Modules.pokegame
{"hack",3}, {"hack",3},
{"scare",13}, {"scare",13},
{"splash",2}, {"splash",2},
{"flame",1},
{"freeze",5}, {"freeze",5},
{"strike",4}, {"strike",4},
{"surge",3}, {"surge",3},
@ -295,7 +294,6 @@ namespace NadekoBot.Modules.pokegame
{"ultrabash",6}, {"ultrabash",6},
{"punch",6}, {"punch",6},
{"blind",15}, {"blind",15},
{"scare",13},
{"earthquake",8}, {"earthquake",8},
{"rocksmash",12}, {"rocksmash",12},
{"transform",0}, {"transform",0},
@ -325,7 +323,7 @@ namespace NadekoBot.Modules.pokegame
.Do(async e => .Do(async e =>
{ {
var targetTypeString = e.GetArg("targetType"); var targetTypeString = e.GetArg("targetType");
var targetType = PokemonTypes.stringToPokeType(targetTypeString); var targetType = PokemonTypes.stringToPokeType(targetTypeString.ToUpperInvariant());
if (targetType == null) if (targetType == null)
{ {
await e.Channel.SendMessage("Invalid type specified. Type must be one of:\nNORMAL, FIRE, WATER, ELECTRIC, GRASS, ICE, FIGHTING, POISON, GROUND, FLYING, PSYCHIC, BUG, ROCK, GHOST, DRAGON, DARK, STEEL"); await e.Channel.SendMessage("Invalid type specified. Type must be one of:\nNORMAL, FIRE, WATER, ELECTRIC, GRASS, ICE, FIGHTING, POISON, GROUND, FLYING, PSYCHIC, BUG, ROCK, GHOST, DRAGON, DARK, STEEL");
@ -358,7 +356,7 @@ namespace NadekoBot.Modules.pokegame
} }
private int getDamage(PokemonTypes.PokeType usertype, PokemonTypes.PokeType targetType) private int getDamage(PokemonTypes.PokeType usertype, PokemonTypes.PokeType targetType)
{ {