diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index f9ec22a..81bccf7 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -75,7 +75,7 @@ let pickHack actionId attacker defender bonus isTrainer = **{defender.Name}** has `{defender.Bank} 💰$GBT` we can take from them. **__Your Strength:__** - `💪 {attacker.Stats.Strength.Amount}` + `💪 {attacker.Stats.Strength.Amount}` **__Their Strength:__** `💪 {defender.Stats.Strength.Amount}` @@ -130,37 +130,26 @@ let responseSuccessfulHack (hacker : PlayerData) (target : PlayerData) totalTake let responseSuccessfulHack2 successful (hacker : PlayerData) (target : PlayerData) (hackerMember : DiscordMember) (targetMember : DiscordMember) totalTaken bonus (hack : HackItem) = let hackerEmbed = if successful then + // Put how much they lost and if they lost it all, say it + let lostMsg = if target.Bank - totalTaken = 0 then "all their $GBT" else $"`{totalTaken} $GBT`" let e = DiscordEmbedBuilder() - .WithAuthor($"✅ {hacker.Name} Hack Successful!" , iconUrl = hackerMember.AvatarUrl) + .WithDescription($"Successfully hacked **{target.Name}** and took {lostMsg}!") + .WithAuthor($"✅ {hacker.Name}" , iconUrl = hackerMember.GuildAvatarUrl) .WithColor(DiscordColor.Green) - .AddField("Strength", $"{hacker.Stats.Strength.Amount} 💪", true) - .AddField($"Hacked", $"`{totalTaken} 💰$GBT`", true) + .AddField("Strength 💪", $"{hacker.Stats.Strength.Amount} vs {target.Stats.Strength.Amount}", true) if bonus > 0 then e.AddField($"Strength Bonus", $"`{bonus} 💰$GBT`", true) |> ignore - e.AddField("New $GBT Balance", $"`💰` {hacker.Bank} ⋙ `💰` {hacker.Bank + totalTaken} `(+{totalTaken} $GBT)`", true) + e.AddField("New $GBT Balance", $"`💰` {hacker.Bank + totalTaken} `(+{totalTaken} $GBT)`", true) else + let lostMsg = if hacker.Bank - totalTaken = 0 then "all their $GBT" else $"`{totalTaken} $GBT`" DiscordEmbedBuilder() - .WithAuthor(name = $"❌ {hacker.Name} Hack Failed!" , iconUrl = hackerMember.AvatarUrl) - .AddField("Strength", $"{hacker.Stats.Strength.Amount} 💪", true) - .AddField("New $GBT Balance", $"`💰` {hacker.Bank} ⋙ `💰` {hacker.Bank - totalTaken} `(-{totalTaken} $GBT)`", true) + .WithAuthor(name = $"❌ {hacker.Name}" , iconUrl = hackerMember.GuildAvatarUrl) + .WithDescription($"Failed to hack **{target.Name}** and lost {lostMsg}!") + .AddField("Strength 💪", $"{hacker.Stats.Strength.Amount} vs {target.Stats.Strength.Amount}", true) + .AddField("New $GBT Balance", $"`💰` {hacker.Bank - totalTaken} `(-{totalTaken} $GBT)`", true) .WithColor(DiscordColor.Red) - let defenderEmbed = - if successful then - DiscordEmbedBuilder() - .WithAuthor(name = target.Name , iconUrl = targetMember.AvatarUrl) - .AddField("Strength", $"{target.Stats.Strength.Amount} 💪", true) - .AddField("New $GBT Balance", $"`💰` {target.Bank} ⋙ `💰` {target.Bank - totalTaken} `(-{totalTaken} $GBT)`", true) - .WithColor(DiscordColor.Red) - else - DiscordEmbedBuilder() - .WithAuthor(name = target.Name , iconUrl = targetMember.AvatarUrl) - .AddField("Strength", $"{target.Stats.Strength.Amount} 💪", true) - .AddField($"Extracted", $"`{totalTaken} 💰$GBT`", true) - .AddField("New $GBT Balance", $"`💰` {target.Bank} ⋙ `💰` {target.Bank + totalTaken} `(+{totalTaken} $GBT)`", true) - .WithColor(DiscordColor.Green) - - DiscordMessageBuilder().AddEmbeds([ hackerEmbed ; defenderEmbed ] |> List.map (fun e -> e.Build())) + DiscordMessageBuilder().AddEmbed(hackerEmbed) let responseCreatedShield (shield : ShieldItem) = let embed = DiscordEmbedBuilder().WithImageUrl(shield.ImageUrl) diff --git a/Bot/Games/HackerBattle.fs b/Bot/Games/HackerBattle.fs index 9ba18b5..26996d5 100644 --- a/Bot/Games/HackerBattle.fs +++ b/Bot/Games/HackerBattle.fs @@ -102,8 +102,8 @@ let updateCombatants successfulHack (attacker : PlayerData) (defender : PlayerDa Timestamp = DateTime.UtcNow Cooldown = if isDefenderEvent then int WeaponClass.SameTargetAttackCooldown.TotalMinutes * 1 else hack.Cooldown } - [ DbService.updatePlayerCurrency prize attacker.DiscordId - DbService.updatePlayerCurrency -prize defender.DiscordId + [ DbService.updatePlayerCurrency (if successfulHack then prize else -prize) attacker.DiscordId + DbService.updatePlayerCurrency (if successfulHack then -prize else prize) defender.DiscordId DbService.addPlayerEvent attacker.DiscordId (event false) DbService.addPlayerEvent defender.DiscordId (event true) ] |> Async.Parallel diff --git a/Bot/InviteTracker.fs b/Bot/InviteTracker.fs index 8e2660e..ebd40cb 100644 --- a/Bot/InviteTracker.fs +++ b/Bot/InviteTracker.fs @@ -347,27 +347,21 @@ let sendInitialEmbed (ctx : IDiscordContext) = try let channel = ctx.GetGuild().GetChannel(GuildEnvironment.channelRecruitment) let rewardMsg = $""" -**__Win $3,000:__** -🙋 1 invite = 1 entry everyday* -🎟 $100 daily raffles till mint - -**__How To Invite:__** -1️⃣ Click the green button below -2️⃣ Share your unique link with Friends - -**__Bonus__** +**__Invite to Earn__** 💰 Earn an extra {InviteRewardAmount} $GBT for every invite! <:purple_fist:986685279031152650> <@#{GuildEnvironment.roleRecruiter1x}> role if you invite 1 or more Degen <:red_fist:986685280868249690> <@#{GuildEnvironment.roleRecruiter2x}> role is you invite 5 or more Degen <:gold_fist:986685276942377052> <@#{GuildEnvironment.roleRecruiter3x}> role is you invite 10 or more Degen -**Every invite increases your chances of winning* +**__How To Invite:__** +1️⃣ Click the green button below +2️⃣ Share your unique link with Friends """ let embed = DiscordEmbedBuilder() .WithColor(DiscordColor.Gold) .WithDescription(rewardMsg) - .WithImageUrl("https://s8.gifyu.com/images/invite-banner-usdcb670496dc3653cb3.png") + .WithImageUrl("https://s8.gifyu.com/images/invite_banner_new.png") .WithTitle("Invite Degenz") let builder = DiscordMessageBuilder().AddEmbed(embed)