Changeset 37593 for lang/csharp

Timestamp:

05/17/10 01:09:29 (3 years ago)

Author:

isaisstillalive

Message:

• Draw,Shuffle処理を修正
  

Location:

lang/csharp/DominionEngine

Files:

• DominionEngine.Core.Test/PlayerInfoTest.cs (modified) (2 diffs)
• DominionEngine.Core/PlayerInfo.cs (modified) (4 diffs)

lang/csharp/DominionEngine/DominionEngine.Core.Test/PlayerInfoTest.cs

@@ -153 +153 @@
         }
 
+        [Test]
+        public void Draw_With_Number_Before_LessThan()
+        {
+            Card card1 = new Card<CardInfo.Copper>();
+            Card card2 = new Card<CardInfo.Copper>();
+            Card card3 = new Card<CardInfo.Copper>();
+            player.discardPile.Add(card1);// 1559595546
+            player.discardPile.Add(card2);// 1755192844
+            player.discardPile.Add(card3);// 1649316166
+
+            player.Draw(4);
+
+            Assert.That(player.Hand.Count, Is.EqualTo(3));
+            Assert.That(player.Hand[0], Is.SameAs(card1));
+            Assert.That(player.Hand[1], Is.SameAs(card3));
+            Assert.That(player.Hand[2], Is.SameAs(card2));
+        }
+
         #endregion
 
@@ -163 +181 @@
             player.deck.Add(card1);// 1559595546
             player.deck.Add(card2);// 1755192844
-            player.deck.Add(card3);// 1649316166
+            player.discardPile.Add(card3);// 1649316166
 
             player.Shuffle();
+
+            Assert.That(player.DiscardPile.Count, Is.EqualTo(0));
 
             Assert.That(player.Deck.Count, Is.EqualTo(3));

lang/csharp/DominionEngine/DominionEngine.Core/PlayerInfo.cs

@@ -150 +150 @@
         }
 
+        /// <summary>
+        /// 山札から1枚ドローする
+        /// </summary>
         public void Draw()
         {
@@ -155 +158 @@
         }
 
+        /// <summary>
+        /// 山札からドローする
+        /// </summary>
+        /// <param name="quantity">枚数</param>
         public void Draw(int quantity)
         {
@@ -164 +171 @@
                 {
                     quantity -= Deck.Count;
-                    hand.MoveFrom(deck);
+                    hand.MoveFrom(deck, quantity);
                 }
 
                 // その後、捨札をデッキに戻しシャッフル
-                deck.MoveFrom(discardPile);
-                if (deck.Count == 0) return;
-
                 Shuffle();
+
+                // シャッフルしても枚数が足りなければ残り全部をドロー枚数にする
+                if (deck.Count < quantity) quantity = Deck.Count;
             }
 
@@ -178 +185 @@
         }
 
+        /// <summary>
+        /// 捨札をデッキに戻し、シャッフルする
+        /// </summary>
         public void Shuffle()
         {
+            deck.MoveFrom(discardPile);
             deck.Shuffle(game.Random);
         }
 
+        /// <summary>
+        /// カードを取得する
+        /// </summary>
+        /// <param name="card"></param>
         public void Gain(Card card)
         {