Merge branch 'master' into staging

This commit is contained in:
Joseph Ferano 2022-04-18 13:58:06 +07:00
commit 5c62792af6

View File

@ -232,9 +232,10 @@ let scan (ctx : IDiscordContext) =
let! targets = DbService.getRandomHackablePlayers (ctx.GetDiscordMember().Id) let! targets = DbService.getRandomHackablePlayers (ctx.GetDiscordMember().Id)
let targets = let targets =
let hackedIds = let hackedIds =
player.Events player
|> List.choose (fun e -> |> Player.removeExpiredActions
match e.Type with | Hacking hack -> Some hack.Adversary.Id | _ -> None) |> fun p -> p.Events
|> List.choose (fun e -> match e.Type with | Hacking hack -> Some hack.Adversary.Id | _ -> None)
targets targets
|> List.filter (fun t -> hackedIds |> List.exists (fun hid -> hid = t.Id) |> not) |> List.filter (fun t -> hackedIds |> List.exists (fun hid -> hid = t.Id) |> not)
|> List.truncate 5 |> List.truncate 5