This commit is contained in:
VJsong02
2026-01-05 00:58:51 +01:00
parent f498c1ed60
commit d1f9a8066e
7 changed files with 88 additions and 120 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,3 @@
.old .old
.venv .venv
.vscode .vscode
mrlar

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "AzurLaneData"]
path = AzurLaneData
url = https://github.com/MrLar/AzurLaneData.git

View File

@@ -1,142 +1,110 @@
==December 25th 2025== == December 25th 2025 ==
=== New Contents === === New Contents ===
<ol> <ol>
<li>'''Limited Time Event: [[Winter Wishing Well Cards]]''' <li>'''Limited Time Event: [[Winter Wishing Well Cards]]'''
*Event period: From December 25th 2025 to January 7th 2026, 11:59 P.M. (UTC-7): *Event period: From December 25th 2025 to January 7th 2026, 11:59 P.M. (UTC-7):
*Participate in the event, send out cards to get Winter Wishes. Collect 7 Winter Wishes to get the limited item, Wish-Fulfilling Card. Choose one of the 7 SR ships to accompany you into the New Year: [[Bismarck]], [[Belfast]], [[South Dakota]], [[Kuybyshev]], [[Impero]], [[Graf Zeppelin]], [[Richelieu]]. *Participate in the event, send out cards to get Winter Wishes. Collect 7 Winter Wishes to get the limited item, Wish-Fulfilling Card. Choose one of the 7 SR ships to accompany you into the New Year: [[Bismarck]], [[Belfast]], [[South Dakota]], [[Kuybyshev]], [[Impero]], [[Graf Zeppelin]], [[Richelieu]].
<li>'''Port Fashion Collection: Heart-Throbbing Moment II''' <li>'''Port Fashion Collection: Heart-Throbbing Moment II'''
*Event period: From December 25th 2025 to January 7th 2026, 11:59 P.M. (UTC-7):
*Log in every day to get 3 unlock chances and unlock the corresponding side story. *Log in every day to get 3 unlock chances and unlock the corresponding side story.
<li>'''Rental Outfits''' <li>'''Rental Outfits:'''
*Event period: From December 25th 2025 to January 7th 2026, 11:59 P.M. (UTC-7): *Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7):
*Log in during the event period to earn 3 rental outfit vouchers {{Skin ticket}}. *Log in during the event period to earn 3 Rental Outfit Vouchers {{Skin ticket}}
*Can be used to rent the following skins for a duration of 48 hours: *Can be used to rent the following skins for a duration of 48 hours
<div style="display:flex; flex-wrap:wrap; margin-left:15px"> <div style="display:flex; flex-wrap:wrap; margin-left:15px">
{{ShipDisplay|6|Gouden Leeuw|CV|Maid|An Intimate Cleaning |{{Gem}} 1|L2D+|142}} {{ShipDisplay|6|Gouden Leeuw|CA|Maid|An Intimate Cleaning|{{Gem}} 1260|L2D+|116|}}
{{ShipDisplay|6|Mecklenburg|DD|Maid|Branding Witchcraft |{{Gem}} 1|L2D+|142}} {{ShipDisplay|6|Mecklenburg|BB|Maid|Branding Witchcraft|{{Gem}} 1260|L2D+|156|}}
{{ShipDisplay|5|Prinz Eugen|CL|Bunny|Between Tipsiness and a Wager |{{Gem}} 1|L2D+|142}} {{ShipDisplay|5|Prinz Eugen|CA|Bunny|Between Tipsiness and a Wager|{{Gem}} 1260|L2D+|145|}}
</div> </div>
<li>'''New [[Skins]]:''' <li>'''New [[Skins]]:'''
*Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7): *Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7):
<div style="display:flex; flex-wrap:wrap; margin-left:15px"> <div style="display:flex; flex-wrap:wrap; margin-left:15px">
{{ShipDisplay|6|Gouden Leeuw|CV|Maid|An Intimate Cleaning |{{Gem}} 1|L2D+|142}} {{ShipDisplay|6|Gouden Leeuw|CA|Maid|An Intimate Cleaning|{{Gem}} 1260|L2D+|116|}}
{{ShipDisplay|6|Mecklenburg|DD|Maid|Branding Witchcraft |{{Gem}} 1|L2D+|142}} {{ShipDisplay|6|Mecklenburg|BB|Maid|Branding Witchcraft|{{Gem}} 1260|L2D+|156|}}
{{ShipDisplay|5|Prinz Eugen|CL|Bunny|Between Tipsiness and a Wager |{{Gem}} 1|L2D+|142}} {{ShipDisplay|5|Prinz Eugen|CA|Bunny|Between Tipsiness and a Wager|{{Gem}} 1260|L2D+|145|}}
{{ShipDisplay|4|Guichen|CV|Maid|Milk and Kisses |{{Gem}} 1|DYN|172}} {{ShipDisplay|5|Guichen|CL|Maid|Milk and Kisses|{{Gem}} 1050|DYN|185|}}
{{ShipDisplay|6|Kansas|CV|Bunny|Late-Night Leisure |{{Gem}} 1|DYN|172}} {{ShipDisplay|5|Kansas|BB|Bunny|Late-Night Leisure|{{Gem}} 1000|DYN|161|}}
{{ShipDisplay|5|Otto von Alvensleben|DD|Maid|The Clumsy Maid is in a Bind! |{{Gem}} 1|DYN|172}} {{ShipDisplay|5|Otto von Alvensleben|DD|Maid|The Clumsy Maid is in a Bind!|{{Gem}} 980|DYN|136|}}
{{ShipDisplay|6|Bismarck Zwei|CV|Casual|Bathed in Brightness and Spirit |{{Gem}} 1|DYN|172}} {{ShipDisplay|6|Bismarck Zwei|BB|Casual|Bathed in Brightness and Spirit|{{Gem}} 900|DYN|None|}}
{{ShipDisplay|5|Vittorio Cuniberti|CV|Maid|On the Habits of Cats |{{Gem}} 1|DYN|172}} {{ShipDisplay|5|Vittorio Cuniberti|DD|Maid|On the Habits of Cats|{{Gem}} 880||185|}}
{{ShipDisplay|5|Dmitri Donskoi|DD|Bunny|Bedside Bunny |{{Gem}} 1|DYN|172}} {{ShipDisplay|5|Dmitri Donskoi|CL|Bunny|Bedside Bunny|{{Gem}} 880||185|}}
{{ShipDisplay|5|Kuybyshev|CV|Bunny|Rainy Day Blues |{{Gem}} 1|DYN|172}} {{ShipDisplay|5|Kuybyshev|CL|Bunny|Rainy Day Blues|{{Gem}} 880||145|}}
</div> </div>
<li>'''Rerun [[Skins]]:''' <li>'''Rerun [[Skins]]:'''
*Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7): *Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7):
<div style="display:flex; flex-wrap:wrap; margin-left:15px"> <div style="display:flex; flex-wrap:wrap; margin-left:15px">
{{ShipDisplay|6|Shinano|CV|Bunny|Visions of Fantasy |{{Gem}} 1|L2D|142}} {{ShipDisplay|6|Shinano|CV|Bunny|Visions of Fantasy|{{Gem}} 1180|L2D|608|}}
{{ShipDisplay|6|Napoli|CV|Bunny|Dreamy Night |{{Gem}} 1|L2D|142}} {{ShipDisplay|6|Napoli|CA|Bunny|Dreamy Night|{{Gem}} 1180|L2D|145|}}
{{ShipDisplay|6|Admiral Nakhimov|CV|Bunny|First Time in the Limelight |{{Gem}} 1|L2D|142}} {{ShipDisplay|6|Admiral Nakhimov|CV|Bunny|First Time in the Limelight|{{Gem}} 1180|L2D|150|}}
{{ShipDisplay|5|Halford|DD|Bunny|A Special Day with the Bunny Lord |{{Gem}} 1|DYN|142}} {{ShipDisplay|5|Halford|DD|Bunny|A Special Day with the Bunny Lord|{{Gem}} 980|DYN|150|}}
{{ShipDisplay|5|Daisen|DD|Bunny|Bunny Priestess in Prayer |{{Gem}} 1|DYN|142}} {{ShipDisplay|5|Daisen|BB|Bunny|Bunny Priestess in Prayer|{{Gem}} 980|DYN|160|}}
{{ShipDisplay|5|Bayard|CL|Bunny|The Most Treacherous Trial |{{Gem}} 1|DYN|142}} {{ShipDisplay|5|Bayard|CL|Bunny|The Most Treacherous Trial|{{Gem}} 880||608|}}
{{ShipDisplay|5|Regensburg|CV|Bunny|The Dark Dragons Dungeon |{{Gem}} 1|DYN|142}} {{ShipDisplay|5|Regensburg|CL|Bunny|The Dark Dragon's Dungeon|{{Gem}} 880||154|}}
{{ShipDisplay|5|Chikuma|CV|Bunny|Premium Prize on the Table |{{Gem}} 1|DYN|142}} {{ShipDisplay|5|Chikuma|CA|Bunny|Premium Prize on the Table|{{Gem}} 880||608|}}
</div> </div>
*Available permanently: *Available permanently:
<div style="display:flex; flex-wrap:wrap; margin-left:15px"> <div style="display:flex; flex-wrap:wrap; margin-left:15px">
{{ShipDisplay|6|Kearsarge|DD|Bunny|All-Night Charge |{{Gem}} 1|L2D|142}} {{ShipDisplay|6|Kearsarge|BBV|Bunny|All-Night Charge|{{Gem}} 1180|L2D|145|}}
{{ShipDisplay|6|Hindenburg|CV|Bunny|Delirious Duel |{{Gem}} 1|L2D|142}} {{ShipDisplay|6|Hindenburg|CA|Bunny|Delirious Duel|{{Gem}} 1180|L2D|501|}}
{{ShipDisplay|5|Kazagumo|CV|Home Relaxation|Diligent Domestic Discipline |{{Gem}} 1|L2D|142}} {{ShipDisplay|5|Kazagumo|DD|Home Relaxation|Diligent Domestic Discipline|{{Gem}} 1180|L2D|142|}}
{{ShipDisplay|5|Shimanto|CV|Maid|The Comfy Dragon God |{{Gem}} 1|L2D|142}} {{ShipDisplay|5|Shimanto|CL|Maid|The Comfy Dragon God|{{Gem}} 880||172|}}
{{ShipDisplay|5|Felix Schultz|DD|Maid|Sweet, Sleepy Revenge|{{Gem}} 1|L2D|142}} {{ShipDisplay|5|Felix Schultz|DD|Maid|Sweet, Sleepy "Revenge"|{{Gem}} 880||501|}}
{{ShipDisplay|5|Flandre|CV|Maid|If Love is a Sin, Thou Art Forgiven |{{Gem}} 1|L2D|142}} {{ShipDisplay|5|Flandre|BB|Maid|If Love is a Sin, Thou Art Forgiven|{{Gem}} 880||150|}}
{{ShipDisplay|5|Janus|DD|Bunny|Dont Turn Off the Lights! |{{Gem}} 1|L2D|142}} {{ShipDisplay|5|Janus|DD|Bunny|Don't Turn Off the Lights!|{{Gem}} 880||174|}}
</div> </div>
<li>'''New Items in [[Shop]]:''' <li>'''New Items in [[Akashi's Shop]]:'''
*Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7): *Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7):
**Maidly Service Lucky Box B (1 purchase limited) **Maidly Service Lucky Box B (1 purchase limited)
**Game Night Lucky Bag B Rerun (1 purchase limited) **Game Night Lucky Bag B Rerun (1 purchase limited)
<li>'''Private Quarters Update:''' <li>'''Private Quarters Update:'''
*New Character: *''New character:''
**[[Ägir]] **'''[[Ägir]]'''
*Interact with [[Ägir]] in her Bedroom; ***Interact with Ägir in her Bedroom;
*Unlock [[Ägir]]s Café Invitation and invite [[Ägir]] to the Common Area to unlock her new Interaction, Minigame, and 3D outfit. ***Move Ägir to the Café and unlock new Interaction, Minigame, and her 3D outfit.
*New Items: *''New items:''
**Ägirs exclusive furniture Crimson Serenity **Available permanently:
**Ägirs exclusive gift Tulip Glass ***New furniture Crimson Serenity
*Rerun Item: ***New gift Tulip Glass
**Noshiros furniture Where Warmth Lingers (Available for a limited-time between December 25th 2025 and December 31st 2025, 11:59 P.M. (UTC-7)) **Available between December 25th 2025 and December 31st 2025, 11:59 P.M. (UTC-7):
<li>'''PrivateChat Update:''' ***New furniture Where Warmth Lingers
*[[Ägir]] <li>'''New [[Memories#Secrets|Secrets]]:'''
*You can check [[Ägir]]s info, calls, and posts through “Private Quarters” “PrivateChat”. **Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7):
<li>'''Core Data Shop Update:''' **[[Ägir]] ??? (Details pending)
*Available permanently in Core Shop (Ltd.): <li>'''New Monthly Login Reward (January):'''
<div style="display:flex; flex-wrap:wrap; margin-left:15px"> *Furniture '''(EN Only)''':
{{ShipDisplay|6|Admiralty Fire Control Table|Auxiliary||'''Admiralty Fire Control Table'''|}} {| class="wikitable" style="text-align: center; margin-left:20px; margin-top:0px;"
</div> |{{Furniture|yingtouebaijianicon}}||'''Nile Crocodile Statue'''
<li>'''Gear Lab Update:''' |}
*Iron Blood Sub Torps <li>'''Extreme Challenge:'''
*New Gear: *Event period: From January 1st 2026 to January 31st 2026, 11:59 P.M. (UTC-7):
**[[G7e (Improved) Submarine Torpedo]] *The next boss, [[Katsuragi]], will automatically rotate when the month changes to January.
*Existing Research Series 5 Gears added to Gear Lab: *Assemble the best fleet you can and clear challenge stages to earn limited portrait and chat frames of [[Capricorn]].
**[[Prototype Quadruple 152mm Main Gun Mount]]
**[[Prototype Twin 130mm Model 1936 Main Gun Mount]]
**[[Prototype Quadruple 330mm Mle 1931 (CB Only) Main Gun Mount]]
**[[Prototype Quadruple 30mm AA Gun Mount]]
**[[Prototype Su-2]]
**[[Prototype VIT-2 (VK-107)]]
*New Faction added to Gear Lab: [[Northern Parliament]]
*New research categories added to Northern Parliament:
**DD Main Guns
**CL Main Guns
**BB Main Guns
**Torp/Dive Bombers
*New Gears added:
**Northern Parliament DD Main Guns
**[[Single 130mm Model 1913 Main Gun Mount]]
**Northern Parliament CL Main Guns
**[[Single 180mm B-1-K Main Gun Mount]]
**[[Twin 152mm B-38 MK17 Main Gun Mount]]
**Northern Parliament BB Main Guns
**[[Triple 356mm Model 1913 Main Gun Mount]]
**Northern Parliament Torp/Dive Bombers
**[[Prototype Carrier-Based Su-6]]
**[[R-5]]
**[[LBSh]]
<li>'''Monthly Update:'''
*Januarys login furniture:
**[[Nile Crocodile Statue]]
*Januarys Extreme Challenge:
**Capricorn (The next boss, “Katsuragi”, will automatically rotate when the month changes to January. Assemble the best fleet you can and clear challenge stages to earn limited portrait and chat frames of Capricorn.)
<li>'''Juustagram:''' <li>'''Juustagram:'''
*Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7): *Available between December 25th 2025 and January 7th 2026, 11:59 P.M. (UTC-7):
**New content added *New content added
<li>'''FleetChat:''' <li>'''FleetChat:'''
*Gouden Leeuw *New groups:
*Mecklenburg **[[Gouden Leeuw]]
*Dmitri Donskoi **[[Mecklenburg]]
*Kansas **[[Dmitri Donskoi]]
*Vittorio Cuniberti **[[Kansas]]
**[[Vittorio Cuniberti]]
<li>'''CV Update:''' <li>'''CV Update:'''
*'''Skins:''' *'''Skins'''
**[[Gouden Leeuw]] An Intimate Cleaning (L2D+) Kikuko Inoue **[[Gouden Leeuw/Quotes|Gouden Leeuw]] An Intimate Cleaning (L2D+) Kikuko Inoue
**[[Mecklenburg]] Branding Witchcraft (L2D+) Mariya Ise **[[Mecklenburg/Quotes|Mecklenburg]] Branding Witchcraft (L2D+) Mariya Ise
**[[Prinz Eugen]] Between Tipsiness and a Wager (L2D+) Ayane Sakura **[[Prinz Eugen/Quotes|Prinz Eugen]] Between Tipsiness and a Wager (L2D+) Ayane Sakura
**[[Guichen]] Milk and Kisses (Dynamic) Aya Yamane **[[Guichen/Quotes|Guichen]] Milk and Kisses (Dynamic) Aya Yamane
**[[Kansas]] Late-Night Leisure (Dynamic) Risae Matsuda **[[Kansas/Quotes|Kansas]] Late-Night Leisure (Dynamic) Risae Matsuda
**[[Otto von Alvensleben]] The Clumsy Maid is in a Bind! (Dynamic) Anzu Haruno **[[Otto von Alvensleben/Quotes|Otto von Alvensleben]] The Clumsy Maid is in a Bind! (Dynamic) Anzu Haruno
**[[Bismarck Zwei]] Bathed in Brightness and Spirit (Dynamic) Ayaka Fukuhara **[[Vittorio Cuniberti/Quotes|Vittorio Cuniberti]] On the Habits of Cats Non Harusaki
**[[Vittorio Cuniberti]] On the Habits of Cats (Dynamic) Non Harusaki **[[Dmitri Donskoi/Quotes|Dmitri Donskoi]] Bedside Bunny Miyari Nemoto
**[[Dmitri Donskoi]] Bedside Bunny (Dynamic) Miyari Nemoto **[[Kuybyshev/Quotes|Kuybyshev]] Rainy Day Blues Rio Tsuchiya
**[[Kuybyshev]] Rainy Day Blues (Dynamic) Rio Tsuchiya
</ol> </ol>
=== System Optimization === === System Optimization ===
#'''General''' #'''General'''
#*Fixed an issue where [[Vittorio Cuniberti]]s skill “Insight Upon a Starry Night” behaved abnormally under certain conditions. #*Fixed abnormal behavior for certain augment module skills;
#*Fixed an issue where [[Raffaello]]s skill “Jet-Black Dedication” behaved abnormally under certain conditions. #*Fixed the issue where the actual damage of the Mark 20 “Bidder” Submarine Torpedo did not match its description; after this fix, its actual damage has been increased to match the description;
#*Fixed an issue where [[Z26]]s skill “Anti-Torpedo Field” did not function correctly under certain conditions. #*Fixed abnormal behavior for the phase reward sync value percentage in Dossier Analysis under certain conditions;
#*Fixed abnormal behavior for certain augment module skills. #*Fixed the issue where the effect of Grape Drink in Island Planner behaved abnormally under certain conditions; as compensation, Commanders who have participated in Island Planner will receive Grape Drink ×3 after this
#*Fixed an issue where the actual damage of the [[Mark 20 "Bidder" Submarine Torpedo]] did not match its description; after this fix, its actual damage has been increased to match the description.
#*Fixed an issue where the phase reward sync value percentage in Dossier Analysis displayed abnormally under certain conditions.
#*Fixed an issue where the effect of [[Grape Drink]] in Island Planner behaved abnormally under certain conditions; as compensation, Commanders who have participated in Island Planner will receive [[Grape Drink]] ×3 after this maintenance.

