@@ -84,10 +84,14 @@ const isHarunaKaiNiC = shipIdIs(954)
84
84
85
85
const isKirishimaKaiNi = shipIdIs ( 152 )
86
86
87
+ const isKirishimaKaiNiC = shipIdIs ( 694 )
88
+
87
89
const isWarspite = _ . overSome ( [ shipIdIs ( 364 ) , shipIdIs ( 439 ) ] )
88
90
89
91
const isWarspiteKai = shipIdIs ( 364 )
90
92
93
+ const isValiant = _ . overSome ( [ shipIdIs ( 927 ) , shipIdIs ( 733 ) ] )
94
+
91
95
const isValiantKai = shipIdIs ( 733 )
92
96
93
97
const isRichelieuKaiOrDeux = _ . overSome ( [ shipIdIs ( 392 ) , shipIdIs ( 969 ) ] )
@@ -166,22 +170,62 @@ const isKongoClassKaiNiCSpAttack = _.overEvery([
166
170
isSpAttackLessThan ( [ SP_ATTACK_ID . Kongo_Class_Kaini_C_Charge ] ) ( 2 ) ,
167
171
isFleetWith5NonSubs ,
168
172
_ . overSome ( [
173
+ // Kongo Kai Ni C
169
174
_ . overEvery ( [
170
175
overShip ( 0 ) ( _ . overEvery ( [ isKongoKaiNiC , isNotMidDmg ] ) ) ,
171
176
overShip ( 1 ) (
172
177
_ . 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
+ ] ) ,
174
187
isNotMidDmg ,
175
188
] ) ,
176
189
) ,
177
190
] ) ,
191
+ // Hiei Kai Ni C
178
192
_ . overEvery ( [
179
193
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
+ ) ,
181
206
] ) ,
207
+ // Haruna Kai Ni B/C
182
208
_ . overEvery ( [
183
209
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
+ ) ,
185
229
] ) ,
186
230
] ) ,
187
231
] )
0 commit comments