Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebuild & fix parse error #9

Merged
merged 20 commits into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions .github/workflows/update.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Auto Refresh

on:
schedule:
- cron: '0 1 * * *'
workflow_dispatch:
push:
branches: [ main ]


jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Run
run: |
python src/main.py kcQuests -d 1
- name: Copy file
run: |
cp quests-scn.json dist/quests-scn.json
cp quests-scn-new.json dist/quests-scn-new.json
# Runs a set of commands using the runners shell
- name: Commit changes
uses: EndBug/add-and-commit@v9
with:
andychucs marked this conversation as resolved.
Show resolved Hide resolved
author_name: GitHub Actions Bot
author_email: <>
message: "GitHub Actions Refresh"
add: "."
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,4 @@ dmypy.json
# Cython debug symbols
cython_debug/

.idea/
3,633 changes: 1,644 additions & 1,989 deletions dist/quests-scn.json

Large diffs are not rendered by default.

769 changes: 769 additions & 0 deletions equip.json

Large diffs are not rendered by default.

100 changes: 51 additions & 49 deletions quests-scn-new.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"1001": {
"code": "B194 ",
"code": "B194",
"desc": "",
"memo": "奖励:以下奖励三选一:新型火炮兵装资材×3 ,12.7cm连装炮D型改二,61cm四连装(酸素)鱼雷后期型,以下奖励三选一:改修资材×7,开发资材×30,22号对水上电探改四(后期调整型)",
"memo": "以下奖励三选一: 新型火炮兵装资材 ×3 12.7cm连装炮D型改二 61cm四连装(酸素)鱼雷后期型 以下奖励三选一: 改修资材 ×7 开发资材 ×30 22号对水上电探改四(后期调整型) ",
"memo2": "清霜改二/丁+【霞、朝霜、大淀、足柄】任选2只,+3自由位,2-2、2-3、2-4、7-4各S胜一次?",
"name": "主力中的主力“清霜改二”出击!",
"pre": [
Expand All @@ -11,136 +11,138 @@
]
},
"1002": {
"code": "2310B5 ",
"code": "2310B5",
"desc": "以含「鹈来」「稻木」「朝潮」「夕立」「野分」「滨波」「早波」「阿武隈」中任意2艘的精锐舰队歼灭镇守府近海、东部奥廖尔海、加斯加达马岛、中部北海域孔雀岛近海的敌方战力!",
"memo": "奖励:以下奖励三选一,大发动艇×4 ,装甲艇(AB艇)★+4 ,一式陆攻三四型★+4,以下奖励三选一,试制东海★+2,战斗详报×1,南瓜×3",
"memo": " 以下奖励三选一 大发动艇 ×4 装甲艇(AB艇) green|★+4 一式陆攻三四型 green|★+4 以下奖励三选一 试制东海 green|★+2 战斗详报 ×1 南瓜 ×3 ",
andychucs marked this conversation as resolved.
Show resolved Hide resolved
"memo2": "单次任务:舰队包含【鹈来、稻木、朝潮、夕立、野分、滨波、早波、阿武隈】中任选2只,出击1-5、2-3、4-4、6-4各取得S胜1次",
"name": "【期间限定任务】10周年秋季南瓜祭扩张作战!",
"pre": [
"2310B4",
"B194"
]
},
"1119": {
"code": "2310F1 ",
"desc": "废弃「小口径主炮」「中口径主炮」「水上侦察机」各x6,准备「35.6cm连装炮」x3、「25mm连装机铳」x3、及家具币1031个!(任务完成后,准备的装备、家具币会消费掉)",
"memo": "奖励:以下奖励三选一,勋章×1 ,高速建造材×8,开发资材×10,以下奖励三选一,南瓜×1 ,伊良湖×2 ,铝土×2023",
"memo2": "周常任务,废弃:小口径主炮、中口径主炮、水上侦察机各6个,准备:35.6cm连装炮×3、25mm连装机枪×3、家具币1031。",
"code": "2310F1",
"desc": "废弃「小口径主炮」「中口径主炮」「水上侦察机」各x6,准备「35.6cm连装炮」x3、「25mm连装机铳」x3、及家具币1031个!任务完成后,准备的装备、家具币会消费掉",
"memo": " 以下奖励三选一 勋章 ×1 高速建造材 ×8 开发资材 ×10以下奖励三选一 南瓜 ×1 伊良湖 ×2 铝土×2023 ",
"memo2": " 周常任务 废弃:小口径主炮、中口径主炮、水上侦察机各6个,准备:35.6cm连装炮×3、25mm连装机枪×3、家具币1031。",
"name": "【期间限定】Halloween也要好好做扫除哦?",
"pre": []
"pre": [
"2310C1"
]
},
"1132": {
"code": "F120 ",
"code": "F120",
"desc": "",
"memo": "奖励:12.7cm连装炮D型改三",
"memo2": "旗舰清霜改二/丁 ,第一格装备12.7cm連装砲D型改二(改修★+8以上),并准备开发资材×22、新型砲熕兵装資材×1、「12.7cm連装砲」×10、弾薬350",
"memo": " 12.7cm连装炮D型改三 ",
"memo2": "旗舰清霜改二/丁 第一格装备12.7cm連装砲D型改二改修★+8以上,并准备开发资材×22、新型砲熕兵装資材×1、「12.7cm連装砲」×10、弾薬350",
"name": "",
"pre": [
"F115",
"F119"
]
},
"1133": {
"code": "F121 ",
"code": "F121",
"desc": "",
"memo": "奖励:逆探(E27)+22号对水上电探改四(后期调整型)",
"memo2": "旗舰清霜改二/丁 或 朝霜改二 ,第一格装备22号対水上電探改四(後期調整型),并准备开发资材×40、「13号対空電探改(後期型)」(改修★+4以上)×1、「改修資材×6",
"memo": " 逆探(E27)+22号对水上电探改四(后期调整型) ",
"memo2": "旗舰清霜改二/丁 或 朝霜改二 第一格装备22号対水上電探改四(後期調整型),并准备开发资材×40、「13号対空電探改(後期型)」(改修★+4以上)×1、「改修資材×6",
"name": "",
"pre": [
"B194",
"F119"
]
},
"1134": {
"code": "F122",
"desc": "",
"memo": "奖励:22号对水上电探改四(后期调整型)",
"memo2": "旗舰時雨改二/改三 或満潮改二 , 第一格装备22号対水上電探改四(改修★max),并准备开发资材×22、新型兵装資材×2、「22号対水上電探」×4、改修資材×6",
"memo": " 22号对水上电探改四(后期调整型) ",
"memo2": "旗舰時雨改二/改三 或満潮改二 第一格装备22号対水上電探改四改修★max,并准备开发资材×22、新型兵装資材×2、「22号対水上電探」×4、改修資材×6",
"name": "",
"pre": [
"F110",
"F119"
]
},
"313": {
"code": "Cs1",
"desc": "同日中演习取得八次胜利以上,进一步加强舰队练度!",
"memo": "奖励:间宫*1礼物箱*1",
"memo": " 间宫 *1 礼物箱 *1",
"memo2": "2016、2018、2019、2020、2021、2022、2023秋季大演习",
"name": "秋季大演习",
"pre": [
"Cd1",
"B6"
]
},
"314": {
"code": "C71",
"desc": "在冬季的一天之内取得8次以上「演习」的胜利,进一步提高舰队的水平!",
"memo": "奖励:高速修复材×3 ,间宫×1",
"memo2": "冬季限定,单日内演习取得8次胜利,与「冬季大演習(C63)」内容相同",
"name": "冬季大演习",
"pre": [
"C2",
"B6"
]
},
"359": {
"code": "2310C1 ",
"code": "2310C1",
"desc": "以含「野分」「朝潮」「夕立」「滨波」「早波」「鹈来」「稻木」「伊47」「伊201」「Johnston」中的4艘及以上编成Halloween舰队。以该舰队在本日的演习中取得【A胜】4次以上!",
"memo": "奖励:以下奖励三选一,间宫×1 ,高速建造材×5,改修资材×3,以下奖励三选一,南瓜×1 ,燃油×4000 ,铝土×2500",
"memo": " 以下奖励三选一 间宫 ×1 高速建造材 ×5 改修资材 ×3以下奖励三选一 南瓜 ×1 燃油×4000 铝土×2500 ",
"memo2": "单次任务:一日中演习A胜四次,演习舰队中包含以下舰娘中任选4艘 :野分、朝潮、夕立、滨波、早波、鹈来、伊47、伊201、Johnston、稲木",
"name": "Halloween小型舰艇 特别演习 !",
"pre": [
"2310B1"
]
},
"984": {
"code": "2310B1 ",
"code": "2310B1",
"desc": "以「鹈来」「稻木」「夕立」「朝潮」「清霜」中任意一艘为旗舰的舰队,出击炼油厂地带沿岸、南西群岛防卫线、镇守府近海!搜寻敌方舰队并将其歼灭! Trick or Treat!",
"memo": "奖励:南瓜×1 ,以下奖励三选一,伊良湖×2 ,高速修复材×2 ,开发资材×6。",
"memo": " 南瓜 ×1 以下奖励三选一 伊良湖 ×2 高速修复材 ×2 开发资材 ×6 ",
"memo2": "单次任务:将【鹈来、稻木、夕立、朝潮、清霜】任一设为旗舰,出击1-3、1-4、1-5",
"name": "【期间限定任务】10周年秋季南瓜祭,开始!",
"pre": []
"pre": [
"B7"
]
},
"985": {
"code": "2310B2 ",
"code": "2310B2",
"desc": "将含有「霞」「足柄」「大淀」「朝霜」「清霜」中任意2艘或以上的舰队,派往北方莫雷海、阿尔锋西诺方向及北方阿留申海域!揪出北方方面的敌舰队并将其歼灭!",
"memo": "奖励:南瓜×2 ,以下奖励三选一,大发动艇×2 ,补强增设 ,间宫×2。",
"memo": " 南瓜 ×2 以下奖励三选一 大发动艇 ×2 补强增设 间宫 ×2 ",
"memo2": "单次任务:舰队包含【霞、足柄、大淀、朝霜、清霜】中任选2只,3-1,3-3,3-5各S胜一次",
"name": "【期间限定任务】10周年秋季南瓜祭,向着北方!",
"pre": []
"pre": [
"2310B1"
]
},
"986": {
"code": "2310B3 ",
"code": "2310B3",
"desc": "以含有「Roma」「Maestrale」「Grecale」「Libeccio」「Scirocco」「滨波」「早波」中任意2艘或以上的舰队,歼灭咖喱洋海域、里兰卡岛、咖喱洋里兰卡岛海域的敌方战斗单位! Happy Halloween!",
"memo": "奖励:以下奖励三选一,南瓜×2 ,勋章×2 ,战斗详报×1,以下奖励三选一,Spitfire Mk.I×3 ,一式战 隼II型×3 ,改修资材×5",
"memo": " 以下奖励三选一 南瓜 ×2 勋章 ×2 战斗详报 ×1以下奖励三选一 Spitfire Mk.I ×3 一式战 隼II型 ×3 改修资材 ×5 ",
"memo2": "单次任务:舰队包含【Roma、Maestrale、Grecale、Libeccio、Scirocco、滨波、早波】中任选2只,出击4-2、4-3、4-5取得S胜1次",
"name": "【期间限定任务】10周年秋季南瓜祭,向着西方!",
"pre": [
"2310C1"
]
},
"987": {
"code": "2310B4 ",
"code": "2310B4",
"desc": "含「阿武隈」「伊201」2艘、「鹈来」「稻木」2艘、或「瑞穂」「Brooklyn」「Johnston」3艘的舰队,部署于中部海域哨戒线、马绍尔群岛近海、古阿诺环礁海域,并击溃遭遇到的敌人!",
"memo": "奖励:南瓜×1 ,以下奖励三选一,12cm30连装喷进炮×2 ,间宫 ×1,勋章×1。",
"memo2": "周常任务,舰队包含【阿武隈+伊201】或【鹈来+稻木】或【瑞穗+Brooklyn+Johnston】出击6-1、6-2、6-3,各A胜一次",
"memo": " 南瓜 ×1 以下奖励三选一 12cm30连装喷进炮 ×2 间宫 ×1 勋章 ×1 ",
"memo2": " 周常任务 舰队包含【阿武隈+伊201】或【鹈来+稻木】或【瑞穗+Brooklyn+Johnston】出击6-1、6-2、6-3,各A胜一次",
"name": "【限定每周任务】10周年南瓜祭再来一份",
"pre": [
"2310B3",
"Cs1"
]
},
"992": {
"code": "2307B1 ",
"code": "2307B1",
"desc": "【期间限定任务】以包含「天津风」「雪风」「时津风」「初风」内2艘以上的舰队,反复巡逻炼油所地带沿岸,南西群岛防卫线和镇守府近海!确保镇守府海域的安全,做好作战准备吧!",
"memo": "奖励:以下奖励三选一:伊良湖×2 ,补强增设×1,应急修理女神×1,以下奖励二选一:改装设计图×1,船坞开放匙×1",
"memo2": "舰队包含【天津风、雪风、时津风、初风】中的4选2,取得1-3、1-4、1-5各A胜3次。,船坞开放匙:可增加修理渠/建造渠/装备记录/编成记录,不可增加船位。",
"memo": "以下奖励三选一: 伊良湖 ×2 补强增设 ×1 应急修理女神 ×1 以下奖励二选一: 改装设计图 ×1 船坞开放匙 ×1 ",
"memo2": "舰队包含【天津风、雪风、时津风、初风】中的4选2,取得1-3、1-4、1-5各A胜3次。 船坞开放匙 :可增加修理渠/建造渠/装备记录/编成记录, 不可增加船位 。",
"name": "“十六驱”出击!确保镇守府海域的安全!",
"pre": []
"pre": [
"Cy11"
]
},
"994": {
"code": "2307B2 ",
"code": "2307B2",
"desc": "【期间限定任务】编成以战舰级为旗舰,包含夕云级驱逐舰2艘以上的主力舰队!出击到南西群岛近海、南西群岛防卫线、巴士海峡、东北奥廖尔海、冲之岛海域!歼灭敌方主力舰队!",
"memo": "奖励:白襻×1,以下舰娘三选一神威 ,明石,大淀",
"memo": " 白襻 ×1 以下舰娘三选一: 神威 明石 大淀 ",
"memo2": "战舰级为旗舰,包含夕云级驱逐舰2艘,取得1-2、1-4、2-2、2-3、2-4各S胜1次。",
"name": "主力of主力,拔锚!歼灭敌方舰队!",
"pre": [
"F119",
"B13"
]
}
Expand Down
Loading