diff --git a/Bot/Bot.fs b/Bot/Bot.fs index 2d8ce5e..b2d32fc 100644 --- a/Bot/Bot.fs +++ b/Bot/Bot.fs @@ -111,7 +111,7 @@ slotsBot.ConnectAsync() |> Async.AwaitTask |> Async.RunSynchronously //if guild <> 922419263275425832uL then // Trainer.sendInitialEmbed hackerBattleBot // InviteTracker.sendInitialEmbed inviterBot -SlotMachine.sendInitialEmbed slotsBot +//SlotMachine.sendInitialEmbed slotsBot let rec loop areBotsRunning = async { diff --git a/Bot/Games/SlotMachine.fs b/Bot/Games/SlotMachine.fs index 20a6ed3..38fe33e 100644 --- a/Bot/Games/SlotMachine.fs +++ b/Bot/Games/SlotMachine.fs @@ -23,17 +23,30 @@ let slots = // "https://s7.gifyu.com/images/ramen.png" // "https://s7.gifyu.com/images/rat.png" //|] +// [| +// "https://s7.gifyu.com/images/A-bottle-of-pills0a3006d0170e08df.png" +// "https://s7.gifyu.com/images/an-eyec362d8152ae2382b.png" +// "https://s7.gifyu.com/images/anon-face-mask6c7624821c89fc08.png" +// "https://s7.gifyu.com/images/a-piece-of-sushi77071d30f60a89c6.png" +// "https://s7.gifyu.com/images/Circuit-board89056017b80f1d13.png" +// "https://s7.gifyu.com/images/OBEYf2a8234109836c03.png" +// "https://s7.gifyu.com/images/old-tv-screendc6bc9d4b6c1fd65.png" +// "https://s7.gifyu.com/images/pizza030ffc00ff50da0e.png" +// "https://s7.gifyu.com/images/ramen08336d448018c98f.png" +// "https://s7.gifyu.com/images/rat14f65f54f0d75036.png" +//|] + [| - "https://s7.gifyu.com/images/A-bottle-of-pills0a3006d0170e08df.png" - "https://s7.gifyu.com/images/an-eyec362d8152ae2382b.png" - "https://s7.gifyu.com/images/anon-face-mask6c7624821c89fc08.png" - "https://s7.gifyu.com/images/a-piece-of-sushi77071d30f60a89c6.png" - "https://s7.gifyu.com/images/Circuit-board89056017b80f1d13.png" - "https://s7.gifyu.com/images/OBEYf2a8234109836c03.png" - "https://s7.gifyu.com/images/old-tv-screendc6bc9d4b6c1fd65.png" - "https://s7.gifyu.com/images/pizza030ffc00ff50da0e.png" - "https://s7.gifyu.com/images/ramen08336d448018c98f.png" - "https://s7.gifyu.com/images/rat14f65f54f0d75036.png" + "<:sushi:>" + "<:pizza:>" + "<:ramen:>" + "<:circuitboard:>" + "<:obey:>" + "<:pills:>" + "<:oldtv:>" + "<:rat:>" + "<:aneye:>" + "<:anon:>" |] let slotsLocal = [| @@ -68,12 +81,12 @@ let spin (ctx : IDiscordContext) = then do! DbService.updatePlayerCurrency twoOfAKindPrize player |> Async.Ignore else do! DbService.updatePlayerCurrency -PlayPrice player |> Async.Ignore - let embed1 = DiscordEmbedBuilder() - embed1.ImageUrl <- slots.[results.[0]] - let embed2 = DiscordEmbedBuilder() - embed2.ImageUrl <- slots.[results.[1]] - let embed3 = DiscordEmbedBuilder() - embed3.ImageUrl <- slots.[results.[2]] +// let embed1 = DiscordEmbedBuilder() +// embed1.ImageUrl <- slots.[results.[0]] +// let embed2 = DiscordEmbedBuilder() +// embed2.ImageUrl <- slots.[results.[1]] +// let embed3 = DiscordEmbedBuilder() +// embed3.ImageUrl <- slots.[results.[2]] let embed4 = DiscordEmbedBuilder() embed4.Title <- "Slot Machine" embed4.Description <- "You hit the jackpot!" @@ -88,44 +101,27 @@ let spin (ctx : IDiscordContext) = builder.Content <- "Spinning!" builder.IsEphemeral <- true + let emojis = ctx.GetGuild().Emojis |> Seq.map (fun kvp -> kvp.Value) |> Seq.toArray + + let! followUp = iCtx.CreateFollowupMessageAsync(builder) |> Async.AwaitTask do! Async.Sleep 1500 - use f1 = new FileStream(slotsLocal.[0], FileMode.Open) - let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().AddFile(f1)) |> Async.AwaitTask + let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().WithContent(Formatter.Emoji(emojis.[results.[0]]))) |> Async.AwaitTask do! Async.Sleep 1500 - use f2 = new FileStream(slotsLocal.[1], FileMode.Open) - let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().AddFile(f2)) |> Async.AwaitTask + let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().WithContent($"{Formatter.Emoji(emojis.[results.[0]])}{Formatter.Emoji(emojis.[results.[1]])}")) |> Async.AwaitTask do! Async.Sleep 1500 - use f3 = new FileStream(slotsLocal.[2], FileMode.Open) - let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().AddFile(f3)) |> Async.AwaitTask - + let! asdf = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder() + .WithContent($"{Formatter.Emoji(emojis.[results.[0]])}{Formatter.Emoji(emojis.[results.[1]])}{Formatter.Emoji(emojis.[results.[2]])}") + .AddEmbed(embed4) + ) |> Async.AwaitTask do! Async.Sleep 1500 - let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().AddEmbed(embed1)) |> Async.AwaitTask - do! Async.Sleep 1500 - let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().AddEmbeds([embed1.Build() ; embed2.Build()])) |> Async.AwaitTask - do! Async.Sleep 1500 - let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().AddEmbeds([embed1.Build() ; embed2.Build() ; embed3.Build() ])) |> Async.AwaitTask - do! Async.Sleep 1500 - let! _ = iCtx.EditFollowupMessageAsync(followUp.Id, DiscordWebhookBuilder().AddEmbeds([embed1.Build() ; embed2.Build() ; embed3.Build() ; embed4.Build() ])) |> Async.AwaitTask + let builder = DiscordFollowupMessageBuilder() + builder.AddEmbeds([ embed4.Build() ]) |> ignore + builder.IsEphemeral <- true +// let! _ = iCtx.CreateFollowupMessageAsync(builder) |> Async.AwaitTask return () -// do! Async.Sleep sleepTime -// let builder = DiscordFollowupMessageBuilder() -// let embed = DiscordEmbedBuilder() -// embed.ImageUrl <- slots.[results.[0]] -// builder.AddEmbed(embed.Build()) |> ignore -// -// do! Async.Sleep sleepTime -// let builder = DiscordFollowupMessageBuilder() -// embed.ImageUrl <- slots.[results.[1]] -// builder.AddEmbed(embed.Build()) |> ignore -// -// do! Async.Sleep sleepTime -// let builder = DiscordFollowupMessageBuilder() -// embed.ImageUrl <- slots.[results.[2]] -// builder.AddEmbed(embed.Build()) |> ignore -// // if winConditions then // do! Async.Sleep sleepTime // let builder = DiscordFollowupMessageBuilder()