戦闘：僚艦夜戦突撃に対応した

* グループ：艦名列でのソートで「母港ソート順」を選択できるようにした
andanteyk · Apr 25, 2020 · 73dd32b · 73dd32b
1 parent f0ee370
commit 73dd32b
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 22 deletions.
diff --git a/Browser/Program.cs b/Browser/Program.cs
@@ -65,7 +65,7 @@ private static System.Reflection.Assembly CurrentDomain_AssemblyResolve(object s
 
 					if (MessageBox.Show(
 @"ブラウザの起動に失敗しました。
-インストールに必要な操作が行われていないことが原因の可能性があります。
+zip のセキュリティ許可を行うなど、インストール手順を再確認してみてください。
 インストールガイドを開きますか？（外部ブラウザが開きます）",
 							"ブラウザロード失敗", MessageBoxButtons.YesNo, MessageBoxIcon.Error)
 						== DialogResult.Yes)

diff --git a/ElectronicObserver/Data/Battle/Phase/PhaseNightBattle.cs b/ElectronicObserver/Data/Battle/Phase/PhaseNightBattle.cs
@@ -111,10 +111,11 @@ public override void EmulateBattle(int[] hps, int[] damages)
 						break;
 
 					case 103:
-						// colorado touch
+					case 104:
+						// colorado touch / kongo-class night attack
 						for (int i = 0; i < atk.Defenders.Count; i++)
 						{
-							var comboatk = new BattleIndex(atk.Attacker.Side, i);       // #1, #2, #3
+							var comboatk = new BattleIndex(atk.Attacker.Side, i);       // #1, #2 (, #3)
 							BattleDetails.Add(new BattleNightDetail(Battle, comboatk, atk.Defenders[i].Defender, new[] { atk.Defenders[i].RawDamage }, new[] { atk.Defenders[i].CriticalFlag }, atk.AttackType, atk.EquipmentIDs, atk.NightAirAttackFlag, hps[atk.Defenders[i].Defender]));
 							AddDamage(hps, atk.Defenders[i].Defender, atk.Defenders[i].Damage);
 							damages[comboatk] += atk.Defenders[i].Damage;

diff --git a/ElectronicObserver/Data/Battle/Phase/PhaseShelling.cs b/ElectronicObserver/Data/Battle/Phase/PhaseShelling.cs
@@ -146,10 +146,11 @@ public override void EmulateBattle(int[] hps, int[] damages)
 						break;
 
 					case 103:
-						// colorado touch
+					case 104:
+						// colorado touch / kongo-class night attack
 						for (int i = 0; i < atk.Defenders.Count; i++)
 						{
-							var comboatk = new BattleIndex(atk.Attacker.Side, i);       // #1, #2, #3
+							var comboatk = new BattleIndex(atk.Attacker.Side, i);       // #1, #2 (, #3)
 							BattleDetails.Add(new BattleDayDetail(Battle, comboatk, atk.Defenders[i].Defender, new[] { atk.Defenders[i].RawDamage }, new[] { atk.Defenders[i].CriticalFlag }, atk.AttackType, atk.EquipmentIDs, hps[atk.Defenders[i].Defender]));
 							AddDamage(hps, atk.Defenders[i].Defender, atk.Defenders[i].Damage);
 							damages[comboatk] += atk.Defenders[i].Damage;

diff --git a/ElectronicObserver/Data/Constants.cs b/ElectronicObserver/Data/Constants.cs
@@ -782,6 +782,8 @@ public static string GetDayAttackKind(DayAttackKind id)
 					return "長門、いい？ いくわよ！ 主砲一斉射ッ！";
 				case DayAttackKind.SpecialColorado:
 					return "Colorado Touch";
+				case DayAttackKind.SpecialKongo:
+					return "僚艦夜戦突撃";
 				case DayAttackKind.ZuiunMultiAngle:
 					return "瑞雲立体攻撃";
 				case DayAttackKind.SeaAirMultiAngle:
@@ -845,6 +847,8 @@ public static string GetNightAttackKind(NightAttackKind id)
 					return "長門、いい？ いくわよ！ 主砲一斉射ッ！";
 				case NightAttackKind.SpecialColorado:
 					return "Colorado Touch";
+				case NightAttackKind.SpecialKongo:
+					return "僚艦夜戦突撃";
 				case NightAttackKind.Shelling:
 					return "砲撃";
 				case NightAttackKind.AirAttack:

diff --git a/ElectronicObserver/Utility/Data/Calculator.cs b/ElectronicObserver/Utility/Data/Calculator.cs
@@ -2397,6 +2397,8 @@ public enum DayAttackKind
 		/// <summary> Colorado Touch </summary>
 		SpecialColorado = 103,
 
+		/// <summary> 僚艦夜戦突撃 </summary>
+		SpecialKongo = 104,
 
 		/// <summary> 瑞雲立体攻撃 </summary>
 		ZuiunMultiAngle = 200,
@@ -2488,6 +2490,9 @@ public enum NightAttackKind
 		/// <summary> Colorado Touch </summary>
 		SpecialColorado = 103,
 
+		/// <summary> 僚艦夜戦突撃 </summary>
+		SpecialKongo = 104,
+
 
 		/// <summary> 砲撃 </summary>
 		Shelling = 1000,

diff --git a/ElectronicObserver/Window/Dialog/DialogConfiguration.Designer.cs b/ElectronicObserver/Window/Dialog/DialogConfiguration.Designer.cs
diff --git a/ElectronicObserver/Window/FormShipGroup.cs b/ElectronicObserver/Window/FormShipGroup.cs
@@ -819,6 +819,10 @@ private void ShipView_SortCompare(object sender, DataGridViewSortCompareEventArg
                         if (e.SortResult == 0)
                             e.SortResult = ship1.Name.CompareTo(ship2.Name);
                         break;
+
+					case 2:     // ソートキー順
+						e.SortResult = ship1.SortID - ship2.SortID;
+						break;
                 }
 
             }