JosephFerano/discord-bot-game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs with redpill, cooldowns, and store

Browse Source
This commit is contained in:
Joseph Ferano 2022-01-24 03:53:14 +07:00
parent b501dfbb73
commit 2553d789d1
3 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Bot/HackerBattle.fs
View File

@ -9,6 +9,15 @@ open DSharpPlus.SlashCommands
open Degenz open Degenz
open Degenz.Shared open Degenz.Shared
let getTimeTillCooldownFinishes (timespan : TimeSpan) timestamp =
let timeRemaining = timespan - (DateTime.UtcNow - timestamp)
if timeRemaining.Hours > 0 then
$"{timeRemaining.Hours} hours"
elif timeRemaining.Minutes > 0 then
$"{timeRemaining.Minutes} minutes"
else
$"{timeRemaining.Seconds} seconds"
let checkForExistingHack attacker defenderId = let checkForExistingHack attacker defenderId =
let updatedAttacks = let updatedAttacks =
attacker.Attacks attacker.Attacks
@ -17,8 +26,8 @@ let checkForExistingHack attacker defenderId =
|> Array.tryFind (fun a -> a.Target.Id = defenderId) |> Array.tryFind (fun a -> a.Target.Id = defenderId)
|> function |> function
| Some attack -> | Some attack ->
let timeRemaining = TimeSpan.FromHours(24) - (DateTime.UtcNow - attack.Timestamp) let cooldown = getTimeTillCooldownFinishes (TimeSpan.FromHours(24)) attack.Timestamp
Error $"You can only hack the same target once every 24 hours, wait {timeRemaining.Seconds} seconds to attempt another hack on {attack.Target.Name}." Error $"You can only hack the same target once every 24 hours, wait {cooldown} to attempt another hack on {attack.Target.Name}."
| None -> | None ->
Ok updatedAttacks Ok updatedAttacks
@ -28,12 +37,12 @@ let checkIfHackHasCooldown hack updatedAttacks =
|> Array.tryFind (fun a -> a.HackType = hack) |> Array.tryFind (fun a -> a.HackType = hack)
|> function |> function
| Some a -> a.Timestamp | Some a -> a.Timestamp
| None -> DateTime.UtcNow | None -> DateTime.MinValue
if DateTime.UtcNow - mostRecentHackAttack <= TimeSpan.FromMinutes(5) then if DateTime.UtcNow - mostRecentHackAttack > TimeSpan.FromMinutes(5) then
Ok updatedAttacks Ok updatedAttacks
else else
let timeRemaining = TimeSpan.FromMinutes(5) - (DateTime.UtcNow - mostRecentHackAttack) let cooldown = getTimeTillCooldownFinishes (TimeSpan.FromMinutes(5)) mostRecentHackAttack
Error $"You can only attack once a minute, wait {timeRemaining.Seconds} seconds to attack again." Error $"{hack} is currently on cooldown, wait {cooldown} to use it again."
let calculateDamage (hack: int) (shield: int) = let calculateDamage (hack: int) (shield: int) =
let hackClass = getClass hack let hackClass = getClass hack
@ -43,7 +52,7 @@ let calculateDamage (hack: int) (shield: int) =
| h, p when h = p -> Weak | h, p when h = p -> Weak
| _ -> Strong | _ -> Strong
let runHackerBattle attacker defender hack = let runHackerBattle defender hack =
defender.Defenses defender.Defenses
|> removeExpiredActions (TimeSpan.FromHours(6)) (fun (pro : Defense) -> pro.Timestamp) |> removeExpiredActions (TimeSpan.FromHours(6)) (fun (pro : Defense) -> pro.Timestamp)
|> Seq.toArray |> Seq.toArray
@ -70,8 +79,7 @@ let successfulHack (event : ComponentInteractionCreateEventArgs) attacker defend
let builder = DiscordInteractionResponseBuilder() let builder = DiscordInteractionResponseBuilder()
builder.IsEphemeral <- true builder.IsEphemeral <- true
builder.Content <- $"Successfully hacked {defender.Name} using {hack}! You just won {prize} GoodBoyTokenz!" builder.Content <- $"Successfully hacked {defender.Name} using {hack}! You just won {prize} GoodBoyTokenz!"
// TODO: Don't make this an Update do! event.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder)
do! event.Interaction.CreateResponseAsync(InteractionResponseType.UpdateMessage, builder)
|> Async.AwaitTask |> Async.AwaitTask
let builder = Embeds.eventSuccessfulHack event defender.DiscordId prize let builder = Embeds.eventSuccessfulHack event defender.DiscordId prize
@ -87,7 +95,7 @@ let failedHack (event : ComponentInteractionCreateEventArgs) attacker defender h
let prize = 2 let prize = 2
builder.IsEphemeral <- true builder.IsEphemeral <- true
builder.Content <- $"Hack failed! {defender.Name} was able to mount a successful defense! You lost {prize} GoodBoyTokenz!" builder.Content <- $"Hack failed! {defender.Name} was able to mount a successful defense! You lost {prize} GoodBoyTokenz!"
do! event.Interaction.CreateResponseAsync(InteractionResponseType.UpdateMessage, builder) do! event.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder)
|> Async.AwaitTask |> Async.AwaitTask
do! updateCombatants attacker defender hack -prize do! updateCombatants attacker defender hack -prize
@ -113,7 +121,10 @@ let attack (ctx : InteractionContext) (target : DiscordUser) =
do! ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, embed) do! ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, embed)
|> Async.AwaitTask |> Async.AwaitTask
| Error msg -> | Error msg ->
let builder = DiscordInteractionResponseBuilder().WithContent(msg).AsEphemeral(true) let builder =
DiscordInteractionResponseBuilder()
.WithContent(msg)
.AsEphemeral(true)
do! ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder) do! ctx.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder)
|> Async.AwaitTask |> Async.AwaitTask
| None , _ -> do! notYetAHackerMsg ctx | None , _ -> do! notYetAHackerMsg ctx
@ -136,13 +147,16 @@ let handleAttack (event : ComponentInteractionCreateEventArgs) =
|> Result.bind (checkIfHackHasCooldown hack) |> Result.bind (checkIfHackHasCooldown hack)
|> function |> function
| Ok _ -> | Ok _ ->
runHackerBattle attacker defender hack runHackerBattle defender hack
|> function |> function
| false -> successfulHack event attacker defender hack | false -> successfulHack event attacker defender hack
| true -> failedHack event attacker defender hack | true -> failedHack event attacker defender hack
| Error msg -> | Error msg ->
let builder = DiscordInteractionResponseBuilder() let builder =
event.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder.WithContent(msg)) DiscordInteractionResponseBuilder()
.WithContent(msg)
.AsEphemeral(true)
event.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder)
|> Async.AwaitTask |> Async.AwaitTask
| _ -> | _ ->
let builder = DiscordInteractionResponseBuilder() let builder = DiscordInteractionResponseBuilder()
@ -201,19 +215,17 @@ let handleDefense (event : ComponentInteractionCreateEventArgs) =
let builder = DiscordInteractionResponseBuilder() let builder = DiscordInteractionResponseBuilder()
builder.IsEphemeral <- true builder.IsEphemeral <- true
let timestamp = updatedDefenses |> Array.rev |> Array.head |> fun a -> a.Timestamp // This should be the next expiring timestamp let timestamp = updatedDefenses |> Array.rev |> Array.head |> fun a -> a.Timestamp // This should be the next expiring timestamp
let timeRemaining = TimeSpan.FromMinutes(15) - (DateTime.UtcNow - timestamp) let cooldown = getTimeTillCooldownFinishes (TimeSpan.FromHours(6)) timestamp
let hours = if timeRemaining.Hours > 0 then $"{timeRemaining.Hours} hours and " else "" builder.Content <- $"You are only allowed two shields at a time. Wait {cooldown} minutes to add another shield"
builder.Content <- $"You are only allowed two shields at a time. Wait {hours}{timeRemaining.Minutes} minutes to add another shield" do! event.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder)
do! event.Interaction.CreateResponseAsync(InteractionResponseType.UpdateMessage, builder)
|> Async.AwaitTask |> Async.AwaitTask
do! DbService.updatePlayer <| { player with Defenses = updatedDefenses } do! DbService.updatePlayer <| { player with Defenses = updatedDefenses }
| true , _ -> | true , _ ->
let builder = DiscordInteractionResponseBuilder() let builder = DiscordInteractionResponseBuilder()
builder.IsEphemeral <- true builder.IsEphemeral <- true
let timestamp = updatedDefenses |> Array.find (fun d -> d.DefenseType = shield) |> fun a -> a.Timestamp let timestamp = updatedDefenses |> Array.find (fun d -> d.DefenseType = shield) |> fun a -> a.Timestamp
let timeRemaining = TimeSpan.FromMinutes(15) - (DateTime.UtcNow - timestamp) let cooldown = getTimeTillCooldownFinishes (TimeSpan.FromHours(6)) timestamp
let hours = if timeRemaining.Hours > 0 then $"{timeRemaining.Hours} hours and " else "" builder.Content <- $"{shield} shield is already in use. Wait {cooldown} minutes to use this shield again"
builder.Content <- $"{shield} shield is already in use. Wait {hours}{timeRemaining.Minutes} minutes to use this shield again"
do! event.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder) do! event.Interaction.CreateResponseAsync(InteractionResponseType.ChannelMessageWithSource, builder)
|> Async.AwaitTask |> Async.AwaitTask
do! DbService.updatePlayer <| { player with Defenses = updatedDefenses } do! DbService.updatePlayer <| { player with Defenses = updatedDefenses }

