From 0f82354f8e38055cfa3596ac6e2520df712843f0 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Thu, 2 Jun 2022 23:08:14 +0700 Subject: [PATCH 1/7] Copy changes --- Bot/Embeds.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index 7e8011b..9af533f 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -67,10 +67,10 @@ 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} + `💪 {defender.Stats.Strength.Amount}` {outcomeMsg}{bonusMsg}""" else "" let embed = @@ -81,7 +81,7 @@ let pickHack actionId attacker defender bonus isTrainer = if not isTrainer then for hack in Inventory.getHacks attacker.Inventory do let amount = if hack.Power > int defender.Bank then int defender.Bank else hack.Power - embed.AddField(hack.Name, $"Cooldown {hack.Cooldown} mins\nExtract {amount} $GBT", true) |> ignore + embed.AddField(hack.Name, $"Cooldown: {hack.Cooldown} mins\nSteal Total: `{amount + bonus} $GBT`", true) |> ignore DiscordFollowupMessageBuilder() .AddComponents(buttons) From 14af51c25e0ba2b52aa4b120b943110ad52ae5c5 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Thu, 2 Jun 2022 23:15:59 +0700 Subject: [PATCH 2/7] More --- Bot/Embeds.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index 9af533f..01d4d5f 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -58,13 +58,13 @@ let pickHack actionId attacker defender bonus isTrainer = let ( outcomeMsg , bonusMsg ) = if attacker.Stats.Strength.Amount > defender.Stats.Strength.Amount then - "\nYou're stronger so you'll steal more!!!\n" , $"\n**__Potential Bonus:__**\n{bonus} 💰$GBT" + "\nYou're stronger so you'll steal more!!!\n" , $"\n**__Potential Bonus:__**\n`{bonus} 💰$GBT`" else "\nYou're not stronger than them, you need to eat more!" , "" let stealMsg = if not isTrainer then $""" - {defender.Name} has **{defender.Bank} $GBT** we can take from them. + **{defender.Name}** has `{defender.Bank} $GBT`` we can take from them. **__Your Strength:__** `💪 {attacker.Stats.Strength.Amount}` From 5166511044341b7dda82af7b87be78bb047a18b5 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Thu, 2 Jun 2022 23:25:03 +0700 Subject: [PATCH 3/7] Ugh --- Bot/Embeds.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index 01d4d5f..b633624 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -64,7 +64,7 @@ let pickHack actionId attacker defender bonus isTrainer = let stealMsg = if not isTrainer then $""" - **{defender.Name}** has `{defender.Bank} $GBT`` we can take from them. + **{defender.Name}** has `{defender.Bank} $GBT` we can take from them. **__Your Strength:__** `💪 {attacker.Stats.Strength.Amount}` From 56d253bab809fdc71eed4012d6e5601f502d8dc7 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Thu, 2 Jun 2022 23:53:55 +0700 Subject: [PATCH 4/7] Add emojis --- Bot/Embeds.fs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index b633624..afaad8f 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -1,6 +1,7 @@ module Degenz.Embeds open System +open DSharpPlus open Degenz open Degenz.Messaging open DSharpPlus.Entities @@ -42,7 +43,13 @@ let pickDefense actionId player isTrainer = for shield in Inventory.getShields player.Inventory do let hours = TimeSpan.FromMinutes(int shield.Cooldown).TotalHours |> int let against = WeaponClass.getGoodAgainst shield.Class |> snd - embed.AddField(shield.Name, $"Active {hours} hours\nDefeats {against}", true) |> ignore + let emoji = + match shield.Id with + | "FIREWALL" -> "<:firewall_shield:971620988649340989>" + | "ENCRYPTION" -> "<:encryption_shield:971620979912605727>" + | "CYPHER" -> "<:cypher_shield:971620965576503326>" + | _ -> "" + embed.AddField($"{emoji} {shield.Name}", $"Active {hours} hours\nDefeats {against}", true) |> ignore DiscordFollowupMessageBuilder() .AddComponents(buttons) @@ -81,7 +88,13 @@ let pickHack actionId attacker defender bonus isTrainer = if not isTrainer then for hack in Inventory.getHacks attacker.Inventory do let amount = if hack.Power > int defender.Bank then int defender.Bank else hack.Power - embed.AddField(hack.Name, $"Cooldown: {hack.Cooldown} mins\nSteal Total: `{amount + bonus} $GBT`", true) |> ignore + let emoji = + match hack.Id with + | "REMOTE" -> "<:remote_access:971621009981571132>" + | "VIRUS" -> "<:virus_hack:971636840580927510>" + | "WORM" -> "<:worm_hack:971636842640310312>" + | _ -> "" + embed.AddField($"{emoji} {hack.Name}", $"Cooldown: {hack.Cooldown} mins\nSteal Total: `{amount + bonus} $GBT`", true) |> ignore DiscordFollowupMessageBuilder() .AddComponents(buttons) From a80d31b40c1d9c05fd6243f08e3daa1a2146120c Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Fri, 3 Jun 2022 00:04:13 +0700 Subject: [PATCH 5/7] More info --- Bot/Embeds.fs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index afaad8f..2f298b9 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -65,7 +65,7 @@ let pickHack actionId attacker defender bonus isTrainer = let ( outcomeMsg , bonusMsg ) = if attacker.Stats.Strength.Amount > defender.Stats.Strength.Amount then - "\nYou're stronger so you'll steal more!!!\n" , $"\n**__Potential Bonus:__**\n`{bonus} 💰$GBT`" + "\nYou're stronger so you'll hack more!!!\n" , $"\n**__Potential Bonus:__**\n`{bonus} 💰$GBT`" else "\nYou're not stronger than them, you need to eat more!" , "" let stealMsg = @@ -94,7 +94,12 @@ let pickHack actionId attacker defender bonus isTrainer = | "VIRUS" -> "<:virus_hack:971636840580927510>" | "WORM" -> "<:worm_hack:971636842640310312>" | _ -> "" - embed.AddField($"{emoji} {hack.Name}", $"Cooldown: {hack.Cooldown} mins\nSteal Total: `{amount + bonus} $GBT`", true) |> ignore + let fieldMsg = $""" + **Cooldown:** {hack.Cooldown} mins + **Hack Base:** {hack.Power} + **Strength Bonus:** {bonus} + **Hack Total:** {amount + bonus} $GBT""" + embed.AddField($"{emoji} {hack.Name}", fieldMsg, true) |> ignore DiscordFollowupMessageBuilder() .AddComponents(buttons) From 1ff6a4dc28c8ddc7aa06d21df3288fda3b09ab02 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Fri, 3 Jun 2022 00:24:56 +0700 Subject: [PATCH 6/7] Assorted fixes --- Bot/Embeds.fs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index 2f298b9..61be815 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -11,6 +11,7 @@ let shieldGif = "https://s10.gifyu.com/images/Defense-Degenz-V2-min.gif" let constructButtons (actionId: string) (buttonInfo : string) (player: PlayerData) (items : Inventory) ignoreCooldown = items + |> List.sortBy (fun item -> item.Id) |> List.map (fun item -> let action = player.Events @@ -71,7 +72,7 @@ let pickHack actionId attacker defender bonus isTrainer = let stealMsg = if not isTrainer then $""" - **{defender.Name}** has `{defender.Bank} $GBT` we can take from them. + **{defender.Name}** has `{defender.Bank} 💰$GBT` we can take from them. **__Your Strength:__** `💪 {attacker.Stats.Strength.Amount}` @@ -86,7 +87,8 @@ let pickHack actionId attacker defender bonus isTrainer = .WithDescription($"{stealMsg}\n\nPick the hack you want to use.") if not isTrainer then - for hack in Inventory.getHacks attacker.Inventory do + let hacks = Inventory.getHacks attacker.Inventory |> List.sortBy (fun h -> h.Id) + for hack in hacks do let amount = if hack.Power > int defender.Bank then int defender.Bank else hack.Power let emoji = match hack.Id with @@ -95,11 +97,10 @@ let pickHack actionId attacker defender bonus isTrainer = | "WORM" -> "<:worm_hack:971636842640310312>" | _ -> "" let fieldMsg = $""" - **Cooldown:** {hack.Cooldown} mins - **Hack Base:** {hack.Power} - **Strength Bonus:** {bonus} - **Hack Total:** {amount + bonus} $GBT""" - embed.AddField($"{emoji} {hack.Name}", fieldMsg, true) |> ignore + Hack Base: `{hack.Power} 💰$GBT` + Bonus: `{bonus} 💰$GBT` + **Hack Total:** `{amount + bonus} 💰$GBT`""" + embed.AddField($"{emoji} __{hack.Name}__", fieldMsg, true) |> ignore DiscordFollowupMessageBuilder() .AddComponents(buttons) From a457382482d78214244426aab02334662c991067 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Fri, 3 Jun 2022 00:28:39 +0700 Subject: [PATCH 7/7] Boldify --- Bot/Embeds.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bot/Embeds.fs b/Bot/Embeds.fs index 61be815..be75379 100644 --- a/Bot/Embeds.fs +++ b/Bot/Embeds.fs @@ -66,9 +66,9 @@ let pickHack actionId attacker defender bonus isTrainer = let ( outcomeMsg , bonusMsg ) = if attacker.Stats.Strength.Amount > defender.Stats.Strength.Amount then - "\nYou're stronger so you'll hack more!!!\n" , $"\n**__Potential Bonus:__**\n`{bonus} 💰$GBT`" + "\nYou're **STRONGER** so you'll **HACK MORE!!!**\n" , $"\n**__Potential Bonus:__**\n`{bonus} 💰$GBT`" else - "\nYou're not stronger than them, you need to eat more!" , "" + "\nYou're **NOT STRONGER** than them, you need to **EAT MORE!**" , "" let stealMsg = if not isTrainer then $"""