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

Fix presenttation and change data connection

Browse Source
This commit is contained in:
Pg 2016-11-28 02:15:08 +01:00
parent 90c80c7bd9
commit 3fbd52d74b
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/NadekoBot/Modules/Pokemon/PokemonModule.cs
View File

@ -41,6 +41,15 @@ namespace NadekoBot.Modules.Pokemon
{ {
_pokelog.Warn(PokemonTypesFile + " is missing. Pokemon types not loaded."); _pokelog.Warn(PokemonTypesFile + " is missing. Pokemon types not loaded.");
} }
using (var uow = DbHandler.UnitOfWork())
{
var conf = uow.BotConfig.GetOrCreate();
CurrencyName = conf.CurrencyName;
CurrencySign = conf.CurrencySign;
CurrencyPluralName = conf.CurrencyPluralName;
}
} }
@ -191,11 +200,11 @@ namespace NadekoBot.Modules.Pokemon
if (targetStats.Hp <= 0) if (targetStats.Hp <= 0)
{ {
response += $"\n**{targetUser.Username}** has fainted!"; response += $"\n**{targetUser.Nickname}** has fainted!";
} }
else else
{ {
response += $"\n**{targetUser.Username}** has {targetStats.Hp} HP remaining"; response += $"\n**{targetUser.Nickname}** has {targetStats.Hp} HP remaining";
} }
//update other stats //update other stats
@ -250,13 +259,13 @@ namespace NadekoBot.Modules.Pokemon
var targetStats = Stats[targetUser.Id]; var targetStats = Stats[targetUser.Id];
if (targetStats.Hp == targetStats.MaxHp) if (targetStats.Hp == targetStats.MaxHp)
{ {
await channel.SendMessageAsync($"{targetUser.Username} already has full HP!").ConfigureAwait(false); await channel.SendMessageAsync($"{targetUser.Nickname} already has full HP!").ConfigureAwait(false);
return; return;
} }
//Payment~ //Payment~
var amount = 1; var amount = 1;
var target = (targetUser.Id == user.Id) ? "yourself" : targetUser.Username; var target = (targetUser.Id == user.Id) ? "yourself" : targetUser.Nickname;
if (amount > 0) if (amount > 0)
{ {
if (!await CurrencyHandler.RemoveCurrencyAsync(user, $"Poke-Heal {target}", amount, true).ConfigureAwait(false)) if (!await CurrencyHandler.RemoveCurrencyAsync(user, $"Poke-Heal {target}", amount, true).ConfigureAwait(false))
@ -278,16 +287,16 @@ namespace NadekoBot.Modules.Pokemon
} }
else else
{ {
await channel.SendMessageAsync($"{user.Username} revived {targetUser.Username} with one {CurrencySign}").ConfigureAwait(false); await channel.SendMessageAsync($"{user.Nickname} revived {targetUser.Nickname} with one {CurrencySign}").ConfigureAwait(false);
} }
return; return;
} }
await channel.SendMessageAsync($"{user.Username} healed {targetUser.Username} with one {CurrencySign}").ConfigureAwait(false); await channel.SendMessageAsync($"{user.Nickname} healed {targetUser.Nickname} with one {CurrencySign}").ConfigureAwait(false);
return; return;
} }
else else
{ {
await channel.SendMessageAsync($"{targetUser.Username} already has full HP!").ConfigureAwait(false); await channel.SendMessageAsync($"{targetUser.Nickname} already has full HP!").ConfigureAwait(false);
} }
} }
@ -301,12 +310,11 @@ namespace NadekoBot.Modules.Pokemon
if (targetUser == null) if (targetUser == null)
{ {
await channel.SendMessageAsync("No such person.").ConfigureAwait(false);
return; return;
} }
var pType = GetPokeType(targetUser.Id); var pType = GetPokeType(targetUser.Id);
await channel.SendMessageAsync($"Type of {targetUser.Username} is **{pType.Name.ToLowerInvariant()}**{pType.Icon}").ConfigureAwait(false); await channel.SendMessageAsync($"Type of {targetUser.Nickname} is **{pType.Name.ToLowerInvariant()}**{pType.Icon}").ConfigureAwait(false);
} }
@ -335,7 +343,7 @@ namespace NadekoBot.Modules.Pokemon
var amount = 1; var amount = 1;
if (amount > 0) if (amount > 0)
{ {
if (!await CurrencyHandler.RemoveCurrencyAsync(user, $"{user.Username} change type to {typeTargeted}", amount, true).ConfigureAwait(false)) if (!await CurrencyHandler.RemoveCurrencyAsync(user, $"{user.Nickname} change type to {typeTargeted}", amount, true).ConfigureAwait(false))
{ {
try { await channel.SendMessageAsync($"{user.Mention} You don't have enough {CurrencyName}s.").ConfigureAwait(false); } catch { } try { await channel.SendMessageAsync($"{user.Mention} You don't have enough {CurrencyName}s.").ConfigureAwait(false); } catch { }
return; return;
@ -347,7 +355,8 @@ namespace NadekoBot.Modules.Pokemon
using (var uow = DbHandler.UnitOfWork()) using (var uow = DbHandler.UnitOfWork())
{ {
setTypes = uow.PokeGame.GetAll().ToDictionary(x => x.UserId, y => y.type); var pokeUsers = uow.PokeGame.GetAll();
setTypes = pokeUsers.ToDictionary(x => x.UserId, y => y.type);
var pt = new UserPokeTypes var pt = new UserPokeTypes
{ {
UserId = (long)user.Id, UserId = (long)user.Id,
@ -361,7 +370,9 @@ namespace NadekoBot.Modules.Pokemon
else else
{ {
//update user in db //update user in db
uow.PokeGame.Update(pt); var pokeUserCmd = pokeUsers.Where(p => p.UserId == (long)user.Id).FirstOrDefault();
pokeUserCmd.type = targetType.Name;
uow.PokeGame.Update(pokeUserCmd);
} }
await uow.CompleteAsync(); await uow.CompleteAsync();
} }