11/18 アップデート対応

Grabacr07 · Nov 18, 2016 · 3333d48 · 3333d48
1 parent 6af1d74
commit 3333d48
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 318 deletions.
diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -15,4 +15,4 @@
 	ResourceDictionaryLocation.None,
 	ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("4.2.8.0")]
+[assembly: AssemblyVersion("4.2.9.0")]
diff --git a/source/Grabacr07.KanColleWrapper/Master.cs b/source/Grabacr07.KanColleWrapper/Master.cs
@@ -56,7 +56,8 @@ public class Master
 		/// <summary>
 		/// すべてのセルの定義を取得します。
 		/// </summary>
-		public MasterTable<MapCell> MapCells { get; }
+		[Obsolete("マスター データから削除されました。")]
+		public MasterTable<MapCell> MapCells { get; } = new MasterTable<MapCell>();
 
 
 		internal Master(kcsapi_start2 start2)
@@ -67,8 +68,7 @@ internal Master(kcsapi_start2 start2)
 			this.SlotItems = new MasterTable<SlotItemInfo>(start2.api_mst_slotitem.Select(x => new SlotItemInfo(x, this.SlotItemEquipTypes)));
 			this.UseItems = new MasterTable<UseItemInfo>(start2.api_mst_useitem.Select(x => new UseItemInfo(x)));
 			this.Missions = new MasterTable<Mission>(start2.api_mst_mission.Select(x => new Mission(x)));
-			this.MapCells = new MasterTable<MapCell>(start2.api_mst_mapcell.Select(x => new MapCell(x)));
-			this.MapInfos = new MasterTable<MapInfo>(start2.api_mst_mapinfo.Select(x => new MapInfo(x, this.MapCells)));
+			this.MapInfos = new MasterTable<MapInfo>(start2.api_mst_mapinfo.Select(x => new MapInfo(x)));
 			this.MapAreas = new MasterTable<MapArea>(start2.api_mst_maparea.Select(x => new MapArea(x, this.MapInfos)));
 		}
 	}

diff --git a/source/Grabacr07.KanColleWrapper/Models/MapInfo.cs b/source/Grabacr07.KanColleWrapper/Models/MapInfo.cs
@@ -26,9 +26,7 @@ public class MapInfo : RawDataWrapper<kcsapi_mst_mapinfo>, IIdentifiable
 
 		public int RequiredDefeatCount { get; }
 
-		public MasterTable<MapCell> MapCells { get; }
-
-		public MapInfo(kcsapi_mst_mapinfo mapinfo, MasterTable<MapCell> mapCells)
+		public MapInfo(kcsapi_mst_mapinfo mapinfo)
 			: base(mapinfo)
 		{
 			this.Id = mapinfo.api_id;
@@ -39,9 +37,6 @@ public MapInfo(kcsapi_mst_mapinfo mapinfo, MasterTable<MapCell> mapCells)
 			this.OperationName = mapinfo.api_opetext;
 			this.OperationSummary = mapinfo.api_infotext;
 			this.RequiredDefeatCount = mapinfo.api_required_defeat_count ?? 1;
-			this.MapCells = new MasterTable<MapCell>(mapCells.Values.Where(x => x.MapInfoId == mapinfo.api_id));
-			foreach (var cell in this.MapCells.Values)
-				cell.MapInfo = this;
 		}
 
 		public override string ToString()
@@ -58,7 +53,7 @@ public override string ToString()
 		    api_maparea_id = 0,
 		    api_no = 0,
 		    api_level = 0,
-		}, new MasterTable<MapCell>())
+		})
 	    {
 		    MapArea = MapArea.Dummy,
 	    };

diff --git a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_maparea.cs b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_maparea.cs
@@ -5,10 +5,14 @@
 
 namespace Grabacr07.KanColleWrapper.Models.Raw
 {
+	// ReSharper disable InconsistentNaming
+
 	public class kcsapi_mst_maparea
 	{
 		public int api_id { get; set; }
 		public string api_name { get; set; }
 		public int api_type { get; set; }
 	}
+
+	// ReSharper restore InconsistentNaming
 }
diff --git a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_mapinfo.cs b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_mapinfo.cs
@@ -5,6 +5,7 @@
 
 namespace Grabacr07.KanColleWrapper.Models.Raw
 {
+	// ReSharper disable InconsistentNaming
 	public class kcsapi_mst_mapinfo
 	{
 		public int api_id { get; set; }
@@ -19,4 +20,5 @@ public class kcsapi_mst_mapinfo
 		public int? api_required_defeat_count { get; set; }
 		public int[] api_sally_flag { get; set; }
 	}
+	// ReSharper restore InconsistentNaming
 }
diff --git a/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_slotitem.cs b/source/Grabacr07.KanColleWrapper/Models/Raw/kcsapi_mst_slotitem.cs
@@ -35,6 +35,8 @@ public class kcsapi_mst_slotitem
 		public int[] api_broken { get; set; }
 		public string api_info { get; set; }
 		public string api_usebull { get; set; }
+		public int api_cost { get; set; }
+		public int api_distance { get; set; }
 	}
 	// ReSharper restore InconsistentNaming
 }