Changeset 37523

Timestamp:

05/14/10 20:59:12 (3 years ago)

Author:

isaisstillalive

Message:

• Chooseに1枚固定のメソッドを追加
  

Location:

lang/csharp/DominionEngine

Files:

• DominionEngine.CardInfo.Base/Feast.cs (modified) (1 diff)
• DominionEngine.CardInfo.Base/Workshop.cs (modified) (1 diff)
• DominionEngine.CardInfo/DDL/AnyPlayer.cs (modified) (4 diffs)

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

@@ -16 +16 @@
 
             //Gain a card costing up to 5.
-            var gainCard = Player.Choose(CardPosition.Supply, 1, cardinfo => (Worth.Coin(5)).IsAfford(cardinfo.Cost));
+            var gainCard = Player.Choose(CardPosition.Supply, cardinfo => (Worth.Coin(5)).IsAfford(cardinfo.Cost));
             Player.Gain(gainCard);
         }

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

@@ -13 +13 @@
         {
             //Gain a card costing up to 4 Coin.
-            var gainCard = Player.Choose(CardPosition.Supply, 1, cardinfo => Worth.Coin(4).IsAfford(cardinfo.Cost));
+            var gainCard = Player.Choose(CardPosition.Supply, cardinfo => Worth.Coin(4).IsAfford(cardinfo.Cost));
             Player.Gain(gainCard);
         }

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

@@ -173 +173 @@
         /// </summary>
         /// <param name="from">選択元</param>
+        /// <param name="quantity">枚数</param>
+        /// <param name="filter">フィルタ</param>
+        /// <returns></returns>
+        public CardList Choose(CardPosition from, int quantity, Func<ICardInfo, bool> filter)
+        {
+            return Choose(from, quantity, quantity, filter);
+        }
+
+        /// <summary>
+        /// カード選択
+        /// </summary>
+        /// <param name="from">選択元</param>
+        /// <param name="minQuantity">枚数</param>
+        /// <param name="filter">フィルタ</param>
+        /// <returns></returns>
+        public CardList Choose(CardPositionBuilder from, int quantity, Func<ICardInfo, bool> filter)
+        {
+            return Choose(from, quantity, quantity, filter);
+        }
+
+        /// <summary>
+        /// カードを1枚選択
+        /// </summary>
+        /// <param name="from">選択元</param>
+        /// <param name="filter">フィルタ</param>
+        /// <returns></returns>
+        public CardList Choose(CardPosition from, Func<ICardInfo, bool> filter)
+        {
+            return Choose(from, 1, filter);
+        }
+
+        /// <summary>
+        /// カードを1枚選択
+        /// </summary>
+        /// <param name="from">選択元</param>
+        /// <param name="filter">フィルタ</param>
+        /// <returns></returns>
+        public CardList Choose(CardPositionBuilder from, Func<ICardInfo, bool> filter)
+        {
+            return Choose(from, 1, filter);
+        }
+
+        /// <summary>
+        /// カード選択
+        /// </summary>
+        /// <param name="from">選択元</param>
         /// <param name="minQuantity">最小枚数</param>
         /// <param name="maxQuantity">最大枚数</param>
@@ -198 +244 @@
         /// <param name="from">選択元</param>
         /// <param name="quantity">枚数</param>
-        /// <param name="filter">フィルタ</param>
-        /// <returns></returns>
-        public CardList Choose(CardPosition from, int quantity, Func<ICardInfo, bool> filter)
-        {
-            return Choose(from, quantity, quantity, filter);
-        }
-
-        /// <summary>
-        /// カード選択
-        /// </summary>
-        /// <param name="from">選択元</param>
-        /// <param name="minQuantity">枚数</param>
-        /// <param name="filter">フィルタ</param>
-        /// <returns></returns>
-        public CardList Choose(CardPositionBuilder from, int quantity, Func<ICardInfo, bool> filter)
-        {
-            return Choose(from, quantity, quantity, filter);
+        /// <returns></returns>
+        public CardList Choose(CardPosition from, int quantity)
+        {
+            return Choose(from, quantity, quantity);
         }
 
@@ -223 +256 @@
         /// <param name="quantity">枚数</param>
         /// <returns></returns>
-        public CardList Choose(CardPosition from, int quantity)
+        public CardList Choose(CardPositionBuilder from, int quantity)
         {
             return Choose(from, quantity, quantity);
@@ -229 +262 @@
 
         /// <summary>
-        /// カード選択
-        /// </summary>
-        /// <param name="from">選択元</param>
-        /// <param name="quantity">枚数</param>
-        /// <returns></returns>
-        public CardList Choose(CardPositionBuilder from, int quantity)
-        {
-            return Choose(from, quantity, quantity);
+        /// カードを1枚選択
+        /// </summary>
+        /// <param name="from">選択元</param>
+        /// <returns></returns>
+        public CardList Choose(CardPosition from)
+        {
+            return Choose(from, 1);
+        }
+
+        /// <summary>
+        /// カードを1枚選択
+        /// </summary>
+        /// <param name="from">選択元</param>
+        /// <returns></returns>
+        public CardList Choose(CardPositionBuilder from)
+        {
+            return Choose(from, 1);
         }