From a9500ee4e902a58c30fbd95f7eae8681e78283ca Mon Sep 17 00:00:00 2001 From: periwinkle Date: Mon, 19 Aug 2019 15:01:09 -0400 Subject: [PATCH 1/3] Add speedrunner muscle memory-friendly delays When pressing down to pick up Curly (in the Waterway and in Hell), the natural instinct is to immediately press jump and shoot (in some order) in order to mash through the message box that normally pops up in vanilla. Since those message boxex were removed for rando, this results in the player jumping after picking up Curly (which, if speedrunning Hell, would lose precious time on the clock). Putting in a small delay is intended to eat the jump input, allowing the player to continue onwards as normal. I also put in a tiny delay at the start of Hell after the message box, because I found myself often doing an unintentional extra boost at the start. This doesn't completely solve the issue for me, but it's slightly better than nothing, so I'll leave this in for now and come back to it later if I ever find a better solution. --- pre-edited-cs/data/Stage/Hell1.tsc | 2 +- pre-edited-cs/data/Stage/Pixel.tsc | 2 +- pre-edited-cs/data/Stage/ScriptSource/Hell1.txt | 6 +++--- pre-edited-cs/data/Stage/ScriptSource/Pixel.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pre-edited-cs/data/Stage/Hell1.tsc b/pre-edited-cs/data/Stage/Hell1.tsc index c82365c..1742ec0 100644 --- a/pre-edited-cs/data/Stage/Hell1.tsc +++ b/pre-edited-cs/data/Stage/Hell1.tsc @@ -1 +1 @@ -NKdqqzqNK}}qqtw}qqqq}NKdqqzrNK}}qqtw}qqqr}NKdqqzsNK}}qqtw}qqqs}NKdqqztNK}}qqqq}}qqss{qqzv}qqzwNKdqqzuNK}}qqtw}qqqu}NKdqqzvNK}lqsvw}s}NK}qqut}rqssao}}qqqq}qqzwNKdqqzwNK}}aaaaaNKaoNKaaaaarb}}NK}}}qqtw}qqqt}NKdqrqqNK}}qqqs}Aqqyq{qqzq{qqry{qqzxNKdqrrqNK}}rvtr{qrrrNK}qqrw}qqqs}qqyr{qqzs{qqqs{qqrtNKdqrrrNK}qqrq}}qqvqNK}qqqq}}NKdqsqqNK}}}NKaab}}NKdquqqNK}}qqss}quqq}quqrNKdquqrNK}qqruNKdqusqNK}qusqNK}qutq{qqtq{qqqq}qutq{qqrwNK}qvqq{qqts{qqqq}NKdqutqNKdqvqqNK}}nrvtr}lrvtsNK}qvqq{qsvz{qqqq}NKdqzqqNK}qzqq}NKdqzqrNK}qzqr} \ No newline at end of file +a^wa^a^wa^a^wa^a^wa^a^wa^a^wa^a^ȹtȽʵȹa^wa^tttt˽¸ta^ȼɻtɂa^t˹tĹttʹtua^a^wa^Ta^wa^a^a^wa^a^a^wa^a^ttua^wa^a^wa^a^wa^a^a^a^wa^wa^a^a^wa^a^wa^ \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/Pixel.tsc b/pre-edited-cs/data/Stage/Pixel.tsc index bce9577..56cb7fb 100644 --- a/pre-edited-cs/data/Stage/Pixel.tsc +++ b/pre-edited-cs/data/Stage/Pixel.tsc @@ -1 +1 @@ -A>WddmdA>pupwddehpzu}ddddpyxA>WddmeA>pupwddehpzu}dddepyxA>WddmfA>pupwddehpzu}dddfpyxA>WddmgA>pupwddehpzu}dddgpyxA>WddmhA>pupwddehpzu}dddhpyxA>WddmiA>pzu}dddepyxA>A>WdeddA>pypudeddnddddndddfpddeeA>pzudddhpwpuddhlnddmhndeignddejA>A>WdfddA>pypuA>pz~ehhendfdgA>pz~ehhdndfdfA>pz~dlgindfdeA>p{pTTTTbpxpwA>dhadladlTTTbpxpyxA>A>WdfdeA>pyp{pTTTTbpxpwA>pT[TTTTspxpyxA>A>WdfdfA>pypz_ehhip{pTTTTbpxpwpT`T}TTTA>}TTTTbbbpxpyxA>A>WdfdgA>pyp{TTTTbpxpwA>p}TTTTbpxpyxA>A>WdfedA>A>WdffdA>pyp{TTTTbbbpxpyxA>WdffeA>pypup{[TT`TA>Tbbbpxpz~ehhendffgpz~e4hindfffpyxA>WdfffA>pyp{pA>xTTTTTTsp~ddddpz_ehhepwA>pwddedTTTTA>Upu}dejdpxppyxA>WdffgA>pyp{TTTA>TbbbpxpyxA>A>WdfidA>pyA>puA>pz~ehhhndfikA>pz~ehhfndfihA>pz~ehhendfigA>pz~ehhdndfifA>pz~dlgjndfiepyyddemA>WdfieA>pyp{A>xTTTTsp~ddddpzudddhpwddddpu}ddfdpwA>bbbbbpxpwA>pu}deddp}_edddA>pxdfedpzadlgjpz_ehhdpxdddfpA>puddkgnddminddefndddmA>WdfifA>pyp{pT[T`TTTA>T[TTbpxpyxA>WdfigA>pyp{pxTTTTTTA>Twsp~ddddpwA>pz_ehhfpzudddepwddddpu}deddpzu}dddeA>pwddehpudfjdndddendddfpudfjdndddenddddA>pyxA>WdfihA>pypwdfjdndfimnddddpz_dlgjpz_edhfpzaehhdpz_ehhhpyxA>WdfikA>pyp{T[TTbpxpyxA>A>WdfjdA>A> \ No newline at end of file +? Date: Mon, 19 Aug 2019 15:19:23 -0400 Subject: [PATCH 2/3] The delay after Chaba's "HEY!!!" really doesn't need to be that long --- pre-edited-cs/data/Stage/MazeA.tsc | 2 +- pre-edited-cs/data/Stage/ScriptSource/MazeA.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pre-edited-cs/data/Stage/MazeA.tsc b/pre-edited-cs/data/Stage/MazeA.tsc index 5e99669..f09b96e 100644 --- a/pre-edited-cs/data/Stage/MazeA.tsc +++ b/pre-edited-cs/data/Stage/MazeA.tsc @@ -1 +1 @@ -öʥùöʥùöʥùöʥùöʥùαʥťĥǶǾȼܡܕ䡕ڕٕւݕ٣Ĺڜڕڕقݡ蕼ٕ壱ĹùǾȼڕڣڕݕق֕ڕ磱ĹǶٕܕڕقڕڕܕە裣ĹùǾȼݣĕ֕ݣĹǟە۟Ĺǂʕ֕ڕ֣ĹùǾȼ֢֢ݣĹڕĹùǾȼڕڕڕۂٴĹٕܕݕڕ裱Ĺ飣ĹڣĹùǾȼڂٕڕܕ֕ڕڕ䣱ĹەڡقڕڕݣĹùȼڕڂܕ죱Ĺەڡڕڕڕݡ鴱Ĺùαöʥťť̶ťιť¸ùα˺ť¸̶ť̶ĥǶαȼڣĹڕݕ喱ĹڕڕڴĹڕڕٕڕڣĹùαȼⴱĹǽڕ܂ڣĹǶٕ֕ᡂ蕾裱ĹǸ㕾ڕ֕uⴱÿĂ¢̶ȼɥٕڕ磱ĹɥٕڕᣱĹɥǂʥ䖱ĹDZɥǂɶ¥ʥڲږ̶ĹʱùαȼݟĹǽڣ贱ĹDZɦǂʥɠƠڕڲ̶ĹʱɥڕڣĹڕꡂĹùαȼڕܕ閱ĹùαȼݟĹǽڣ贱ĹDZɦǂʥɠڕ粖̶ƠĹʱɥǿ֕㡕١Ĺڕڂ㡕ڕ㕾䴱Ĺùαȼڕڕٕڂ֕ݕٕ֣ĹǣڕڕܣĹڜڕڕݕܣĹǣڡ閱Ĺùα¿ηʥȼǽΖ̶ĹږĹǂȼڕ֕ɥڕ㲕ٕڕڣĹùαʥť˺˺α¿ηʥȼǽΖ̶ĹږĹǂȼە֕ɥᲕڕڣĹùαʥť˺˺α¿ηʥȼǽΖ̶ĹږĹǂȼڕ֕ɥ粕ٕڕڣĹùαʥť˺˺ \ No newline at end of file +öʥùöʥùöʥùöʥùöʥùαʥťĥǶǾȼܡܕ䡕ڕٕւݕ٣Ĺڜڕڕقݡ蕼ٕ壱ĹùǾȼڕڣڕݕق֕ڕ磱ĹǶٕܕڕقڕڕܕە裣ĹùǾȼݣĕ֕ݣĹǟە۟Ĺǂʕ֕ڕ֣ĹùǾȼ֢֢ݣĹڕĹùǾȼڕڕڕۂٴĹٕܕݕڕ裱Ĺ飣ĹڣĹùǾȼڂٕڕܕ֕ڕڕ䣱ĹەڡقڕڕݣĹùȼڕڂܕ죱Ĺەڡڕڕڕݡ鴱Ĺùαöʥťť̶ťιť¸ùα˺ť¸̶ť̶ĥǶαȼڣĹڕݕ喱ĹڕڕڴĹڕڕٕڕڣĹùαȼⴱĹǽڕ܂ڣĹǶٕ֕ᡂ蕾裱ĹǸ㕾ڕ֕uⴱÿĂ¢̶ȼɥٕڕ磱ĹɥٕڕᣱĹɥǂʥ䖱ĹDZɥǂɶ¥ʥڲږ̶ĹʱùαȼݟĹǽڣ贱ĹDZɦǂʥɠƠڕڲ̶ĹʱɥڕڣĹڕꡂĹùαȼڕܕ閱ĹùαȼݟĹǽڣ贱ĹDZɦǂʥɠڕ粖̶ƠĹʱɥǿ֕㡕١Ĺڕڂ㡕ڕ㕾䴱Ĺùαȼڕڕٕڂ֕ݕٕ֣ĹǣڕڕܣĹڜڕڕݕܣĹǣڡ閱Ĺùα¿ηʥȼǽΖ̶ĹږĹǂȼڕ֕ɥڕ㲕ٕڕڣĹùαʥť˺˺α¿ηʥȼǽΖ̶ĹږĹǂȼە֕ɥᲕڕڣĹùαʥť˺˺α¿ηʥȼǽΖ̶ĹږĹǂȼڕ֕ɥ粕ٕڕڣĹùαʥť˺˺ \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt b/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt index 101acd0..f35a493 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt @@ -108,7 +108,7 @@ it is anymore, but that's all right! Date: Thu, 12 Sep 2019 02:57:11 -0400 Subject: [PATCH 3/3] Shake the screen when Chaba yells at you Also use the original delays for dramatic effect --- pre-edited-cs/data/Stage/MazeA.tsc | 2 +- pre-edited-cs/data/Stage/ScriptSource/MazeA.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pre-edited-cs/data/Stage/MazeA.tsc b/pre-edited-cs/data/Stage/MazeA.tsc index f09b96e..2df54a2 100644 --- a/pre-edited-cs/data/Stage/MazeA.tsc +++ b/pre-edited-cs/data/Stage/MazeA.tsc @@ -1 +1 @@ -öʥùöʥùöʥùöʥùöʥùαʥťĥǶǾȼܡܕ䡕ڕٕւݕ٣Ĺڜڕڕقݡ蕼ٕ壱ĹùǾȼڕڣڕݕق֕ڕ磱ĹǶٕܕڕقڕڕܕە裣ĹùǾȼݣĕ֕ݣĹǟە۟Ĺǂʕ֕ڕ֣ĹùǾȼ֢֢ݣĹڕĹùǾȼڕڕڕۂٴĹٕܕݕڕ裱Ĺ飣ĹڣĹùǾȼڂٕڕܕ֕ڕڕ䣱ĹەڡقڕڕݣĹùȼڕڂܕ죱Ĺەڡڕڕڕݡ鴱Ĺùαöʥťť̶ťιť¸ùα˺ť¸̶ť̶ĥǶαȼڣĹڕݕ喱ĹڕڕڴĹڕڕٕڕڣĹùαȼⴱĹǽڕ܂ڣĹǶٕ֕ᡂ蕾裱ĹǸ㕾ڕ֕uⴱÿĂ¢̶ȼɥٕڕ磱ĹɥٕڕᣱĹɥǂʥ䖱ĹDZɥǂɶ¥ʥڲږ̶ĹʱùαȼݟĹǽڣ贱ĹDZɦǂʥɠƠڕڲ̶ĹʱɥڕڣĹڕꡂĹùαȼڕܕ閱ĹùαȼݟĹǽڣ贱ĹDZɦǂʥɠڕ粖̶ƠĹʱɥǿ֕㡕١Ĺڕڂ㡕ڕ㕾䴱Ĺùαȼڕڕٕڂ֕ݕٕ֣ĹǣڕڕܣĹڜڕڕݕܣĹǣڡ閱Ĺùα¿ηʥȼǽΖ̶ĹږĹǂȼڕ֕ɥڕ㲕ٕڕڣĹùαʥť˺˺α¿ηʥȼǽΖ̶ĹږĹǂȼە֕ɥᲕڕڣĹùαʥť˺˺α¿ηʥȼǽΖ̶ĹږĹǂȼڕ֕ɥ粕ٕڕڣĹùαʥť˺˺ \ No newline at end of file +-*CPPYP-*\mna\cmuPPPX\faiPPPP\end-*CPPYQ-*\mna\cmuPPPX\faiPPPQ\end-*CPPYR-*\mna\cmuPPPX\faiPPPR\end-*CPPYS-*\mna\cmuPPPX\faiPPPS\end-*CPPYT-*\mna\cmuPPPX\faiPPPT\end-*CPQPP-*\key\souPPQQ\anpPQPPZPPPPZPPPR\faoPPPT\traPPSYZPPYTZPPSSZPPPY-*CPRPP-*\pri\msglL@@L@@@-*@@@N\nod-*sG@@@@-*@L@@@-*@@g@@N\nod\end-*CPRQP-*\pri\msgt@@@@@@N-*b@@@@@@-*@@@N\nod\clra@@@@-*@@@@@-*NNN\nod\end-*CPRRP-*\pri\fljQPRPZPRRQ\msgaNNN@iG@so@@-*m@NNN\nod\clrJ@J\nod\clr-*you@@@@@mN\nod\end-*CPRRQ-*\pri\msghMMNNN\nod\clryG@N\nod\end-*CPRSP-*\pri\msgh@@@@@@-*@_\nod\clrt@@@@@-*@N\nod-*a@@@@@@NNN\nod-*t@@@@-*N\nod\end-*CPRTP-*\pri\fljPWRPZPRTQ-*\msgt@@@-*@@@@-*@@@N\nod-*o@L@@@-*@@@NNN\nod\end-*CPRTQ-*\msgt@@@@-*@N\nod\clro@L@@@@-*@@@@L-*G@_\nod\end-*CPSPP-*CPSPQ-*\key\mna\cmuPPPX-*\anpPSQPZPPPQZPPPP\faiPPPT-*\cnpPSPQZPQQRZPPPP\waiPQPP-*\anpPSQPZPPPPZPPPP-*\mydPPPP\dnpPSPQ\smc\end-*CPSQP-*\key\evePSQQ-*-*CPSQQ-*\cnpPSPPZPQQQZPPPR\hmc\waiPPVP\anpPSQPZPPPQZPPPP-*\waiPQPP\faoPPPT\traPPTUZPSPQZPPPRZPPUS-*CPTPP-*\key\fljPWRQZPTQP\msgh@N\nod\clrt@@@l@sA\nod-*s@@@@_\nod@s-*@@@@@@-*@G@N\nod\end-*CPTPQ-*\key\msgh_\nod\clrhL@G@@-*@@N\nod\clra@p@s@@@fL-*@i@@@N\nod\clrc@i@@@@@ _\ynjPTPS\clo-*\amMPPPS-*\waiPPRP\msg\gitPPPRh@@@p@sN\nod-*\gitPPPSh@@@fN\nod\gitPPPP\clr-*\souPPTThA\nod\clr\flKPWRQ\gitPPPQ\clr-*\tamPPPRZPPPQZPPPP\cmuPPQP]s]@A\waiPQVP\nod\rmu\end-*CPTPR-*\key\flKPWRQ\msgJJ\nod\clrhN@h@@_\nod\clr\gitQPRP\clr-*\cmuPPQP\itKPPRP\eqKPPPXg@@]t]A\waiPQVP\nod\rmu\gitPPPP\clry@@@@@N\nod-*i@G@@@@@L-*N\nod\end-*CPTPS-*\key\msg\clryG@@A\nod\end-*CPTPT-*\key\flKPWRQ\msgJJ\nod\clrhN@h@@_\nod\clr\gitQPSX\clr-*\cmuPPQP\itKPPSXg@@]w@s]A\waiPQVP\eqKPQRX\flKPWRR\nod\rmu\gitPPPP\clrj@@L@iG@L\nod-*@G@@@-*@L@@-*@@i@_\nod\end-*CPTQP-*\key\msgt@@@@@@@-*@@@@jN\nod\clrNNNb@G@@@@-*@@N\nod-*wG@@@@@-*@@@N\nod\clrNNNi@G@@@-*@@L@@G@-*A\nod\end-*CPUPP-*\key\amjPPPTZPUPQ\mybPPPR\souPPUR\quaPQPP\msg\turheyAAA\waiPQPP\nod-*t@@@A\nod\clr-*\msgs@@@\gitPPPT]m@g]@@iG-*@@@G@N\nod\end-*CPUPQ-*\key\fljRUPPZPPPQ\flKRUPP\souPPRR\cnpPUPPZPPRQZPPPP\evePUPR-*CPUPR-*\evePPWP-*CPUQP-*\key\amjPPPSZPUQQ\fljRXPRZPUQQ\mybPPPR\souPPUR\quaPQPP\msg\turheyAAA\waiPQPP\nod-*t@@@A\nod\clr-*\msgi@@@@\gitPPPS]f]@iG@-*@@G@N\nod\end-*CPUQQ-*\key\fljRUPQZPPPQ\flKRUPQ\souPPRR\cnpPUQPZPPRQZPPPP\evePUQR-*CPUQR-*\evePPPU-*CPURP-*\key\amjPPQSZPURQ\mybPPPR\souPPUR\quaPQPP\msg\turheyAAA\waiPQPP\nod-*t@@@A\nod\clr-*\msgs@@@\gitPPQS]s]@@iG@@-*@G@N\nod\end-*CPURQ-*\key\fljRUPRZPPPQ\flKRUPR\souPPRR\cnpPURPZPPRQZPPPP\evePURR-*CPURR-*\evePPXX \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt b/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt index f35a493..6ea4260 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/MazeA.txt @@ -108,7 +108,7 @@ it is anymore, but that's all right!