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

…to gh-pages
KC3Kai · Aug 26, 2024 · 2ba32c6 · 2ba32c6
2 parents 4e2f79a + de70910
commit 2ba32c6
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 2 deletions.
diff --git a/js/data/bonus/59-4.json b/js/data/bonus/59-4.json
@@ -81,7 +81,7 @@
  { "dmg": 1.04, "shipType": [5,6,8,9,10] },
  { "dmg": 1.13, "shipBase": [14,42,43,46,61,62,65,113,405,413,453,486] },
  { "dmg": 1.13, "shipBase": [50,97,131,138,143,414,415,452] },
- { "dmg": 1.15, "shipBase": [596] },
+ { "dmg": 1.15, "shipBase": [596,952] },
  { "dmg": 1.08, "shipBase": [405] }
  ]
  }

diff --git a/js/simulator-ui/common.js b/js/simulator-ui/common.js
@@ -94,6 +94,21 @@ var COMMON = {
  return false;
  },
 
+ friendFleetImproveSpecial: {
+ '59-4': [
+ [{ "id": 264, "improvement": [10,10,0,10] }, { "id": 487, "improvement": [10,10] }, { "id": 647, "improvement": [10,10,10] }, { "id": 627, "improvement": [10,10,10] }],
+ [{ "id": 156, "improvement": [4] }, { "id": 411, "improvement": [10,10,0,10] }, { "id": 412, "improvement": [10,10,10] }, { "id": 501, "improvement": [10,10,10] }, { "id": 968, "improvement": [10,10,10] }],
+ [{ "id": 411, "improvement": [10,10,10] }, { "id": 319, "improvement": [10,10,0,10] }, { "id": 194, "improvement": [10,10,0,10] }, { "id": 564, "improvement": [8,10,10] }, { "id": 327, "improvement": [10,10,10] }],
+ [{ "id": 319, "improvement": [10,10,10,10] }, { "id": 194, "improvement": [10,10] }, { "id": 246, "improvement": [9,10,10] }, { "id": 497, "improvement": [10,10,10] }, { "id": 961, "improvement": [10,10,10] }],
+ [{ "id": 734, "improvement": [8,8] }, { "id": 659, "improvement": [0,0,10] }, { "id": 697, "improvement": [] }, { "id": 928, "improvement": [9,9] }, { "id": 689, "improvement": [] }, { "id": 726, "improvement": [4] }],
+ [{ "id": 411, "improvement": [10,10,10] }, { "id": 564, "improvement": [8,10,10] }, { "id": 327, "improvement": [10,10,10] }],
+ [{ "id": 487, "improvement": [10,10] }, { "id": 647, "improvement": [10,10,10] }, { "id": 627, "improvement": [10,10,10] }],
+ [{ "id": 928, "improvement": [9,9] }, { "id": 726, "improvement": [] }, { "id": 689, "improvement": [4] }],
+ [{ "id": 564, "improvement": [8,10,10] }, { "id": 327, "improvement": [10,10,10] }],
+ [{ "id": 647, "improvement": [10,10,10] }, { "id": 627, "improvement": [10,10,10] }]
+ ]
+ },
+
  getHash: function(str) {
  var hash = 0, i, chr;
  if (str.length === 0) return hash;

diff --git a/js/simulator-ui/convert.js b/js/simulator-ui/convert.js
@@ -585,6 +585,8 @@ window.CONVERT = {
  for (let equip of shipSave.equips) {
  equip.mstId = this._convertEquipId20221109(equip.mstId);
  }
+ } else {
+ if (SHIPDATA[shipSave.mstId] && SHIPDATA[shipSave.mstId].LUKmax) shipSave.statsBase.luk = SHIPDATA[shipSave.mstId].LUKmax;
  }
  shipsSave.push(shipSave);
  }

diff --git a/js/simulator-ui/fleet-editor.js b/js/simulator-ui/fleet-editor.js
@@ -441,6 +441,7 @@ var UI_FLEETEDITOR = Vue.createApp({
 
  let shipPrev = this.fleet[shipsProp][ind];
  let ship = this.fleet[shipsProp][ind] = FLEET_MODEL.getDefaultShip(mstId,ind);
+ if (this.fleet.isFriend && SHIPDATA[mstId] && SHIPDATA[mstId].LUKmax) ship.statsBase.luk = SHIPDATA[mstId].LUKmax;
  let eqDef;
  if (mstId > 0 && (eqDef = SHIPDATA[mstId].EQUIPS)) {
  for (let i=0; i<eqDef.length; i++) {
@@ -520,7 +521,7 @@ var UI_FLEETEDITOR = Vue.createApp({
  return (+ship.statsBase[stat] || 0) + (+ship.statsEquip[stat] || 0) + ((this.showEquipBonus && +ship.statsBonus[stat]) || 0);
  },
  getClassStat: function(ship,stat) {
- if (ship.statsBase[stat] != ship.statsDefault[stat]) return {changed:COMMON.isShipIdAbyssal(ship.mstId)};
+ if (ship.statsBase[stat] != ship.statsDefault[stat]) return {changed:COMMON.isShipIdAbyssal(ship.mstId) || stat == 'luk'};
  if (ship.statsUnknown[stat] == CONST.STAT_UNKNOWN.NONE) return {unknownHigh:true};
  if (ship.statsUnknown[stat] == CONST.STAT_UNKNOWN.PLACEHOLDER) return {unknownHigh:true};
  if (ship.statsUnknown[stat] == CONST.STAT_UNKNOWN.DB_ESTIMATE) return {unknownMed:true};

diff --git a/js/simulator-ui/ui-main.js b/js/simulator-ui/ui-main.js
@@ -1182,6 +1182,7 @@ var UI_DECKBUILDERIMPORTER = Vue.createApp({
  }
  if (this.importLBAS) {
  CONVERT.loadSaveLBAS(CONVERT.deckbuilderToSaveLBAS(dataDb),UI_MAIN.landBases);
+ COMMON.BONUS_MANAGER.applyAutoLBAS();
  }
  COMMON.global.fleetEditorMoveTemp();
  },
@@ -1382,6 +1383,28 @@ var UI_KCNAVCOMPIMPORTER = Vue.createApp({
  }
  }
  let compsSave = CONVERT.kcnavToSaveComps(compsNav.result);
+
+ if (this.isFriendFleet) {
+ let improveSpecial = COMMON.friendFleetImproveSpecial[this.world + '-' + this.mapnum];
+ if (improveSpecial) {
+ let improveSpecialByKey = {};
+ for (let ships of improveSpecial) {
+ let key = ships.map(ship => ship.id).join(',');
+ improveSpecialByKey[key] = ships;
+ }
+ for (let comp of compsSave) {
+ let key = comp.fleet.ships.map(ship => ship.mstId).join(',');
+ if (!improveSpecialByKey[key]) continue;
+ for (let i=0; i<improveSpecialByKey[key].length; i++) {
+ let ship = comp.fleet.ships[i];
+ for (let j=0; j<improveSpecialByKey[key][i].improvement.length; j++) {
+ ship.equips[j].level = improveSpecialByKey[key][i].improvement[j];
+ }
+ }
+ }
+ }
+ }
+
  compsSave.sort((a,b) => b.rate - a.rate);
  for (let i=this.comps.length; i>compsSave.length; i--) UI_MAIN.deleteComp(this.comps);
  for (let comp of this.comps) comp.fleet = FLEET_MODEL.getBlankFleet(comp.fleet);