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

Merge branch 'develop' into master

Browse Source
This commit is contained in:
Daniel_I_Am 2020-08-11 02:47:11 +02:00
commit 3f2370a4bc
No known key found for this signature in database
GPG Key ID: 80C428FCC9743E84
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChaosBot/Discord/Modules/User/Level.cs
View File

@ -40,7 +40,8 @@ namespace ChaosBot.Discord.Modules.User
if (usrXp.Any())
{
ulong nextLevelXP = 1 * usrXp.First().Level * (2 * usrXp.First().Level * usrXp.First().Level + 27 * usrXp.First().Level + 91);
// ulong nextLevelXP = 1 * usrXp.First().Level * (2 * usrXp.First().Level * usrXp.First().Level + 27 * usrXp.First().Level + 91);
ulong nextLevelXP = 5 * usrXp.First().Level ^ 3 + 95 * usrXp.First().Level;
sb.AppendLine($"Name: {Context.User.Mention}");
sb.AppendLine($"\tLevel: {usrXp.First().Level}");
sb.AppendLine($"\tExperience: {usrXp.First().Amount}");

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

@ -5,6 +5,7 @@ using System.Threading.Channels;
using System.Threading.Tasks;
using ChaosBot.Models;
using ChaosBot.Repositories;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Microsoft.EntityFrameworkCore;
@ -64,15 +65,26 @@ namespace ChaosBot.Discord.Services
.On(x => new { x.DiscordGuildId, x.DiscordUserId}).RunAsync();
string ConfigSet = ConfigurationRepository.GetValue<string>("LevelUp:Channel", context.Guild.Id, "false");
string mentionString = $"<@{context.User.Id}>";
if (!ConfigurationRepository.GetValue<bool>("LevelUp:MentionUser", context.Guild.Id, true))
{
mentionString = context.User.Username;
if (context.User is IGuildUser guildUser)
{
mentionString = guildUser.Nickname ?? mentionString;
}
}
if (ConfigSet != "false")
{
ulong channelId = Convert.ToUInt64(ConfigSet.Substring(2, ConfigSet.Length - 3));
await context.Guild.GetTextChannel(channelId).SendMessageAsync(
$"Grats <@{context.User.Id}>! You have reached level 1 <:wot:740387232514572310>");
$"Grats {mentionString}! You have reached level 1 <:wot:740387232514572310>");
}
else
await context.Channel.SendMessageAsync($"Grats <@{context.User.Id}>! You have reached level 1! <:wot:740387232514572310>");
await context.Channel.SendMessageAsync($"Grats {mentionString}! You have reached level 1! <:wot:740387232514572310>");
}
}
}
@ -89,23 +101,33 @@ namespace ChaosBot.Discord.Services
try
{
// var xp_to_desired_level = 5 / 6 * desired_level * (2 * desired_level * desired_level + 27 * desired_level + 91);
var nextLevelXP = 1 * usrExperience.Level * (2 * usrExperience.Level * usrExperience.Level + 27 * usrExperience.Level + 91);
// var nextLevelXP = 1 * usrExperience.Level * (2 * usrExperience.Level * usrExperience.Level + 27 * usrExperience.Level + 91);
var nextLevelXP = 5 * usrExperience.Level ^ 3 + 95 * usrExperience.Level;
Console.WriteLine(nextLevelXP);
if (usrExperience.Amount > nextLevelXP)
{
curLevel = usrExperience.Level + 1;
string ConfigSet = ConfigurationRepository.GetValue<string>("LevelUp:Channel", usrExperience.DiscordGuildId, "false");
string mentionString = $"<@{context.User.Id}>";
if (!ConfigurationRepository.GetValue<bool>("LevelUp:MentionUser", context.Guild.Id, true))
{
mentionString = context.User.Username;
if (context.User is IGuildUser guildUser)
{
mentionString = guildUser.Nickname ?? mentionString;
}
}
if (ConfigSet != "false")
{
ulong channelId = Convert.ToUInt64(ConfigSet.Substring(2, ConfigSet.Length - 3));
await context.Guild.GetTextChannel(channelId).SendMessageAsync(
$"Grats <@{usrExperience.DiscordUserId}>! You have reached level {curLevel} <:wot:740387232514572310>");
$"Grats {mentionString}! You have reached level {curLevel} <:wot:740387232514572310>");
}
else
await context.Channel.SendMessageAsync($"Grats <@{usrExperience.DiscordUserId}>! You have reached level {curLevel} <:wot:740387232514572310>");
await context.Channel.SendMessageAsync($"Grats {mentionString}! You have reached level {curLevel} <:wot:740387232514572310>");
}
}
catch (Exception ex)