Discord/chaosbot
3
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Fixing nextLevel notifications

See merge request discord-bots/chaosbot!9
This commit is contained in:
Sean "Solao Bajiuik" Stoves 2020-08-09 09:21:09 -04:00
commit ddea76777a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChaosBot/Discord/Services/ExperienceHandler.cs
View File

@ -39,11 +39,17 @@ namespace ChaosBot.Discord.Services
usrNewXp.DiscordGuildId = context.Guild.Id; usrNewXp.DiscordGuildId = context.Guild.Id;
usrNewXp.DiscordUserId = context.User.Id; usrNewXp.DiscordUserId = context.User.Id;
usrNewXp.LastUpdated = DateTime.Now; usrNewXp.LastUpdated = DateTime.Now;
usrNewXp.Level = await checkLevel(usrNewXp, context); usrNewXp.Level = usrNewXp.Level;
ulong newLevel = await checkLevel(usrNewXp, context);
if(newLevel > usrNewXp.Level)
usrNewXp.Level = newLevel;
await dbContext.ExperiencePoints.Upsert(usrNewXp) await dbContext.ExperiencePoints.Upsert(usrNewXp)
.On(x => new {x.DiscordGuildId, x.DiscordUserId}).RunAsync(); .On(x => new {x.DiscordGuildId, x.DiscordUserId}).RunAsync();
} } }
}
else else
{ {
usrNewXp = new Experience(); usrNewXp = new Experience();
@ -52,6 +58,7 @@ namespace ChaosBot.Discord.Services
usrNewXp.DiscordGuildId = context.Guild.Id; usrNewXp.DiscordGuildId = context.Guild.Id;
usrNewXp.DiscordUserId = context.User.Id; usrNewXp.DiscordUserId = context.User.Id;
usrNewXp.LastUpdated = DateTime.Now; usrNewXp.LastUpdated = DateTime.Now;
usrNewXp.Level = 0;
await dbContext.ExperiencePoints.Upsert(usrNewXp) await dbContext.ExperiencePoints.Upsert(usrNewXp)
.On(x => new { x.DiscordGuildId, x.DiscordUserId}).RunAsync(); .On(x => new { x.DiscordGuildId, x.DiscordUserId}).RunAsync();
@ -71,9 +78,9 @@ namespace ChaosBot.Discord.Services
try try
{ {
ulong nextLevelXP = 6 * (usrExperience.Level / 2) + 48 * usrExperience.Level + 123; ulong nextLevelXP = 5 * (usrExperience.Level ^ 2) + 50 * usrExperience.Level + 100;
if (usrExperience.Amount >= nextLevelXP) if (usrExperience.Amount > nextLevelXP)
{ {
curLevel = usrExperience.Level + 1; curLevel = usrExperience.Level + 1;
string ConfigSet = ConfigurationRepository.GetValue<string>("LevelUp:Channel", usrExperience.DiscordGuildId, "false"); string ConfigSet = ConfigurationRepository.GetValue<string>("LevelUp:Channel", usrExperience.DiscordGuildId, "false");