Skip to content

W
windbot
Commit f91fdbcf authored by mercury233's avatar mercury233
Browse files
Options

add ClientCard.IsOriginalCode

parent e2046451
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
Game/ClientCard.cs
View file @ f91fdbcf
...@@ -336,6 +336,11 @@ namespace WindBot.Game ...@@ -336,6 +336,11 @@ namespace WindBot.Game
return ids.Contains(Id) || Alias != 0 && ids.Contains(Alias); return ids.Contains(Id) || Alias != 0 && ids.Contains(Alias);
} }
public bool IsOriginalCode(int id)
{
return Id == id || Alias - Id < 10 && Alias == id;
}
public bool HasXyzMaterial() public bool HasXyzMaterial()
{ {
return Overlays.Count > 0; return Overlays.Count > 0;
......
Game/ClientField.cs
View file @ f91fdbcf
...@@ -306,10 +306,11 @@ namespace WindBot.Game ...@@ -306,10 +306,11 @@ namespace WindBot.Game
public int GetRemainingCount(int cardId, int initialCount) public int GetRemainingCount(int cardId, int initialCount)
{ {
int remaining = initialCount; int remaining = initialCount;
remaining = remaining - Hand.Count(card => card != null && card.IsCode(cardId)); remaining = remaining - Hand.Count(card => card != null && card.IsOriginalCode(cardId));
remaining = remaining - SpellZone.Count(card => card != null && card.IsCode(cardId)); remaining = remaining - SpellZone.Count(card => card != null && card.IsOriginalCode(cardId));
remaining = remaining - Graveyard.Count(card => card != null && card.IsCode(cardId)); remaining = remaining - MonsterZone.Count(card => card != null && card.IsOriginalCode(cardId));
remaining = remaining - Banished.Count(card => card != null && card.IsCode(cardId)); remaining = remaining - Graveyard.Count(card => card != null && card.IsOriginalCode(cardId));
remaining = remaining - Banished.Count(card => card != null && card.IsOriginalCode(cardId));
return (remaining < 0) ? 0 : remaining; return (remaining < 0) ? 0 : remaining;
} }
......
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