Don't shield up if it exists, fix messaging

This commit is contained in:
Joseph Ferano 2022-02-11 16:09:00 +07:00
parent 785660558d
commit a0fbe76422
3 changed files with 3 additions and 3 deletions

View File

@ -257,7 +257,7 @@ type HackerGame() =
battleFn ctx battleFn ctx
| _ -> | _ ->
task { 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 do! Messaging.sendSimpleResponse ctx msg
} }

View File

@ -106,7 +106,7 @@ type Store() =
| id when id = GuildEnvironment.channelArmory -> storeFn ctx | id when id = GuildEnvironment.channelArmory -> storeFn ctx
| _ -> | _ ->
task { 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 do! Messaging.sendSimpleResponse ctx msg
} }

View File

@ -190,7 +190,7 @@ let handleAttack (event : ComponentInteractionCreateEventArgs) =
} }
ActionId = defaultHack.Id 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.Timestamp = System.DateTime.UtcNow
Action.Type = Defense Action.Type = Defense
Action.ActionId = freeShield.Id Action.ActionId = freeShield.Id