From 1cd7a0cdebf8c274a48577a6dfdf844b36d94867 Mon Sep 17 00:00:00 2001 From: appelemac Date: Sat, 26 Mar 2016 20:23:05 +0100 Subject: [PATCH] Fix defaultmoves --- NadekoBot/Modules/Pokegame/Pokegame.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/NadekoBot/Modules/Pokegame/Pokegame.cs b/NadekoBot/Modules/Pokegame/Pokegame.cs index 62e9bf63..2b25e280 100644 --- a/NadekoBot/Modules/Pokegame/Pokegame.cs +++ b/NadekoBot/Modules/Pokegame/Pokegame.cs @@ -173,7 +173,7 @@ namespace NadekoBot.Modules.pokegame .Do(async e => { //Implement NadekoFlowers???? - string newMove = e.GetArg("move"); + string newMove = e.GetArg("move").ToLowerInvariant(); var newType = PokemonTypes.stringToPokeType(e.GetArg("type").ToUpperInvariant()); int typeNum = newType.getNum(); var db = DbHandler.Instance.GetAllRows().Select(x => x.move); @@ -276,7 +276,6 @@ namespace NadekoBot.Modules.pokegame {"hack",3}, {"scare",13}, {"splash",2}, - {"flame",1}, {"freeze",5}, {"strike",4}, {"surge",3}, @@ -295,7 +294,6 @@ namespace NadekoBot.Modules.pokegame {"ultrabash",6}, {"punch",6}, {"blind",15}, - {"scare",13}, {"earthquake",8}, {"rocksmash",12}, {"transform",0}, @@ -325,7 +323,7 @@ namespace NadekoBot.Modules.pokegame .Do(async e => { var targetTypeString = e.GetArg("targetType"); - var targetType = PokemonTypes.stringToPokeType(targetTypeString); + var targetType = PokemonTypes.stringToPokeType(targetTypeString.ToUpperInvariant()); 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"); @@ -358,7 +356,7 @@ namespace NadekoBot.Modules.pokegame } - + private int getDamage(PokemonTypes.PokeType usertype, PokemonTypes.PokeType targetType) {