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

…to gh-pages
KC3Kai · Mar 21, 2024 · a56a118 · a56a118
2 parents 42ddb88 + 150f86b
commit a56a118
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 21 deletions.
diff --git a/js/data/bonus/58-1.json b/js/data/bonus/58-1.json
@@ -16,7 +16,7 @@
  { "dmg": 1.16, "shipBase": [80] },
  { "dmg": 1.28, "shipBase": [699] },
  { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] },
- { "dmg": 1.05, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
+ { "dmg": 1.06, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
  ]
  },
  {

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-11",
+ "date": "2024-03-21",
  "note": "WIP",
  "listBonus": [
  {
@@ -16,10 +16,10 @@
  ]
  },
  {
- "nodesExclude": ["Y"],
+ "nodesExclude": ["D3","H","N","R","Y"],
  "bonuses": [
  { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] },
- { "dmg": 1.05, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
+ { "dmg": 1.06, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
  ]
  },
  {
@@ -45,6 +45,7 @@
  "nodes": ["Y"],
  "bonuses": [
  { "dmg": 1.85, "shipType": [13,14], "requireEquipId": [525,526] },
+ { "dmg": 1.25, "shipType": [13,14], "requireEquipId": [62,208] },
  { "dmg": 1.45, "shipId": [348,507,586], "requireEquipId": [525,526] }
  ]
  }
@@ -60,7 +61,7 @@
  "nodes": ["Y"],
  "debuffs": [
  { "shipId": [2204,2205,2206,2207,2208,2209], "amount": 44 },
- { "shipId": [1591,1592,1615,1765,1776], "amount": 13 }
+ { "shipId": [1528,1591,1592,1615,1765,1776], "amount": 13 }
  ]
  }
  ]

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-11",
+ "date": "2024-03-21",
  "note": "WIP",
  "listBonus": [
  {
@@ -16,10 +16,10 @@
  ]
  },
  {
- "nodesExclude": ["Z"],
+ "nodesExclude": ["N","O3","U","Z"],
  "bonuses": [
  { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] },
- { "dmg": 1.05, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
+ { "dmg": 1.06, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
  ]
  },
  {
@@ -29,7 +29,7 @@
  ]
  },
  {
- "nodes": ["P","R","S","T","U"],
+ "nodes": ["L","P","R","S","T","U"],
  "bonuses": [
  { "dmg": 1.18, "shipBase": [50,66,67,68,69,71,72,78,79,102,103,116,124,125,131,135,138,143,425,452,484,485,527,528,674] }
  ]
@@ -51,6 +51,7 @@
  "nodes": ["Z"],
  "bonuses": [
  { "dmg": 1.95, "shipType": [13,14], "requireEquipId": [525,526] },
+ { "dmg": 1.25, "shipType": [13,14], "requireEquipId": [62,208] },
  { "dmg": 1.45, "shipId": [348,507,586], "requireEquipId": [525,526] }
  ]
  }
@@ -66,7 +67,7 @@
  "nodes": ["Z"],
  "debuffs": [
  { "shipId": [2210,2211,2212,2213,2214,2215], "amount": 48 },
- { "shipId": [1519,1555,1591,1592,1594,1595,1765,1776], "amount": 14 }
+ { "shipId": [1506,1519,1555,1591,1592,1595,1765,1776], "amount": 14 }
  ]
  }
  ]

