From edcbed3862e6c6e73f080022378b167da3286b69 Mon Sep 17 00:00:00 2001
From: sorewachigauyo <paultan_1@hotmail.com>
Date: Sun, 30 May 2021 11:18:24 +0800
Subject: [PATCH 1/2] feat: add support for new ddci

---
 reporters/utils.es | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/reporters/utils.es b/reporters/utils.es
index 36f9624..0b38e04 100644
--- a/reporters/utils.es
+++ b/reporters/utils.es
@@ -53,6 +53,8 @@ const houmAboveOrEqual = num => equip => equip.api_houm >= num
 
 // G_T_R = Gun Torpedo Radar
 // T_R_P = Torpedo Radar Personnel
+// T_P_T Torpedo Personnel Torpedo
+// T_P_D Torpedo Personnel Drum
 export const getNightBattleDDCIType = equips => {
   if (
     validAll(
@@ -74,6 +76,20 @@ export const getNightBattleDDCIType = equips => {
     return 'DD_T_R_P'
   }
 
+  if (validAll(hasAtLeast(2)(equipType2Is(5)), hasAtLeast(1)(equipIdIs(412)))(equips)) {
+    return 'DD_T_P_T'
+  }
+
+  if (
+    validAll(
+      hasAtLeast(1)(equipType2Is(5)),
+      hasAtLeast(1)(equipIdIs(412)),
+      hasAtLeast(1)(equipType2Is(30)),
+    )(equips)
+  ) {
+    return 'DD_T_P_D'
+  }
+
   return ''
 }
 

From 45628518b1c6cb6aa8cce8baa271e8f14671fad4 Mon Sep 17 00:00:00 2001
From: sorewachigauyo <paultan_1@hotmail.com>
Date: Sun, 30 May 2021 11:49:51 +0800
Subject: [PATCH 2/2] fix: update condition for trp ddci

---
 reporters/utils.es | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reporters/utils.es b/reporters/utils.es
index 0b38e04..d1ff849 100644
--- a/reporters/utils.es
+++ b/reporters/utils.es
@@ -69,7 +69,7 @@ export const getNightBattleDDCIType = equips => {
   if (
     validAll(
       hasAtLeast(1)(equipType2Is(5)),
-      hasAtLeast(1)(equipIdIs(129)),
+      hasAtLeast(1)(equipType2Is(39)),
       hasAtLeast(1)(validAll(validAny(equipType2Is(12), equipType2Is(13)), houmAboveOrEqual(3))),
     )(equips)
   ) {