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

…to gh-pages
KC3Kai · Mar 11, 2024 · 54560f1 · 54560f1
2 parents 025f08c + 5968b7b
commit 54560f1
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 27 deletions.
diff --git a/js/data/bonus/58-1.json b/js/data/bonus/58-1.json
@@ -1,7 +1,7 @@
 {
  "world": 58,
  "mapnum": 1,
- "date": "2024-03-03",
+ "date": "2024-03-11",
  "note": "",
  "listBonus": [
  {
@@ -12,8 +12,10 @@
  { "dmg": 1.11, "shipType": [7] },
  { "dmg": 1.04, "shipType": [13,14] },
  { "dmg": 1.08, "shipType": [16] },
+ { "dmg": 1.08, "shipType": [20] },
  { "dmg": 1.16, "shipBase": [80] },
- { "dmg": 1.28, "shipBase": [699] }
+ { "dmg": 1.28, "shipBase": [699] },
+ { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] }
  ]
  },
  {

diff --git a/js/data/bonus/58-2.json b/js/data/bonus/58-2.json
@@ -1,7 +1,7 @@
 {
  "world": 58,
  "mapnum": 2,
- "date": "2024-03-05",
+ "date": "2024-03-11",
  "note": "WIP",
  "listBonus": [
  {
@@ -18,7 +18,8 @@
  {
  "nodesExclude": ["Y"],
  "bonuses": [
- { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] }
+ { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] },
+ { "dmg": 1.05, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
  ]
  },
  {
@@ -43,7 +44,8 @@
  {
  "nodes": ["Y"],
  "bonuses": [
- { "dmg": 1.85, "shipType": [13,14], "requireEquipId": [525,526] }
+ { "dmg": 1.85, "shipType": [13,14], "requireEquipId": [525,526] },
+ { "dmg": 1.45, "shipId": [348,507,586], "requireEquipId": [525,526] }
  ]
  }
  ],

diff --git a/js/data/bonus/58-3.json b/js/data/bonus/58-3.json
@@ -1,7 +1,7 @@
 {
  "world": 58,
  "mapnum": 3,
- "date": "2024-03-05",
+ "date": "2024-03-11",
  "note": "WIP",
  "listBonus": [
  {
@@ -18,7 +18,8 @@
  {
  "nodesExclude": ["Z"],
  "bonuses": [
- { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] }
+ { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] },
+ { "dmg": 1.05, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
  ]
  },
  {
@@ -49,22 +50,23 @@
  {
  "nodes": ["Z"],
  "bonuses": [
- { "dmg": 1.95, "shipType": [13,14], "requireEquipId": [525,526] }
+ { "dmg": 1.95, "shipType": [13,14], "requireEquipId": [525,526] },
+ { "dmg": 1.45, "shipId": [348,507,586], "requireEquipId": [525,526] }
  ]
  }
  ],
  "listDebuff": [
  {
  "nodes": ["Y2"],
  "debuffs": [
- { "shipId": [1518,1554,1555,1591,1594], "amount": 13 }
+ { "shipId": [1518,1554,1555,1591,1594], "amount": 10 }
  ]
  },
  {
  "nodes": ["Z"],
  "debuffs": [
- { "shipId": [2210,2211,2212,2213,2214,2215], "amount": 44 },
- { "shipId": [1519,1555,1591,1592,1594,1595,1765,1776], "amount": 13 }
+ { "shipId": [2210,2211,2212,2213,2214,2215], "amount": 48 },
+ { "shipId": [1519,1555,1591,1592,1594,1595,1765,1776], "amount": 14 }
  ]
  }
  ]

diff --git a/js/kcSHIPDATA.js b/js/kcSHIPDATA.js
@@ -7848,7 +7848,7 @@ var SHIPDATA = {
  TP: 88, TPbase: 36,
  AA: 80, AAbase: 28,
  AR: 80, ARbase: 47,
- EV: 87, EVbase: 47,
+ EV: 88, EVbase: 47,
  ASW: 0, ASWbase: 0,
  LOS: 61, LOSbase: 19,
  LUK: 32, LUKmax: 80,
@@ -18627,7 +18627,7 @@ var SHIPDATA = {
  AR: 87, ARbase: 71,
  EV: 47, EVbase: 20,
  ASW: 0, ASWbase: 0,
- LOS: 36, LOSbase: 6,
+ LOS: 36, LOSbase: 8,
  LUK: 33, LUKmax: 103,
  RNG: 3,
  SPD: 5,
@@ -34759,7 +34759,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, LOS: 2, LUK: 2, TACC: 2 },
  RNG: 2,
  SPD: 10,
- SLOTS: [0, 0, 61, 61],
+ SLOTS: [0, 0, 52, 52],
  EQUIPS: [1647, 1647, 1648, 1648],
  },
  2216: {
@@ -34795,7 +34795,7 @@ var SHIPDATA = {
  HP: 550,
  FP: 110,
  TP: 121,
- AA: 130,
+ AA: 120,
  AR: 125,
  EV: 120,
  ASW: 120,
@@ -34906,6 +34906,7 @@ var SHIPDATA = {
  image: 'S2222.jpg',
  type: 'CV',
  hasBuiltInNightCrew: true,
+ nightattack: 1,
  HP: 600,
  FP: 200,
  TP: 0,
@@ -34918,7 +34919,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, ASW: 2, LOS: 2, LUK: 2, },
  RNG: 4,
  SPD: 10,
- SLOTS: [24, 24, 24, 23, 0],
+ SLOTS: [31, 8, 28, 28, 0],
  EQUIPS: [1617, 1648, 1618, 1619, 1608],
  },
  2223: {
@@ -34927,6 +34928,7 @@ var SHIPDATA = {
  image: 'S2222.jpg',
  type: 'CV',
  hasBuiltInNightCrew: true,
+ nightattack: 1,
  HP: 800,
  FP: 240,
  TP: 0,
@@ -34939,7 +34941,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, ASW: 2, LOS: 2, LUK: 2, },
  RNG: 4,
  SPD: 10,
- SLOTS: [26, 26, 26, 26, 0],
+ SLOTS: [38, 15, 27, 24, 0],
  EQUIPS: [1617, 1648, 1618, 1619, 1608],
  },
  2224: {
@@ -34948,6 +34950,7 @@ var SHIPDATA = {
  image: 'S2222.jpg',
  type: 'CV',
  hasBuiltInNightCrew: true,
+ nightattack: 1,
  HP: 980,
  FP: 280,
  TP: 0,
@@ -34969,6 +34972,7 @@ var SHIPDATA = {
  image: 'S2225.jpg',
  type: 'CV',
  hasBuiltInNightCrew: true,
+ nightattack: 1,
  HP: 600,
  FP: 240,
  TP: 0,
@@ -34981,7 +34985,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, ASW: 2, LOS: 2, LUK: 2, },
  RNG: 4,
  SPD: 10,
- SLOTS: [26, 26, 26, 26, 0],
+ SLOTS: [38, 15, 27, 24, 0],
  EQUIPS: [1617, 1648, 1618, 1619, 1608],
  },
  2226: {
@@ -34990,6 +34994,7 @@ var SHIPDATA = {
  image: 'S2225.jpg',
  type: 'CV',
  hasBuiltInNightCrew: true,
+ nightattack: 1,
  HP: 800,
  FP: 280,
  TP: 0,
@@ -35011,6 +35016,7 @@ var SHIPDATA = {
  image: 'S2225.jpg',
  type: 'CV',
  hasBuiltInNightCrew: true,
+ nightattack: 1,
  HP: 980,
  FP: 320,
  TP: 0,
@@ -35023,7 +35029,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, ASW: 2, LOS: 2, LUK: 2, },
  RNG: 4,
  SPD: 10,
- SLOTS: [48, 44, 44, 42, 0],
+ SLOTS: [50, 42, 43, 43, 0],
  EQUIPS: [1617, 1648, 1618, 1619, 1608],
  },
  2228: {
@@ -35045,7 +35051,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, LOS: 2, LUK: 2, TACC: 2 },
  RNG: 1,
  SPD: 5,
- SLOTS: [0, 0, 1, 0],
+ SLOTS: [0, 0, 1, 3],
  EQUIPS: [1580, 1580, 1586, 0],
  },
  2229: {
@@ -35067,7 +35073,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, LOS: 2, LUK: 2, TACC: 2 },
  RNG: 1,
  SPD: 5,
- SLOTS: [0, 0, 1, 0],
+ SLOTS: [0, 0, 1, 3],
  EQUIPS: [1580, 1580, 1586, 0],
  },
  2230: {
@@ -35111,7 +35117,7 @@ var SHIPDATA = {
  unknownstats: { EV: 2, LOS: 2, LUK: 2, TACC: 2 },
  RNG: 1,
  SPD: 5,
- SLOTS: [0, 0, 1, 0],
+ SLOTS: [0, 0, 1, 3],
  EQUIPS: [1580, 1580, 1586, 0],
  },
  2232: {

diff --git a/js/kcsim.js b/js/kcsim.js
@@ -1665,7 +1665,7 @@ function torpedoPhase(alive1,subsalive1,alive2,subsalive2,opening,APIrai,combine
  for (var i=0; i<alive1.length+subsalive1.length; i++) {
  var ship = (i < alive1.length) ? alive1[i] : subsalive1[i-alive1.length];
  if (ship.fleet.combinedWith && !ship.isescort && (!ship.canOpTorpMain || !opening)) continue;
- if ((opening)? (ship.canOpTorp() || ship.fleet.useAtoll) : ship.canTorp()) {
+ if ((opening)? (ship.canOpTorp() || (ship.fleet.useAtoll && (!ship.isSub || ship.LVL >= 10))) : ship.canTorp()) {
  let numAttack = opening && ship.fleet.useAtoll ? (ship.numAtollAttacks || 0) : 1;
  for (let n=0; n<numAttack; n++) {
  if (combinedAll && !opening) {

diff --git a/js/simulator-ui/bonus.js b/js/simulator-ui/bonus.js
@@ -185,11 +185,11 @@ COMMON.BONUS_MANAGER = {
  let numBonus = 0;
  if (bonus.requireEquipId) {
  numBonus = ship.equips.filter((eq,i) => bonus.requireEquipId.includes(eq.mstId) && (!bonus.requireSlot || ship.slots[i])).length;
- if (numBonus <= 0) continue;
+ if (numBonus < (bonus.requireEquipIdNum || 1)) continue;
  }
  if (bonus.requireEquipType) {
  numBonus = ship.equips.filter((eq,i) => bonus.requireEquipType.includes(EQDATA[eq.mstId].type) && (!bonus.requireSlot || ship.slots[i])).length;
- if (numBonus <= 0) continue;
+ if (numBonus < (bonus.requireEquipTypeNum || 1)) continue;
  }
  if (!bonus.perEquip) numBonus = 1;
  if (!bonusesTotal[nodeId]) bonusesTotal[nodeId] = { dmg: null, acc: null, eva: null };

diff --git a/js/simulator-ui/fleet-editor.js b/js/simulator-ui/fleet-editor.js
@@ -875,6 +875,7 @@ var UI_ADDITIONALSTATS = Vue.createApp({
  los2: null,
  los3: null,
  los4: null,
+ transport: null,
  },
  ships: [],
  }),
@@ -1023,6 +1024,7 @@ var UI_ADDITIONALSTATS = Vue.createApp({
  this.fleet.airPower = fleetSim.fleetAirPower();
  this.fleet.airPowerCombined = null;
  this.fleet.airPowerLB = fleetSim.fleetAirPower('isPlane');
+ this.fleet.transport = fleetSim.getTransport();
  if (fleetSim.combinedWith) {
  this.fleet.airPowerCombined = fleetSim.fleetAirPower() + fleetSim.combinedWith.fleetAirPower();
  this.fleet.airPowerLB += fleetSim.combinedWith.fleetAirPower('isPlane');

diff --git a/js/simulator-ui/sim-interface.js b/js/simulator-ui/sim-interface.js
@@ -444,7 +444,7 @@ var SIM = {
 
  this._setMechanics(dataInput);
 
- if (dataInput.nodes.find(node => node.useSmoke) && !SIMCONSTS.smokeChance.reduce((a,b)=>a+b,0)) {
+ if (dataInput.nodes.find(node => node.useSmoke) && !SIMCONSTS.smokeChance.reduce((a,b)=>a+(b||0),0)) {
  this._addError('no_smoke');
  }
 

diff --git a/simulator.html b/simulator.html
@@ -953,7 +953,7 @@ <h3>Statistics</h3>
  <div id="divAdditionalStats"><div v-show="active">
  <vmodal :active="active" @vclose="doClose">
  <div id="divAdditionalStatsMain" class="additionalStatsMain">
- <div>Fleet Air Power: {{fleet.airPower}} (<span v-show="fleet.airPowerCombined">combined = {{fleet.airPowerCombined}}, </span>vs LBAS = {{fleet.airPowerLB}})</div>
+ <div>Fleet Air Power: {{fleet.airPower}} (<span v-show="fleet.airPowerCombined">combined = {{fleet.airPowerCombined}}, </span>vs LBAS = {{fleet.airPowerLB}})&nbsp;&nbsp;&nbsp;&nbsp;Transport: {{fleet.transport}}</div>
  <div>Effective LoS (HQ120): C1 = {{fleet.los1}}, C2 = {{fleet.los2}}, C3 = {{fleet.los3}}, C4 = {{fleet.los4}}</div>
  <table>
  <tr><td v-for="s in ships"><img :src="'assets/icons/' + s.imgName"/></td></tr>