diff --git a/js/data/bonus/58-4.json b/js/data/bonus/58-4.json
@@ -1,7 +1,7 @@
 {
  "world": 58,
  "mapnum": 4,
- "date": "2024-03-14",
+ "date": "2024-03-21",
  "note": "WIP (LBAS incomplete, may be inaccurate)",
  "listBonus": [
  {
@@ -12,9 +12,14 @@
  { "dmg": 1.11, "shipType": [7] },
  { "dmg": 1.04, "shipType": [13,14] },
  { "dmg": 1.08, "shipType": [16] },
- { "dmg": 1.08, "shipType": [20] },
- { "dmg": 1.12, "shipType": [17,19,20,21,22], "requireEquipId": [524] },
- { "dmg": 1.05, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
+ { "dmg": 1.08, "shipType": [20] }
+ ]
+ },
+ {
+ "nodesExclude": ["G","Z"],
+ "bonuses": [
+ { "dmg": 1.15, "shipType": [17,19,20,21,22], "requireEquipId": [524] },
+ { "dmg": 1.06, "shipType": [17,19,20,21,22], "requireEquipId": [524], "requireEquipIdNum": 2 }
  ]
  },
  {
@@ -39,7 +44,7 @@
  {
  "nodes": ["G"],
  "bonuses": [
- { "dmg": 1.05, "shipType": [2,3,5,6,7,11,18] }
+ { "dmg": 1.05, "shipType": [1,2,3,5,6,7,11,18,21] }
  ]
  },
  {
@@ -65,29 +70,29 @@
  "bonuses": [
  { "dmg": 1.14, "shipBase": [26,42,43,46,47,50,62,65,71,72,78,79,80,113,124,125,131,135,138,143,405,425,452,458,484,485,527,528,671,674] },
  { "dmg": 1.06, "shipType": [1,2,3,21] },
- { "dmg": 1.16, "shipType": [4,5,6] }
+ { "dmg": 1.16, "shipType": [4,5,6,16] }
  ]
  }
  ],
  "listBonusLBAS": [
  {
  "nodesExclude": ["G","S","Z"],
  "bonuses": [
- { "dmg": 1.2, "basewide": 1, "requireEquipId": [170,178,395,493,504] },
+ { "dmg": 1.2, "basewide": 1, "requireEquipId": [170,178,395,492,493,504] },
  { "dmg": 1.2, "basewide": 1, "requireEquipId": [388,396] }
  ]
  },
  {
  "nodes": ["G"],
  "bonuses": [
- { "dmg": 1.35, "basewide": 1, "requireEquipId": [170,178,395,493,504] },
+ { "dmg": 1.35, "basewide": 1, "requireEquipId": [170,178,395,492,493,504] },
  { "dmg": 1.65, "basewide": 1, "requireEquipId": [388,396] }
  ]
  },
  {
  "nodes": ["S","Z"],
  "bonuses": [
- { "dmg": 1.3, "basewide": 1, "requireEquipId": [170,178,395,493,504] },
+ { "dmg": 1.3, "basewide": 1, "requireEquipId": [170,178,395,492,493,504] },
  { "dmg": 1.56, "basewide": 1, "requireEquipId": [388,396] }
  ]
  }

diff --git a/js/kcships.js b/js/kcships.js
@@ -2244,6 +2244,10 @@ Equip.prototype.setImprovement = function(level) {
  if ([226,227,488].includes(this.mid)) {
  this.improves.Pshell = 0;
  }
+
+ if (this.mid == 138 && level >= 4) {
+ this.AAImprove = .5;
+ }
 }
 Equip.prototype.setProficiency = function(rank,forLBAS) {
  if (!EQTDATA[this.type].isPlane) return;

diff --git a/js/kcsim.js b/js/kcsim.js
@@ -739,6 +739,9 @@ function NBattack(ship,target,NBonly,NBequips,APIyasen,attackSpecial) {
  }
  }
  }
+ if (!attackSpecial && ship.fleet.useAtoll && ship.numAtollAttacks) {
+ cutin = 1000;
+ }
 
  if (ship.getFormation() == VANGUARD1) {
  preMod *= .5;
@@ -860,7 +863,7 @@ function NBattack(ship,target,NBonly,NBequips,APIyasen,attackSpecial) {
  APIyasen.api_df_list.push([target.apiID]);
  }
  APIyasen.api_damage.push([realdmg+DIDPROTECT*.1]);
- APIyasen.api_sp_list.push(!attackSpecial && ship.fleet.useAtoll && ship.numAtollAttacks ? 1000 : cutin || 0);
+ APIyasen.api_sp_list.push(cutin || 0);
  APIyasen.api_cl_list.push([((res>1)?2:1)]);
  APIyasen.api_n_mother_list.push(+ship.canNBAirAttack());
  }
@@ -1460,7 +1463,7 @@ function shellPhase(order1,order2,alive1,subsalive1,alive2,subsalive2,APIhou,isO
 }
 
 function doShellC(ship,targets,APIhou,isOASW,attackSpecial) {
- var targetData, targetCFirst = targets.alive2C && Math.random() < .39;
+ var targetData, targetCFirst = targets.alive2C && Math.random() < (isOASW ? .61 : .39);
  if (ship.isAntiPT) {
  let hasMain = !!targets.alive2.find(target => target.isPT), hasEscort = !!targets.alive2C.find(target => target.isPT);
  if (hasMain && !hasEscort) targetCFirst = false;

diff --git a/js/simulator-ui/fleet-editor.js b/js/simulator-ui/fleet-editor.js
@@ -1028,6 +1028,7 @@ var UI_ADDITIONALSTATS = Vue.createApp({
  if (fleetSim.combinedWith) {
  this.fleet.airPowerCombined = fleetSim.fleetAirPower() + fleetSim.combinedWith.fleetAirPower();
  this.fleet.airPowerLB += fleetSim.combinedWith.fleetAirPower('isPlane');
+ this.fleet.transport += fleetSim.combinedWith.getTransport();
  }
  for (let i=1; i<=4; i++) {
  let los = fleetSim.fleetELoS(i);