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 Aug 25, 2024
2 parents 103f73d + 88070e7 commit 4e2f79a
Show file tree
Hide file tree
Showing 6 changed files with 284 additions and 51 deletions.
6 changes: 3 additions & 3 deletions css/simulator-ui/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,14 @@ div.progressBarInner {
color: red;
font-weight: bold;
}
#divResultColsWrap {
div.divResultColsWrap {
margin-top: 20px;
display: flex;
}
#divResultColsWrap div.resultCol {
div.divResultColsWrap div.resultCol {
margin-right: 20px;
}
#divResultColsWrap div.resultCol > div {
div.divResultColsWrap div.resultCol > div {
margin-bottom: 20px;
}
#divResults h3 {
Expand Down
15 changes: 15 additions & 0 deletions js/data/strings_en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@
"land_base_aerial_support": "Land Base Aerial Support",
"friend_fleet": "Friend Fleet",
"use_friend_fleet": "Use Friend Fleet",
"set_all_ff_luck_to": "Set All FF Luck to",
"ff_luck_base": "Base",
"ff_luck_max": "Max",
"ff_luck_value": "Value",
"battles": "Battles",
"insert_node": "Insert Node",
"settings": "Settings",
Expand Down Expand Up @@ -352,6 +356,9 @@
"repair_team": "Repair Team",
"avg_repair": "Avg Repair",
"avg_resource_per": "{avg_res} Per {img}",
"avg_resource_per_or_better": "{avg_res} Per {img} or Better",
"avg_resource_per_hp": "{avg_res} Per {input} Boss HP",
"avg_resource_per_tp": "{avg_res} Per {input} TP",
"avg_resource": "Avg Resource",
"avg_resource_tooltip": "Includes Resupply + Repair",
"copy_to_clipboard": "Copy to Clipboard",
Expand Down Expand Up @@ -875,11 +882,19 @@
"results": {
"retreat_rate": "Retreat",
"S_rate": "S Rate",
"A_rate": "A+ Rate",
"B_rate": "B+ Rate",
"non_S_rate": "non-S",
"non_A_rate": "non-A+",
"non_B_rate": "non-B+",
"flagsunk_rate": "Flagship Sunk Rate",
"non_flagsunk_rate": "Flagship Not Sunk",
"avg_per_S": "Avg Resource Per S",
"avg_per_A": "Avg Resource Per A",
"avg_per_B": "Avg Resource Per B",
"avg_per_flagsunk": "Avg Resource Per Flagship Sunk",
"avg_per_hp": "Avg Resource Per {0} HP",
"avg_per_tp": "Avg Resource Per {0} TP",
"fuel": "Fuel",
"ammo": "Ammo",
"steel": "Steel",
Expand Down
15 changes: 15 additions & 0 deletions js/data/strings_ja.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@
"land_base_aerial_support": "基地航空隊",
"friend_fleet": "友軍艦隊",
"use_friend_fleet": "友軍艦隊を要請する",
"set_all_ff_luck_to": "運一括適用",
"ff_luck_base": "初期値",
"ff_luck_max": "上限値",
"ff_luck_value": "任意値",
"battles": "敵艦隊",
"insert_node": "Node追加",
"settings": "設定",
Expand Down Expand Up @@ -352,6 +356,9 @@
"repair_team": "ダメコン",
"avg_repair": "平均入渠コスト",
"avg_resource_per": "最終Node{img}あたり",
"avg_resource_per_or_better": "最終Node{img}以上あたり",
"avg_resource_per_hp": "ボスHP{input}あたり",
"avg_resource_per_tp": "TP{input}あたり",
"avg_resource": "平均消費資源",
"avg_resource_tooltip": "補給 + 入渠コスト",
"copy_to_clipboard": "クリップボードにコピー",
Expand Down Expand Up @@ -875,11 +882,19 @@
"results": {
"retreat_rate": "撤退率",
"S_rate": "S率",
"A_rate": "A以上",
"B_rate": "B以上",
"non_S_rate": "S以外",
"non_A_rate": "A未満",
"non_B_rate": "B未満",
"flagsunk_rate": "旗艦撃沈率",
"non_flagsunk_rate": "旗艦撃沈以外",
"avg_per_S": "S勝利あたり",
"avg_per_A": "A以上あたり",
"avg_per_B": "B以上あたり",
"avg_per_flagsunk": "旗艦撃沈あたり",
"avg_per_hp": "ボスHP{0}あたり",
"avg_per_tp": "TP{0}あたり",
"fuel": "燃料",
"ammo": "弾薬",
"steel": "鋼材",
Expand Down
84 changes: 38 additions & 46 deletions js/kcSHIPDATA.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4815,7 +4815,7 @@ var SHIPDATA = {
TP: 0, TPbase: 0,
AA: 82, AAbase: 33,
AR: 76, ARbase: 37,
EV: 85, EVbase: 40,
EV: 86, EVbase: 40,
ASW: 0, ASWbase: 0,
LOS: 89, LOSbase: 52,
LUK: 50, LUKmax: 93,
Expand All @@ -4842,7 +4842,7 @@ var SHIPDATA = {
AR: 75, ARbase: 36,
EV: 74, EVbase: 36,
ASW: 0, ASWbase: 0,
LOS: 90, LOSbase: 55,
LOS: 93, LOSbase: 55,
LUK: 15, LUKmax: 60,
RNG: 1,
SPD: 10,
Expand Down Expand Up @@ -9407,7 +9407,7 @@ var SHIPDATA = {
TP: 0, TPbase: 0,
AA: 79, AAbase: 28,
AR: 97, ARbase: 78,
EV: 73, EVbase: 39,
EV: 74, EVbase: 39,
ASW: 0, ASWbase: 0,
LOS: 54, LOSbase: 16,
LUK: 24, LUKmax: 95,
Expand Down Expand Up @@ -15498,7 +15498,7 @@ var SHIPDATA = {
TP: 0, TPbase: 0,
AA: 21, AAbase: 4,
AR: 15, ARbase: 4,
EV: 77, EVbase: 39,
EV: 77, EVbase: 38,
ASW: 65, ASWbase: 30,
LOS: 11, LOSbase: 2,
LUK: 17, LUKmax: 77,
Expand Down Expand Up @@ -15674,8 +15674,8 @@ var SHIPDATA = {
AA: 0, AAbase: 0,
AR: 40, ARbase: 13,
EV: 79, EVbase: 26,
ASW: 2, ASWbase: 1,
LOS: 18, LOSbase: 14,
ASW: 2, ASWbase: 0,
LOS: 18, LOSbase: 9,
LUK: 65, LUKmax: 130,
RNG: 1,
SPD: 5,
Expand Down Expand Up @@ -16182,7 +16182,7 @@ var SHIPDATA = {
AR: 51, ARbase: 11,
EV: 85, EVbase: 49,
ASW: 82, ASWbase: 28,
LOS: 71, LOSbase: 9,
LOS: 41, LOSbase: 8,
LUK: 10, LUKmax: 73,
RNG: 1,
SPD: 10,
Expand Down Expand Up @@ -16884,7 +16884,7 @@ var SHIPDATA = {
TP: 78, TPbase: 20,
AA: 54, AAbase: 12,
AR: 49, ARbase: 12,
EV: 88, EVbase: 44,
EV: 89, EVbase: 44,
ASW: 59, ASWbase: 16,
LOS: 39, LOSbase: 6,
LUK: 12, LUKmax: 59,
Expand Down Expand Up @@ -17034,7 +17034,7 @@ var SHIPDATA = {
TP: 81, TPbase: 28,
AA: 56, AAbase: 16,
AR: 49, ARbase: 14,
EV: 85, EVbase: 36,
EV: 85, EVbase: 35,
ASW: 66, ASWbase: 27,
LOS: 54, LOSbase: 11,
LUK: 9, LUKmax: 54,
Expand Down Expand Up @@ -17411,7 +17411,7 @@ var SHIPDATA = {
TP: 0, TPbase: 0,
AA: 78, AAbase: 24,
AR: 97, ARbase: 77,
EV: 73, EVbase: 38,
EV: 74, EVbase: 38,
ASW: 0, ASWbase: 0,
LOS: 53, LOSbase: 15,
LUK: 22, LUKmax: 94,
Expand Down Expand Up @@ -17638,11 +17638,10 @@ var SHIPDATA = {
TP: 0, TPbase: 0,
AA: 92, AAbase: 56,
AR: 92, ARbase: 78,
EV: 0, EVbase: 0,
EV: 69, EVbase: 29,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
LOS: 59, LOSbase: 18,
LUK: 40, LUKmax: 105,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 3,
SPD: 5,
SLOTS: [3, 3, 3, 3],
Expand Down Expand Up @@ -17685,16 +17684,16 @@ var SHIPDATA = {
type: 'CV', sclass: 69,
nid: 1735,
added: '2024-08-08',
nightattack: 1,
HP: 89, HPmax: 98,
FP: 55, FPbase: 30,
TP: 0, TPbase: 0,
AA: 84, AAbase: 50,
AR: 80, ARbase: 50,
EV: 0, EVbase: 0,
EV: 51, EVbase: 21,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
LOS: 80, LOSbase: 45,
LUK: 17, LUKmax: 74,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 1,
SPD: 10,
SLOTS: [22, 38, 20, 13],
Expand Down Expand Up @@ -18778,11 +18777,10 @@ var SHIPDATA = {
TP: 0, TPbase: 0,
AA: 87, AAbase: 40,
AR: 90, ARbase: 72,
EV: 0, EVbase: 0,
EV: 54, EVbase: 25,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
LOS: 47, LOSbase: 15,
LUK: 35, LUKmax: 85,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 3,
SPD: 5,
SLOTS: [3, 3, 3, 3],
Expand Down Expand Up @@ -19255,11 +19253,10 @@ var SHIPDATA = {
TP: 33, TPbase: 0,
AA: 69, AAbase: 26,
AR: 39, ARbase: 16,
EV: 0, EVbase: 0,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
EV: 68, EVbase: 31,
ASW: 34, ASWbase: 0,
LOS: 68, LOSbase: 18,
LUK: 19, LUKmax: 79,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 2,
SPD: 10,
SLOTS: [0, 1, 3],
Expand Down Expand Up @@ -19483,11 +19480,10 @@ var SHIPDATA = {
TP: 56, TPbase: 16,
AA: 64, AAbase: 28,
AR: 34, ARbase: 13,
EV: 0, EVbase: 0,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
EV: 87, EVbase: 53,
ASW: 52, ASWbase: 32,
LOS: 38, LOSbase: 8,
LUK: 6, LUKmax: 51,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 2,
SPD: 10,
SLOTS: [0, 0, 0],
Expand Down Expand Up @@ -19534,11 +19530,10 @@ var SHIPDATA = {
TP: 48, TPbase: 12,
AA: 68, AAbase: 32,
AR: 37, ARbase: 16,
EV: 0, EVbase: 0,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
EV: 74, EVbase: 32,
ASW: 36, ASWbase: 0,
LOS: 64, LOSbase: 20,
LUK: 22, LUKmax: 82,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 2,
SPD: 10,
SLOTS: [1, 1, 4],
Expand All @@ -19555,16 +19550,16 @@ var SHIPDATA = {
type: 'CV', sclass: 69,
nid: 566,
added: '2024-08-08',
nightattack: 1,
HP: 84, HPmax: 94,
FP: 46, FPbase: 30,
TP: 0, TPbase: 0,
AA: 72, AAbase: 36,
AR: 64, ARbase: 40,
EV: 0, EVbase: 0,
EV: 40, EVbase: 21,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
LOS: 67, LOSbase: 40,
LUK: 15, LUKmax: 70,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 2,
SPD: 10,
SLOTS: [27, 19, 19, 15],
Expand All @@ -19586,11 +19581,10 @@ var SHIPDATA = {
TP: 64, TPbase: 17,
AA: 73, AAbase: 34,
AR: 57, ARbase: 29,
EV: 0, EVbase: 0,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
EV: 91, EVbase: 58,
ASW: 63, ASWbase: 38,
LOS: 50, LOSbase: 11,
LUK: 11, LUKmax: 71,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 2,
SPD: 10,
SLOTS: [0, 0, 0, 0],
Expand Down Expand Up @@ -19640,9 +19634,8 @@ var SHIPDATA = {
AR: 109, ARbase: 83,
EV: 74, EVbase: 40,
ASW: 0, ASWbase: 0,
LOS: 58, LOSbase: 0,
LOS: 58, LOSbase: 19,
LUK: 28, LUKmax: 118,
unknownstats: { LOS: 1 },
RNG: 3,
SPD: 10,
SLOTS: [2, 2, 4, 4],
Expand All @@ -19664,11 +19657,10 @@ var SHIPDATA = {
TP: 60, TPbase: 12,
AA: 76, AAbase: 38,
AR: 66, ARbase: 24,
EV: 0, EVbase: 0,
ASW: 0, ASWbase: 0,
LOS: 0, LOSbase: 0,
EV: 83, EVbase: 38,
ASW: 45, ASWbase: 0,
LOS: 76, LOSbase: 24,
LUK: 35, LUKmax: 97,
unknownstats: { EV: 1, ASW: 1, LOS: 1 },
RNG: 2,
SPD: 10,
SLOTS: [1, 2, 2, 2],
Expand Down Expand Up @@ -36078,7 +36070,7 @@ var SHIPDATA = {
unknownstats: { EV: 2, ASW: 2, LOS: 2, LUK: 2, TACC: 2 },
RNG: 4,
SPD: 10,
SLOTS: [54, 24, 24, 10, 0],
SLOTS: [52, 24, 24, 12, 0],
EQUIPS: [1650, 1651, 1652, 1648, 1608],
},
2258: {
Expand Down Expand Up @@ -36144,7 +36136,7 @@ var SHIPDATA = {
unknownstats: { EV: 2, ASW: 2, LOS: 2, LUK: 2, TACC: 2 },
RNG: 4,
SPD: 10,
SLOTS: [68, 40, 40, 14, 0],
SLOTS: [64, 42, 42, 14, 0],
EQUIPS: [1650, 1651, 1652, 1648, 1608],
},
2261: {
Expand Down
Loading

0 comments on commit 4e2f79a

Please sign in to comment.