From 979a17f280c3dcba307eb314639fa7ee2a65cb31 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Tue, 5 Nov 2024 08:30:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E4=B8=80=E5=A4=84=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=B2=A1=E6=9B=B4=E6=96=B0=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=9F=B3=E4=B9=90=E7=B4=A2=E5=BC=95=EF=BC=8C=E5=86=99?= =?UTF-8?q?=E6=98=8E=E8=AF=A6=E7=BB=86=E7=9A=84=E7=BD=B2=E5=90=8D=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/game/pubClass.lua | 2 +- assets/songbook.lua | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/assets/game/pubClass.lua b/assets/game/pubClass.lua index 50109d9f..56e95d3e 100644 --- a/assets/game/pubClass.lua +++ b/assets/game/pubClass.lua @@ -66,7 +66,7 @@ ---@field id number piece id ---@field did number drop id (exist when hand piece locks) ---@field cid string cell id (unique) (already exist when piece display in next queue) ----@field color number 0~63 +---@field color number 000~999 ---@field alpha? number 0~1 ---@field conn table ---@field bias {expBack?:number, lineBack?:number, teleBack?:number, x:number, y:number} diff --git a/assets/songbook.lua b/assets/songbook.lua index d8985f09..7d58a8c1 100644 --- a/assets/songbook.lua +++ b/assets/songbook.lua @@ -12,11 +12,16 @@ ---@field multitrack? boolean ---@field looppoint? boolean +-- Ordering rule of music with multiple authors: +-- 1. Prepare seats equal to the number of all authors, then choose one by one. +-- 2. Original Author(s) choose first, then Direct Author(s). +-- 3. Default to choose the first seat available. Can also choose not to credit. + ---@enum (key) Techmino.MusicName local songbook={ ['8-bit happiness'] ={}, ['8-bit sadness'] ={}, - ['antispace'] ={message="Blank remix remix"}, + ['antispace'] ={message="Blank remix^2"}, ['battle'] ={author="Aether & MrZ"}, ['blank'] ={message="The beginning"}, ['blox'] ={message="Recollection remix"}, @@ -95,7 +100,9 @@ local songbook={ ['reason remix'] ={author="TetraCepra"}, ['seeking star'] ={}, ['space warp'] ={author="LR & MrZ"}, - ['invisible'] ={author="DJ Asriel"}, + ['invisible mode'] ={author="DJ Asriel"}, + ['invisible mode 2'] ={author="DJ Asriel"}, + ['total mayhem'] ={author="DJ Asriel"}, ['caprice'] ={inside=true,redirect='rectification'}, ['fruit dance_ex'] ={inside=true,redirect='fruit dance'}, @@ -112,10 +119,11 @@ local songbook={ ['reason remix_mix'] ={inside=true,author="TetraCepra",redirect='reason remix'}, ['sakura_noloop'] ={inside=true,author="C₂₉H₂₅N₃O₅",redirect='sakura'}, ['shibamata_noloop'] ={inside=true,author="C₂₉H₂₅N₃O₅",redirect='shibamata'}, + ['invisible'] ={inside=true,author="DJ Asriel"}, } for name,data in next,songbook do - if not data.author then data.author="MrZ" end + if not data.author then data.author="MrZ" end -- MrZ is fun! local words=name:split(' ') for i=1,#words do words[i]=words[i]:sub(1,1):upper()..words[i]:sub(2)