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

…to gh-pages
KC3Kai · Apr 2, 2024 · 745627f · 745627f
2 parents 9b668eb + 84fb8db
commit 745627f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/js/kcEQDATA.js b/js/kcEQDATA.js
@@ -6102,7 +6102,7 @@ var EQDATA = {
 	527: {
 		name: 'Type 281 Radar',
 		nameJP: 'Type281 レーダー',
-		added: '2024-03-30',
+		added: '2024-03-28',
 		type: RADARL,
 		AA: 7,
 		ACC: 1,
@@ -6112,7 +6112,7 @@ var EQDATA = {
 	528: {
 		name: 'Type 274 Fire Control Radar',
 		nameJP: 'Type274 射撃管制レーダー',
-		added: '2024-03-30',
+		added: '2024-03-28',
 		type: RADARL,
 		FP: 2,
 		AA: 3,

diff --git a/js/kcsim.js b/js/kcsim.js
@@ -1504,6 +1504,8 @@ function shellPhaseC(order1,order2,targets,APIhou,isOASW) {
 			if (isOASW) {
 				targetData = shellPhaseTarget(order1[i],[],targets.subsalive2.concat(targets.subsalive2C || []),isOASW);
 				shellPhaseAttack(order1[i],targetData,APIhou);
+				targets.subsalive2 = targets.subsalive2.filter(ship => ship.HP > 0);
+				targets.subsalive2C = targets.subsalive2C.filter(ship => ship.HP > 0);
 			} else if (targets.alive2.length + targets.alive2C.length && canSpecialAttack(order1[i])) {
 				let ships = getSpecialAttackShips(order1[i].fleet.ships,order1[i].attackSpecial,order1[i]);
 				let k=0;
@@ -1527,6 +1529,8 @@ function shellPhaseC(order1,order2,targets,APIhou,isOASW) {
 			if (isOASW) {
 				targetData = shellPhaseTarget(order2[i],[],targets.subsalive1.concat(targets.subsalive1C || []),isOASW);
 				shellPhaseAttack(order2[i],targetData,APIhou);
+				targets.subsalive1 = targets.subsalive1.filter(ship => ship.HP > 0);
+				targets.subsalive1C = targets.subsalive1C.filter(ship => ship.HP > 0);
 			} else {
 				var targetData, targetCFirst = targets.alive1C && Math.random() < .39;
 				if (targetCFirst) {