-
Notifications
You must be signed in to change notification settings - Fork 73
Add "Modern Grade" mode #906
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
JackTriton
wants to merge
19
commits into
26F-Studio:main
Choose a base branch
from
JackTriton:modern-grade
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
12db344
Add Modernized Grade Mode
JackTriton b188ca0
Add Modernized Grade Mode
JackTriton b542ca0
Language Files
JackTriton 05d49f1
Add Modern Grade to Map
JackTriton 5718237
Update master_g_modern.lua
JackTriton 7caa0db
Update master_g_modern.lua
JackTriton 82a12ce
Fix Error
JackTriton b08fafb
Resolve
JackTriton 4a8f31d
Resolve tabs
JackTriton e778360
Replace tabs with 4 spaces
JackTriton 4b73e75
Add new background and configure system of the mode.
JackTriton fccb40f
Update master_g_modern.lua
JackTriton 71af608
Refractor Modern Graded
JackTriton 5f4bd62
New Grades and Adjustment
JackTriton 92efc55
Add Super-Invis and Change some names of grades
JackTriton 8912562
Merge branch 'main' into modern-grade
JackTriton 557bcec
Regarding the review
JackTriton 02a6ba9
Add 0.1 gravity during line 600 >> 699
JackTriton 901761d
Regarding Review
JackTriton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,384 @@ | ||
| local regretDelay=-1 | ||
| local int_grade=0 | ||
| local grade_points=0 | ||
| local int_grade_boosts={0,1,2,3,4,5,5,6,6,7,7,7,8,8,8,9,9,9,10,11,12,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26} | ||
| local awsomeList={false,false,false,false,false,false,false,false,false} | ||
| local coolList={false,false,false,false,false,false,false,false,false} | ||
| local regretList={false,false,false,false,false,false,false,false,false,false} | ||
| local faultList={false,false,false,false,false,false,false,false,false,false} | ||
| local gradeList={ | ||
| "9","8","7","6","5","4","3","2","1", | ||
| "S1","S2","S3","S4","S5","S6","S7","S8","S9", | ||
| "m1","m2","m3","m4","m5","m6","m7","m8","m9", | ||
| "M","MK","MV","MO","MM-","MM","MM+","GM-","GM","GM+","TM-","TM","TM+" | ||
| } | ||
| local spd_lvl=0 | ||
| local cools=0 | ||
| local regrets=0 | ||
| local prevSectTime=0 | ||
| local isInRoll=false | ||
| local isFault=false | ||
| local rollGrades=0 | ||
| local aws_time= {2700,2700,2520,2280,2280,1980,1980,1620,1620,0} | ||
| local cool_time={3120,3120,2940,2700,2700,2520,2520,2280,2280,0} | ||
| local reg_time= {5400,4500,4500,4080,3600,3600,3000,3000,3000,3000} | ||
| local fal_time= {7200,5400,5400,4500,4080,4080,3600,3600,3600,3600} | ||
| local prevDrop70=false -- determines if previous piece has level less than __70 | ||
| local nextSpeedUp=false -- determines if the next section speed should be boosted by 100 | ||
| local isInRollTrans=false | ||
| local function getGrav(l) | ||
| return | ||
| l<30 and 64 or | ||
| l<35 and 43 or | ||
| l<40 and 32 or | ||
| l<50 and 26 or | ||
| l<60 and 21 or | ||
| l<70 and 16 or | ||
| l<80 and 8 or | ||
| l<90 and 6 or | ||
| l<120 and 4 or | ||
| l<160 and 3 or | ||
| l<200 and 2 or | ||
| l<220 and 64 or | ||
| l<230 and 8 or | ||
| l<233 and 4 or | ||
| l<236 and 3 or | ||
| l<243 and 2 or | ||
| l<300 and 1 or | ||
| l<360 and 0.5 or | ||
| l<450 and 0.25 or | ||
| 0 | ||
| end | ||
| local function getLock(l) | ||
| return | ||
| l<900 and 30 or | ||
| l<1100 and 17 or | ||
| 15 | ||
| end | ||
| local function getGrade() | ||
| if int_grade==nil then int_grade=0 end | ||
| if rollGrades==nil then rollGrades=0 end | ||
| return gradeList[math.max(math.min(math.floor(int_grade_boosts[math.min(int_grade+1,#int_grade_boosts)]+rollGrades+cools+1-regrets),#gradeList),1)] | ||
| end | ||
| local function addGrade(row, cmb, chk, lvl) -- IGS = internal grade system | ||
| if row<1 then | ||
| if grade_points+1<100 and chk.spin then grade_points=grade_points+1 end | ||
| return | ||
| end | ||
| local pts=0 | ||
| local cmb_mult=1.0 | ||
| local lvl_mult=math.floor(lvl/250)+1 | ||
| local spn_mult=1.0 | ||
|
|
||
| if chk.spin then spn_mult=spn_mult*1.5 | ||
| elseif chk.mini then spn_mult=spn_mult*1.2 | ||
| end | ||
|
|
||
| if chk.pc then spn_mult=spn_mult*2.0 | ||
| elseif chk.hpc then spn_mult=spn_mult*1.2 | ||
| end | ||
|
|
||
| if row==1 then | ||
| pts=int_grade<5 and 10 or int_grade<10 and 5 or 2 | ||
| cmb_mult=1.0 | ||
| elseif row==2 then | ||
| pts=int_grade<3 and 20 or int_grade<6 and 15 or int_grade<10 and 10 or 12 | ||
| cmb_mult=cmb==1 and 1 or cmb<4 and 1.2 or cmb<8 and 1.4 or cmb<10 and 1.5 or 2.0 | ||
| elseif row==3 then | ||
| pts=int_grade==0 and 40 or int_grade<4 and 30 or int_grade<7 and 20 or int_grade<10 and 15 or 13 | ||
| cmb_mult=cmb==1 and 1 or cmb<10 and 1+(cmb+2)*0.1 or 2 | ||
| else | ||
| pts=int_grade==0 and 50 or int_grade<5 and 40 or 30 | ||
| cmb_mult=cmb==1 and 1 or cmb==2 and 1.5 or cmb<6 and (0.2*cmb)+1.2 or cmb<10 and (0.1*cmb)+1.7 or 3 | ||
| end | ||
|
|
||
| grade_points=grade_points+(pts*cmb_mult*lvl_mult*spn_mult) | ||
| if grade_points>=100 then | ||
| grade_points=0 | ||
| int_grade=int_grade+1 | ||
| end | ||
| end | ||
| local function getRollGoal() | ||
| -- get amount of grades needed for TM+ | ||
| local rem=#gradeList-(int_grade_boosts[math.min(int_grade+1,#int_grade_boosts)]+rollGrades+cools+1-regrets) | ||
| if rem<=0 then return 0 end | ||
| local goal=0 | ||
| if cools>8 then | ||
| goal=math.floor(rem)*4 | ||
| rem=rem%1 | ||
| return goal+(rem>0.3 and 4 or rem*10) | ||
| else | ||
| goal=math.floor(rem/0.26)*4 | ||
| rem=rem%0.26 | ||
| return goal+(rem>0.12 and 4 or rem*25) | ||
| end | ||
| end | ||
|
|
||
| return { | ||
| drop=64, | ||
| lock=30, | ||
| keyCancel={10,11,12,14,15,16,17,18,19,20}, | ||
| arr=1, | ||
| minsdarr=1, | ||
| ihs=true,irs=true,ims=false, | ||
| mesDisp=function(P) | ||
| GC.setColor(1,1,1,1) | ||
| setFont(45) | ||
| mText(TEXTOBJ.grade,63,180) | ||
| setFont(60) | ||
| GC.mStr(getGrade(),63,110) -- draw grade | ||
| for i=1,10 do -- draw cool/regret history | ||
| if not (awsomeList[i] or faultList[i] or coolList[i] or regretList[i]) then -- neither cool nor regret | ||
| GC.setColor(0.6,0.6,0.6,P.modeData.pt<(i-1)*100 and 0.25 or 0.6) | ||
| else | ||
| GC.setColor(faultList[i] and 0.5 or regretList[i] and 1 or 0, coolList[i] and 1 or 0, awsomeList[i] and 1 or 0, 1) | ||
| end | ||
| GC.circle('fill',-10,150+i*25,10) | ||
| GC.setColor(1,1,1,1) | ||
| end | ||
| if isInRoll then | ||
| setFont(20) | ||
| GC.mStr(("%.1f"):format(rollGrades),63,208) -- draw roll grades | ||
| GC.setLineWidth(2) | ||
| GC.setColor(.98,.98,.98,.8) | ||
| GC.rectangle('line',0,240,126,80,4) | ||
| GC.setColor(.98,.98,.98,.4) | ||
| GC.rectangle('fill',0+2,240+2,126-4,80-4,2) -- draw time box | ||
| setFont(45) | ||
| local t=(P.stat.frame-prevSectTime)/60 | ||
| local T=("%.1f"):format(60-t) | ||
| GC.setColor(COLOR.dH) | ||
| GC.mStr(T,65,250) -- draw time | ||
| t=t/60 | ||
| GC.setColor(1.7*t,2.3-2*t,.3) | ||
| GC.mStr(T,63,248) | ||
| PLY.draw.drawTargetLine(P,getRollGoal()) | ||
| else | ||
| -- draw level counter | ||
| setFont(20) | ||
| GC.mStr(grade_points,63,208) | ||
| setFont(45) | ||
| if awsomeList[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(0,1,1,1) | ||
| elseif coolList[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(0,1,0,1) | ||
| elseif P.stat.frame-prevSectTime > cool_time[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(0.7,0.7,0.7,1) | ||
| end | ||
| if awsList[math.ceil(P.modeData.pt/100+0.01)] and faultList[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(0.5,0,0.5,1) | ||
| elseif awsList[math.ceil(P.modeData.pt/100+0.01)] and regretList[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(0.5,0.5,1,1) | ||
| elseif coolList[math.ceil(P.modeData.pt/100+0.01)] and faultList[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(1,0.5,0,1) | ||
| elseif coolList[math.ceil(P.modeData.pt/100+0.01)] and regretList[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(1,1,0,1) | ||
| elseif faultList[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(0.5,0,0,1) | ||
| elseif regretList[math.ceil(P.modeData.pt/100+0.01)] then | ||
| GC.setColor(1,0,0,1) | ||
| end | ||
| PLY.draw.drawProgress(P.modeData.pt,P.modeData.target) | ||
| end | ||
| end, | ||
| hook_drop=function(P) | ||
| local D=P.modeData | ||
|
|
||
| local c=#P.clearedRow | ||
|
|
||
| if cools>8 and isInRoll then | ||
| rollGrades=rollGrades+(c==4 and 1 or 0.1*c) | ||
| return | ||
| elseif isInRoll then | ||
| rollGrades=rollGrades+(c==4 and 0.26 or 0.04*c) | ||
| return | ||
| end | ||
|
|
||
| if c==0 and D.pt+1>=D.target then return end | ||
| local s=c<3 and c+1 or c==3 and 5 or 7 | ||
| local LP=P.lastPiece | ||
| local B2B=P.b2b | ||
| if c==4 then | ||
| if B2B>800 then s=s+2 | ||
| elseif B2B>=50 then s=s+1 | ||
| end | ||
| end | ||
| if LP.spin and c==0 then s=s+1 | ||
| elseif LP.spin and c>0 then | ||
| if B2B>=50 then s=s+2 | ||
| else s=s+1 | ||
| end | ||
| end | ||
| if LP.mini and c>0 and B2B>=50 then s=s+1 end | ||
| if LP.pc then s=s+4 end | ||
| if LP.hpc then s=s+1 end | ||
| if P.finesseCombo>31 and c>0 then s=s+2 | ||
| elseif P.finesseCombo>15 and c>0 then s=s+1 | ||
| end | ||
| if P.combo>7 then s=s+2 | ||
| elseif P.combo>3 then s=s+1 | ||
| end | ||
|
|
||
| addGrade(c,P.combo,LP,D.pt) | ||
|
|
||
| D.pt=D.pt+s | ||
| spd_lvl=spd_lvl+1 | ||
|
|
||
| P.gameEnv.drop=getGrav(spd_lvl) | ||
|
|
||
| if (P.gameEnv.drop==0) then | ||
| P:set20G(true) | ||
| end | ||
|
|
||
| if D.pt%100>70 and not prevDrop70 then | ||
| if P.stat.frame-prevSectTime < cool_time[math.ceil(D.pt/100)] then | ||
| cools=cools+2 | ||
| awsomeList[math.ceil(D.pt/100)]=true | ||
| coolList[math.ceil(D.pt/100)]=true | ||
| P:_showText("AWSOME!!",0,-120,80,'fly',.8) | ||
| nextSpeedUp=true | ||
| elseif P.stat.frame-prevSectTime < cool_time[math.ceil(D.pt/100)] then | ||
| cools=cools+1 | ||
| coolList[math.ceil(D.pt/100)]=true | ||
| P:_showText("COOL!",0,-120,80,'fly',.8) | ||
| nextSpeedUp=true | ||
| end | ||
| prevDrop70=true | ||
| end | ||
|
|
||
| if D.pt+1==D.target then | ||
| SFX.play('warn_1') | ||
| elseif D.pt>=D.target then-- Level up! | ||
| spd_lvl=nextSpeedUp and spd_lvl+100 or spd_lvl | ||
| nextSpeedUp=false | ||
| prevDrop70=false | ||
| s=D.target/100 | ||
| local E=P.gameEnv | ||
| E.lock=getLock(spd_lvl) | ||
|
|
||
| if P.stat.frame-prevSectTime > fal_time[math.ceil(s)] then | ||
| regrets=regrets+2 | ||
| regretDelay=60 | ||
| elseif P.stat.frame-prevSectTime > reg_time[math.ceil(s)] then | ||
| regrets=regrets+1 | ||
| regretDelay=60 | ||
| end | ||
| prevSectTime=P.stat.frame | ||
| if s==2 then | ||
| BG.set('rainbow') | ||
| elseif s==4 then | ||
| BG.set('rainbow2') | ||
| elseif s==5 then | ||
| if P.stat.frame>420*60 then | ||
| D.pt=500 | ||
| P:win('finish') | ||
| return | ||
| else | ||
| BG.set('glow') | ||
| BGM.play('secret7th remix') | ||
| end | ||
| elseif s==6 then | ||
| BG.set('lightning') | ||
| elseif s>9 then | ||
| if cools>8 then | ||
| if E.lockFX and E.lockFX>1 then E.lockFX=1 end | ||
| P:setInvisible(5) | ||
| else | ||
| P:setInvisible(300) | ||
| end | ||
| D.pt=999 | ||
| P.waiting=240 | ||
| BGM.stop() | ||
| isInRollTrans=true | ||
| return | ||
| end | ||
| D.target=D.target<900 and D.target+100 or 999 | ||
| P:stageComplete(s) | ||
| SFX.play('reach') | ||
| end | ||
| end, | ||
| task=function(P) | ||
| regretDelay=-1 | ||
| P.modeData.pt=0 | ||
| P.modeData.target=100 | ||
| int_grade=0 | ||
| grade_points=0 | ||
| rollGrades=0 | ||
| spd_lvl=0 | ||
| cools=0 | ||
| regrets=0 | ||
| prevSectTime=0 | ||
| isInRoll=false | ||
| isInRollTrans=false | ||
| isFault=false | ||
| prevDrop70=false | ||
| nextSpeedUp=false | ||
| awsomeList={false,false,false,false,false,false,false,false,false} | ||
| coolList={false,false,false,false,false,false,false,false,false} | ||
| regretList={false,false,false,false,false,false,false,false,false,false} | ||
| faultList={false,false,false,false,false,false,false,false,false,false} | ||
| local decayRate={125,80,80,50,45,45,45,40,40,40,40,40,30,30,30,20,20,20,20,20,15,15,15,15,15,15,15,15,15,15,10,10,10,9,9,9,8,8,8,7,7,7,6} | ||
| local decayTimer=0 | ||
| while true do | ||
| coroutine.yield() | ||
| P.modeData.grade=getGrade() | ||
| P.modeData.gradePts=math.max(math.min(math.floor(int_grade_boosts[math.min(int_grade+1,#int_grade_boosts)]+rollGrades+cools+1-regrets),#gradeList),1) | ||
| if P.stat.frame-prevSectTime > fal_time[math.ceil(P.modeData.pt/100+0.01)] and not (isInRoll or isInRollTrans) then | ||
| regretList[math.ceil(P.modeData.pt/100)]=true | ||
| faultList[math.ceil(P.modeData.pt/100)]=true | ||
| isFault=true | ||
| elseif P.stat.frame-prevSectTime > reg_time[math.ceil(P.modeData.pt/100+0.01)] and not (isInRoll or isInRollTrans) then | ||
| regretList[math.ceil(P.modeData.pt/100)]=true | ||
| end | ||
| if regretDelay>-1 then | ||
| regretDelay=regretDelay-1 | ||
| if regretDelay==-1 and isfault then | ||
| P:_showText("FAULT!!!",0,-120,80,'beat',.8) | ||
| isFault=false | ||
| else if regretDelay==1 then | ||
| P:_showText("REGRET!!",0,-120,80,'beat',.8) | ||
| end | ||
| end | ||
| if isInRollTrans then | ||
| if P.waiting>=220 then | ||
| -- Make field invisible | ||
| for y=1,#P.field do for x=1,10 do | ||
| P.visTime[y][x]=P.waiting-220 | ||
| end end | ||
| elseif P.waiting==190 then | ||
| TABLE.cut(P.field) | ||
| TABLE.cut(P.visTime) | ||
| elseif P.waiting==180 then | ||
| playReadySFX(3,3) | ||
| P:_showText("3",0,-120,120,'fly',1) | ||
| elseif P.waiting==120 then | ||
| playReadySFX(2,1) | ||
| P:_showText("2",0,-120,120,'fly',1) | ||
| elseif P.waiting==60 then | ||
| playReadySFX(1,1) | ||
| P:_showText("1",0,-120,120,'fly',1) | ||
| elseif P.waiting==1 then | ||
| playReadySFX(0,1) | ||
| isInRollTrans=false | ||
| isInRoll=true | ||
| BGM.play('hope') | ||
| BG.set('blockspace') | ||
| prevSectTime=P.stat.frame | ||
| end | ||
| end | ||
| if P.waiting<=0 and grade_points>0 and not isInRoll then | ||
| decayTimer=decayTimer+1 | ||
| if decayTimer>=decayRate[math.min(int_grade+1,#decayRate)] then | ||
| decayTimer=0 | ||
| grade_points=grade_points-1 | ||
| end | ||
| elseif isInRoll and P.stat.frame>=prevSectTime+3599 then | ||
| rollGrades=rollGrades+(cools>8 and 1.6 or 0.5) | ||
| P.modeData.grade=getGrade() | ||
| P.modeData.gradePts=math.min(math.floor(int_grade_boosts[math.min(int_grade+1,#int_grade_boosts)]+rollGrades+cools+1-regrets),#gradeList) | ||
| coroutine.yield() | ||
| P:win('finish') | ||
| end | ||
| end | ||
| end | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.