From ef9aa8e1951f934979526e8c9e8b1b5d720ec96d Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 9 Oct 2021 01:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=8F=E5=88=97=E6=A8=A1?= =?UTF-8?q?=E5=BC=8FbagES(easy=20start)=EF=BC=8C=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E5=9D=97=E4=B8=8D=E4=BC=9A=E6=98=AF=E9=82=A3=E4=BA=9B=E4=B8=8D?= =?UTF-8?q?=E5=A5=BD=E5=AE=89=E6=8E=92=E7=9A=84=E5=9D=97=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=A0=87=E5=87=86=E5=8C=85+noInitSZO=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E7=9A=84=E6=A8=A1=E5=BC=8F=E6=94=B9=E4=B8=BA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=96=B0=E7=9A=84bagES=E3=80=90=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=EF=BC=9A=E6=97=A7=E7=9A=84=E5=BD=95=E5=83=8F=E9=83=BD=E4=BC=9A?= =?UTF-8?q?=E5=9D=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/gameTables.lua | 2 +- parts/modes/marathon_h.lua | 2 +- parts/modes/marathon_n.lua | 2 +- parts/modes/master_final.lua | 2 +- parts/modes/master_h.lua | 2 +- parts/modes/master_l.lua | 2 +- parts/modes/master_m.lua | 2 +- parts/modes/master_n.lua | 2 +- parts/modes/master_u.lua | 2 +- parts/player/seqGenerators.lua | 37 ++++++++++++++++++++++++++++++++ parts/scenes/custom_sequence.lua | 2 +- 11 files changed, 47 insertions(+), 10 deletions(-) diff --git a/parts/gameTables.lua b/parts/gameTables.lua index 96ea46de..ebc0c0cc 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -469,7 +469,7 @@ do--Mod data }, {no=19,id="CS",name="customSeq", key="b",x=680,y=470,color='lB', - list={'bag','his','hisPool','c2','rnd','mess','reverb'}, + list={'bag','bagES','his','hisPool','c2','rnd','mess','reverb'}, func=function(P,O)P.gameEnv.sequence=O end, unranked=true, }, diff --git a/parts/modes/marathon_h.lua b/parts/modes/marathon_h.lua index 375831a9..833d02a1 100644 --- a/parts/modes/marathon_h.lua +++ b/parts/modes/marathon_h.lua @@ -3,7 +3,7 @@ return{ env={ noTele=true, mindas=7,minarr=1,minsdarr=1, - noInitSZO=true, + sequence="bagES", eventSet='marathon_h', bg='cubes',bgm='push', }, diff --git a/parts/modes/marathon_n.lua b/parts/modes/marathon_n.lua index 72bf055a..f8959c93 100644 --- a/parts/modes/marathon_n.lua +++ b/parts/modes/marathon_n.lua @@ -3,7 +3,7 @@ return{ env={ noTele=true, mindas=7,minarr=1,minsdarr=1, - noInitSZO=true, + sequence="bagES", eventSet='marathon_n', bg='bg2',bgm='push', }, diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index 20b24d6d..77c402a3 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -5,7 +5,7 @@ return{ das=5,arr=1, freshLimit=15, easyFresh=false,bone=true, - noInitSZO=true, + sequence="bagES", eventSet='master_final', bg='lightning',bgm='rectification', }, diff --git a/parts/modes/master_h.lua b/parts/modes/master_h.lua index 54ddf0af..52b2f900 100644 --- a/parts/modes/master_h.lua +++ b/parts/modes/master_h.lua @@ -4,7 +4,7 @@ return{ noTele=true, das=6,arr=1, freshLimit=15, - noInitSZO=true, + sequence="bagES", eventSet='master_h', bg='bg2',bgm='secret7th', }, diff --git a/parts/modes/master_l.lua b/parts/modes/master_l.lua index 3b2b5db7..070d67fe 100644 --- a/parts/modes/master_l.lua +++ b/parts/modes/master_l.lua @@ -4,7 +4,7 @@ return{ noTele=true, das=9,arr=3, freshLimit=15, - noInitSZO=true, + sequence="bagES", eventSet='master_l', bg='bg1',bgm='secret8th', }, diff --git a/parts/modes/master_m.lua b/parts/modes/master_m.lua index 76cac2b8..8be35c93 100644 --- a/parts/modes/master_m.lua +++ b/parts/modes/master_m.lua @@ -1,7 +1,7 @@ return{ color=COLOR.lSea, env={ - noInitSZO=true, + sequence="bagES", eventSet='master_m', bg='bg2',bgm='super7th', }, diff --git a/parts/modes/master_n.lua b/parts/modes/master_n.lua index d4fdeb1c..a989a035 100644 --- a/parts/modes/master_n.lua +++ b/parts/modes/master_n.lua @@ -3,7 +3,7 @@ return{ env={ noTele=true, das=10,arr=3, - noInitSZO=true, + sequence="bagES", freshLimit=15, eventSet='master_n', bg='bg1',bgm='secret8th', diff --git a/parts/modes/master_u.lua b/parts/modes/master_u.lua index 69526a3a..940ffe36 100644 --- a/parts/modes/master_u.lua +++ b/parts/modes/master_u.lua @@ -5,7 +5,7 @@ return{ noTele=true, das=6,arr=1, freshLimit=15, - noInitSZO=true, + sequence="bagES", eventSet='master_u', bg='bg2',bgm='secret7th', }, diff --git a/parts/player/seqGenerators.lua b/parts/player/seqGenerators.lua index c708a5ad..a5a60003 100644 --- a/parts/player/seqGenerators.lua +++ b/parts/player/seqGenerators.lua @@ -20,6 +20,43 @@ local seqGenerators={ yield() end end, + bagES=function(P,seq0) + local rndGen=P.seqRND + local len=#seq0 + local bag=TABLE.shift(seq0) + do--Get a good first-bag + --Shuffle + for i=1,len-1 do ins(bag,rem(bag,rndGen:random(len-i+1)))end + --Skip Uncomfortable minoes + for _=1,len-1 do + if + bag[1]<3 or bag[1]==6 or + bag[1]==8 or bag[1]==9 or + bag[1]==12 or bag[1]==13 or + bag[1]==17 or bag[1]==18 or + bag[1]==23 or bag[1]==24 + then + ins(bag,rem(bag,1)) + else + break + end + end + --Finish + for i=1,len do P:getNext(bag[i])end + end + bag={} + while true do + while #P.nextQueue<12 do + if #bag==0 then + for i=1,len do + bag[i]=seq0[len-i+1] + end + end + P:getNext(rem(bag,rndGen:random(#bag))) + end + yield() + end + end, his=function(P,seq0) local rndGen=P.seqRND local len=#seq0 diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index d0c27f7c..42947098 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -191,7 +191,7 @@ scene.widgetList={ WIDGET.newText{name="subTitle",x=530,y=50,font=35,align='L',color='H'}, WIDGET.newSelector{name="sequence",x=1080,y=60,w=200,color='Y', - list={'bag','his','hisPool','c2','rnd','mess','reverb','loop','fixed'}, + list={'bag','bagES','his','hisPool','c2','rnd','mess','reverb','loop','fixed'}, disp=CUSval('sequence'),code=CUSsto('sequence') },