From 4a758b412f2333acace12e51cc70469411578a5f Mon Sep 17 00:00:00 2001 From: appelemac Date: Sat, 2 Apr 2016 22:18:44 +0200 Subject: [PATCH] Removed hardcoded pokemoves --- NadekoBot/Modules/Pokemon/DefaultMoves.cs | 91 ---------------------- NadekoBot/Modules/Pokemon/PokemonModule.cs | 8 +- NadekoBot/NadekoBot.csproj | 1 - 3 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 NadekoBot/Modules/Pokemon/DefaultMoves.cs diff --git a/NadekoBot/Modules/Pokemon/DefaultMoves.cs b/NadekoBot/Modules/Pokemon/DefaultMoves.cs deleted file mode 100644 index 4cdba343..00000000 --- a/NadekoBot/Modules/Pokemon/DefaultMoves.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NadekoBot.Modules.Pokemon -{ - class DefaultMoves - { - - public static Dictionary DefaultMovesList = new Dictionary() - { - {"sonic boom",0}, - {"quick attack",0}, - {"doubleslap",0}, - {"headbutt",0}, - {"incinerate",1}, - {"ember",1}, - {"fire punch",1}, - {"fiery dance",1}, - {"bubblebeam",2}, - {"dive",2}, - {"whirlpool",2}, - {"aqua tail",2}, - {"nuzzle",3}, - {"thunderbolt",3}, - {"thundershock",3}, - {"discharge",3}, - {"absorb",4}, - {"mega drain",4}, - {"vine whip",4}, - {"razor leaf",4}, - {"ice ball",5}, - {"powder snow",5}, - {"avalanche",5}, - {"icy wind",5}, - {"low kick",6}, - {"force palm",6}, - {"mach punch",6}, - {"double kick",6}, - {"acid",7}, - {"smog",7}, - {"sludge",7}, - {"poison jab",7}, - {"mud-slap",8}, - {"boomerang",8}, - {"bulldoze",8}, - {"dig",8}, - {"peck",9}, - {"pluck",9}, - {"gust",9}, - {"aerial ace",9}, - {"confusion",10}, - {"psybeam",10}, - {"psywave",10}, - {"heart stamp",10}, - {"bug bite",11}, - {"infestation",11}, - {"x-scissor",11}, - {"twineedle",11}, - {"rock throw",12}, - {"rollout",12}, - {"rock tomb",12}, - {"rock blast",12}, - {"astonish",13}, - {"night shade",13}, - {"lick",13}, - {"ominous wind",13}, - {"hex",13}, - {"dragon tail",14}, - {"dragon rage",14}, - {"dragonbreath",14}, - {"twister",14}, - {"pursuit",15}, - {"assurance",15}, - {"bite",15}, - {"faint attack",15}, - {"bullet punch",16}, - {"metal burst",16}, - {"gear grind",16}, - {"magnet bomb",16}, - {"fairy wind",17}, - {"draining kiss",17}, - {"dazzling gleam",17}, - {"play rough",17} - }; - - - } -} diff --git a/NadekoBot/Modules/Pokemon/PokemonModule.cs b/NadekoBot/Modules/Pokemon/PokemonModule.cs index ed181485..8ddf25e9 100644 --- a/NadekoBot/Modules/Pokemon/PokemonModule.cs +++ b/NadekoBot/Modules/Pokemon/PokemonModule.cs @@ -21,13 +21,7 @@ namespace NadekoBot.Modules.Pokemon public PokemonModule() { - DbHandler.Instance.DeleteAll(); - DbHandler.Instance.InsertMany( - DefaultMoves.DefaultMovesList.Select(move => new PokeMoves - { - move = move.Key, - type = move.Value - })); + } private int GetDamage(PokeType usertype, PokeType targetType) diff --git a/NadekoBot/NadekoBot.csproj b/NadekoBot/NadekoBot.csproj index 4d233b8c..c43cd975 100644 --- a/NadekoBot/NadekoBot.csproj +++ b/NadekoBot/NadekoBot.csproj @@ -199,7 +199,6 @@ -