From a0fbe76422ca887d5e89be8c63e031c6781fd4aa Mon Sep 17 00:00:00 2001
From: Joseph Ferano <joseph@ferano.io>
Date: Fri, 11 Feb 2022 16:09:00 +0700
Subject: [PATCH] Don't shield up if it exists, fix messaging

---
 Bot/HackerBattle.fs | 2 +-
 Bot/Store.fs        | 2 +-
 Bot/Trainer.fs      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bot/HackerBattle.fs b/Bot/HackerBattle.fs
index 3ae8995..e8b3a74 100644
--- a/Bot/HackerBattle.fs
+++ b/Bot/HackerBattle.fs
@@ -257,7 +257,7 @@ type HackerGame() =
             battleFn ctx
         | _ ->
             task {
-                let msg = $"You must go to <#{GuildEnvironment.channelBattle}> channel to hack or shield up for real"
+                let msg = $"You must go to <#{GuildEnvironment.channelBattle}> channel to hack, shield, or check your arsenal"
                 do! Messaging.sendSimpleResponse ctx msg
             }
 
diff --git a/Bot/Store.fs b/Bot/Store.fs
index 0d9433d..332318e 100644
--- a/Bot/Store.fs
+++ b/Bot/Store.fs
@@ -106,7 +106,7 @@ type Store() =
         | id when id = GuildEnvironment.channelArmory -> storeFn ctx
         | _ ->
             task {
-                let msg = $"You must go to <#{GuildEnvironment.channelArmory}> channel to buy/sell or check your arsenal"
+                let msg = $"You must go to <#{GuildEnvironment.channelArmory}> channel to buy or sell weapons"
                 do! Messaging.sendSimpleResponse ctx msg
             }
 
diff --git a/Bot/Trainer.fs b/Bot/Trainer.fs
index a558818..5427d46 100644
--- a/Bot/Trainer.fs
+++ b/Bot/Trainer.fs
@@ -190,7 +190,7 @@ let handleAttack (event : ComponentInteractionCreateEventArgs) =
                                       }
                                   ActionId = defaultHack.Id
                                 }
-                                if not hasShields then {
+                                if not hasShields && Array.exists (fun act -> act.ActionId = freeShield.Id) player.Actions |> not then {
                                     Action.Timestamp = System.DateTime.UtcNow
                                     Action.Type = Defense
                                     Action.ActionId = freeShield.Id