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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Joseph Ferano 2022-07-19 14:45:44 +07:00
commit 9cf0b0b4fe
3 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Bot/Embeds.fs
View File

@ -75,7 +75,7 @@ let pickHack actionId attacker defender bonus isTrainer =
**{defender.Name}** has `{defender.Bank} 💰$GBT` we can take from them. **{defender.Name}** has `{defender.Bank} 💰$GBT` we can take from them.
**__Your Strength:__** **__Your Strength:__**
`💪 {attacker.Stats.Strength.Amount}` `💪 {attacker.Stats.Strength.Amount}`
**__Their Strength:__** **__Their Strength:__**
`💪 {defender.Stats.Strength.Amount}` `💪 {defender.Stats.Strength.Amount}`
@ -130,37 +130,26 @@ let responseSuccessfulHack (hacker : PlayerData) (target : PlayerData) totalTake
let responseSuccessfulHack2 successful (hacker : PlayerData) (target : PlayerData) (hackerMember : DiscordMember) (targetMember : DiscordMember) totalTaken bonus (hack : HackItem) = let responseSuccessfulHack2 successful (hacker : PlayerData) (target : PlayerData) (hackerMember : DiscordMember) (targetMember : DiscordMember) totalTaken bonus (hack : HackItem) =
let hackerEmbed = let hackerEmbed =
if successful then if successful then
// Put how much they lost and if they lost it all, say it
let lostMsg = if target.Bank - totalTaken = 0<GBT> then "all their $GBT" else $"`{totalTaken} $GBT`"
let e = let e =
DiscordEmbedBuilder() DiscordEmbedBuilder()
.WithAuthor($"✅ {hacker.Name} Hack Successful!" , iconUrl = hackerMember.AvatarUrl) .WithDescription($"Successfully hacked **{target.Name}** and took {lostMsg}!")
.WithAuthor($"✅ {hacker.Name}" , iconUrl = hackerMember.GuildAvatarUrl)
.WithColor(DiscordColor.Green) .WithColor(DiscordColor.Green)
.AddField("Strength", $"{hacker.Stats.Strength.Amount} 💪", true) .AddField("Strength 💪", $"{hacker.Stats.Strength.Amount} vs {target.Stats.Strength.Amount}", true)
.AddField($"Hacked", $"`{totalTaken} 💰$GBT`", true)
if bonus > 0<GBT> then e.AddField($"Strength Bonus", $"`{bonus} 💰$GBT`", true) |> ignore if bonus > 0<GBT> then e.AddField($"Strength Bonus", $"`{bonus} 💰$GBT`", true) |> ignore
e.AddField("New $GBT Balance", $"`💰` {hacker.Bank} ⋙ `💰` {hacker.Bank + totalTaken} `(+{totalTaken} $GBT)`", true) e.AddField("New $GBT Balance", $"`💰` {hacker.Bank + totalTaken} `(+{totalTaken} $GBT)`", true)
else else
let lostMsg = if hacker.Bank - totalTaken = 0<GBT> then "all their $GBT" else $"`{totalTaken} $GBT`"
DiscordEmbedBuilder() DiscordEmbedBuilder()
.WithAuthor(name = $"❌ {hacker.Name} Hack Failed!" , iconUrl = hackerMember.AvatarUrl) .WithAuthor(name = $"❌ {hacker.Name}" , iconUrl = hackerMember.GuildAvatarUrl)
.AddField("Strength", $"{hacker.Stats.Strength.Amount} 💪", true) .WithDescription($"Failed to hack **{target.Name}** and lost {lostMsg}!")
.AddField("New $GBT Balance", $"`💰` {hacker.Bank} ⋙ `💰` {hacker.Bank - totalTaken} `(-{totalTaken} $GBT)`", true) .AddField("Strength 💪", $"{hacker.Stats.Strength.Amount} vs {target.Stats.Strength.Amount}", true)
.AddField("New $GBT Balance", $"`💰` {hacker.Bank - totalTaken} `(-{totalTaken} $GBT)`", true)
.WithColor(DiscordColor.Red) .WithColor(DiscordColor.Red)
let defenderEmbed = DiscordMessageBuilder().AddEmbed(hackerEmbed)
if successful then
DiscordEmbedBuilder()
.WithAuthor(name = target.Name , iconUrl = targetMember.AvatarUrl)
.AddField("Strength", $"{target.Stats.Strength.Amount} 💪", true)
.AddField("New $GBT Balance", $"`💰` {target.Bank} ⋙ `💰` {target.Bank - totalTaken} `(-{totalTaken} $GBT)`", true)
.WithColor(DiscordColor.Red)
else
DiscordEmbedBuilder()
.WithAuthor(name = target.Name , iconUrl = targetMember.AvatarUrl)
.AddField("Strength", $"{target.Stats.Strength.Amount} 💪", true)
.AddField($"Extracted", $"`{totalTaken} 💰$GBT`", true)
.AddField("New $GBT Balance", $"`💰` {target.Bank} ⋙ `💰` {target.Bank + totalTaken} `(+{totalTaken} $GBT)`", true)
.WithColor(DiscordColor.Green)
DiscordMessageBuilder().AddEmbeds([ hackerEmbed ; defenderEmbed ] |> List.map (fun e -> e.Build()))
let responseCreatedShield (shield : ShieldItem) = let responseCreatedShield (shield : ShieldItem) =
let embed = DiscordEmbedBuilder().WithImageUrl(shield.ImageUrl) let embed = DiscordEmbedBuilder().WithImageUrl(shield.ImageUrl)

