Changeset 37539 for lang/csharp

Timestamp:

05/15/10 13:19:56 (3 years ago)

Author:

isaisstillalive

Message:

• Worthを、セットで拡張可能な形に変更
  

Files:

• lang/csharp/DominionEngine/DominionEngine.CardInfo/Unit/Worth.cs (modified) (8 diffs)

lang/csharp/DominionEngine/DominionEngine.CardInfo/Unit/Worth.cs

@@ -9 +9 @@
     /// 価値
     /// </summary>
-    public struct Worth : IComparable<Worth>
+    public class Worth : IComparable<Worth>
     {
         #region ビルダ
@@ -16 +16 @@
         /// 無価値
         /// </summary>
-        public static readonly Worth None = new Worth(0x0000);
+        public static readonly Worth None = new Worth();
 
         /// <summary>
@@ -25 +25 @@
         public static Worth Coin(int value)
         {
-            return new Worth(0x0001 * value);
+            Worth result = new Worth();
+            result.items.Add(typeof(CoinUnit), value);
+            return result;
         }
 
@@ -35 +37 @@
         public static Worth Potion(int value)
         {
-            return new Worth(0x0100 * value);
+            Worth result = new Worth();
+            result.items.Add(typeof(PotionUnit), value);
+            return result;
         }
 
         #endregion
 
-        #region 値とコンストラクタ
+        #region コンストラクタ
 
-        /// <summary>
-        /// 値
-        /// </summary>
-        internal int value;
+        internal Dictionary<Type, int> items = new Dictionary<Type, int>();
 
         /// <summary>
@@ -51 +52 @@
         /// </summary>
         /// <param name="value">値</param>
-        internal Worth(int value)
-        {
-            this.value = value;
-        }
+        internal Worth() { }
 
         #endregion
@@ -83 +81 @@
         /// </summary>
         /// <returns></returns>
-        public int CoinValue { get { return value & 0x00FF; } }
+        public int CoinValue { get { return Value<CoinUnit>(); } }
 
         /// <summary>
@@ -89 +87 @@
         /// </summary>
         /// <returns></returns>
-        public int PotionValue { get { return (value >> 8) & 0x00FF; } }
+        public int PotionValue { get { return Value<PotionUnit>(); } }
+
+        /// <summary>
+        /// 単位ごとの価値
+        /// </summary>
+        /// <typeparam name="T">価値の単位</typeparam>
+        /// <returns></returns>
+        public int Value<T>()
+            where T : Unit
+        {
+            return items.ContainsKey(typeof(T)) ? items[typeof(T)] : 0;
+        }
 
         #endregion
@@ -111 +120 @@
         public static Worth operator +(Worth cost1, Worth cost2)
         {
-            return new Worth(cost1.value + cost2.value);
+            Worth worth = new Worth();
+            worth.items = new Dictionary<Type, int>(cost1.items);
+            foreach (var item in cost2.items)
+            {
+                if (!worth.items.ContainsKey(item.Key)) worth.items[item.Key] = 0;
+                worth.items[item.Key] += item.Value;
+            }
+            return worth;
         }
 
         public static Worth operator -(Worth cost1, Worth cost2)
         {
-            return new Worth(cost1.value - cost2.value);
+            Worth worth = new Worth();
+            worth.items = new Dictionary<Type, int>(cost1.items);
+            foreach (var item in cost2.items)
+            {
+                if (!worth.items.ContainsKey(item.Key)) worth.items[item.Key] = 0;
+                worth.items[item.Key] -= item.Value;
+            }
+            return worth;
         }
+
+        #endregion
+
+        #region 価値の単位
+
+        /// <summary>
+        /// 価値の単位
+        /// </summary>
+        public interface Unit { };
+
+        /// <summary>
+        /// コイン
+        /// </summary>
+        public class CoinUnit : Unit { }
+
+        /// <summary>
+        /// ポーション
+        /// </summary>
+        public class PotionUnit : Unit { }
 
         #endregion