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

…to gh-pages
KC3Kai · May 26, 2024 · 5854887 · 5854887
2 parents 68dd1f3 + 9ce2894
commit 5854887
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 47 deletions.
diff --git a/js/kcEQDATA.js b/js/kcEQDATA.js
@@ -104,7 +104,7 @@ EQTDATA[MAINGUNS] = {
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3},
  canequip: ['DD','CL','CT','CLT','AS','AV','AO','AR','LHA','DE'],
  canequipS: [541],
- cannotequipS: [645, 650, 699, 717, 900, 943],
+ cannotequipS: [507, 645, 650, 717, 900, 943],
 };
 EQTDATA[MAINGUNSAA] = {
  name: 'Main Gun (S)',
@@ -114,7 +114,7 @@ EQTDATA[MAINGUNSAA] = {
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3,AAfleet:2,AAself:1},
  canequip: ['DD','CL','CT','CLT','AS','AV','AO','AR','LHA','DE'],
  canequipS: [541],
- cannotequipS: [645, 650, 699, 717, 900, 943],
+ cannotequipS: [507, 645, 650, 717, 900, 943],
 };
 EQTDATA[MAINGUNM] = {
  name: 'Main Gun (M)',
@@ -123,7 +123,7 @@ EQTDATA[MAINGUNM] = {
  atype: A_GUN,
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3},
  canequip: ['CL','CT','CLT','CA','CAV','BB','BBV'],
- canequipS: [372, 491, 500, 581, 586, 634, 635, 639, 640, 690, 911],
+ canequipS: [372, 491, 500, 507, 581, 586, 634, 635, 639, 640, 690, 911],
  cannotequipS: [877],
 };
 EQTDATA[MAINGUNL] = {
@@ -150,7 +150,7 @@ EQTDATA[SECGUN] = {
  atype: A_GUN,
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3},
  canequip: ['CL','CT','CLT','CA','CAV','FBB','BB','BBV','CVL','CV','CVB','AS','AV','AR','LHA'],
- canequipS: [500, 717],
+ canequipS: [352, 460, 500, 699, 717],
  cannotequipS: [477, 478, 622, 623, 624, 945],
 };
 EQTDATA[SECGUNL] = {
@@ -168,7 +168,7 @@ EQTDATA[SECGUNAA] = {
  atype: A_HAGUN,
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3,AAfleet:2,AAself:1},
  canequip: ['CL','CT','CLT','CA','CAV','FBB','BB','BBV','CVL','CV','CVB','AS','AV','AR','LHA'],
- canequipS: [500, 717],
+ canequipS: [352, 460, 500, 699, 717],
  cannotequipS: [477, 478, 622, 623, 624, 945],
 };
 EQTDATA[APSHELL] = {
@@ -185,7 +185,7 @@ EQTDATA[TORPEDO] = {
  btype: B_TORPEDO,
  improve: {Ptorp:1.2,Pnb:1,ACCtorp:2,ACCnb:1.3},
  canequip: ['DD','CL','CT','CLT','CA','CAV','SS','SSV'],
- canequipS: [178, 591, 592, 593, 877, 879, 954],
+ canequipS: [178, 507, 591, 592, 593, 877, 879, 954],
  cannotequipS: [657],
 };
 EQTDATA[TORPEDOSS] = {
@@ -226,7 +226,7 @@ EQTDATA[SONARS] = {
  btype: B_SONAR,
  improve: {Pshell:.75,Pasw:1,ACCasw:1.3,EVtorp:1.5},
  canequip: ['DD','CL','CT','CLT','SS','SSV','DE'],
- canequipS: [352, 372, 380, 381, 382, 450, 491, 500, 529, 534, 536, 546, 554, 586, 591, 592, 593, 626, 645, 650, 690, 699, 707, 713, 717, 879, 885, 889, 894, 899, 900, 911, 916, 943, 948, 954],
+ canequipS: [352, 372, 380, 381, 382, 450, 491, 500, 507, 529, 534, 536, 546, 554, 586, 591, 592, 593, 626, 645, 650, 690, 699, 707, 713, 717, 879, 885, 889, 894, 899, 900, 911, 916, 943, 948, 954],
  canASWDamage: true,
 };
 EQTDATA[SONARL] = {
@@ -246,7 +246,7 @@ EQTDATA[DEPTHCHARGE] = {
  improve: {Pshell:.75,Pasw:1,ACCasw:1.3},
  canequip: ['DD','CL','CT','CLT','AV','DE'],
  canequipS: [380, 381, 382, 411, 412, 500, 529, 534, 536, 699, 717, 889, 900],
- cannotequipS: [372, 491, 581, 586, 690],
+ cannotequipS: [372, 491, 507, 581, 586, 690],
  canASWDamage: true,
 };
 EQTDATA[FIGHTER] = {
@@ -372,7 +372,7 @@ EQTDATA[RADARL] = {
  btype: B_RADAR,
  improve: {ACCshell:1,ACCnb:1.3,LOS:1.4},
  canequip: ['CL','CT','CLT','CA','CAV','FBB','BB','BBV','CVL','CV','CVB','AV'],
- canequipS: [330, 346, 352, 357, 419, 421, 422, 423, 470, 532, 533, 537, 538, 626, 645, 650, 699, 717, 948],
+ canequipS: [179, 180, 330, 346, 352, 357, 419, 421, 422, 423, 470, 532, 533, 537, 538, 626, 645, 650, 699, 717, 948],
  cannotequipS: [477, 478, 521, 522, 574, 623, 624, 877],
 };
 EQTDATA[RADARXL] = {
@@ -397,12 +397,13 @@ EQTDATA[TYPE3SHELL] = {
  atype: A_TYPE3SHELL,
  canequip: ['CA','CAV','FBB','BB','BBV'],
  cannotequipS: [877],
+ canequipS: [507],
 };
 EQTDATA[BULGEM] = {
  name: 'Torpedo Bulge',
  image: 23,
  canequip: ['CT','CA','CAV','CVL','AS','AV','AR'],
- canequipS: [146, 147, 216, 217, 305, 306, 307, 314, 330, 346, 357, 500, 537, 538, 542, 543, 547, 556, 559, 563, 564, 566, 567, 568, 569, 578, 579, 621, 622, 623, 624, 626, 629, 630, 645, 649, 650, 652, 656, 657, 662, 663, 668, 670, 699, 717, 727, 900, 915, 943, 948, 951, 955, 960, 961],
+ canequipS: [146, 147, 179, 180, 216, 217, 305, 306, 307, 314, 330, 346, 357, 500, 537, 538, 542, 543, 547, 556, 559, 563, 564, 566, 567, 568, 569, 578, 579, 621, 622, 623, 624, 626, 629, 630, 645, 649, 650, 652, 656, 657, 662, 663, 668, 670, 699, 717, 727, 900, 915, 943, 948, 951, 955, 960, 961],
 };
 EQTDATA[BULGEL] = {
  name: 'Torpedo Bulge',
@@ -416,7 +417,7 @@ EQTDATA[LANDINGCRAFT] = {
  btype: B_LC1,
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3},
  canequip: ['AV','LHA'],
- canequipS: [147, 198, 199, 200, 260, 352, 382, 418, 419, 434, 435, 464, 468, 469, 470, 478, 487, 488, 489, 490, 498, 500, 506, 541, 547, 548, 559, 563, 587, 623, 630, 645, 647, 650, 657, 666, 667, 699, 703, 707, 716, 718, 720, 725, 889, 899, 908, 915, 916, 951, 959, 960],
+ canequipS: [147, 198, 199, 200, 260, 352, 382, 418, 419, 434, 435, 464, 468, 469, 470, 478, 487, 488, 489, 490, 498, 500, 506, 541, 547, 548, 559, 563, 587, 623, 630, 645, 647, 650, 657, 666, 667, 699, 703, 707, 716, 718, 720, 725, 889, 899, 908, 915, 916, 951, 959, 960, 975],
  cannotequipS: [445, 491, 727, 945],
 };
 EQTDATA[SEARCHLIGHTS] = {
@@ -431,7 +432,7 @@ EQTDATA[SEARCHLIGHTL] = {
  image: 24,
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3},
  canequip: ['FBB','BB','BBV'],
- canequipS: [372, 477, 491, 496, 501, 506, 579, 586, 626, 630, 645],
+ canequipS: [372, 477, 491, 496, 501, 502, 506, 507, 579, 586, 626, 630, 645],
 };
 EQTDATA[STARSHELL] = {
  name: 'Night Equip',
@@ -465,7 +466,7 @@ EQTDATA[FCF] = {
  image: 28,
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3},
  canequip: ['CL','CT','CLT','CA','CAV','FBB','BB','BBV','CVL','CV','CVB','AS','AV','LHA'],
- canequipS: [330, 346, 357, 419, 421, 422, 423, 464, 497, 498, 500, 532, 533, 537, 538, 542, 543, 567, 587, 628, 629, 645, 649, 650, 651, 656, 667, 699, 720, 915, 961],
+ canequipS: [330, 346, 357, 419, 421, 422, 423, 464, 497, 498, 500, 532, 533, 537, 538, 542, 543, 567, 587, 628, 629, 645, 649, 650, 651, 656, 667, 699, 720, 915, 961, 975],
  cannotequipS: [521, 522, 727, 877, 943, 945, 948],
 };
 EQTDATA[DRUM] = {
@@ -479,7 +480,7 @@ EQTDATA[SCAMP] = {
  name: 'Misc',
  image: 29,
  canequip: ['CAV','BBV','CVL','CV','CVB','AO'],
- canequipS: [166, 372, 450, 488, 491, 496, 547, 574, 579, 581, 586, 626, 630, 652, 662, 663, 668, 690, 879, 943, 948],
+ canequipS: [166, 372, 450, 488, 491, 496, 507, 547, 574, 579, 581, 586, 626, 630, 652, 662, 663, 668, 690, 879, 943, 948],
  cannotequipS: [645, 699],
 };
 EQTDATA[FLYINGBOAT] = {
@@ -557,7 +558,7 @@ EQTDATA[TRANSPORTITEM] = {
  image: 41,
  canequip: ['CAV','BBV','CVL','CV','CVB','SSV','AV','AR','LHA'],
  canequipS: [500, 530, 539, 605, 645, 650, 699, 717, 731, 900, 939, 940],
- cannotequipS: [621, 626, 916],
+ cannotequipS: [502, 507, 621, 626, 916],
 };
 EQTDATA[SUBRADAR] = {
  name: 'Submarine Equipment',
@@ -595,7 +596,7 @@ EQTDATA[SMOKESCREEN] = {
  image: 54,
  improve: {Pshell:1,Pnb:1,ACCshell:1,ACCnb:1.3},
  canequip: ['DE','DD','CL','CLT','CA','CT'],
- canequipS: [411, 412, 645, 650, 699],
+ canequipS: [411, 412, 507, 645, 650, 699],
 };
 EQTDATA[OTHER] = {
  name: 'Misc',
@@ -1049,7 +1050,7 @@ var EQDATA = {
  name: '12cm Single High-Angle Cannon',
  nameJP: '12cm単装高角砲',
  added: '2013-06-05',
- type: SECGUN, image: 16,
+ type: MAINGUNS, image: 16,
  FP: 1,
  AA: 3,
  RNG: 1

diff --git a/js/kcSHIPDATA.js b/js/kcSHIPDATA.js
@@ -17611,11 +17611,10 @@ var SHIPDATA = {
  TP: 84, TPbase: 38,
  AA: 0, AAbase: 0,
  AR: 24, ARbase: 6,
- EV: 0, EVbase: 0,
+ EV: 59, EVbase: 18,
  ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ LOS: 43, LOSbase: 12,
  LUK: 37, LUKmax: 107,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 1,
  SPD: 5,
  SLOTS: [0, 0],
@@ -17965,11 +17964,10 @@ var SHIPDATA = {
  TP: 75, TPbase: 35,
  AA: 0, AAbase: 0,
  AR: 21, ARbase: 4,
- EV: 0, EVbase: 0,
+ EV: 47, EVbase: 17,
  ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ LOS: 43, LOSbase: 11,
  LUK: 33, LUKmax: 90,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 1,
  SPD: 5,
  SLOTS: [0],
@@ -19025,11 +19023,10 @@ var SHIPDATA = {
  TP: 0, TPbase: 0,
  AA: 28, AAbase: 10,
  AR: 18, ARbase: 3,
- EV: 0, EVbase: 0,
+ EV: 27, EVbase: 14,
  ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ LOS: 30, LOSbase: 11,
  LUK: 6, LUKmax: 44,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 2,
  SPD: 5,
  SLOTS: [0, 0],
@@ -19102,11 +19099,10 @@ var SHIPDATA = {
  TP: 0, TPbase: 0,
  AA: 32, AAbase: 12,
  AR: 34, ARbase: 17,
- EV: 0, EVbase: 0,
+ EV: 37, EVbase: 16,
  ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ LOS: 39, LOSbase: 18,
  LUK: 11, LUKmax: 57,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 2,
  SPD: 5,
  SLOTS: [1, 1, 1],
@@ -19354,11 +19350,10 @@ var SHIPDATA = {
  TP: 71, TPbase: 36,
  AA: 0, AAbase: 0,
  AR: 19, ARbase: 4,
- EV: 0, EVbase: 0,
+ EV: 38, EVbase: 10,
  ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ LOS: 31, LOSbase: 9,
  LUK: 46, LUKmax: 90,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 1,
  SPD: 5,
  SLOTS: [1, 1],
@@ -19380,11 +19375,10 @@ var SHIPDATA = {
  TP: 73, TPbase: 36,
  AA: 0, AAbase: 0,
  AR: 20, ARbase: 4,
- EV: 0, EVbase: 0,
+ EV: 37, EVbase: 12,
  ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ LOS: 30, LOSbase: 10,
  LUK: 18, LUKmax: 71,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 1,
  SPD: 5,
  SLOTS: [1, 1],
@@ -19406,11 +19400,10 @@ var SHIPDATA = {
  TP: 86, TPbase: 28,
  AA: 73, AAbase: 20,
  AR: 51, ARbase: 14,
- EV: 0, EVbase: 0,
- ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ EV: 91, EVbase: 49,
+ ASW: 78, ASWbase: 29,
+ LOS: 51, LOSbase: 10,
  LUK: 18, LUKmax: 79,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 1,
  SPD: 10,
  SLOTS: [0, 0, 0],
@@ -19432,11 +19425,10 @@ var SHIPDATA = {
  TP: 88, TPbase: 38,
  AA: 0, AAbase: 0,
  AR: 20, ARbase: 4,
- EV: 0, EVbase: 0,
+ EV: 49, EVbase: 12,
  ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ LOS: 33, LOSbase: 10,
  LUK: 48, LUKmax: 96,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 1,
  SPD: 5,
  SLOTS: [1, 2],
@@ -19458,11 +19450,10 @@ var SHIPDATA = {
  TP: 89, TPbase: 38,
  AA: 0, AAbase: 0,
  AR: 21, ARbase: 4,
- EV: 0, EVbase: 0,
+ EV: 46, EVbase: 14,
  ASW: 0, ASWbase: 0,
- LOS: 0, LOSbase: 0,
+ LOS: 33, LOSbase: 11,
  LUK: 22, LUKmax: 81,
- unknownstats: { EV: 1, ASW: 1, LOS: 1 },
  RNG: 1,
  SPD: 5,
  SLOTS: [1, 2],

diff --git a/js/simulator-ui/convert.js b/js/simulator-ui/convert.js
@@ -818,6 +818,7 @@ window.CONVERT = {
  formationOverride: +battleUI.formation,
  addCostFuel: battleUI.addCostFuel/100,
  addCostAmmo: battleUI.addCostAmmo/100,
+ addCostMax: battleUI.addCostMax,
  lbas: [],
  useBalloon: battleUI.useBalloon,
  useAtoll: battleUI.useAtoll,

diff --git a/js/simulator-ui/sim-interface.js b/js/simulator-ui/sim-interface.js
@@ -745,8 +745,14 @@ var SIM = {
  for (let fleet of [fleetF,fleetF.combinedWith]) {
  if (!fleet) continue;
  for (let ship of fleet.ships) {
- ship.fuelleft -= 10*Math.floor(Math.round(ship.fuel*(ship.fuelleft/10))*(node.addCostFuel || 0))/ship.fuel;
- ship.ammoleft -= 10*Math.floor(Math.round(ship.ammo*(ship.ammoleft/10))*(node.addCostAmmo || 0))/ship.ammo;
+ let costFuel = Math.floor(Math.round(ship.fuel*(ship.fuelleft/10))*(node.addCostFuel || 0));
+ let costAmmo = Math.floor(Math.round(ship.ammo*(ship.ammoleft/10))*(node.addCostAmmo || 0));
+ if (node.addCostMax != null && node.addCostMax != '') {
+ costFuel = Math.min(node.addCostMax,costFuel);
+ costAmmo = Math.min(node.addCostMax,costAmmo);
+ }
+ ship.fuelleft -= 10*costFuel/ship.fuel;
+ ship.ammoleft -= 10*costAmmo/ship.ammo;
  }
  }
  }

diff --git a/js/simulator-ui/ui-main.js b/js/simulator-ui/ui-main.js
@@ -288,6 +288,7 @@ var UI_MAIN = Vue.createApp({
  lbasWaves: [false,false,false,false,false,false],
  addCostFuel: null,
  addCostAmmo: null,
+ addCostMax: null,
  subOnly: false,
  useNormalSupport: 0,
  useBalloon: false,

diff --git a/simulator-import-help.html b/simulator-import-help.html
@@ -95,6 +95,7 @@
  lbas: [&lt;int&gt;] waves to send, e.g. [1,1,2,2] (optional),
  addCostFuel: &lt;float&gt; 0-1 percent, additional fuel per ship subtracted before battle (optional),
  addCostAmmo: &lt;float&gt; 0-1 percent, additional ammo per ship subtracted before battle (optional),
+ addCostMax: &lt;int&gt; hard cap to fuel/ammo subtracted by addCostFuel/addCostAmmo (optional),
  useNormalSupport: &lt;bool&gt; works for last node only (default 0),
  useBalloon: &lt;bool&gt; enable Barrage Balloon bonus on this node,
  useAtoll: &lt;bool&gt; enable atoll node mechanics on this node,

diff --git a/simulator.html b/simulator.html
@@ -506,6 +506,7 @@ <h3>Statistics</h3>
  <div class="space"><span class="header">Add Cost (% of current supply before battle):</span></div>
  <div><label><img src="assets/stats/fuel.png" /><input type="number" min="0" max="100" v-model="battle.addCostFuel"/>%</label></div>
  <div><label><img src="assets/stats/ammo.png" /><input type="number" min="0" max="100" v-model="battle.addCostAmmo"/>%</label></div>
+ <div><label>Max: <input type="number" min="0" max="999" v-model="battle.addCostMax"/></label></div>
  </div>
  <div>
  <div><span class="header">Player Formation:</span></div>