diff --git a/Bot/Games/HackerBattle.fs b/Bot/Games/HackerBattle.fs index c693712..0b3ccfe 100644 --- a/Bot/Games/HackerBattle.fs +++ b/Bot/Games/HackerBattle.fs @@ -66,7 +66,7 @@ let checkPlayerHasShieldSlotsAvailable player = let checkTargetHasFunds target player = match target.Bank <= 0 with - | true -> Error $"Looks like the poor bastard has no $GBT... pick a different victim." + | true -> Error $"Looks like the poor bastard has no 💰$GBT... pick a different victim." | false -> Ok player let strengthBonus attacker defender = @@ -129,13 +129,13 @@ let successfulHack (ctx : IDiscordContext) attacker defender (hack : HackItem) = let failedHack (ctx : IDiscordContext) attacker defender (hack : HackItem) = async { let lostAmount = if hack.Power < int attacker.Bank then hack.Power else int attacker.Bank - let msg = $"Hack failed! {defender.Name} was able to mount a successful defense! You lost {lostAmount} $GBT!" + let msg = $"Hack failed! {defender.Name} was able to mount a successful defense! You lost {lostAmount} 💰$GBT!" do! sendFollowUpMessage ctx msg do! updateCombatants false attacker defender hack (-lostAmount * 1) let builder = DiscordMessageBuilder() - builder.WithContent($"Hacking attempt failed! <@{defender.DiscordId}> defended hack from {ctx.GetDiscordMember().Username} and took {lostAmount} $GBT from them! ") |> ignore + builder.WithContent($"Hacking attempt failed! **{defender.Name}** defended hack from **{ctx.GetDiscordMember().Username}** and took {lostAmount} 💰$GBT from them! <@!{defender.DiscordId}>") |> ignore let channel = (ctx.GetGuild().GetChannel(GuildEnvironment.channelEventsHackerBattle)) do! channel.SendMessageAsync(builder) |> Async.AwaitTask @@ -223,7 +223,7 @@ let handleDefense (ctx : IDiscordContext) = } do! DbService.addPlayerEvent p.DiscordId defense |> Async.Ignore let builder = DiscordMessageBuilder() - builder.WithContent($"{ctx.GetDiscordMember().Username} has protected their system!") |> ignore + builder.WithContent($"**{ctx.GetDiscordMember().Username}** has protected their system!") |> ignore let channel = ctx.GetGuild().GetChannel(GuildEnvironment.channelEventsHackerBattle) do! channel.SendMessageAsync(builder) |> Async.AwaitTask diff --git a/Bot/InviteTracker.fs b/Bot/InviteTracker.fs index a1887bb..9a85a64 100644 --- a/Bot/InviteTracker.fs +++ b/Bot/InviteTracker.fs @@ -246,7 +246,7 @@ let getInvitedUsersForId (user : DiscordUser) (ctx : IDiscordContext) = let mutable count = 0 for user in users do count <- count + 1 - sb.AppendLine($"{count}.) <@{user}>") |> ignore + sb.AppendLine($"{count}.) <@!{user}>") |> ignore let msg = let str = if users.Length > 0 then @@ -300,7 +300,7 @@ let acceptInvite (guild : DiscordGuild) discordId memberName = do! match GuildEnvironment.botClientRecruit with | Some recruitBot -> async { let builder = DiscordMessageBuilder() - builder.WithContent($"{memberName} was recruited and is now a Degen. <@{player.DiscordId}> just earned {InviteRewardAmount} 💰$GBT for their efforts!") |> ignore + builder.WithContent($"{memberName} was recruited and is now a Degen. **{player.Name}** just earned `{InviteRewardAmount} 💰$GBT` for their efforts! - <@!{player.DiscordId}>") |> ignore let channel = guild.GetChannel(GuildEnvironment.channelEventsHackerBattle) do! recruitBot.SendMessageAsync(channel, builder) |> Async.AwaitTask @@ -327,7 +327,7 @@ let sendInitialEmbed (ctx : IDiscordContext) = 2️⃣ Share your unique link with Degenz **__Bonus__** -💰 Earn an extra 100 $GBT for every invite! +💰 Earn an extra 100 💰$GBT for every invite! **Every invite increases your chances of winning* """ @@ -498,7 +498,7 @@ let submitAddress (address : string) (ctx : IDiscordContext) = Keep an eye on <#{GuildEnvironment.channelAnnouncements}> for updates.""" let builder = DiscordMessageBuilder() - builder.WithContent($"{ctx.GetDiscordMember().Username} submitted their wallet address in <#{GuildEnvironment.channelSubmitWallet}> and confirmed whitelist") |> ignore + builder.WithContent($"**{ctx.GetDiscordMember().Username}** submitted their wallet address in <#{GuildEnvironment.channelSubmitWallet}> and confirmed whitelist") |> ignore let channel = (ctx.GetGuild().GetChannel(GuildEnvironment.channelEventsHackerBattle)) do! channel.SendMessageAsync(builder) |> Async.AwaitTask