From 892db88c2014310bc5ad324bce33c9111556255c Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Sun, 1 May 2022 17:47:14 +0700 Subject: [PATCH] Update trainer db --- Bot/DbService.fs | 10 +++++----- Bot/Games/Trainer.fs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Bot/DbService.fs b/Bot/DbService.fs index dec6bb4..5a1a177 100644 --- a/Bot/DbService.fs +++ b/Bot/DbService.fs @@ -269,8 +269,8 @@ let addAchievement (did : uint64) (achievement : string) = [ ( "did" , Sql.string (string did) ) ( "symbol", Sql.string achievement ) ] |> Sql.query """ - WITH ach AS (SELECT id FROM achievement WHERE symbol = cast(@symbol AS achievement_symbol_enum)), - usr AS (SELECT id FROM "user" WHERE discord_id = @did) + WITH ach AS (SELECT id FROM achievement WHERE id = @symbol), + usr AS (SELECT id FROM "user" WHERE id = @did) INSERT INTO user_achievements_achievement (user_id, achievement_id) SELECT usr.id, ach.id FROM usr, ach; """ |> Sql.executeNonQueryAsync @@ -284,9 +284,9 @@ let checkHasAchievement (did : uint64) (achievement : string) = async { [ ( "did" , Sql.string (string did) ) ( "symbol", Sql.string achievement ) ] |> Sql.query """ - WITH ach AS (SELECT id FROM achievement WHERE symbol = cast(@symbol AS achievement_symbol_enum)), - usr AS (SELECT id FROM "user" WHERE discord_id = @did) - SELECT achievement_id FROM user_achievements_achievement, ach, usr WHERE user_id = usr.id and achievement_id = ach.id; + WITH ach AS (SELECT id FROM achievement WHERE id = @symbol), + usr AS (SELECT id FROM "user" WHERE id = @did) + SELECT achievement_id FROM user_achievements_achievement, ach, usr WHERE user_id = usr.id AND achievement_id = ach.id; """ |> Sql.executeAsync (fun read -> read.int "achievement_id") |> Async.AwaitTask diff --git a/Bot/Games/Trainer.fs b/Bot/Games/Trainer.fs index 7a32086..a880dbc 100644 --- a/Bot/Games/Trainer.fs +++ b/Bot/Games/Trainer.fs @@ -7,7 +7,7 @@ open DSharpPlus.Entities open Degenz.Types open Degenz.Messaging -let TrainerAchievement = "FINISHED_TRAINER" +let TrainerAchievement = "LEARN_TO_HACKER_BATTLE_QUEST_COMPLETED" let Sensei = { Id = GuildEnvironment.botIdHackerBattle ; Name = "Sensei" } let weapons = DbService.getWeapons () |> Async.RunSynchronously let hackItem = weapons |> Inventory.findItemById (int ItemId.Virus)