diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index 3a32f5a..f9ec22a 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -128,49 +128,39 @@ let responseSuccessfulHack (hacker : PlayerData) (target : PlayerData) totalTake .AsEphemeral(true) let responseSuccessfulHack2 successful (hacker : PlayerData) (target : PlayerData) (hackerMember : DiscordMember) (targetMember : DiscordMember) totalTaken bonus (hack : HackItem) = - let earnedMoney = totalTaken > 0 - - let title = if successful then $"✅ {hacker.Name} Hacked Successful!" else $"❌ {target.Name} Hack Failed!" - - let embed1 = - DiscordEmbedBuilder() - .WithColor(DiscordColor.Blurple) - .WithTitle(title) - - if successful then - if earnedMoney then embed1.AddField($"Total Hacked", $"`{totalTaken} 💰$GBT`", true) |> ignore - else - if earnedMoney then embed1.AddField($"Defender Extracted", $"`{totalTaken} 💰$GBT`", true) |> ignore - - if bonus > 0 then embed1.AddField("Bonus", $"`{bonus}` 💰$GBT", true) |> ignore - - let h = ( hacker.Name , hackerMember.AvatarUrl ) - let t = ( target.Name , targetMember.AvatarUrl ) - let winner = if successful then h else t - let loser = if successful then t else h - let winnerEmbed = - DiscordEmbedBuilder() - .WithAuthor(name = fst winner , iconUrl = snd winner) - .WithColor(DiscordColor.Green) + let hackerEmbed = + if successful then + let e = + DiscordEmbedBuilder() + .WithAuthor($"✅ {hacker.Name} Hack Successful!" , iconUrl = hackerMember.AvatarUrl) + .WithColor(DiscordColor.Green) + .AddField("Strength", $"{hacker.Stats.Strength.Amount} 💪", true) + .AddField($"Hacked", $"`{totalTaken} 💰$GBT`", 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) + else + 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) + .WithColor(DiscordColor.Red) - let loserEmbed = - DiscordEmbedBuilder() - .WithAuthor(name = fst loser , iconUrl = snd loser) - .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) - let h = ( hacker.Stats.Strength.Amount , hacker.Bank ) - let t = ( target.Stats.Strength.Amount , target.Bank ) - let winner = if successful then h else t - let loser = if successful then t else h - winnerEmbed.AddField("Strength", $"{fst winner} 💪", true) |> ignore - winnerEmbed.AddField("New $GBT Balance", $"`💰` {snd winner} ⋙ `💰` {(snd winner) + totalTaken} `(+{totalTaken} $GBT)`", true) |> ignore - loserEmbed.AddField("Strength", $"{fst loser} 💪", true) |> ignore - loserEmbed.AddField("New $GBT Balance", $"`💰` {snd loser} ⋙ `💰` {(snd loser) - totalTaken} `(-{totalTaken} $GBT)`", true) |> ignore - let embeds = - if successful - then [ embed1 ; winnerEmbed ; loserEmbed ] |> List.map (fun e -> e.Build()) - else [ embed1 ; loserEmbed ; winnerEmbed ] |> List.map (fun e -> e.Build()) - DiscordMessageBuilder().AddEmbeds(embeds) + DiscordMessageBuilder().AddEmbeds([ hackerEmbed ; defenderEmbed ] |> List.map (fun e -> e.Build())) let responseCreatedShield (shield : ShieldItem) = let embed = DiscordEmbedBuilder().WithImageUrl(shield.ImageUrl)