Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/KC3Kai/kancolle-replay in…
Browse files Browse the repository at this point in the history 
…to gh-pages
  • Loading branch information
@fourinone41
fourinone41 committed Sep 3, 2023
2 parents 35e1b76 + 1ecc5de commit 053f40d
Show file tree
Hide file tree
Showing 15 changed files with 295 additions and 14 deletions.
Binary file added assets/stats/nightbattle.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions js/data/bonus/57-4.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"world": 57,
"mapnum": 4,
"date": "2023-08-17",
"note": "WIP, dmg only",
"date": "2023-09-04",
"note": "WIP, acc/eva incomplete",
"listBonus": [
{
"bonuses": [
{ "dmg": 1.12, "shipType": [1] },
{ "dmg": 1.03, "shipType": [2] },
{ "dmg": 1.02, "shipType": [3] },
{ "dmg": 1.11, "shipType": [7] },
{ "dmg": 1.14, "shipType": [16] },
{ "dmg": 1.03, "acc": 1.05, "eva": 1.1, "shipType": [2] },
{ "dmg": 1.02, "acc": 1.05, "eva": 1.1, "shipType": [3] },
{ "dmg": 1.11, "acc": 1.1, "eva": 1.07, "shipType": [7] },
{ "dmg": 1.14, "acc": 1.1, "shipType": [16] },
{ "dmg": 1.05, "requireEquipType": [25], "perEquip": 1 },
{ "dmg": 1.07, "requireEquipType": [26], "perEquip": 1 },
{ "dmg": 1.2, "shipBase": [881,882] }
Expand All @@ -19,33 +19,33 @@
{
"nodes": ["A","A1","A2","B","C","C1","C2","F","R1","R2","S","T","U","V"],
"bonuses": [
{ "dmg": 1.14, "shipBase": [15,18,38,40,41,49,63,64,99,100,101,114,413,631] }
{ "dmg": 1.14, "acc": 1.08, "eva": 1.05, "shipBase": [15,18,38,40,41,49,63,64,99,100,101,114,413,631] }
]
},
{
"nodes": ["C","H","I","J","K","L","M","M3","N","P"],
"bonuses": [
{ "dmg": 1.11, "shipBase": [26,27,35,36,37,52,77,80,81,87,414,425,452,485,527,528,674,675] },
{ "dmg": 1.11, "acc": 1.05, "eva": 1.05, "shipBase": [26,27,35,36,37,52,77,80,81,87,414,425,452,485,527,528,674,675] },
{ "dmg": 1.11, "shipBase": [881,882] }
]
},
{
"nodes": ["Q"],
"bonuses": [
{ "dmg": 1.15, "shipBase": [26,27,35,36,37,52,77,80,81,87,414,425,452,485,527,528,674,675] },
{ "dmg": 1.15, "acc": 1.05, "eva": 1.05, "shipBase": [26,27,35,36,37,52,77,80,81,87,414,425,452,485,527,528,674,675] },
{ "dmg": 1.11, "shipBase": [881,882] }
]
},
{
"nodes": ["X"],
"bonuses": [
{ "dmg": 1.16, "shipBase": [15,18,38,40,41,49,63,64,99,100,101,114,413,631] }
{ "dmg": 1.16, "acc": 1.08, "eva": 1.05, "shipBase": [15,18,38,40,41,49,63,64,99,100,101,114,413,631] }
]
},
{
"nodes": ["T","V","X"],
"bonuses": [
{ "dmg": 1.15, "shipBase": [49,413,631] }
{ "dmg": 1.15, "acc": 1.15, "eva": 1.05, "shipBase": [49,413,631] }
]
}
],
Expand Down
67 changes: 67 additions & 0 deletions js/data/bonus/57-5.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"world": 57,
"mapnum": 5,
"date": "2023-09-04",
"note": "WIP, dmg only",
"listBonus": [
{
"bonuses": [
{ "dmg": 1.12, "shipType": [1] },
{ "dmg": 1.03, "shipType": [2] },
{ "dmg": 1.04, "shipType": [3] },
{ "dmg": 1.05, "shipType": [7] },
{ "dmg": 1.08, "shipType": [16,20] },
{ "dmg": 1.05, "shipClass": [96,98] },
{ "dmg": 1.06, "shipClass": [47,48,55,57,63, 58,61,64,68,80,92,113,124] },
{ "dmg": 1.07, "shipClass": [65,69,83,84,87,91,93,95,99,102,105,106,107,110,114,116,118,121,122,125, 89] },
{ "dmg": 1.09, "shipClass": [70,79] },
{ "dmg": 1.12, "shipClass": [67,78,82,88,108,112] },
{ "dmg": 1.04, "shipBase": [519] },
{ "dmg": 1.05, "shipBase": [515] },
{ "dmg": 1.07, "shipBase": [439] },
{ "dmg": 1.28, "shipBase": [699] },
{ "dmg": 1.04, "requireEquipType": [25], "perEquip": 1 },
{ "dmg": 1.03, "requireEquipId": [158,159,195,196,197,198,205,206,233,242,254,255,256,257,277,353,367,368,369,370,371,375,389,414,415,419,420,422], "perEquip": 0 },
{ "dmg": 1.04, "requireEquipId": [64,184,188,194,243,248,249,305,306,316,422,473,474,475,510], "perEquip": 0 },
{ "dmg": 1.05, "requireEquipId": [189,244,252,423,424,425,434,435,471,476,481,515], "perEquip": 0 }
]
},
{
"nodes": ["L1","L2","O"],
"bonuses": [
{ "dmg": 1.05, "requireEquipId": [167,230,436,494,495,507,508,513], "perEquip": 0 },
{ "dmg": 1.08, "requireEquipId": [355,449,482], "perEquip": 0 }
]
},
{
"nodes": ["T"],
"bonuses": [
{ "dmg": 1.05, "shipClass": [67,78,82,88,108,112] }
]
},
{
"nodes": ["Y"],
"bonuses": [
{ "dmg": 1.06, "shipClass": [67,78,82,88,108,112] }
]
},
{
"nodes": ["T","Y"],
"bonuses": [
{ "dmg": 1.03, "requireEquipId": [158,159,195,196,197,198,205,206,233,242,254,255,256,257,277,353,367,368,369,370,371,375,389,414,415,419,420,422], "perEquip": 0 },
{ "dmg": 1.04, "requireEquipId": [64,184,188,194,243,248,249,305,306,316,422,473,474,475,510], "perEquip": 0 },
{ "dmg": 1.05, "requireEquipId": [189,244,252,423,424,425,434,435,471,476,481,515], "perEquip": 0 }
]
}
],
"listDebuff": [
{
"nodes": ["Y"],
"debuffs": [
{ "shipId": [2182,2183,2184,2185,2186,2187], "amount": 44 },
{ "shipId": [1524,1529,1557,1594,1595,1779,1862,1953,1954], "amount": 39 },
{ "shipId": [1509,1591,1592,1762,1764], "amount": 13 }
]
}
]
}
77 changes: 77 additions & 0 deletions js/data/bonus/57-6.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"world": 57,
"mapnum": 6,
"date": "2023-09-04",
"note": "WIP, dmg only",
"listBonus": [
{
"bonuses": [
{ "dmg": 1.12, "shipType": [1] },
{ "dmg": 1.03, "shipType": [2] },
{ "dmg": 1.04, "shipType": [3] },
{ "dmg": 1.05, "shipType": [7] },
{ "dmg": 1.08, "shipType": [16,20] },
{ "dmg": 1.05, "shipClass": [96,98] },
{ "dmg": 1.06, "shipClass": [47,48,55,57,63, 58,61,64,68,80,92,113,124] },
{ "dmg": 1.07, "shipClass": [65,69,83,84,87,91,93,95,99,102,105,106,107,110,114,116,118,121,122,125, 89] },
{ "dmg": 1.09, "shipClass": [70,79] },
{ "dmg": 1.12, "shipClass": [67,78,82,88,108,112] },
{ "dmg": 1.04, "shipBase": [519] },
{ "dmg": 1.05, "shipBase": [515] },
{ "dmg": 1.07, "shipBase": [439] },
{ "dmg": 1.28, "shipBase": [699] },
{ "dmg": 1.03, "requireEquipId": [158,159,195,196,197,198,205,206,233,242,254,255,256,257,277,353,367,368,369,370,371,375,389,414,415,419,420,422], "perEquip": 0 },
{ "dmg": 1.04, "requireEquipId": [64,184,188,194,243,248,249,305,306,316,422,473,474,475,510], "perEquip": 0 },
{ "dmg": 1.05, "requireEquipId": [189,244,252,423,424,425,434,435,471,476,481,515], "perEquip": 0 }
]
},
{
"nodes": ["C2","Q"],
"bonuses": [
{ "dmg": 1.05, "requireEquipId": [167,230,436,494,495,507,508,513], "perEquip": 0 },
{ "dmg": 1.08, "requireEquipId": [355,449,482], "perEquip": 0 },
{ "dmg": 1.06, "requireEquipId": [513], "perEquip": 1 }
]
},
{
"nodes": ["H","U","W","X"],
"bonuses": [
{ "dmg": 1.04, "requireEquipId": [158,159,195,196,197,198,205,206,233,242,254,255,256,257,277,353,367,368,369,370,371,375,389,414,415,419,420,422], "perEquip": 0 },
{ "dmg": 1.05, "requireEquipId": [64,184,188,194,243,248,249,305,306,316,422,473,474,475,510], "perEquip": 0 },
{ "dmg": 1.06, "requireEquipId": [189,244,252,423,424,425,434,435,471,476,481,515], "perEquip": 0 }
]
},
{
"nodes": ["H","Q","U","W","X","Z"],
"bonuses": [
{ "dmg": 1.06, "shipClass": [67,78,82,88,108,112] }
]
},
{
"nodes": ["Q"],
"bonuses": [
{ "dmg": 1.03, "shipType": [5,6,7,8,9,10,11,18] },
{ "dmg": 1.09, "shipClass": [65,69,83,84,87,91,93,95,99,102,105,106,107,110,114,116,118,121,122,125] },
{ "dmg": 1.16, "shipClass": [67,78,82,88,108,112] }
]
},
{
"nodes": ["Q","Z"],
"bonuses": [
{ "dmg": 1.15, "shipBase": [439,519,571,572,923,924] },
{ "dmg": 1.05, "requireEquipId": [158,159,195,196,197,198,205,206,233,242,254,255,256,257,277,353,367,368,369,370,371,375,389,414,415,419,420,422], "perEquip": 0 },
{ "dmg": 1.06, "requireEquipId": [64,184,188,194,243,248,249,305,306,316,422,473,474,475,510], "perEquip": 0 },
{ "dmg": 1.07, "requireEquipId": [189,244,252,423,424,425,434,435,471,476,481,515], "perEquip": 0 }
]
}
],
"listDebuff": [
{
"nodes": ["Z"],
"debuffs": [
{ "shipId": [2158,2159,2160,2161,2162,2163], "amount": 52 },
{ "shipId": [1696,1697,1698,1953,1954,1955,1998,2012,2101,2102,2104,2117,2118,2119], "amount": 39 }
]
}
]
}
80 changes: 80 additions & 0 deletions js/data/bonus/57-7.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"world": 57,
"mapnum": 7,
"date": "2023-09-04",
"note": "WIP, dmg only",
"listBonus": [
{
"bonuses": [
{ "dmg": 1.12, "shipType": [1] },
{ "dmg": 1.03, "shipType": [2] },
{ "dmg": 1.04, "shipType": [3] },
{ "dmg": 1.05, "shipType": [7] },
{ "dmg": 1.08, "shipType": [16,20] },
{ "dmg": 1.05, "shipClass": [96,98] },
{ "dmg": 1.06, "shipClass": [47,48,55,57,63, 58,61,64,68,80,92,113,124] },
{ "dmg": 1.07, "shipClass": [65,69,83,84,87,91,93,95,99,102,105,106,107,110,114,116,118,121,122,125, 89] },
{ "dmg": 1.09, "shipClass": [70,79] },
{ "dmg": 1.12, "shipClass": [67,78,82,88,108,112] },
{ "dmg": 1.04, "shipBase": [519] },
{ "dmg": 1.05, "shipBase": [515] },
{ "dmg": 1.07, "shipBase": [439] },
{ "dmg": 1.28, "shipBase": [699] },
{ "dmg": 1.03, "requireEquipId": [158,159,195,196,197,198,205,206,233,242,254,255,256,257,277,353,367,368,369,370,371,375,389,414,415,419,420,422], "perEquip": 0 },
{ "dmg": 1.04, "requireEquipId": [64,184,188,194,243,248,249,305,306,316,422,473,474,475,510], "perEquip": 0 },
{ "dmg": 1.05, "requireEquipId": [189,244,252,423,424,425,434,435,471,476,481,515], "perEquip": 0 }
]
},
{
"nodes": ["A5","H","P","U"],
"bonuses": [
{ "dmg": 1.05, "requireEquipId": [167,230,436,494,495,507,508,513], "perEquip": 0 },
{ "dmg": 1.09, "requireEquipId": [355,449,482], "perEquip": 0 }
]
},
{
"nodes": ["H","P","U","X"],
"bonuses": [
{ "dmg": 1.04, "shipType": [5,6] },
{ "dmg": 1.03, "shipType": [7,11,18] },
{ "dmg": 1.04, "shipClass": [65,69,83,84,87,91,93,95,99,102,105,106,107,110,114,116,118,121,122,125] },
{ "dmg": 1.06, "shipClass": [67,78,82,88,108,112] },
{ "dmg": 1.04, "requireEquipId": [158,159,195,196,197,198,205,206,233,242,254,255,256,257,277,353,367,368,369,370,371,375,389,414,415,419,420,422], "perEquip": 0 },
{ "dmg": 1.05, "requireEquipId": [64,184,188,194,243,248,249,305,306,316,422,473,474,475,510], "perEquip": 0 },
{ "dmg": 1.06, "requireEquipId": [189,244,252,423,424,425,434,435,471,476,481,515], "perEquip": 0 }
]
},
{
"nodes": ["H","P","U","Z"],
"bonuses": [
{ "dmg": 1.06, "requireEquipId": [513], "perEquip": 1 },
{ "dmg": 1.05, "requireEquipId": [126,347,348], "perEquip": 1 },
{ "dmg": 1.08, "requireEquipId": [349], "perEquip": 1 }
]
},
{
"nodes": ["Z"],
"bonuses": [
{ "dmg": 1.09, "shipType": [2] },
{ "dmg": 1.08, "shipType": [3] },
{ "dmg": 1.07, "shipType": [5,6] },
{ "dmg": 1.06, "shipClass": [67,78,82,88,108,112] },
{ "dmg": 1.15, "shipBase": [439,519,571,572,923,924] },
{ "dmg": 1.05, "requireEquipId": [158,159,195,196,197,198,205,206,233,242,254,255,256,257,277,353,367,368,369,370,371,375,389,414,415,419,420,422], "perEquip": 0 },
{ "dmg": 1.07, "requireEquipId": [64,184,188,194,243,248,249,305,306,316,422,473,474,475,510], "perEquip": 0 },
{ "dmg": 1.08, "requireEquipId": [189,244,252,423,424,425,434,435,471,476,481,515], "perEquip": 0 },
{ "dmg": 1.04, "requireEquipId": [167,230,436,494,495,507,508,513], "perEquip": 0 },
{ "dmg": 1.07, "requireEquipId": [355,449,482], "perEquip": 0 }
]
}
],
"listDebuff": [
{
"nodes": ["Z"],
"debuffs": [
{ "shipId": [2198,2199,2200,2201,2202,2203], "amount": 59 },
{ "shipId": [1696,1697,1698,1953,1955,1956,1998,2012,2117,2118,2119], "amount": 39 }
]
}
]
}
2 changes: 2 additions & 0 deletions js/kcEQDATA.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5955,6 +5955,7 @@ var EQDATA = {
nameJP: '阻塞気球',
added: '2023-08-26',
type: SMOKESCREEN, image: 55,
isBalloon: true,
EV: 1,
},
514: {
Expand Down Expand Up @@ -7421,6 +7422,7 @@ var EQDATA = {
nameJP: '深海観測阻塞気球',
added: '2023-08-26',
type: SMOKESCREEN, image: 55,
isBalloon: true,
FP: 1,
AR: 1,
ACC: 3,
Expand Down
3 changes: 3 additions & 0 deletions js/kcSHIPDATA.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13793,6 +13793,7 @@ var SHIPDATA = {
type: 'BB', sclass: 88,
nid: 372,
added: '2023-08-28',
attackSpecial: 100,
HP: 81, HPmax: 92,
FP: 102, FPbase: 72,
TP: 0, TPbase: 0,
Expand Down Expand Up @@ -13923,6 +13924,7 @@ var SHIPDATA = {
type: 'BB', sclass: 88,
nid: 377,
added: '2023-08-28',
attackSpecial: 100,
HP: 92, HPmax: 98,
FP: 114, FPbase: 81,
TP: 0, TPbase: 0,
Expand Down Expand Up @@ -18194,6 +18196,7 @@ var SHIPDATA = {
type: 'DD', sclass: 82,
nid: 506,
added: '2023-08-26',
alwaysOASW: true,
HP: 31, HPmax: 47,
FP: 54, FPbase: 14,
TP: 91, TPbase: 40,
Expand Down
10 changes: 10 additions & 0 deletions js/kcsim.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,12 @@ function shell(ship,target,APIhou,attackSpecial,combinedAll) {

if (ship.type == 'DE') acc -= .13;

if (ship.fleet.useBalloon || (ship.fleet.combinedWith && ship.fleet.combinedWith.useBalloon)) {
let ships = ship.fleet.combinedWith ? ship.fleet.combinedWith.ships.concat(ship.fleet.ships) : ship.fleet.ships;
let modBalloon = 1 + (ships.filter(s => s.HP > 0 && !s.retreated && s.equips.find(eq => eq.isBalloon)).length/50);
postMod *= modBalloon;
}

if (target.installtype == 3 || target.isSupplyDepot) {
postMod *= (ship.supplyPostMult||1);
}
Expand Down Expand Up @@ -1264,6 +1270,10 @@ function getSpecialAttackMod(ship,attackSpecial) {
if (attackSpecial == 100) {
mod = 2;
modAcc = 1.05;
if (ship.fleet.ships[2].sclass == 88) {
if (ship.isflagship) mod *= 1.15;
if (ship.num == 3) mod *= 1.2;
}
} else if (attackSpecial == 101) {
mod = (ship.isflagship)? 1.4 : 1.2;
if (ship.fleet.ships[1].mid == 81 || ship.fleet.ships[1].mid == 276) {
Expand Down
3 changes: 3 additions & 0 deletions js/simulator-ui/bonus.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ COMMON.BONUS_MANAGER = {
'57-2': { name: 'Summer 2023 E2' },
'57-3': { name: 'Summer 2023 E3' },
'57-4': { name: 'Summer 2023 E4' },
'57-5': { name: 'Summer 2023 E5' },
'57-6': { name: 'Summer 2023 E6' },
'57-7': { name: 'Summer 2023 E7' },
},
_URL_DEWY_INDEX: 'https://api.github.com/repos/sorewachigauyo/kc-event-bonus/git/trees/master?recursive=1',
_URL_DEWY_PATH: 'https://raw.githubusercontent.com/sorewachigauyo/kc-event-bonus/master/',
Expand Down
2 changes: 2 additions & 0 deletions js/simulator-ui/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ var COMMON = {

shipTypeHullToId: { 'DE':1, 'DD':2, 'CL':3, 'CLT':4, 'CA':5, 'CAV':6, 'CVL':7, 'FBB':8, 'BB':9, 'BBV':10, 'CV':11, 'SS':13, 'SSV':14, 'AT':15, 'AV':16, 'LHA':17, 'CVB':18, 'AR':19, 'AS':20, 'CT':21, 'AO':22 },

BARRAGE_BALLOON_NODES: ['3-5-H','4-3-N','4-5-T','57-5-L1','57-5-L2','57-5-O','57-6-C2','57-6-Q','57-7-A5','57-7-H','57-7-P','57-7-U','57-7-Z'],

ID_GEN: {
_ids: {},
nextId: function(key) {
Expand Down
Loading

0 comments on commit 053f40d

Please sign in to comment.