X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer%2FAdditionalData.cs;fp=KancolleSniffer%2FDataLoader.cs;h=425ee4b671b92f6b3c8186bdb4f5334476d944f6;hb=cd0b5f5621e38e5c18479b12490b3e195ca0cc72;hp=3cc36291ce337a516118cec23ba8a5a3b0937c65;hpb=03997ac63250b267597f7c3ee0904d0585bbb71c;p=kancollesniffer%2FKancolleSniffer.git

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