Skip to content

Commit 690c555

Browse files
committed
feat: update sp attack for Kirishima kai ni c
1 parent 5bee621 commit 690c555

File tree

1 file changed

+47
-3
lines changed

1 file changed

+47
-3
lines changed

views/utils/sp_attack.es

+47-3
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,14 @@ const isHarunaKaiNiC = shipIdIs(954)
8484

8585
const isKirishimaKaiNi = shipIdIs(152)
8686

87+
const isKirishimaKaiNiC = shipIdIs(694)
88+
8789
const isWarspite = _.overSome([shipIdIs(364), shipIdIs(439)])
8890

8991
const isWarspiteKai = shipIdIs(364)
9092

93+
const isValiant = _.overSome([shipIdIs(927), shipIdIs(733)])
94+
9195
const isValiantKai = shipIdIs(733)
9296

9397
const isRichelieuKaiOrDeux = _.overSome([shipIdIs(392), shipIdIs(969)])
@@ -166,22 +170,62 @@ const isKongoClassKaiNiCSpAttack = _.overEvery([
166170
isSpAttackLessThan([SP_ATTACK_ID.Kongo_Class_Kaini_C_Charge])(2),
167171
isFleetWith5NonSubs,
168172
_.overSome([
173+
// Kongo Kai Ni C
169174
_.overEvery([
170175
overShip(0)(_.overEvery([isKongoKaiNiC, isNotMidDmg])),
171176
overShip(1)(
172177
_.overEvery([
173-
_.overSome([isHieiKaiNiC, isHarunaKaiNi, isHarunaKaiNiB, isHarunaKaiNiC, isWarspite]),
178+
_.overSome([
179+
isHieiKaiNiC,
180+
isHarunaKaiNi,
181+
isHarunaKaiNiB,
182+
isHarunaKaiNiC,
183+
isKirishimaKaiNi,
184+
isWarspite,
185+
isValiant,
186+
]),
174187
isNotMidDmg,
175188
]),
176189
),
177190
]),
191+
// Hiei Kai Ni C
178192
_.overEvery([
179193
overShip(0)(_.overEvery([isHieiKaiNiC, isNotMidDmg])),
180-
overShip(1)(_.overEvery([_.overSome([isKongoKaiNiC, isKirishimaKaiNi]), isNotMidDmg])),
194+
overShip(1)(
195+
_.overEvery([
196+
_.overSome([
197+
isKongoKaiNiC,
198+
isHarunaKaiNiB,
199+
isHarunaKaiNiC,
200+
isKirishimaKaiNi,
201+
isKirishimaKaiNiC,
202+
]),
203+
isNotMidDmg,
204+
]),
205+
),
181206
]),
207+
// Haruna Kai Ni B/C
182208
_.overEvery([
183209
overShip(0)(_.overEvery([_.overSome([isHarunaKaiNiB, isHarunaKaiNiC]), isNotMidDmg])),
184-
overShip(1)(_.overEvery([_.overSome([isKongoKaiNiC, isHieiKaiNiC]), isNotMidDmg])),
210+
overShip(1)(
211+
_.overEvery([_.overSome([isKongoKaiNiC, isHieiKaiNiC, isKirishimaKaiNiC]), isNotMidDmg]),
212+
),
213+
]),
214+
// Kirishima Kai Ni C
215+
_.overEvery([
216+
overShip(0)(_.overEvery([isKirishimaKaiNiC, isNotMidDmg])),
217+
overShip(1)(
218+
_.overEvery([
219+
_.overSome([
220+
isKongoKaiNiC,
221+
isHieiKaiNiC,
222+
isHarunaKaiNiB,
223+
isHarunaKaiNiC,
224+
isSouthDakotaKai,
225+
]),
226+
isNotMidDmg,
227+
]),
228+
),
185229
]),
186230
]),
187231
])

0 commit comments

Comments
 (0)