Merge branch 'master' of https://github.com/KC3Kai/kancolle-replay in…

…to gh-pages
KC3Kai · Apr 13, 2024 · 37b938a · 37b938a
2 parents 3ffd47b + 102f76c
commit 37b938a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/js/kcships.js b/js/kcships.js
@@ -1611,6 +1611,11 @@ Ship.prototype.getAACItype = function(atypes) {
 		if (this.equips.find(eq => eq.mid == 502 || eq.mid == 503) && concentrated && atypes[A_AIRRADAR]) types.push(46);
 	}
 
+	if (this.sclass == 23 && SHIPDATA[this.mid].AA >= 70) { //CK3H
+		let numCK3H = this.equips.filter(eq => eq.mid == 529).length;
+		if (numCK3H >= 2 || (numCK3H && (this.equips.find(eq => eq.mid == 505) || this.equips.find(eq => eq.btype == B_RADAR && eq.AA >= 4)))) types.push(47);
+	}
+
 	var add6 = false;
 	if (this.type=='BB'||this.type=='BBV'||this.type=='FBB') {  //is BB
 		if (atypes[A_GUN] && atypes[A_TYPE3SHELL] && atypes[A_AAFD]) {

diff --git a/js/kcsim.js b/js/kcsim.js
@@ -103,9 +103,10 @@ var AACIDATA = {
 	44:{num:6,rate:.55,mod:1.6,equip:'HRG',num1:1},
 	45:{num:5,rate:.5,mod:1.55,equip:'HR',num1:1},
 	46:{num:8,rate:.6,mod:1.55,equip:'MCR',num1:1},
+	47:{num:2,rate:.7,mod:1.3,equip:'MG',num1:1},
 };
 (() => {
-	let orderKnown = [38,39,40,42,41,10,43,46,11,25,1,34,44,26,4,2,35,36,27,45,19,21,29,16,14,3,5,6,28,37,33,30,8,13,15,7,20,24,32,12,31,17,18,22,9,23];
+	let orderKnown = [38,39,40,42,41,10,43,46,11,25,1,34,44,26,4,2,35,36,27,45,19,21,29,16,14,3,5,6,28,37,33,30,8,13,15,7,20,24,32,12,31,47,17,18,22,9,23];
 	let orderUnknown = Object.keys(AACIDATA).map(key => +key).filter(type => !orderKnown.includes(type)).sort((a,b) => AACIDATA[a].num != AACIDATA[b].num ? AACIDATA[b].num - AACIDATA[a].num : AACIDATA[a].mod != AACIDATA[b].mod ? AACIDATA[b].mod - AACIDATA[a].mod : +a-+b);
 	let orderAll = [], n = 0;
 	for (let id of orderKnown) {