18
Bot/PlayerInteractions.fs
View File

@ -40,13 +40,13 @@ module Commands =
| Some _ -> async.Return false | Some _ -> async.Return false
| None -> | None ->
async { async {
do! newPlayer ctx.Member.Username ctx.Member.Id do! newPlayer ctx.Member.DisplayName ctx.Member.Id
|> DbService.insertNewPlayer |> DbService.insertNewPlayer
for role in ctx.Guild.Roles do // for role in ctx.Guild.Roles do
if role.Value.Name = "Hacker" then // if role.Value.Name = "Hacker" then
do! ctx.Member.GrantRoleAsync(role.Value) // do! ctx.Member.GrantRoleAsync(role.Value)
|> Async.AwaitTask // |> Async.AwaitTask
return true return true
} }
@ -64,10 +64,10 @@ module Commands =
let removeHackerRole (ctx : InteractionContext) = let removeHackerRole (ctx : InteractionContext) =
async { async {
for role in ctx.Member.Roles do // for role in ctx.Member.Roles do
if role.Name = "Hacker" then // if role.Name = "Hacker" then
do! ctx.Member.RevokeRoleAsync(role) // do! ctx.Member.RevokeRoleAsync(role)
|> Async.AwaitTask // |> Async.AwaitTask
do! DbService.removePlayer ctx.Member.Id do! DbService.removePlayer ctx.Member.Id

2
Bot/Store.fs
View File

@ -148,7 +148,7 @@ let handleSellButtonEvents (_ : DiscordClient) (event : ComponentInteractionCrea
let itemName = split.[1] let itemName = split.[1]
match itemType with match itemType with
| ItemType.Hack -> do! sellItem event updateHacks player player.Weapons ItemType.Hack itemName | ItemType.Hack -> do! sellItem event updateHacks player player.Weapons ItemType.Hack itemName
| ItemType.Shield -> do! sellItem event updateShields player player.Shields ItemType.Hack itemName | ItemType.Shield -> do! sellItem event updateShields player player.Shields ItemType.Shield itemName
| None -> | None ->
let builder = DiscordInteractionResponseBuilder() let builder = DiscordInteractionResponseBuilder()
builder.IsEphemeral <- true builder.IsEphemeral <- true