diff --git a/parts/eventsets/classic_h.lua b/parts/eventsets/classic_h.lua index 2103e93d..82cb43c3 100644 --- a/parts/eventsets/classic_h.lua +++ b/parts/eventsets/classic_h.lua @@ -9,6 +9,7 @@ return{ lock=3, wait=10, fall=25, + freshLimit=0, fieldH=19, nextCount=1, holdCount=0, diff --git a/parts/eventsets/classic_l.lua b/parts/eventsets/classic_l.lua index 766a2d40..c12d2cec 100644 --- a/parts/eventsets/classic_l.lua +++ b/parts/eventsets/classic_l.lua @@ -9,6 +9,7 @@ return{ lock=2, wait=10, fall=25, + freshLimit=0, fieldH=19, nextCount=1, holdCount=0, diff --git a/parts/eventsets/classic_u.lua b/parts/eventsets/classic_u.lua index e7ea3ee9..59d4b88a 100644 --- a/parts/eventsets/classic_u.lua +++ b/parts/eventsets/classic_u.lua @@ -9,6 +9,7 @@ return{ lock=1, wait=10, fall=25, + freshLimit=0, fieldH=19, nextCount=1, holdCount=0, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 8a94b5c3..504219a8 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -781,7 +781,6 @@ return{ ['blind_l']= {"Blind", "SUDDEN+", "For professionals."}, ['blind_u']= {"Blind", "?", "Are you ready?"}, ['blind_wtf']= {"Blind", "WTF", "You're not ready."}, - ['classic_fast']= {"Classic", "CTWC", "High-speed classic mode."}, ['classic_h']= {"Classic", "HARD", "A medium speed recreation from the 80s."}, ['classic_l']= {"Classic", "LUNATIC", "A high-speed recreation from the 80s."}, ['classic_u']= {"Classic", "ULTIMATE", "A very high-speed recreation from the 80s."}, @@ -833,6 +832,7 @@ return{ ['master_l']= {"Master", "LUNATIC"}, ['master_u']= {"Master", "ULTIMATE"}, + ['classic_fast']= {"Classic", "CTWC"}, ['custom_clear']= {"Custom", "NORMAL"}, ['custom_puzzle']= {"Custom", "PUZZLE"}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 82ada070..d20215f4 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -685,7 +685,6 @@ return{ ['blind_l']= {"A Ciegas", "Inmediato+", "Para profesionales."}, ['blind_u']= {"A Ciegas", "?", "¿Estás preparado?"}, ['blind_wtf']= {"A Ciegas", "ELFUF", "No, no lo estás."}, - ['classic_fast']= {"Clásico", "CTWC", "Modo clásico con alta velocidad."}, ['classic_h']= {"Clásico", "Difícil", "Modo clásico con alta velocidad."}, ['classic_l']= {"Clásico", "Lunático", "Modo clásico con alta velocidad."}, ['classic_u']= {"Clásico", "Supremo", "Modo clásico con alta velocidad."}, @@ -737,6 +736,7 @@ return{ ['master_l']= {"Master", "Lunático"}, ['master_u']= {"Master", "Supremo"}, + ['classic_fast']= {"Clásico", "CTWC"}, ['custom_clear']= {"Personalizado", "Normal"}, ['custom_puzzle']= {"Personalizado", "Puzzle"}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 7a913741..2d7fbd8c 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -688,7 +688,6 @@ return{ ['blind_l']= {"Aveugle", "SOUDAIN+", "Pour les pros."}, ['blind_u']= {"Aveugle", "?", "Êtes-vous prêt ?"}, ['blind_wtf']= {"Aveugle", "WTF", "Vous n'êtes pas prêt."}, - ['classic_fast']= {"Classic", "CTWC", "Un mode classique rapide."}, ['classic_h']= {"Classic", "DIFFICILE", "Un mode classique rapide."}, ['classic_l']= {"Classic", "LUNATIQUE", "Un mode classique rapide."}, ['classic_u']= {"Classic", "ULTIME", "Un mode classique rapide."}, @@ -740,6 +739,7 @@ return{ ['master_l']= {"Master", "LUNATIQUE"}, ['master_u']= {"Master", "ULTIME"}, + ['classic_fast']= {"Classic", "CTWC"}, ['custom_clear']= {"Perso.", "NORMAL"}, ['custom_puzzle']= {"Perso.", "PUZZLE"}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 33a23c00..c956e21b 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -770,7 +770,6 @@ return{ ['blind_l']= {"Cego", "DE REPENTE+", "For professionals."}, ['blind_u']= {"Cego", "?", "Are you ready?"}, ['blind_wtf']= {"Cego", "WTF", "You're not ready."}, - ['classic_fast']= {"Clássico", "CTWC", "Modo clássico rápido. "}, ['classic_h']= {"Classic", "DIFÍCIL", "Modo clássico rápido."}, ['classic_l']= {"Classic", "LUNÁTICO", "Modo clássico rápido."}, ['classic_u']= {"Classic", "ULTIMATE", "Modo clássico rápido."}, @@ -822,6 +821,7 @@ return{ ['master_l']= {"Mestre", "LUNÁTICO"}, ['master_u']= {"Mestre", "ULTIMATE"}, + ['classic_fast']= {"Clássico", "CTWC"}, ['custom_clear']= {"Custom", "NORMAL"}, ['custom_puzzle']= {"Custom", "PUZZLE"}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 7d027c12..d3f3c268 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -259,10 +259,9 @@ return{ ['blind_l']= {"隐形", "瞬隐+", "这个确实挺难的"}, ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, - ['classic_fast']= {"高速经典", "CTWC", "就这?简单"}, ['classic_h']= {"高速经典", "困难", "就这?简单"}, - ['classic_l']= {"高速经典", "疯狂", "就这?简单"}, - ['classic_u']= {"高速经典", "极限", "就这?简单"}, + ['classic_l']= {"高速经典", "疯狂", "就这?一般"}, + ['classic_u']= {"高速经典", "极限", "就这…算了"}, ['survivor_e']= {"生存", "简单", "这都玩不下去?不会吧"}, ['survivor_n']= {"生存", "普通", "呵,这都玩不过?"}, ['survivor_h']= {"生存", "困难", "所以呢?"}, @@ -311,6 +310,7 @@ return{ ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, + ['classic_fast']= {"高速经典", "CTWC"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 9a585746..7f8ae303 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -782,10 +782,9 @@ return{ ['blind_l']= {"隐形", "瞬隐+", "最强大脑"}, ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, - ['classic_fast']= {"高速经典", "CTWC", "高速经典"}, ['classic_h']= {"高速经典", "困难", "高速经典"}, - ['classic_l']= {"高速经典", "疯狂", "高速经典"}, - ['classic_u']= {"高速经典", "极限", "高速经典"}, + ['classic_l']= {"高速经典", "疯狂", "飞速经典"}, + ['classic_u']= {"高速经典", "极限", "极速经典"}, ['survivor_e']= {"生存", "简单", "你能存活多久?"}, ['survivor_n']= {"生存", "普通", "你能存活多久?"}, ['survivor_h']= {"生存", "困难", "你能存活多久?"}, @@ -834,6 +833,7 @@ return{ ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, + ['classic_fast']= {"高速经典", "CTWC"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index 2d4928b0..d1620329 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -176,10 +176,9 @@ return{ ['blind_l']= {"隐形", "瞬隐+", "超强大脑"}, ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, - ['classic_fast']= {"高速经典", "CTWC", "高速经典"}, - ['classic_h']= {"高速经典", "困难", "高速经典"}, - ['classic_l']= {"高速经典", "疯狂", "高速经典"}, - ['classic_u']= {"高速经典", "极限", "高速经典"}, + ['classic_h']= {"高速经典", "困难", "高速经典"}, + ['classic_l']= {"高速经典", "疯狂", "飞速经典"}, + ['classic_u']= {"高速经典", "极限", "极速经典"}, ['survivor_e']= {"生存", "简单", "你能存活多久?"}, ['survivor_n']= {"生存", "普通", "你能存活多久?"}, ['survivor_h']= {"生存", "困难", "你能存活多久?"}, @@ -228,6 +227,8 @@ return{ ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, + ['classic_fast']= {"高速经典", "CTWC"}, + ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, }, diff --git a/parts/modes/classic_fast.lua b/parts/modes/classic_fast.lua index 45910669..2f1028e2 100644 --- a/parts/modes/classic_fast.lua +++ b/parts/modes/classic_fast.lua @@ -3,7 +3,6 @@ return{ env={ center=0,ghost=0, smooth=false, - freshLimit=0, face={0,0,2,2,2,0,0}, eventSet='classic_h', bg='rgb',bgm='magicblock', diff --git a/parts/modes/classic_h.lua b/parts/modes/classic_h.lua index 45910669..d45eca98 100644 --- a/parts/modes/classic_h.lua +++ b/parts/modes/classic_h.lua @@ -3,7 +3,6 @@ return{ env={ center=0,ghost=0, smooth=false, - freshLimit=0, face={0,0,2,2,2,0,0}, eventSet='classic_h', bg='rgb',bgm='magicblock', @@ -22,11 +21,11 @@ return{ getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=191 and 4 or - L>=110 and 3 or - L>=50 and 2 or - L>=5 and 1 or + L>=100 and 5 or + L>=70 and 4 or + L>=50 and 3 or + L>=30 and 2 or + L>=10 and 1 or L>=1 and 0 end, } diff --git a/parts/modes/classic_l.lua b/parts/modes/classic_l.lua index 84052cc6..e749b486 100644 --- a/parts/modes/classic_l.lua +++ b/parts/modes/classic_l.lua @@ -3,7 +3,6 @@ return{ env={ center=0,ghost=0, smooth=false, - freshLimit=0, face={0,0,2,2,2,0,0}, eventSet='classic_l', bg='rgb',bgm='magicblock', @@ -22,10 +21,10 @@ return{ getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=191 and 4 or - L>=110 and 3 or - L>=50 and 2 or + L>=30 and 5 or + L>=20 and 4 or + L>=15 and 3 or + L>=10 and 2 or L>=5 and 1 or L>=1 and 0 end, diff --git a/parts/modes/classic_u.lua b/parts/modes/classic_u.lua index 74bad9c8..c1a80611 100644 --- a/parts/modes/classic_u.lua +++ b/parts/modes/classic_u.lua @@ -3,7 +3,6 @@ return{ env={ center=0,ghost=0, smooth=false, - freshLimit=0, face={0,0,2,2,2,0,0}, eventSet='classic_u', bg='rgb',bgm='magicblock', @@ -22,11 +21,11 @@ return{ getRank=function(P) local L=P.stat.row return - L>=200 and 5 or - L>=191 and 4 or - L>=110 and 3 or - L>=50 and 2 or - L>=5 and 1 or + L>=15 and 5 or + L>=12 and 4 or + L>=9 and 3 or + L>=6 and 2 or + L>=3 and 1 or L>=1 and 0 end, } diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index 4ef2431e..06084ea4 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -23,7 +23,7 @@ local sList={ lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, wait={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, fall={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, - eventSet={'X','attacker_h','attacker_u','backfire_0','backfire_120','backfire_30','backfire_60','checkAttack_100','checkLine_10','checkLine_20','checkLine_40','checkLine_100','checkLine_200','checkLine_400','checkLine_1000','checkTurn_1','checkTurn_7','classic_fast','defender_n','defender_l','dig_10l','dig_40l','dig_100l','dig_400l','dig_h','dig_u','marathon_n','marathon_h','master_ex','master_final','master_h','master_n','master_ph','pctrain_n','pctrain_l','pc_inf','rhythm_e','rhythm_h','rhythm_u','survivor_e','survivor_n','survivor_h','survivor_l','survivor_u','tsd_e','tsd_h','tsd_u','ultra'}, + eventSet={'X','attacker_h','attacker_u','backfire_0','backfire_120','backfire_30','backfire_60','checkAttack_100','checkLine_10','checkLine_20','checkLine_40','checkLine_100','checkLine_200','checkLine_400','checkLine_1000','checkTurn_1','checkTurn_7','classic_h','classic_l','classic_u','defender_n','defender_l','dig_10l','dig_40l','dig_100l','dig_400l','dig_h','dig_u','marathon_n','marathon_h','master_ex','master_final','master_h','master_n','master_ph','pctrain_n','pctrain_l','pc_inf','rhythm_e','rhythm_h','rhythm_u','survivor_e','survivor_n','survivor_h','survivor_l','survivor_u','tsd_e','tsd_h','tsd_u','ultra'}, } local scene={} diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index 97420212..16ab45aa 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -20,7 +20,7 @@ local sList={ lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, wait={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, fall={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, - eventSet={'X','attacker_h','attacker_u','backfire_0','backfire_120','backfire_30','backfire_60','checkAttack_100','checkLine_10','checkLine_20','checkLine_40','checkLine_100','checkLine_200','checkLine_400','checkLine_1000','checkTurn_1','checkTurn_7','classic_fast','defender_n','defender_l','dig_10l','dig_40l','dig_100l','dig_400l','dig_h','dig_u','marathon_n','marathon_h','master_ex','master_final','master_h','master_n','master_ph','pctrain_n','pctrain_l','pc_inf','rhythm_e','rhythm_h','rhythm_u','survivor_e','survivor_n','survivor_h','survivor_l','survivor_u','tsd_e','tsd_h','tsd_u','ultra'}, + eventSet={'X','attacker_h','attacker_u','backfire_0','backfire_120','backfire_30','backfire_60','checkAttack_100','checkLine_10','checkLine_20','checkLine_40','checkLine_100','checkLine_200','checkLine_400','checkLine_1000','checkTurn_1','checkTurn_7','classic_h','classic_l','classic_u','defender_n','defender_l','dig_10l','dig_40l','dig_100l','dig_400l','dig_h','dig_u','marathon_n','marathon_h','master_ex','master_final','master_h','master_n','master_ph','pctrain_n','pctrain_l','pc_inf','rhythm_e','rhythm_h','rhythm_u','survivor_e','survivor_n','survivor_h','survivor_l','survivor_u','tsd_e','tsd_h','tsd_u','ultra'}, } local scene={}