Changeset 37784

Timestamp:

06/02/10 16:28:11 (3 years ago)

Author:

isaisstillalive

Message:

• ChooseしてDiscardするメソッドを追加
  

Location:

lang/csharp/DominionEngine

Files:

• DominionEngine.CardInfo.Base/Cellar.cs (modified) (1 diff)
• DominionEngine.CardInfo.Test/DDL/CardInfoTest.cs (modified) (3 diffs)
• DominionEngine.CardInfo/DDL/CardInfo.cs (modified) (1 diff)

lang/csharp/DominionEngine/DominionEngine.CardInfo.Base/Cellar.cs

@@ -13 +13 @@
         {
             //Discard any number of cards.
-            var discardCards = Player.Choose(new AnyPlayer.ChooseOptions(CardPosition.Hand, 0, Player.Card));
-            discardCards.Discard();
+            var discardCards = Discard(new AnyPlayer.ChooseOptions(CardPosition.Hand, 0, Player.Card));
             //+1 Card per card discarded.
             Player.Card += discardCards.Count();

lang/csharp/DominionEngine/DominionEngine.CardInfo.Test/DDL/CardInfoTest.cs

@@ -52 +52 @@
 
         [Test]
-        public void Trash()
+        public void Trash_ThisCard()
         {
             Global.TurnPlayer = 1;
@@ -72 +72 @@
 
         [Test]
-        public void Trash_Choose()
+        public void Discard()
         {
             Global.TurnPlayer = 1;
 
+            MockCardInfo cardInfo = new MockCardInfo();
+
+            AnyPlayer.ChoosingEventArgs choosingArgs = null;
+            AnyPlayer.Choosing += (sender, e) =>
+            {
+                choosingArgs = e;
+                e.Result = new Card[] { new Card(cardInfo, CardPosition.Hand(0)) };
+            };
             Card.MovingEventArgs movingArgs = null;
             Card.Moving += (sender, e) =>
@@ -82 +90 @@
             };
 
-            MockCardInfo cardInfo = new MockCardInfo();
+            AnyPlayer.ChooseOptions options = new AnyPlayer.ChooseOptions(CardPosition.Hand(0), 1);
+            cardInfo.Discard(options);
 
-            cardInfo.Trash();
+            Assert.That(choosingArgs.From, Is.EqualTo(options.From));
+            Assert.That(choosingArgs.Filter, Is.EqualTo(options.Filter));
+            Assert.That(choosingArgs.MinQuantity, Is.EqualTo(options.MinQuantity));
+            Assert.That(choosingArgs.MaxQuantity, Is.EqualTo(options.MaxQuantity));
 
             Assert.That(movingArgs.From.CardInfo, Is.EqualTo(cardInfo));
-            Assert.That(movingArgs.From.Position, Is.EqualTo(CardPosition.PlayArea(1)));
-            Assert.That(movingArgs.ToPosition, Is.EqualTo(CardPosition.Trash));
+            Assert.That(movingArgs.From.Position, Is.EqualTo(CardPosition.Hand(0)));
+            Assert.That(movingArgs.ToPosition, Is.EqualTo(CardPosition.Discard(0)));
         }
 

lang/csharp/DominionEngine/DominionEngine.CardInfo/DDL/CardInfo.cs

@@ -32 +32 @@
         }
 
+        protected internal CardList Discard(AnyPlayer.ChooseOptions options)
+        {
+            CardList discardCards = Player.Choose(options);
+            discardCards.Discard();
+            return discardCards;
+        }
+
         #endregion