Commit f0cfe743 authored by mercury233's avatar mercury233

Fix Card.Controller

parent 6e28da11
...@@ -32,7 +32,7 @@ namespace WindBot.Game ...@@ -32,7 +32,7 @@ namespace WindBot.Game
public int RealPower { get; set; } public int RealPower { get; set; }
public List<int> Overlays { get; private set; } public List<int> Overlays { get; private set; }
public int Owner { get; private set; } public int Owner { get; private set; }
public int Controller { get; private set; } public int Controller { get; set; }
public int Disabled { get; private set; } public int Disabled { get; private set; }
public int ProcCompleted { get; private set; } public int ProcCompleted { get; private set; }
public int SelectSeq { get; set; } public int SelectSeq { get; set; }
......
...@@ -96,30 +96,8 @@ namespace WindBot.Game ...@@ -96,30 +96,8 @@ namespace WindBot.Game
public void AddCard(CardLocation loc, int cardId, int player, int seq, int pos) public void AddCard(CardLocation loc, int cardId, int player, int seq, int pos)
{ {
switch (loc) ClientCard card = new ClientCard(cardId, loc, seq, pos);
{ AddCard(loc, card, player, seq, pos, cardId);
case CardLocation.Hand:
Fields[player].Hand.Add(new ClientCard(cardId, loc, -1, pos));
break;
case CardLocation.Grave:
Fields[player].Graveyard.Add(new ClientCard(cardId, loc,-1, pos));
break;
case CardLocation.Removed:
Fields[player].Banished.Add(new ClientCard(cardId, loc, -1, pos));
break;
case CardLocation.MonsterZone:
Fields[player].MonsterZone[seq] = new ClientCard(cardId, loc, seq, pos);
break;
case CardLocation.SpellZone:
Fields[player].SpellZone[seq] = new ClientCard(cardId, loc, seq, pos);
break;
case CardLocation.Deck:
Fields[player].Deck.Add(new ClientCard(cardId, loc, -1, pos));
break;
case CardLocation.Extra:
Fields[player].ExtraDeck.Add(new ClientCard(cardId, loc, -1, pos));
break;
}
} }
public void AddCard(CardLocation loc, ClientCard card, int player, int seq, int pos, int id) public void AddCard(CardLocation loc, ClientCard card, int player, int seq, int pos, int id)
...@@ -127,6 +105,7 @@ namespace WindBot.Game ...@@ -127,6 +105,7 @@ namespace WindBot.Game
card.Location = loc; card.Location = loc;
card.Sequence = seq; card.Sequence = seq;
card.Position = pos; card.Position = pos;
card.Controller = player;
card.SetId(id); card.SetId(id);
switch (loc) switch (loc)
{ {
......
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