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

…to gh-pages
KC3Kai · Sep 20, 2024 · 63cb4f8 · 63cb4f8
2 parents a4d1de8 + 5795f80
commit 63cb4f8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/js/kcSHIPDATA.js b/js/kcSHIPDATA.js
@@ -19353,9 +19353,9 @@ var SHIPDATA = {
  TP: 45, TPbase: 0,
  AA: 100, AAbase: 85,
  AR: 72, ARbase: 55,
- EV: 83, EVbase: 39,
+ EV: 83, EVbase: 38,
  ASW: 45, ASWbase: 0,
- LOS: 90, LOSbase: 38,
+ LOS: 90, LOSbase: 40,
  LUK: 39, LUKmax: 99,
  RNG: 2,
  SPD: 10,
@@ -33267,7 +33267,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, LOS: 2, LUK: 2 },
  RNG: 4,
  SPD: 10,
- SLOTS: [48, 44, 46, 42, 0],
+ SLOTS: [48, 50, 46, 36, 0],
  EQUIPS: [1581, 1574, 1582, 1583, 1608],
  },
  2128: {
@@ -33311,7 +33311,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, LOS: 2, LUK: 2 },
  RNG: 4,
  SPD: 10,
- SLOTS: [48, 44, 46, 42, 0],
+ SLOTS: [48, 50, 46, 36, 0],
  EQUIPS: [1581, 1574, 1582, 1583, 1608],
  },
  2130: {
@@ -36112,7 +36112,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, ASW: 2, LOS: 2, LUK: 2, TACC: 2 },
  RNG: 4,
  SPD: 10,
- SLOTS: [32, 60, 20, 20, 0],
+ SLOTS: [34, 58, 20, 20, 0],
  EQUIPS: [1650, 1651, 1652, 1648, 1608],
  },
  2260: {
@@ -36156,7 +36156,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, ASW: 2, LOS: 2, LUK: 2, TACC: 2 },
  RNG: 4,
  SPD: 10,
- SLOTS: [44, 74, 32, 32, 0],
+ SLOTS: [42, 76, 32, 32, 0],
  EQUIPS: [1650, 1651, 1652, 1648, 1608],
  },
  3001: {

diff --git a/js/kcships.js b/js/kcships.js
@@ -1224,7 +1224,7 @@ Ship.prototype.getEquipBonusCVTorp = function(slot) {
 Ship.prototype.getFormation = function() {
  if (!this.fleet || !this.fleet.formation) return null;
  if (this.fleet.formation.id != 6) return this.fleet.formation;
- let threshold = Math.floor(this.fleet.ships.length/2);
+ let threshold = this.isescort ? Math.max(2,Math.floor(this.fleet.combinedWith.ships.length/2)) : Math.floor(this.fleet.ships.length/2);
  return (this.num <= threshold)? VANGUARD1 : VANGUARD2;
 }
 Ship.prototype.addJetSteelCost = function() {

diff --git a/js/kcsim.js b/js/kcsim.js
@@ -666,7 +666,7 @@ function shell(ship,target,APIhou,attackSpecial,combinedAll) {
 
 function NBattack(ship,target,NBonly,NBequips,APIyasen,attackSpecial) {
  var starshells = NBequips[0], searchlights = NBequips[1], nightscouts = NBequips[2];
- if (!ship.canNB()) return false;
+ if (!ship.canNB() && attackSpecial != 100) return false;
  var da = false; //1 = combined damage, 2 = separate damages
  var cutin = false, cutinR = 0;