diff --git a/js/simulator-ui/common.js b/js/simulator-ui/common.js index 9b30b43f..d44fd6e5 100644 --- a/js/simulator-ui/common.js +++ b/js/simulator-ui/common.js @@ -96,16 +96,16 @@ var COMMON = { 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] }] + { "ships": [{ "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] }], "rate": 25 }, + { "ships": [{ "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] }], "rate": 30 }, + { "ships": [{ "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] }], "rate": 50 }, + { "ships": [{ "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] }], "rate": 70 }, + { "ships": [{ "id": 264, "improvement": [10,10,0,10] }, { "id": 487, "improvement": [10,10] }, { "id": 647, "improvement": [10,10,10] }, { "id": 627, "improvement": [10,10,10] }], "rate": 99 }, + { "ships": [{ "id": 411, "improvement": [10,10,10] }, { "id": 564, "improvement": [8,10,10] }, { "id": 327, "improvement": [10,10,10] }], "rate": 20 }, + { "ships": [{ "id": 487, "improvement": [10,10] }, { "id": 647, "improvement": [10,10,10] }, { "id": 627, "improvement": [10,10,10] }], "rate": 25 }, + { "ships": [{ "id": 928, "improvement": [9,9] }, { "id": 726, "improvement": [] }, { "id": 689, "improvement": [4] }], "rate": 33.333 }, + { "ships": [{ "id": 647, "improvement": [10,10,10] }, { "id": 627, "improvement": [10,10,10] }], "rate": 50 }, + { "ships": [{ "id": 564, "improvement": [8,10,10] }, { "id": 327, "improvement": [10,10,10] }], "rate": 100 } ] }, diff --git a/js/simulator-ui/ui-main.js b/js/simulator-ui/ui-main.js index 308cd171..b3f7190f 100644 --- a/js/simulator-ui/ui-main.js +++ b/js/simulator-ui/ui-main.js @@ -1387,20 +1387,25 @@ var UI_KCNAVCOMPIMPORTER = Vue.createApp({ 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; + let compSaveByKey = {}; + for (let compSave of compsSave) { + let key = compSave.fleet.ships.map(ship => ship.mstId).join(','); + compSaveByKey[key] = compSave; + compSave.rate = 0; } - for (let comp of compsSave) { - let key = comp.fleet.ships.map(ship => ship.mstId).join(','); - if (!improveSpecialByKey[key]) continue; - for (let i=0; i ship.id).join(','); + let compSave = compSaveByKey[key]; + if (!compSave) continue; + for (let i=0; i