Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes SCF_OVERLAPFAIL in favor of Fail list (#6865)

Browse Source 
* Removes the SCF_OVERLAPFAIL status flag in favor of adding the status to the Fail list.
* Confirmed that Burning does renew itself.
This commit is contained in:
Aleos 2022-05-17 16:45:07 -04:00 committed by GitHub
parent d9ae335edf
commit f1b181ec9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 101 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
db/pre-re/status.yml
View File

@ -133,7 +133,6 @@ Body:
BossResist: true
StopAttacking: true
StopCasting: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -152,7 +151,6 @@ Body:
StopAttacking: true
StopCasting: true
RemoveOnDamaged: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -169,7 +167,6 @@ Body:
SendOption: true
BossResist: true
StopAttacking: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -187,7 +184,6 @@ Body:
Flags:
SendOption: true
BossResist: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -203,7 +199,6 @@ Body:
SendOption: true
BossResist: true
StopCasting: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -229,7 +224,6 @@ Body:
Flags:
SendOption: true
BossResist: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -1087,9 +1081,10 @@ Body:
NoClearbuff: true
NoDispell: true
NoBanishingBuster: true
OverlapFail: true
NoClearance: true
NoForcedEnd: true
Fail:
Nochat: true
- Status: Protectexp
Icon: EFST_PROTECTEXP
DurationLookup: WE_BABY
@ -1301,7 +1296,8 @@ Body:
Marionette: true
Flags:
RemoveOnChangeMap: true
OverlapFail: true
Fail:
Marionette: true
- Status: Marionette2
Icon: EFST_MARIONETTE
DurationLookup: CG_MARIONETTE
@ -1316,7 +1312,8 @@ Body:
Marionette: true
Flags:
RemoveOnChangeMap: true
OverlapFail: true
Fail:
Marionette2: true
- Status: Changeundead
Icon: EFST_PROPERTYUNDEAD
DurationLookup: NPC_CHANGEUNDEAD
@ -1659,7 +1656,8 @@ Body:
NoSave: true
NoRemoveOnDead: true
RemoveOnChangeMap: true
OverlapFail: true
Fail:
Closeconfine2: true
- Status: Dancing
Icon: EFST_BDPLAYING
DurationLookup: BD_ENCORE
@ -2502,7 +2500,8 @@ Body:
NoBanishingBuster: true
NoClearance: true
RemoveOnMapWarp: true
OverlapFail: true
Fail:
Bossmapinfo: true
- Status: Lifeinsurance
Icon: EFST_CASH_DEATHPENALTY
States:
@ -2671,16 +2670,18 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoRemoveOnDead: true
Fail:
S_Lifepotion: true
- Status: L_Lifepotion
Icon: EFST_L_LIFEPOTION
Flags:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoRemoveOnDead: true
Fail:
L_Lifepotion: true
- Status: Jexpboost
Icon: EFST_CASH_PLUSONLYJOBEXP
Flags:
@ -2862,7 +2863,6 @@ Body:
RemoveOnLuxAnima: true
BossResist: true
Debuff: true
OverlapFail: true
MinDuration: 10000
Fail:
Refresh: true
@ -2883,7 +2883,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
MinDuration: 6000
Fail:
Refresh: true
@ -2934,7 +2933,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Giantgrowth
Icon: EFST_GIANTGROWTH
@ -2995,7 +2993,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
- Status: Adoramus
Icon: EFST_ADORAMUS
DurationLookup: AB_ADORAMUS
@ -3173,7 +3170,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoSave: true
OverlapFail: true
NoClearance: true
- Status: Wugdash
Icon: EFST_WUGDASH
@ -3424,7 +3420,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
- Status: Paralyse
Icon: EFST_PARALYSE
CalcFlags:
@ -3438,7 +3433,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -3461,7 +3455,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -3484,7 +3477,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -3507,7 +3499,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -3530,7 +3521,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -3556,7 +3546,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -3577,7 +3566,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -3649,7 +3637,6 @@ Body:
Regen: true
Flags:
DisplayPc: true
OverlapFail: true
NoDispell: true
NoBanishingBuster: true
NoClearance: true
@ -3661,7 +3648,6 @@ Body:
Speed: true
Flags:
BossResist: true
OverlapFail: true
- Status: Earthdrive
Icon: EFST_EARTHDRIVE
DurationLookup: LG_EARTHDRIVE
@ -3710,7 +3696,6 @@ Body:
BossResist: true
StopWalking: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -3891,7 +3876,6 @@ Body:
RemoveOnDamaged: true
NoSave: true
Debuff: true
OverlapFail: true
MinDuration: 5000
Fail:
Refresh: true
@ -4108,7 +4092,6 @@ Body:
DisplayPc: true
BossResist: true
StopWalking: true
OverlapFail: true
Debuff: true
- Status: Crescentelbow
Icon: EFST_CRESCENTELBOW
@ -4150,7 +4133,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
- Status: Lightningwalk
Icon: EFST_LIGHTNINGWALK
DurationLookup: SR_LIGHTNINGWALK
@ -4269,7 +4251,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -4519,7 +4500,6 @@ Body:
Batk: true
Watk: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
@ -4532,7 +4512,6 @@ Body:
Aspd: true
Hit: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
@ -4544,7 +4523,6 @@ Body:
States:
NoCast: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
@ -4557,7 +4535,6 @@ Body:
Flee: true
Speed: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
@ -4570,7 +4547,6 @@ Body:
Cri: true
Flee2: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
@ -4582,7 +4558,6 @@ Body:
CalcFlags:
MaxHp: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
@ -5221,7 +5196,6 @@ Body:
StopWalking: true
NoSave: true
RemoveOnChangeMap: true
OverlapFail: true
- Status: Cbc
Icon: EFST_CBC
DurationLookup: MH_CBC
@ -5350,14 +5324,10 @@ Body:
Icon: EFST_SET_NUM_DEF
CalcFlags:
Def: true
Flags:
OverlapFail: true
- Status: Mdefset
Icon: EFST_SET_NUM_MDEF
CalcFlags:
Mdef: true
Flags:
OverlapFail: true
- Status: Darkcrow
Icon: EFST_DARKCROW
DurationLookup: GC_DARKCROW
@ -5907,7 +5877,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_B
Icon: EFST_REUSE_LIMIT_B
@ -5917,7 +5886,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_C
Icon: EFST_REUSE_LIMIT_C
@ -5927,7 +5895,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_D
Icon: EFST_REUSE_LIMIT_D
@ -5937,7 +5904,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_E
Icon: EFST_REUSE_LIMIT_E
@ -5947,7 +5913,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_F
Icon: EFST_REUSE_LIMIT_F
@ -5957,7 +5922,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_G
Icon: EFST_REUSE_LIMIT_G
@ -5967,7 +5931,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_H
Icon: EFST_REUSE_LIMIT_H
@ -5977,7 +5940,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_Mtf
Icon: EFST_REUSE_LIMIT_MTF
@ -5987,7 +5949,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_Aspd_Potion
Icon: EFST_REUSE_LIMIT_ASPD_POTION
@ -5997,7 +5958,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Millenniumshield
Icon: EFST_REUSE_MILLENNIUMSHIELD
@ -6007,7 +5967,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Crushstrike
Icon: EFST_REUSE_CRUSHSTRIKE
@ -6017,7 +5976,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Stormblast
Icon: EFST_REUSE_STORMBLAST
@ -6027,7 +5985,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: All_Riding_Reuse_Limit
Icon: EFST_ALL_RIDING_REUSE_LIMIT
@ -6037,7 +5994,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_Ecl
Icon: EFST_REUSE_LIMIT_ECL
@ -6047,7 +6003,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Reuse_Limit_Recall
Icon: EFST_REUSE_LIMIT_RECALL
@ -6057,7 +6012,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
- Status: Promote_Health_Reserch
Icon: EFST_PROMOTE_HEALTH_RESERCH
@ -6069,8 +6023,6 @@ Body:
MaxSp: true
- Status: Norecover_State
Icon: EFST_HANDICAPSTATE_NORECOVER
Flags:
OverlapFail: true
- Status: Suhide
Icon: EFST_SUHIDE
DurationLookup: SU_HIDE
@ -6428,7 +6380,6 @@ Body:
NoRemoveOnDead: true
NoClearbuff: true
NoBanishingBuster: true
OverlapFail: true
NoDispell: true
NoClearance: true
- Status: Doram_Buf_02
@ -6439,7 +6390,6 @@ Body:
NoRemoveOnDead: true
NoClearbuff: true
NoBanishingBuster: true
OverlapFail: true
NoDispell: true
NoClearance: true
- Status: Hiss
@ -6927,7 +6877,6 @@ Body:
NoBanishingBuster: true
NoDispell: true
NoClearance: true
OverlapFail: true
NoRemoveOnDead: true
NoClearbuff: true
- Status: Ensemblefatigue

151
db/re/status.yml
View File

@ -136,7 +136,6 @@ Body:
BossResist: true
StopAttacking: true
StopCasting: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -155,7 +154,6 @@ Body:
StopAttacking: true
StopCasting: true
RemoveOnDamaged: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
@ -172,7 +170,6 @@ Body:
SendOption: true
BossResist: true
StopAttacking: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -191,7 +188,6 @@ Body:
Flags:
SendOption: true
BossResist: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -208,7 +204,6 @@ Body:
SendOption: true
BossResist: true
StopCasting: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -236,7 +231,6 @@ Body:
Flags:
SendOption: true
BossResist: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -1104,9 +1098,10 @@ Body:
NoClearbuff: true
NoDispell: true
NoBanishingBuster: true
OverlapFail: true
NoClearance: true
NoForcedEnd: true
Fail:
Nochat: true
- Status: Protectexp
Icon: EFST_PROTECTEXP
DurationLookup: WE_BABY
@ -1317,7 +1312,8 @@ Body:
Marionette: true
Flags:
RemoveOnChangeMap: true
OverlapFail: true
Fail:
Marionette: true
- Status: Marionette2
Icon: EFST_MARIONETTE
DurationLookup: CG_MARIONETTE
@ -1332,7 +1328,8 @@ Body:
Marionette: true
Flags:
RemoveOnChangeMap: true
OverlapFail: true
Fail:
Marionette2: true
- Status: Changeundead
Icon: EFST_PROPERTYUNDEAD
DurationLookup: NPC_CHANGEUNDEAD
@ -1656,7 +1653,8 @@ Body:
NoSave: true
NoRemoveOnDead: true
RemoveOnChangeMap: true
OverlapFail: true
Fail:
Closeconfine2: true
- Status: Dancing
Icon: EFST_BDPLAYING
DurationLookup: BD_ENCORE
@ -2614,7 +2612,8 @@ Body:
NoBanishingBuster: true
NoClearance: true
RemoveOnMapWarp: true
OverlapFail: true
Fail:
Bossmapinfo: true
- Status: Lifeinsurance
Icon: EFST_CASH_DEATHPENALTY
States:
@ -2783,14 +2782,16 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
Fail:
S_Lifepotion: true
- Status: L_Lifepotion
Icon: EFST_L_LIFEPOTION
Flags:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
Fail:
L_Lifepotion: true
- Status: Jexpboost
Icon: EFST_CASH_PLUSONLYJOBEXP
Flags:
@ -2972,7 +2973,6 @@ Body:
RemoveOnLuxAnima: true
BossResist: true
Debuff: true
OverlapFail: true
SpreadEffect: true
MinDuration: 10000
Fail:
@ -2995,13 +2995,13 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
MinDuration: 10000
Fail:
Refresh: true
Inspiration: true
Warmer: true
Freezing: true
- Status: Enchantblade
Icon: EFST_ENCHANTBLADE
DurationLookup: RK_ENCHANTBLADE
@ -3045,8 +3045,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Refresh: true
- Status: Giantgrowth
Icon: EFST_GIANTGROWTH
DurationLookup: RK_GIANTGROWTH
@ -3105,7 +3106,8 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
Fail:
Abundance: true
- Status: Adoramus
Icon: EFST_ADORAMUS
DurationLookup: AB_ADORAMUS
@ -3285,8 +3287,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoSave: true
OverlapFail: true
NoClearance: true
Fail:
Electricshocker: true
- Status: Wugdash
Icon: EFST_WUGDASH
DurationLookup: RA_WUGDASH
@ -3551,8 +3554,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
Fail:
Toxin: true
- Status: Paralyse
Icon: EFST_PARALYSE
CalcFlags:
@ -3566,7 +3570,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -3590,7 +3593,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -3614,7 +3616,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -3638,7 +3639,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -3662,7 +3662,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -3689,7 +3688,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -3711,7 +3709,6 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
SpreadEffect: true
Fail:
Refresh: true
@ -3786,18 +3783,20 @@ Body:
Def: true
Flags:
DisplayPc: true
OverlapFail: true
NoDispell: true
NoBanishingBuster: true
NoClearance: true
SendVal1: true
Fail:
Banding: true
End:
Prestige: true
- Status: Banding_Defence
Icon: EFST_BANDING_DEFENCE
Flags:
BossResist: true
OverlapFail: true
Fail:
Banding_Defence: true
- Status: Earthdrive
Icon: EFST_EARTHDRIVE
DurationLookup: LG_EARTHDRIVE
@ -3849,11 +3848,11 @@ Body:
StopCasting: true
SetStand: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
Warmer: true
Crystalize: true
- Status: Striking
Icon: EFST_STRIKING
DurationLookup: SO_STRIKING
@ -4035,11 +4034,11 @@ Body:
RemoveOnDamaged: true
NoSave: true
Debuff: true
OverlapFail: true
MinDuration: 5000
Fail:
Refresh: true
Inspiration: true
Deepsleep: true
End:
Dancing: true
Voiceofsiren: true
@ -4252,8 +4251,9 @@ Body:
DisplayPc: true
BossResist: true
StopWalking: true
OverlapFail: true
Debuff: true
Fail:
Netherworld: true
- Status: Crescentelbow
Icon: EFST_CRESCENTELBOW
DurationLookup: SR_CRESCENTELBOW
@ -4296,7 +4296,8 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
Fail:
Cursedcircle_Target: true
- Status: Lightningwalk
Icon: EFST_LIGHTNINGWALK
DurationLookup: SR_LIGHTNINGWALK
@ -4413,10 +4414,10 @@ Body:
NoDispell: true
NoBanishingBuster: true
Debuff: true
OverlapFail: true
Fail:
Refresh: true
Inspiration: true
Mandragora: true
- Status: Stomachache
Icon: EFST_STOMACHACHE
CalcFlags:
@ -4668,13 +4669,13 @@ Body:
Batk: true
Watk: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
SendVal2: true
Fail:
Inspiration: true
_Enervation: true
- Status: _Groomy
Icon: EFST_GROOMY
DurationLookup: SC_GROOMY
@ -4682,25 +4683,25 @@ Body:
Aspd: true
Hit: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
SendVal3: true
Fail:
Inspiration: true
_Groomy: true
- Status: _Ignorance
Icon: EFST_IGNORANCE
DurationLookup: SC_IGNORANCE
States:
NoCast: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
Fail:
Inspiration: true
_Ignorance: true
- Status: _Laziness
Icon: EFST_LAZINESS
DurationLookup: SC_LAZINESS
@ -4708,13 +4709,13 @@ Body:
Flee: true
Speed: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
SendVal3: true
Fail:
Inspiration: true
_Laziness: true
- Status: _Unlucky
Icon: EFST_UNLUCKY
DurationLookup: SC_UNLUCKY
@ -4722,26 +4723,26 @@ Body:
Cri: true
Flee2: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
SendVal3: true
Fail:
Inspiration: true
_Unlucky: true
- Status: _Weakness
Icon: EFST_WEAKNESS
DurationLookup: SC_WEAKNESS
CalcFlags:
MaxHp: true
Flags:
OverlapFail: true
BossResist: true
NoBanishingBuster: true
NoClearance: true
SendVal2: true
Fail:
Inspiration: true
_Weakness: true
- Status: _Stripaccessory
Icon: EFST_STRIPACCESSARY
DurationLookup: SC_STRIPACCESSARY
@ -5455,7 +5456,8 @@ Body:
Flags:
NoSave: true
RemoveOnChangeMap: true
OverlapFail: true
Fail:
Tinder_Breaker2: true
- Status: Cbc
Icon: EFST_CBC
DurationLookup: MH_CBC
@ -5580,14 +5582,14 @@ Body:
Icon: EFST_SET_NUM_DEF
CalcFlags:
Def: true
Flags:
OverlapFail: true
Fail:
Defset: true
- Status: Mdefset
Icon: EFST_SET_NUM_MDEF
CalcFlags:
Mdef: true
Flags:
OverlapFail: true
Fail:
Mdefset: true
- Status: Darkcrow
Icon: EFST_DARKCROW
DurationLookup: GC_DARKCROW
@ -6151,8 +6153,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_A: true
- Status: Reuse_Limit_B
Icon: EFST_REUSE_LIMIT_B
Flags:
@ -6161,8 +6164,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_B: true
- Status: Reuse_Limit_C
Icon: EFST_REUSE_LIMIT_C
Flags:
@ -6171,8 +6175,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_C: true
- Status: Reuse_Limit_D
Icon: EFST_REUSE_LIMIT_D
Flags:
@ -6181,8 +6186,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_D: true
- Status: Reuse_Limit_E
Icon: EFST_REUSE_LIMIT_E
Flags:
@ -6191,8 +6197,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_E: true
- Status: Reuse_Limit_F
Icon: EFST_REUSE_LIMIT_F
Flags:
@ -6201,8 +6208,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_F: true
- Status: Reuse_Limit_G
Icon: EFST_REUSE_LIMIT_G
Flags:
@ -6211,8 +6219,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_G: true
- Status: Reuse_Limit_H
Icon: EFST_REUSE_LIMIT_H
Flags:
@ -6221,8 +6230,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_H: true
- Status: Reuse_Limit_Mtf
Icon: EFST_REUSE_LIMIT_MTF
Flags:
@ -6231,8 +6241,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_Mtf: true
- Status: Reuse_Limit_Aspd_Potion
Icon: EFST_REUSE_LIMIT_ASPD_POTION
Flags:
@ -6241,8 +6252,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_Aspd_Potion: true
- Status: Reuse_Millenniumshield
Icon: EFST_REUSE_MILLENNIUMSHIELD
Flags:
@ -6251,8 +6263,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Millenniumshield: true
- Status: Reuse_Crushstrike
Icon: EFST_REUSE_CRUSHSTRIKE
Flags:
@ -6261,8 +6274,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Crushstrike: true
- Status: Reuse_Stormblast
Icon: EFST_REUSE_STORMBLAST
Flags:
@ -6271,8 +6285,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Stormblast: true
- Status: All_Riding_Reuse_Limit
Icon: EFST_ALL_RIDING_REUSE_LIMIT
Flags:
@ -6281,8 +6296,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
All_Riding_Reuse_Limit: true
- Status: Reuse_Limit_Ecl
Icon: EFST_REUSE_LIMIT_ECL
Flags:
@ -6291,8 +6307,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_Ecl: true
- Status: Reuse_Limit_Recall
Icon: EFST_REUSE_LIMIT_RECALL
Flags:
@ -6301,8 +6318,9 @@ Body:
NoDispell: true
NoBanishingBuster: true
NoClearance: true
OverlapFail: true
NoForcedEnd: true
Fail:
Reuse_Limit_Recall: true
- Status: Promote_Health_Reserch
Icon: EFST_PROMOTE_HEALTH_RESERCH
CalcFlags:
@ -6313,8 +6331,8 @@ Body:
MaxSp: true
- Status: Norecover_State
Icon: EFST_HANDICAPSTATE_NORECOVER
Flags:
OverlapFail: true
Fail:
Norecover_State: true
- Status: Suhide
Icon: EFST_SUHIDE
DurationLookup: SU_HIDE
@ -6684,9 +6702,10 @@ Body:
NoRemoveOnDead: true
NoClearbuff: true
NoBanishingBuster: true
OverlapFail: true
NoDispell: true
NoClearance: true
Fail:
Doram_Buf_01: true
- Status: Doram_Buf_02
Icon: EFST_DORAM_BUF_02
CalcFlags:
@ -6695,9 +6714,10 @@ Body:
NoRemoveOnDead: true
NoClearbuff: true
NoBanishingBuster: true
OverlapFail: true
NoDispell: true
NoClearance: true
Fail:
Doram_Buf_02: true
- Status: Hiss
Icon: EFST_HISS
DurationLookup: SU_HISS
@ -7211,9 +7231,10 @@ Body:
NoBanishingBuster: true
NoDispell: true
NoClearance: true
OverlapFail: true
NoRemoveOnDead: true
NoClearbuff: true
Fail:
Reuse_Limit_Luxanima: true
- Status: Ensemblefatigue
Icon: EFST_ENSEMBLEFATIGUE
States:

3
doc/status.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Last Updated: ========================================
//= 20220414
//= 20220421
//===== Description: =========================================
//= Explanation of the status.yml file and structure.
//============================================================
@ -201,7 +201,6 @@ Flags: Various status flags for specific status change events.
DislpayNpc - Displays status effect on a NPC.
Debuff - Status is considered a debuff. Used in combination with 'battle_config.debuff_on_logout'.
SetStand - Sets player to standing state.
OverlapFail - The status will fail to activate if the status is already active.
OverlapIgnoreLevel - The status will successfully activate for any level if the status is already active.
FailedMado - Cannot be applied if Madogear is active.
MadoCancel - Cancels the status when mounting Madogear.

1
src/map/script_constants.hpp
View File

@ -8970,7 +8970,6 @@
export_constant(SCF_REMOVEONCHANGEMAP);
export_constant(SCF_REMOVEONMAPWARP);
export_constant(SCF_REMOVECHEMICALPROTECT);
export_constant(SCF_OVERLAPFAIL);
export_constant(SCF_OVERLAPIGNORELEVEL);
export_constant(SCF_SENDOPTION);
export_constant(SCF_ONTOUCH);

2
src/map/status.cpp
View File

@ -9721,8 +9721,6 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
// Check for overlapping fails
if( (sce = sc->data[type]) ) {
if (scdb->flag[SCF_OVERLAPFAIL])
return 0;
switch( type ) {
case SC_MERC_FLEEUP:
case SC_MERC_ATKUP:

1
src/map/status.hpp
View File

@ -2827,7 +2827,6 @@ enum e_status_change_flag : uint16 {
SCF_REMOVEONCHANGEMAP,
SCF_REMOVEONMAPWARP,
SCF_REMOVECHEMICALPROTECT,
SCF_OVERLAPFAIL,
SCF_OVERLAPIGNORELEVEL,
SCF_SENDOPTION,
SCF_ONTOUCH,