ファイルから数値を読むクラスをstaticにするのをやめる

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / AdditionalData.cs

diff --git a/KancolleSniffer/DataLoader.cs b/KancolleSniffer/AdditionalData.cs
similarity index 76%
rename from KancolleSniffer/DataLoader.cs
rename to KancolleSniffer/AdditionalData.cs
index 3cc3629..425ee4b 100644 (file)
--- a/KancolleSniffer/DataLoader.cs
+++ b/KancolleSniffer/AdditionalData.cs
@@ -19,14 +19,14 @@ using System.Linq;
 \r
 namespace KancolleSniffer\r
 {\r
-    public static class DataLoader\r
+    public class AdditionalData\r
     {\r
         private static readonly string EnemySlotFile =\r
             Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "EnemySlot.csv");\r
 \r
-        private static Dictionary<int, int[]> _maxEq;\r
+        private Dictionary<int, int[]> _maxEq;\r
 \r
-        public static void LoadEnemySlot()\r
+        public void LoadEnemySlot()\r
         {\r
             try\r
             {\r
@@ -39,16 +39,16 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        public static int[] EnemySlot(int id) =>\r
+        public int[] EnemySlot(int id) =>\r
             _maxEq != null ? _maxEq.TryGetValue(id, out var slot) ? slot : null : null;\r
 \r
-        private const string FileName = "TP.csv";\r
+        private const string TpFileName = "TP.csv";\r
 \r
-        private static readonly string TpFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, FileName);\r
+        private static readonly string TpFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, TpFileName);\r
 \r
-        private static Dictionary<int, double> _tpSpec;\r
+        private Dictionary<int, double> _tpSpec;\r
 \r
-        public static void LoadTpSpec()\r
+        public void LoadTpSpec()\r
         {\r
             try\r
             {\r
@@ -61,11 +61,11 @@ namespace KancolleSniffer
             }\r
             catch (Exception ex)\r
             {\r
-                throw new Exception(FileName + "が壊れています。", ex);\r
+                throw new Exception(TpFileName + "が壊れています。", ex);\r
             }\r
         }\r
 \r
-        public static double ItemTp(int id) =>\r
+        public double ItemTp(int id) =>\r
             _tpSpec != null ? _tpSpec.TryGetValue(id, out var tp) ? tp : -1 : -1;\r
     }\r
 }
\ No newline at end of file