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

…to gh-pages
KC3Kai · Dec 28, 2023 · 1cc69dd · 1cc69dd
2 parents 606b730 + dd888a6
commit 1cc69dd
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 6 deletions.
diff --git a/js/data/mst_slotitem_bonus.json b/js/data/mst_slotitem_bonus.json
@@ -7174,5 +7174,54 @@
 				"num": 1
 			}
 		]
+	},
+	{
+		"ids": [85],
+		"bonuses": [
+			{
+				"bonus": { "tyku": 1, "kaih": 1 },
+				"level": 6
+			},
+			{
+				"bonus": { "tyku": 2 },
+				"level": 6,
+				"requiresAR": 1,
+				"num": 1
+			},
+			{
+				"bonus": { "houg": 1 },
+				"level": 8
+			},
+			{
+				"bonus": { "tyku": 1, "kaih": 1 },
+				"shipCountry": ["DE","IT"],
+				"level": 8
+			},
+			{
+				"bonus": { "kaih": 1, "houm": 1 },
+				"level": 10
+			},
+			{
+				"bonus": { "houg": 1 },
+				"shipCountry": ["DE","IT"],
+				"level": 10,
+				"num": 1
+			}
+		]
+	},
+	{
+		"ids": [519],
+		"bonuses": [
+			{
+				"bonus": { "houm": 2, "kaih": 2 },
+				"shipClass": [122],
+				"num": 1
+			},
+			{
+				"bonus": { "raig": 1, "houm": 2, "kaih": 2 },
+				"shipClass": [114],
+				"num": 1
+			}
+		]
 	}
 ]
diff --git a/js/kcEQDATA.js b/js/kcEQDATA.js
@@ -6013,6 +6013,16 @@ var EQDATA = {
 		ASW: 3,
 		RNG: 2,
 	},
+	519: {
+		name: 'SJ Radar + Submarine Conning Tower Equipment',
+		nameJP: 'SJレーダー+潜水艦司令塔装備',
+		added: '2023-12-26',
+		type: SUBRADAR,
+		TP: 5,
+		ACC: 5,
+		EV: 6,
+		LOS: 7,
+	},
 	1501: {
 		name: '5inch Single Cannon',
 		nameJP: '5inch単装砲',

diff --git a/js/kcsim.js b/js/kcsim.js
@@ -1543,12 +1543,14 @@ function nightPhase(order1,order2,alive1,subsalive1,alive2,subsalive2,NBonly,API
 		if (alive2[i].hasSearchlight) { light2 = true; lightship2 = i; slrerolls2 = alive2[i].hasSearchlight; break; }
 	}
 	var scout1 = null, scout2 = null;
-	if (alive1[0] && alive1[0].fleet.AS != -2 && (NBonly || alive1[0].fleet.AS != 0)) {
-		scout1 = getNightEquipsScout(alive1);
+	let ship1 = alive1[0] || subsalive1[0];
+	if (ship1 && ship1.fleet.AS != -2 && (NBonly || ship1.fleet.AS != 0)) {
+		scout1 = getNightEquipsScout(alive1.concat(subsalive1));
 		if (C && scout1) APIyasen.api_touch_plane[0] = scout1.mid;
 	}
-	if (alive2[0] && alive2[0].fleet.AS != -2 && (NBonly || alive2[0].fleet.AS != 0)) {
-		scout2 = getNightEquipsScout(alive2);
+	let ship2 = alive2[0] || subsalive2[0];
+	if (ship2 && ship2.fleet.AS != -2 && (NBonly || ship2.fleet.AS != 0)) {
+		scout2 = getNightEquipsScout(alive2.concat(subsalive2));
 		if (C && scout2) APIyasen.api_touch_plane[1] = scout2.mid;
 	}
 	let numRounds = Math.max(order1.length,order2.length);
@@ -4325,7 +4327,7 @@ function simNightFirstCombined(F1,F2,Fsupport,LBASwaves,BAPI) {
 	}
 
 	var APIyasen = BAPI.data;
-	var nightEquips = getNightEquips(alive1,alive2,APIyasen);
+	var nightEquips = getNightEquips(alive1.concat(subsalive1),alive2.concat(subsalive2),APIyasen);
 
 	if (alive1.length+subsalive1.length > 0 && alive2.length+subsalive2.length+alive2C.length+subsalive2C.length > 0) {
 		APIyasen.api_n_hougeki1 = {api_at_eflag:[],api_at_list:[],api_damage:[],api_df_list:[],api_sp_list:[],api_cl_list:[],api_n_mother_list:[],api_si_list:[]};
@@ -4488,7 +4490,7 @@ function friendFleetPhase(fleet1,fleet2,alive2,subsalive2,BAPI) {
 	}
 
 	APIyasen.api_friendly_battle = {};
-	var nightEquips = getNightEquips(fleet1.ships,alive2,APIyasen.api_friendly_battle);
+	var nightEquips = getNightEquips(fleet1.ships,alive2.concat(subsalive2),APIyasen.api_friendly_battle);
 
 	let APIhou = APIyasen.api_friendly_battle.api_hougeki = {api_at_eflag:[],api_at_list:[],api_damage:[],api_df_list:[],api_sp_list:[],api_cl_list:[],api_n_mother_list:[],api_si_list:[]};