Commit 1cf8be29 authored by nanahira's avatar nanahira

Merge branch 'patch-cs6' into develop

parents 303455fc 340fe5c2
Pipeline #42999 passed with stage
in 1 minute and 6 seconds
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using WindBot; using WindBot;
...@@ -3163,8 +3163,8 @@ namespace WindBot.Game.AI.Decks ...@@ -3163,8 +3163,8 @@ namespace WindBot.Game.AI.Decks
IEnumerable<int> avoidIds = null, IEnumerable<int> avoidIds = null,
bool requireMaliss = false) bool requireMaliss = false)
{ {
int LinkValOf(ClientCard m) => m.HasType(CardType.Link) ? Math.Max(1, m.LinkCount) : 1; Func<ClientCard, int> LinkValOf = m => m.HasType(CardType.Link) ? Math.Max(1, m.LinkCount) : 1;
bool IsOneVal(ClientCard m) => !m.HasType(CardType.Link) || Math.Max(1, m.LinkCount) == 1; Func<ClientCard, bool> IsOneVal = m => !m.HasType(CardType.Link) || Math.Max(1, m.LinkCount) == 1;
var all = Bot.GetMonsters() var all = Bot.GetMonsters()
.Where(m => m != null && m.IsFaceup() && isEligible(m)) .Where(m => m != null && m.IsFaceup() && isEligible(m))
...@@ -3292,7 +3292,7 @@ namespace WindBot.Game.AI.Decks ...@@ -3292,7 +3292,7 @@ namespace WindBot.Game.AI.Decks
.ToList(); .ToList();
if (cand.Count < 3) return false; if (cand.Count < 3) return false;
bool IsMaliss(ClientCard m) => m.HasSetcode(0x1bf); Func<ClientCard, bool> IsMaliss = m => m.HasSetcode(0x1bf);
var avoid = new HashSet<int> { CardId.CyberseWicckid, CardId.Apollousa, CardId.AlliedCodeTalkerIgnister, CardId.AccesscodeTalker, CardId.FirewallDragon, CardId.TranscodeTalker }; var avoid = new HashSet<int> { CardId.CyberseWicckid, CardId.Apollousa, CardId.AlliedCodeTalkerIgnister, CardId.AccesscodeTalker, CardId.FirewallDragon, CardId.TranscodeTalker };
...@@ -3370,7 +3370,7 @@ namespace WindBot.Game.AI.Decks ...@@ -3370,7 +3370,7 @@ namespace WindBot.Game.AI.Decks
.ToList(); .ToList();
if (cand.Count == 0) return null; if (cand.Count == 0) return null;
int Score(ClientCard c) Func<ClientCard, int> Score = c =>
{ {
if (c.IsCode(CardId.MalissInTheMirror)) return 100; if (c.IsCode(CardId.MalissInTheMirror)) return 100;
if (c.IsCode(CardId.MalissC_MTP07)) return 95; if (c.IsCode(CardId.MalissC_MTP07)) return 95;
...@@ -3381,7 +3381,7 @@ namespace WindBot.Game.AI.Decks ...@@ -3381,7 +3381,7 @@ namespace WindBot.Game.AI.Decks
if (c.IsCode(CardId.MalissP_WhiteRabbit)) return 70; if (c.IsCode(CardId.MalissP_WhiteRabbit)) return 70;
if (c.IsCode(CardId.MalissP_Dormouse)) return 65; if (c.IsCode(CardId.MalissP_Dormouse)) return 65;
return 50; return 50;
} };
return cand.OrderByDescending(Score).First(); return cand.OrderByDescending(Score).First();
} }
private bool HC_OnBanished_SpecialSummon() private bool HC_OnBanished_SpecialSummon()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment