Skip to content

Commit

Permalink
Revert "[TCN] Updates of multiple sections"
Browse files Browse the repository at this point in the history 
This reverts commit 6e3c3c8.
  • Loading branch information
@Jurrunio
Jurrunio committed Jul 16, 2024
1 parent 6e3c3c8 commit 94f529c
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 128 deletions.
95 changes: 46 additions & 49 deletions data/tcn/battle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
"cutinDay" : [
"",
"激光",
"主砲連擊 判定 2 次，倍率",
"主炮連擊 判定 2 次，倍率",
"主副Cut-In 判定 1 次，倍率",
"主副Cut-In(雷達) 判定 1 次，倍率",
"主副Cut-In(穿甲彈) 判定 1 次，倍率",
"雙砲Cut-In(穿甲彈) 判定 1 次，倍率",
"雙炮Cut-In(穿甲彈) 判定 1 次，倍率",
"航母Cut-In 判定 1 次，倍率",
"", "", "", "", "", "", "", "", "", "", "", "",
"納爾遜特殊攻擊 判定 3 次，倍率",
Expand All @@ -90,17 +90,17 @@

"cutinNight" : [
"",
"主砲連擊 判定 2 次，倍率",
"砲雷Cut-In 判定 2 次，倍率",
"主炮連擊 判定 2 次，倍率",
"炮雷Cut-In 判定 2 次，倍率",
"雙雷Cut-In 判定 2 次，倍率",
"雙主單副Cut-In 判定 1 次，倍率",
"三主砲Cut-In 判定 1 次，倍率",
"三主炮Cut-In 判定 1 次，倍率",
"夜間航母Cut-In 判定 1 次，倍率",
"砲雷電Cut-In 判定 1 次，倍率",
"炮雷電Cut-In 判定 1 次，倍率",
"雷見電Cut-In 判定 1 次，倍率",
"水見雙雷Cut-In 判定 1 次，倍率",
"水見雷桶Cut-In 判定 1 次，倍率",
"砲雷電Cut-In 判定 1~2 次，倍率",
"炮雷電Cut-In 判定 1~2 次，倍率",
"雷見電Cut-In 判定 1~2 次，倍率",
"水見雙雷Cut-In 判定 1~2 次，倍率",
"水見雷桶Cut-In 判定 1~2 次，倍率",
Expand All @@ -123,54 +123,51 @@

"aacitype" : [
[],
["秋月型驅逐艦", "高射砲", "高射砲", "雷達"],
["秋月型驅逐艦", "高射砲", "雷達"],
["秋月型驅逐艦", "高射砲", "高射砲"],
["戰艦", "大口徑主砲", "三式燒霰彈", "高射装置", "對空\u22651的雷達"],
["", "對空\u22658的高射砲", "對空\u22658的高射砲", "對空\u22651的雷達"],
["戰艦", "大口徑主砲", "三式燒霰彈", "高射装置"],
["", "高射砲", "高射装置", "對空\u22651的雷達"],
["", "對空\u22658的高射砲", "對空\u22651的雷達"],
["", "高射砲", "高射装置"],
["摩耶改二", "高射砲", "對空\u22659的機槍", "對空\u22651的雷達"],
["摩耶改二", "高射砲", "對空\u22659的機槍"],
["", "對空\u22659的機槍", "對空值\u22653的機槍", "對空\u22651的雷達"],
["摩耶改二除外", "對空\u22658的高射砲", "對空值\u22653的機槍", "對空\u22651的雷達"],
["五十鈴改二", "高射砲", "機槍", "對空\u22651的雷達"],
["五十鈴改二", "高射砲", "機槍"],
["霞改二乙、夕張改二", "高射砲", "機槍", "對空\u22651的雷達"],
["霞改二乙、稻木改二", "高射砲", "機槍"],
["皐月改二、稻木改二", "對空\u22659的機槍"],
["鬼怒改二", "對空值\u22647的高射砲", "對空\u22659的機槍"],
["鬼怒改二", "對空\u22659的機槍"],
["由良改二", "高射砲", "對空\u22651的雷達"],
["文月改二", "對空\u22659的機槍"],
["UIT-25, I-504", "對空值3~8的機槍"],
["天龍型改二", "高射砲", "對空值3~8的機槍"],
["伊勢型戰艦(改或以上)", "12cm三十管火箭砲改二", "對空\u22651的雷達", "三式燒霰彈"],
["大和改二型戰艦", "10cm聯裝高射砲改+機槍", "對空\u22651的雷達"],
["大淀改", "10cm聯裝高射砲改+機槍", "12cm三十管火箭砲改二", "對空\u22651的雷達"],
["伊勢型戰艦(改或以上)、武藏改及改二", "12cm三十管火箭砲改二", "對空\u22651的雷達"],
["陽炎型乙改驅逐艦", "高射砲", "對空\u22651的雷達"],
["天龍改二, 哥特蘭改及andra", "高射砲", "高射砲", "高射砲"],
["天龍改二、稻木改二", "高射砲", "高射砲"],
["英國艦, 金剛改二型戰艦", "20管7英吋「非旋轉投射」對空火箭砲 或\n後裝式16英吋Mk I三聯裝砲改+284式火控雷達", "20管7英吋「非旋轉投射」對空火箭砲 或\n高射速2磅八聯裝砰砰砲"],
["哥特蘭改及andra", "高射砲", "對空值\u22654的機槍"],
["秋月型驅逐艦", "高射炮", "高射炮", "雷達"],
["秋月型驅逐艦", "高射炮", "雷達"],
["秋月型驅逐艦", "高射炮", "高射炮"],
["戰艦", "大口徑主炮", "三式燒霰彈", "高射装置", "對空雷達"],
["", "高射炮+高射装置", "高射炮+高射装置", "對空雷達"],
["戰艦", "大口徑主炮", "三式燒霰彈", "高射装置"],
["", "高射炮", "高射装置", "對空雷達"],
["", "高射炮+高射装置", "對空雷達"],
["", "高射炮", "高射装置"],
["摩耶改二", "高射炮", "對空機槍(集中配備)", "對空雷達"],
["摩耶改二", "高射炮", "對空機槍(集中配備)"],
["", "對空機槍(集中配備)", "對空值>=3的對空機槍", "對空雷達"],
[],
["五十鈴改二", "高射炮", "對空機槍", "對空雷達"],
["五十鈴改二", "高射炮", "對空機槍"],
["霞改二乙", "高射炮", "對空機槍", "對空雷達"],
["霞改二乙", "高射炮", "對空機槍"],
["皐月改二", "對空機槍(集中配備)"],
["鬼怒改二", "對空值<=7的高射炮", "對空機槍(集中配備)"],
["鬼怒改二", "對空機槍(集中配備)"],
["由良改二", "高射炮", "對空雷達"],
["文月改二", "對空機槍(集中配備)"],
["UIT-25, I-504", "對空值3~8的對空機槍"],
["天龍型改二", "高射炮", "對空值3~8的對空機槍"],
["伊勢改型戰艦", "12cm三十管火箭砲改二", "對空雷達", "三式燒霰彈"],
["大和改二型戰艦", "10cm聯裝高射砲改+機槍", "對空雷達"],
[],
["伊勢改型戰艦、武藏改及改二", "12cm三十管火箭砲改二", "對空雷達"],
["陽炎乙改型驅逐艦", "高射炮", "對空雷達"],
["天龍改二, 哥特蘭改及andra", "高射炮", "高射炮", "高射炮"],
["天龍改二", "高射炮", "高射炮"],
["英國艦, 金剛級改二", "20管7英吋「非旋轉投射」對空火箭砲, 後裝式16英吋Mk I三聯裝砲改+284式火控雷達", "20管7英吋「非旋轉投射」對空火箭砲, 高射速2磅八聯裝砰砰砲"],
["哥特蘭改及andra", "高射炮", "對空值>=4的對空機槍"],
["佛萊契爾級", "5英寸Mk.30單裝砲改+Mk.37火控糸統", "5英寸Mk.30單裝砲改+Mk.37火控糸統"],
["佛萊契爾級", "5英寸Mk.30單裝砲改+Mk.37火控糸統", "5英寸Mk.30單裝砲/改"],
["佛萊契爾級", "5英寸Mk.30單裝砲/改", "5英寸Mk.30單裝砲/改", "Mk.37火控糸統"],
["佛萊契爾級", "5英寸Mk.30單裝砲改", "5英寸Mk.30單裝砲改"],
["亞特蘭大級", "5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統", "5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統"],
["亞特蘭大級", "5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統", "5英寸高平兩用聯裝砲(密集佈置)"],
["亞特蘭大級", "5英寸高平兩用聯裝砲(密集佈置) 或\n5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統", "5英寸高平兩用聯裝砲(密集佈置) 或\n5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統", "Mk.37火控糸統"],
["亞特蘭大級", "5英寸高平兩用聯裝砲(密集佈置) 或\n5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統", "5英寸高平兩用聯裝砲(密集佈置) 或\n5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統"],
["大和改二型戰艦", "多組10cm聯裝高射砲 (密集佈置)", "多組10cm聯裝高射砲 (密集佈置)", "15m雙重測距儀+21號對空雷達改二 或\n15m雙重測距儀+21號對空雷達改二+熟練射擊指揮中心", "對空值>=6的對空機槍"],
["大和改二型戰艦", "多組10cm聯裝高射砲 (密集佈置)", "多組10cm聯裝高射砲 (密集佈置)", "15m雙重測距儀+21號對空雷達改二 或\n15m雙重測距儀+21號對空雷達改二+熟練射擊指揮中心"],
["大和改二型戰艦", "多組10cm聯裝高射砲 (密集佈置)", "15m雙重測距儀+21號對空雷達改二 或\n15m雙重測距儀+21號對空雷達改二+熟練射擊指揮中心", "對空值>=6的對空機槍"],
["大和改二型戰艦", "多組10cm聯裝高射砲 (密集佈置)", "15m雙重測距儀+21號對空雷達改二 或\n15m雙重測距儀+21號對空雷達改二+熟練射擊指揮中心"],
["榛名改二乙", "35.6連裝砲改三(炫目迷彩)", "35.6連裝砲改四", "對空值\u22659的機槍", "對空雷達"],
["春雨改二、白露改二、村雨改二、時雨改二及改三", "12.7cmC型連裝砲改三H", "對空值\u22654的對空雷達 或\n25mm對空機槍(額外) 或\n12.7cmC型連裝砲改三H"],
["秋月改型驅逐艦", "10cm聯裝高射砲改+對空射控系統改", "10cm聯裝高射砲改+對空射控系統改", "對空值\u22654的對空雷達"],
["亞特蘭大級", "5英寸高平兩用聯裝砲(密集佈置) 或 5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統", "5英寸高平兩用聯裝砲(密集佈置) 或 5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統", "Mk.37火控糸統"],
["亞特蘭大級", "5英寸高平兩用聯裝砲(密集佈置) 或 5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統", "5英寸高平兩用聯裝砲(密集佈置) 或 5英寸高平兩用聯裝砲(密集佈置)+Mk.37火控糸統"],
["大和改二型戰艦", "多組10cm聯裝高射砲 (密集佈置)", "多組10cm聯裝高射砲 (密集佈置)", "15m雙重測距儀+21號對空雷達改二 或 15m雙重測距儀+21號對空雷達改二+熟練射擊指揮中心", "對空值>=6的對空機槍"],
["大和改二型戰艦", "多組10cm聯裝高射砲 (密集佈置)", "多組10cm聯裝高射砲 (密集佈置)", "15m雙重測距儀+21號對空雷達改二 或 15m雙重測距儀+21號對空雷達改二+熟練射擊指揮中心"],
["大和改二型戰艦", "多組10cm聯裝高射砲 (密集佈置)", "15m雙重測距儀+21號對空雷達改二 或 15m雙重測距儀+21號對空雷達改二+熟練射擊指揮中心", "對空值>=6的對空機槍"],
["大和改二型戰艦", "多組10cm聯裝高射砲 (密集佈置)", "15m雙重測距儀+21號對空雷達改二 或 15m雙重測距儀+21號對空雷達改二+熟練射擊指揮中心"],
[]
]
}
11 changes: 3 additions & 8 deletions data/tcn/equiptype.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
"陸上偵察機",
"陸上重型轟炸機",
"陸戰部隊",
"煙霧產生器",
"防空氣球",
"水面艦裝備",
""
],

Expand Down Expand Up @@ -83,8 +82,7 @@
"陸上重型轟炸機",
"裝甲艇",
"陸戰部隊",
"艦載煙霧產生器",
"防空氣球",
"艦載發煙裝置",
""
],

Expand Down Expand Up @@ -243,9 +241,7 @@
"夜間水上魚雷機",
"陸戰部隊",
"?",
"艦載煙霧產生器",
"防空氣球",
"基地航空隊噴氣機",
"艦載發煙裝置",
""
],

Expand Down Expand Up @@ -305,7 +301,6 @@
"一式戰隼II型改",
"直升機",
"三式指揮連絡機",
"Me 262A-1a/R1 德國噴氣機",
""
]
]
17 changes: 5 additions & 12 deletions data/tcn/ship_affix.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,30 @@
"丁" : "丁",
"戊" : "戊",
"特" : "特",
"重" : "重",
"戦" : "戰",
"改三" : "改三",
"改二" : "改二",
"改II" : "改乙",
"改II" : "改II",
"乙改" : "乙改",
"丁改" : "丁改",
"改" : "改",
"航" : "航",
"母" : "母",
"護" : "護",
"重" : "重",
" zwei" : " zwei",
" drei" : " drei",
" due" : " due",
" andra": " andra",
" nuovo": " nuovo",
" два" : " два",
" Mod.2" : " Mod.2",
" Mk.II" : " Mk.II",
" nuovo" : " nuovo",
"(特務艦)" : " (特殊用途)",
"(灯台補給船)" : " (照明補給)",
"(南極観測船)" : " (南極觀測)",
"(量産型)": " (量產型)",
"(哨戒機配備)" : " (配備預警機)",
"後期型": " 後期型",
"後期型II": " 後期型II",
"(哨戒機配備)" : " (配備預警機)",
" バカンスmode" : " 度假模式",
" 夏季上陸mode" : " 夏季登陸模式",
" 夏mode" : " 夏季模式",
Expand Down Expand Up @@ -76,8 +74,7 @@
"ハロウィン" : "萬聖節",
"Xmas" : "聖誕",
"クリスマス" : "聖誕",
"修羅場C99" : "C101修羅場(2022)",
"修羅場C99" : "C99修羅場(2021)",
"修羅場C99" : "C99修羅場",
"修羅場" : "修羅場(截稿前)",
"超修羅場" : "超級修羅場(截稿前++)",
"超スーパー修羅場" : "超極修羅場(截稿前max)",
Expand All @@ -87,9 +84,6 @@
"売り子" : "售貨員",
"記念日" : "記念日",
"お祝い" : "祝賀",
"カクテルドレス" : "雞尾酒裙子",
"ホワイトドレス" : "白色裙子",
"菖蒲" : "端午節",
"桜" : "櫻花",
"買い物" : "三越購物",
"買い出し" : "購物",
Expand All @@ -99,7 +93,6 @@
"観艦式" : "軍艦檢閱",
"海峡突入" : "衝入雷伊泰灣海峽",
"決戦" : "雷伊泰灣決戰",
"トーチ作戦" : "火炬作戰",
"【保留】" : "(預留位)"
},

Expand Down
3 changes: 0 additions & 3 deletions data/tcn/stype.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,5 @@
"補給",
"補給",
"補給",
"登陸",
"練巡",
"水母",
""
]
Loading

0 comments on commit 94f529c

Please sign in to comment.