@@ -2529,7 +2529,7 @@ try {
25292529 arena . arrayDone = [ ] ;
25302530 }
25312531 if ( ! isToday || ! arena . isOptionUpdated ) {
2532- arena . array = g ( 'option' ) . idleArenaValue . split ( ',' ) ?? [ ] ;
2532+ arena . array = g ( 'option' ) . idleArenaValue ? .split ( ',' ) ?? [ ] ;
25332533 arena . array . reverse ( ) ;
25342534 }
25352535 return setValue ( 'arena' , arena ) ;
@@ -3755,6 +3755,7 @@ try {
37553755 }
37563756
37573757 const skillOrder = ( g ( 'option' ) . skillOrderValue || 'OFC,FRD,T3,T2,T1' ) . split ( ',' ) ;
3758+ const fightStyle = g ( 'option' ) . fightingStyle ;
37583759 const skillLib = {
37593760 OFC : {
37603761 id : '1111' ,
@@ -3765,16 +3766,17 @@ try {
37653766 oc : 4 ,
37663767 } ,
37673768 T3 : {
3768- id : `2${ g ( 'option' ) . fightingStyle } 03` ,
3769- oc : 2 ,
3769+ id : `2${ fightStyle } 03` ,
3770+ // oc: 2203:4 2303:2 2403:3
3771+ oc : fightStyle === 2 ? 4 : fightStyle === 3 ? 2 : fightStyle === 4 ? 3 : undefined ,
37703772 } ,
37713773 T2 : {
3772- id : `2${ g ( 'option' ) . fightingStyle } 02` ,
3773- oc : 2 ,
3774+ id : `2${ fightStyle } 02` ,
3775+ oc : fightStyle === 1 ? undefined : 2 , // 2202:2 2302:2 2402:2
37743776 } ,
37753777 T1 : {
3776- id : `2${ g ( 'option' ) . fightingStyle } 01` ,
3777- oc : 2 ,
3778+ id : `2${ fightStyle } 01` ,
3779+ oc : fightStyle === 1 ? 4 : fightStyle === 2 ? 1 : 2 // 2101:4 2201:1 2301:2 2401:2 2501:2
37783780 } ,
37793781 } ;
37803782 const rangeSkills = {
@@ -3803,7 +3805,7 @@ try {
38033805 if ( skillLib [ skill ] . id in rangeSkills ) {
38043806 range = rangeSkills [ skillLib [ skill ] . id ] ;
38053807 }
3806- if ( ! g ( 'option' ) . mercifulBlow || g ( 'option' ) . fightingStyle !== '2' || skill !== 'T3' ) {
3808+ if ( ! g ( 'option' ) . mercifulBlow || fightStyle !== '2' || skill !== 'T3' ) {
38073809 continue ;
38083810 }
38093811 // Merciful Blow
0 commit comments