diff --git a/src/clover_splatoon/html_to_image.py b/src/clover_splatoon/html_to_image.py
index d67fa97..268dfc3 100644
--- a/src/clover_splatoon/html_to_image.py
+++ b/src/clover_splatoon/html_to_image.py
@@ -5,7 +5,8 @@ from src.clover_splatoon.stages import RegularScheduleItem, BankaraScheduleItem,
from src.configs.path_config import temp_path
from nonebot_plugin_htmlrender import template_to_pic
from playwright.async_api import async_playwright
-from src.clover_splatoon.splatoon_data import stage3
+from src.clover_splatoon.splatoon_data import stage3, game_types3
+
async def save_img(data: bytes):
@@ -43,6 +44,17 @@ async def generate_splatoon_report_image(regular: RegularScheduleItem, bankara:
]
]
+ bankara_vs_rule = [
+ [
+ game_types3[str(bankara.bankaraMatchSettings[0].vsRule.rule)]["image"],
+ game_types3[str(bankara.bankaraMatchSettings[0].vsRule.rule)]["cname"],
+ ],
+ [
+ game_types3[str(bankara.bankaraMatchSettings[1].vsRule.rule)]["image"],
+ game_types3[str(bankara.bankaraMatchSettings[1].vsRule.rule)]["cname"],
+ ]
+ ]
+
bankara_list_challenge = [
[
@@ -78,6 +90,7 @@ async def generate_splatoon_report_image(regular: RegularScheduleItem, bankara:
data = {
"data_regular": regular_list,
+ "data_bankara_vs_rule": bankara_vs_rule,
"data_bankara_challenge": bankara_list_challenge,
"data_bankara_open": bankara_list_open,
"data_coop": coop_list,
diff --git a/src/clover_splatoon/resources/main.html b/src/clover_splatoon/resources/main.html
index 2a1c59e..aa4583b 100644
--- a/src/clover_splatoon/resources/main.html
+++ b/src/clover_splatoon/resources/main.html
@@ -40,6 +40,7 @@

蛮颓比赛(挑战)
+

{{ data.data_bankara_vs_rule[0][1] }}
{% for match in data.data_bankara_challenge %}
@@ -54,6 +55,7 @@

蛮颓比赛(开放)
+

{{ data.data_bankara_vs_rule[1][1] }}
{% for match in data.data_bankara_open %}
diff --git a/src/clover_splatoon/resources/res/icon/AREA.png b/src/clover_splatoon/resources/res/icon/AREA.png
new file mode 100644
index 0000000..806c40b
Binary files /dev/null and b/src/clover_splatoon/resources/res/icon/AREA.png differ
diff --git a/src/clover_splatoon/resources/res/icon/CLAM.png b/src/clover_splatoon/resources/res/icon/CLAM.png
new file mode 100644
index 0000000..8d6d54a
Binary files /dev/null and b/src/clover_splatoon/resources/res/icon/CLAM.png differ
diff --git a/src/clover_splatoon/resources/res/icon/GOAL.png b/src/clover_splatoon/resources/res/icon/GOAL.png
new file mode 100644
index 0000000..76ab660
Binary files /dev/null and b/src/clover_splatoon/resources/res/icon/GOAL.png differ
diff --git a/src/clover_splatoon/resources/res/icon/LOFT.png b/src/clover_splatoon/resources/res/icon/LOFT.png
new file mode 100644
index 0000000..d9d2a5d
Binary files /dev/null and b/src/clover_splatoon/resources/res/icon/LOFT.png differ
diff --git a/src/clover_splatoon/splatoon_data.py b/src/clover_splatoon/splatoon_data.py
index c0be683..f42ab62 100644
--- a/src/clover_splatoon/splatoon_data.py
+++ b/src/clover_splatoon/splatoon_data.py
@@ -16,6 +16,20 @@ game_types = {
'塔': '24px-Mode_Icon_Tower_Control.png'
}
+game_types3 = {
+ "AREA": {"image": "./res/icon/AREA.png", "cname": "真格区域"},
+ "CLAM": {
+ "image": "./res/icon/CLAM.png", "cname": "真格蛤蜊" },
+ "GOAL": {
+ "image": "./res/icon/GOAL.png",
+ "cname": "真格鱼虎"
+ },
+ "LOFT": {
+ "image": "./res/icon/LOFT.png",
+ "cname": "真格塔楼"
+ }
+}
+
stage = {"0": {"image": "stage/300px-S2_Stage_The_Reef.png", "name": "寿司街"},
"1": {"image": "stage/300px-S2_Stage_Musselforge_Fitness.png", "name": "健身房"},
"2": {"image": "stage/300px-S2_Stage_Starfish_Mainstage.png", "name": "音乐堂"},