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 Oct 11, 2023
2 parents 5b8577f + 062d173 commit 936cb25
Show file tree
Hide file tree
Showing 5 changed files with 233 additions and 112 deletions.
Binary file added assets/icons/K955.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icons/K960.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 97 additions & 18 deletions js/data/mst_slotitem_bonus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@
"shipId": [569,648,951,961],
"requiresAR": 1,
"num": 1
},
{
"bonus": { "tyku": 2, "kaih": 1 },
"shipId": [955,960],
"requiresAR": 1,
"num": 1
}
]
},
Expand Down Expand Up @@ -901,6 +907,12 @@
{
"bonus": { "tyku": 1, "souk": 1, "kaih": 2 },
"shipType": [1]
},
{
"bonus": { "houg": 1, "houm": 1, "tyku": 1, "kaih": 2 },
"shipId": [955,960],
"level": 4,
"num": 1
}
]
},
Expand Down Expand Up @@ -1523,7 +1535,7 @@
},
{
"bonus": { "houg": 1, "raig": 3, "kaih": 2 },
"shipId": [229,542,543,563,564,569,578,648,649],
"shipId": [229,542,543,563,564,569,578,648,649,955,960],
"requiresSR": 1,
"num": 1
},
Expand All @@ -1533,9 +1545,21 @@
"requiresSR": 1,
"num": 1
},
{
"bonus": { "raig": -1 },
"shipId": [955],
"requiresSR": 1,
"num": 1
},
{
"bonus": { "raig": -2 },
"shipId": [960],
"requiresSR": 1,
"num": 1
},
{
"bonus": { "houg": 2 },
"shipId": [648,649,961]
"shipId": [648,649,955,960,961]
},
{
"bonus": { "houg": 2, "raig": 3, "kaih": 1 },
Expand Down Expand Up @@ -1572,43 +1596,54 @@
},
{
"bonus": { "houg": 2 },
"shipId": [648,649,961]
"shipId": [648,649,955,960,961]
},
{
"bonus": { "tyku": 3, "houg": 1, "houm": 1 },
"shipId": [229,542,543,563,564,569,578,648,649,961],
"shipId": [229,542,543,563,564,569,578,648,649,955,960,961],
"num": 1
},
{
"bonus": { "houg": 2, "raig": 4, "kaih": 2, "houm": 2 },
"shipId": [229,542,543,563,564,569,578,648,649,961],
"shipId": [229,542,543,563,564,569,578,648,649,955,960,961],
"requiresSR": 1,
"num": 1
},
{
"bonus": { "houg": 1, "raig": -1 },
"shipId": [960],
"requiresSR": 1,
"num": 1
},
{
"bonus": { "houg": 1, "tyku": 5, "kaih": 3, "houm": 1 },
"shipId": [229,542,543,563,564,569,578,648,649,961],
"shipId": [229,542,543,563,564,569,578,648,649,955,960,961],
"requiresAR": 1,
"num": 1
},
{
"bonus": { "tyku": 2, "houg": 2 },
"shipId": [229,542,543,563,564,569,578,648,649,961],
"shipId": [229,542,543,563,564,569,578,648,649,955,960,961],
"num": 2
},
{
"bonus": { "houg": 1 },
"shipId": [955],
"num": 2
},
{
"bonus": { "houm": 1 },
"shipId": [229,542,543,563,564,569,578,648,649,961],
"shipId": [229,542,543,563,564,569,578,648,649,955,960,961],
"level": 5
},
{
"bonus": { "houg": 1 },
"shipId": [229,542,543,563,564,569,578,648,649,961],
"shipId": [229,542,543,563,564,569,578,648,649,955,960,961],
"level": 8
},
{
"bonus": { "houm": 1 },
"shipId": [229,542,543,563,564,569,578,648,649,961],
"shipId": [229,542,543,563,564,569,578,648,649,955,960,961],
"level": 10
},
{
Expand Down Expand Up @@ -1773,36 +1808,36 @@
"bonuses": [
{
"bonus": { "raig": 2, "kaih": 1 },
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,961],
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,955,960,961],
"num": 1
},
{
"bonus": { "raig": 2, "kaih": 1 },
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,961],
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,955,960,961],
"num": 2
},
{
"bonus": { "houg": 1 },
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,961],
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,955,960,961],
"num": 1,
"level": 10
},
{
"bonus": { "houg": 1 },
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,961],
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,955,960,961],
"num": 2,
"level": 10
},
{
"bonus": { "raig": 1 },
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,961],
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,955,960,961],
"shipClass": [30],
"num": 1,
"level": 5
},
{
"bonus": { "raig": 1 },
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,961],
"shipId": [144,145,198,199,463,464,468,469,470,489,490,497,498,542,543,563,564,566,567,568,569,578,587,588,648,649,651,656,667,670,915,951,955,960,961],
"shipClass": [30],
"num": 2,
"level": 5
Expand Down Expand Up @@ -6839,7 +6874,7 @@
},
{
"bonus": { "houg": 1, "tyku": 1, "kaih": 1 },
"shipId": [147,235,407,419,464,470,557,558,578],
"shipId": [147,235,407,419,464,470,557,558,578,955,960],
"num": 1
},
{
Expand Down Expand Up @@ -6877,7 +6912,7 @@
},
{
"bonus": { "houg": 1, "houm": 1, "tyku": 1, "kaih": 2 },
"shipId": [147,235,407,419,464,470,537,538,578],
"shipId": [147,235,407,419,464,470,537,538,578,955,960],
"num": 1
}
]
Expand Down Expand Up @@ -6987,5 +7022,49 @@
"num": 1
}
]
},
{
"ids": [517],
"bonuses": [
{
"bonus": { "houm": 1, "kaih": 1, "saku": 1 },
"shipClass": [1,5,10,12,18,22,23,28,30,38,54,66,101,74,77,85,104,117],
"num": 1
},
{
"bonus": { "houg": 1, "houm": 1 },
"shipClass": [38],
"num": 1
},
{
"bonus": { "houg": 2, "houm": 1, "kaih": 3, "saku": 2 },
"shipId": [960],
"num": 1
},
{
"bonus": { "houg": 1, "houm": 1, "kaih": 2, "saku": 1 },
"shipId": [147,235,407,419,464,470,578,656,955,961],
"num": 1
},
{
"bonus": { "houg": 1, "houm": 1 },
"requiresId": [267,366],
"requiresIdLevel": 3,
"num": 1
},
{
"bonus": { "houg": 1, "houm": 1 },
"shipClass": [38],
"requiresId": [267,366],
"requiresIdLevel": 3,
"num": 1
},
{
"bonus": { "houg": 1, "houm": 1, "tyku": 4, "kaih": 3 },
"requiresId": [450],
"requiresIdLevel": 4,
"num": 1
}
]
}
]
25 changes: 18 additions & 7 deletions js/kcEQDATA.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,15 @@ EQTDATA[MIDGETSUB] = {
improve: {Pnb:1,ACCnb:1.3},
canequip: ['CLT','SS','SSV','AV'],
canequipS: [200, 488, 506, 623, 657, 668],
cannotequipS: [372, 445, 450, 491, 539, 605],
cannotequipS: [372, 445, 450, 491, 539, 605, 731, 939],
};
EQTDATA[AAGUN] = {
name: 'Anti-Air Gun',
image: 15,
atype: A_AAGUN,
improve: {Pshell:1,Ptorp:1.2,ACCtorp:2,AAself:2},
canequip: ['DD','CL','CT','CLT','CA','CAV','FBB','BB','BBV','CVL','CV','CVB','AS','AV','AO','AR','LHA','DE'],
canequipS: [530, 539],
canequipS: [530, 539, 939, 940],
cannotequipS: [645, 650],
};
EQTDATA[AAFD] = {
Expand Down Expand Up @@ -402,7 +402,7 @@ 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, 961],
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],
};
EQTDATA[BULGEL] = {
name: 'Torpedo Bulge',
Expand All @@ -416,7 +416,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],
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],
cannotequipS: [445, 491, 727, 945],
};
EQTDATA[SEARCHLIGHTS] = {
Expand Down Expand Up @@ -472,7 +472,7 @@ EQTDATA[DRUM] = {
name: 'Misc',
image: 25,
canequip: ['DD','CL','CAV','AV','AO','LHA'],
canequipS: [530, 539, 605, 707, 899],
canequipS: [530, 539, 605, 707, 731, 899, 939, 940],
cannotequipS: [717, 900, 943, 948],
};
EQTDATA[SCAMP] = {
Expand Down Expand Up @@ -520,7 +520,7 @@ EQTDATA[LANDINGTANK] = {
btype: B_LC3,
improve: {Pshell:1,Pnb:1},
canequip: ['SS','SSV','AV','LHA'],
canequipS: [147, 198, 199, 200, 352, 418, 464, 468, 470, 478, 487, 488, 489, 490, 497, 500, 506, 541, 547, 548, 556, 564, 568, 569, 573, 578, 587, 588, 623, 647, 656, 657, 662, 663, 666, 667, 668, 670, 899, 908, 915, 916, 954, 961],
canequipS: [147, 198, 199, 200, 352, 418, 464, 468, 470, 478, 487, 488, 489, 490, 497, 500, 506, 541, 547, 548, 556, 564, 568, 569, 573, 578, 587, 588, 623, 647, 656, 657, 662, 663, 666, 667, 668, 670, 899, 908, 915, 916, 954, 960, 961],
cannotequipS: [445, 491, 581, 943],
};
EQTDATA[OILDRUM] = {
Expand Down Expand Up @@ -556,7 +556,7 @@ EQTDATA[TRANSPORTITEM] = {
name: 'Transportation Material',
image: 41,
canequip: ['CAV','BBV','CVL','CV','CVB','SSV','AV','AR','LHA'],
canequipS: [500, 530, 539, 605, 645, 650, 699, 717, 900],
canequipS: [500, 530, 539, 605, 645, 650, 699, 717, 731, 900, 939, 940],
cannotequipS: [621, 626, 916],
};
EQTDATA[SUBRADAR] = {
Expand Down Expand Up @@ -5990,6 +5990,17 @@ var EQDATA = {
ACC: 6,
EV: 1,
},
517: {
name: 'Passive Radiolocator (E27) + Type 22 Surface Radar Kai 4 (Calibrated Late Model)',
nameJP: '逆探(E27)+22号対水上電探改四(後期調整型)',
added: '2023-10-11',
type: RADARS,
FP: 2,
ACC: 9,
EV: 5,
ASW: 4,
LOS: 8,
},
1501: {
name: '5inch Single Cannon',
nameJP: '5inch単装砲',
Expand Down
Loading

0 comments on commit 936cb25

Please sign in to comment.