refactor dungeon battle grid selection

moonheart · Dec 23, 2023 · f59996f · f59996f
1 parent f6c0861
commit f59996f
Show file tree

Hide file tree

Showing 6 changed files with 283 additions and 187 deletions.
diff --git a/MementoMori.Ortega/Share/Data/ApiInterface/DungeonBattle/GetBattleGridDataResponse.cs b/MementoMori.Ortega/Share/Data/ApiInterface/DungeonBattle/GetBattleGridDataResponse.cs
@@ -5,29 +5,17 @@
 
 namespace MementoMori.Ortega.Share.Data.ApiInterface.DungeonBattle
 {
-	[MessagePackObject(true)]
-	public class GetBattleGridDataResponse : ApiResponseBase
-	{
-		public List<DungeonBattleEnemyInfo> EnemyInfos
-		{
-			get;
-			set;
-		}
+    [MessagePackObject(true)]
+    public class GetBattleGridDataResponse : ApiResponseBase
+    {
+        public List<DungeonBattleEnemyInfo> EnemyInfos { get; set; }
 
-		public List<UserItem> NormalRewardItemList
-		{
-			get;
-			set;
-		}
+        public List<UserItem> NormalRewardItemList { get; set; }
 
-		public List<UserItem> SpecialRewardItemList
-		{
-			get;
-			set;
-		}
+        public List<UserItem> SpecialRewardItemList { get; set; }
 
-		public GetBattleGridDataResponse()
-		{
-		}
-	}
-}
+        public GetBattleGridDataResponse()
+        {
+        }
+    }
+}
diff --git a/MementoMori.Ortega/Share/Data/DungeonBattle/DungeonBattleGrid.cs b/MementoMori.Ortega/Share/Data/DungeonBattle/DungeonBattleGrid.cs
@@ -3,35 +3,19 @@
 
 namespace MementoMori.Ortega.Share.Data.DungeonBattle
 {
-	[MessagePackObject(true)]
-	public class DungeonBattleGrid
-	{
-		public string DungeonGridGuid
-		{
-			get;
-			set;
-		}
+    [MessagePackObject(true)]
+    public class DungeonBattleGrid
+    {
+        public string DungeonGridGuid { get; set; }
 
-		public long DungeonGridId
-		{
-			get;
-			set;
-		}
+        public long DungeonGridId { get; set; }
 
-		public int X
-		{
-			get;
-			set;
-		}
+        public int X { get; set; }
 
-		public int Y
-		{
-			get;
-			set;
-		}
+        public int Y { get; set; }
 
-		public DungeonBattleGrid()
-		{
-		}
-	}
-}
+        public DungeonBattleGrid()
+        {
+        }
+    }
+}
diff --git a/MementoMori.Ortega/Share/Master/Data/DungeonBattleEnemyInfo.cs b/MementoMori.Ortega/Share/Master/Data/DungeonBattleEnemyInfo.cs
@@ -4,54 +4,30 @@
 
 namespace MementoMori.Ortega.Share.Master.Data
 {
-	[Description("時空の洞窟 敵情報")]
-	[MessagePackObject(true)]
-	public class DungeonBattleEnemyInfo
-	{
-		[Description("戦闘力")]
-		public long BattlePower
-		{
-			get;
-			set;
-		}
+    [Description("時空の洞窟 敵情報")]
+    [MessagePackObject(true)]
+    public class DungeonBattleEnemyInfo
+    {
+        [Description("戦闘力")]
+        public long BattlePower { get; set; }
 
-		[Description("レアリティ")]
-		public CharacterRarityFlags CharacterRarityFlags
-		{
-			get;
-			set;
-		}
+        [Description("レアリティ")]
+        public CharacterRarityFlags CharacterRarityFlags { get; set; }
 
-		[Description("属性")]
-		public ElementType ElementType
-		{
-			get;
-			set;
-		}
+        [Description("属性")]
+        public ElementType ElementType { get; set; }
 
-		[Description("レベル")]
-		public long Level
-		{
-			get;
-			set;
-		}
+        [Description("レベル")]
+        public long Level { get; set; }
 
-		[Description("ユニットアイコンID")]
-		public long UnitIconId
-		{
-			get;
-			set;
-		}
+        [Description("ユニットアイコンID")]
+        public long UnitIconId { get; set; }
 
-		[Description("ユニットアイコンタイプ")]
-		public UnitIconType UnitIconType
-		{
-			get;
-			set;
-		}
+        [Description("ユニットアイコンタイプ")]
+        public UnitIconType UnitIconType { get; set; }
 
-		public DungeonBattleEnemyInfo()
-		{
-		}
-	}
-}
+        public DungeonBattleEnemyInfo()
+        {
+        }
+    }
+}
diff --git a/MementoMori.Ortega/Share/Master/Data/DungeonBattleGridMB.cs b/MementoMori.Ortega/Share/Master/Data/DungeonBattleGridMB.cs
@@ -5,34 +5,41 @@
 
 namespace MementoMori.Ortega.Share.Master.Data
 {
-	[MessagePackObject(true)]
-	[Description("時空の洞窟 マス詳細")]
-	public class DungeonBattleGridMB : MasterBookBase
-	{
-		[Description("マス名キー")]
-		[PropertyOrder(1)]
-		public string DungeonGridNameKey
-		{
-			get;
-		}
+    [MessagePackObject(true)]
+    [Description("時空の洞窟 マス詳細")]
+    public class DungeonBattleGridMB : MasterBookBase
+    {
+        [Description("マス名キー")]
+        [PropertyOrder(1)]
+        public string DungeonGridNameKey { get; }
 
-		[Description("マス種別")]
-		[PropertyOrder(2)]
-		public DungeonBattleGridType DungeonGridType
-		{
-			get;
-		}
+        [Description("マス種別")]
+        [PropertyOrder(2)]
+        public DungeonBattleGridType DungeonGridType { get; }
 
-		[SerializationConstructor]
-		public DungeonBattleGridMB(long id, bool? isIgnore, string memo, string dungeonGridNameKey, DungeonBattleGridType dungeonGridType)
-			:base(id, isIgnore, memo)
-		{
-			DungeonGridNameKey = dungeonGridNameKey;
-			DungeonGridType = dungeonGridType;
-		}
+        [SerializationConstructor]
+        public DungeonBattleGridMB(long id, bool? isIgnore, string memo, string dungeonGridNameKey, DungeonBattleGridType dungeonGridType)
+            : base(id, isIgnore, memo)
+        {
+            DungeonGridNameKey = dungeonGridNameKey;
+            DungeonGridType = dungeonGridType;
+        }
 
-		public DungeonBattleGridMB() : base(0, false, "")
-		{
-		}
-	}
-}
+        public DungeonBattleGridMB() : base(0, false, "")
+        {
+        }
+
+        public bool IsBattleType()
+        {
+            return DungeonGridType == DungeonBattleGridType.BattleAndRelicReinforce ||
+                   DungeonGridType == DungeonBattleGridType.BattleBoss ||
+                   DungeonGridType == DungeonBattleGridType.BattleBossNoRelic ||
+                   DungeonGridType == DungeonBattleGridType.BattleElite ||
+                   DungeonGridType == DungeonBattleGridType.BattleNormal ||
+                   DungeonGridType == DungeonBattleGridType.EventBattleElite ||
+                   DungeonGridType == DungeonBattleGridType.EventBattleNormal ||
+                   DungeonGridType == DungeonBattleGridType.EventBattleSpecial
+                ;
+        }
+    }
+}
diff --git a/MementoMori/MementoMoriFuncs.Ops.cs b/MementoMori/MementoMoriFuncs.Ops.cs
@@ -475,6 +475,14 @@ private bool IsBossBattleQuickAvailable
         }
     }
 
+    private bool IsDungeonBattleHardModeAvailable
+    {
+        get
+        {
+            return UserSyncData.UserBattleBossDtoInfo.BossClearMaxQuestId >= OpenContentTable.GetByOpenCommandType(OpenCommandType.DungeonBattleHardMode).OpenContentValue;
+        }
+    }
+
     private bool IsGuildRaidQuickAvailable
     {
         get
-Original file line number
+Diff line change
@@ Expand Up / @@ -475,6 +475,14 @@ private bool IsBossBattleQuickAvailable @@
             }
         }
+        private bool IsDungeonBattleHardModeAvailable
+        {
+            get
+            {
+                return UserSyncData.UserBattleBossDtoInfo.BossClearMaxQuestId >= OpenContentTable.GetByOpenCommandType(OpenCommandType.DungeonBattleHardMode).OpenContentValue;
+            }
+        }
         private bool IsGuildRaidQuickAvailable
         {
             get
@@ Expand Down @@