4
Bot/Games/HackerBattle.fs
View File

@ -102,8 +102,8 @@ let updateCombatants successfulHack (attacker : PlayerData) (defender : PlayerDa
Timestamp = DateTime.UtcNow Timestamp = DateTime.UtcNow
Cooldown = if isDefenderEvent then int WeaponClass.SameTargetAttackCooldown.TotalMinutes * 1<mins> else hack.Cooldown } Cooldown = if isDefenderEvent then int WeaponClass.SameTargetAttackCooldown.TotalMinutes * 1<mins> else hack.Cooldown }
[ DbService.updatePlayerCurrency prize attacker.DiscordId [ DbService.updatePlayerCurrency (if successfulHack then prize else -prize) attacker.DiscordId
DbService.updatePlayerCurrency -prize defender.DiscordId DbService.updatePlayerCurrency (if successfulHack then -prize else prize) defender.DiscordId
DbService.addPlayerEvent attacker.DiscordId (event false) DbService.addPlayerEvent attacker.DiscordId (event false)
DbService.addPlayerEvent defender.DiscordId (event true) ] DbService.addPlayerEvent defender.DiscordId (event true) ]
|> Async.Parallel |> Async.Parallel

16
Bot/InviteTracker.fs
View File

@ -347,27 +347,21 @@ let sendInitialEmbed (ctx : IDiscordContext) =
try try
let channel = ctx.GetGuild().GetChannel(GuildEnvironment.channelRecruitment) let channel = ctx.GetGuild().GetChannel(GuildEnvironment.channelRecruitment)
let rewardMsg = $""" let rewardMsg = $"""
**__Win $3,000:__** **__Invite to Earn__**
🙋 1 invite = 1 entry everyday*
🎟 $100 daily raffles till mint
**__How To Invite:__**
1️⃣ Click the green button below
2️⃣ Share your unique link with Friends
**__Bonus__**
💰 Earn an extra {InviteRewardAmount} $GBT for every invite! 💰 Earn an extra {InviteRewardAmount} $GBT for every invite!
<:purple_fist:986685279031152650> <@#{GuildEnvironment.roleRecruiter1x}> role if you invite 1 or more Degen <:purple_fist:986685279031152650> <@#{GuildEnvironment.roleRecruiter1x}> role if you invite 1 or more Degen
<:red_fist:986685280868249690> <@#{GuildEnvironment.roleRecruiter2x}> role is you invite 5 or more Degen <:red_fist:986685280868249690> <@#{GuildEnvironment.roleRecruiter2x}> role is you invite 5 or more Degen
<:gold_fist:986685276942377052> <@#{GuildEnvironment.roleRecruiter3x}> role is you invite 10 or more Degen <:gold_fist:986685276942377052> <@#{GuildEnvironment.roleRecruiter3x}> role is you invite 10 or more Degen
**Every invite increases your chances of winning* **__How To Invite:__**
1️⃣ Click the green button below
2️⃣ Share your unique link with Friends
""" """
let embed = let embed =
DiscordEmbedBuilder() DiscordEmbedBuilder()
.WithColor(DiscordColor.Gold) .WithColor(DiscordColor.Gold)
.WithDescription(rewardMsg) .WithDescription(rewardMsg)
.WithImageUrl("https://s8.gifyu.com/images/invite-banner-usdcb670496dc3653cb3.png") .WithImageUrl("https://s8.gifyu.com/images/invite_banner_new.png")
.WithTitle("Invite Degenz") .WithTitle("Invite Degenz")
let builder = DiscordMessageBuilder().AddEmbed(embed) let builder = DiscordMessageBuilder().AddEmbed(embed)