1
AzurLaneData Submodule

Submodule AzurLaneData added at f14f50b3bb

View File

@@ -1,8 +1,5 @@
you need uhhhh you need uhhhh
pytorch (ideally with gpu acceleration), huggingface transformers and probably a bunch of other python libraries pytorch (ideally with gpu acceleration), huggingface transformers and probably a bunch of other python libraries :3
i should probably write an actual requirements.txt some time but like xd i should probably write an actual requirements.txt some time but like :3
you also need mrlar's azurlanedata repo, with the root dir renamed to "mrlar"

View File

@@ -54,7 +54,7 @@ streamer = TextIteratorStreamer(tokenizer, skip_prompt=True, skip_special_tokens
# 5) Start generation in background thread (generate is blocking) # 5) Start generation in background thread (generate is blocking)
gen_kwargs = dict( gen_kwargs = dict(
**inputs, **inputs,
max_new_tokens=32768, max_new_tokens=131072,
streamer=streamer, streamer=streamer,
) )

View File

@@ -1,9 +1,9 @@
import json import json
with open("./mrlar/data/ships.json") as f: with open("./AzurLaneData/data/ships.json") as f:
ship_data = json.load(f) ship_data = json.load(f)
with open("./mrlar/data/skins.json") as f: with open("./AzurLaneData/data/skins.json") as f:
skin_data = json.load(f) skin_data = json.load(f)
with open("output", "r") as f: with open("output", "r") as f:
@@ -80,7 +80,7 @@ for line in lines:
# [x] skin background # [x] skin background
skin_bg = curr_skin["bg"] skin_bg = curr_skin["bg"]
# [ ] reconstruct shipdisplay line # [x] reconstruct shipdisplay line
out = "|".join(map(str, ( out = "|".join(map(str, (
"{{ShipDisplay", "{{ShipDisplay",
rarity, rarity,