Merge branch 'master' into cleanup/removeonchangemap

db/pre-re/item_db_equip.yml

@@ -28300,8 +28300,6 @@ Body:
       bonus bMaxHP,50;
       bonus bMaxSP,10;
       skill "AL_RUWACH",1;
-    UnEquipScript: |
-      sc_end SC_RUWACH;
   - Id: 5213
     AegisName: Black_Bunny_Band
     Name: Sheila Hairnet
@@ -31603,8 +31601,6 @@ Body:
     Script: |
       bonus bVit,1;
       skill "AL_ANGELUS",1;
-    UnEquipScript: |
-      sc_end SC_ANGELUS;
   - Id: 5383
     AegisName: Hunting_Cap
     Name: Hunter's Cap

db/pre-re/item_db_etc.yml

@@ -6451,8 +6451,6 @@ Body:
       BuyingStore: true
     Script: |
       bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD") == 10),30;
-    UnEquipScript: |
-      sc_end SC_AUTOGUARD;
   - Id: 4300
     AegisName: Chimera_Card
     Name: Chimera Card

db/pre-re/status.yml

@@ -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
@@ -1090,9 +1084,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
@@ -1306,7 +1301,8 @@ Body:
     Flags:
       RemoveOnMapWarp: true
       NoSave: true
-      OverlapFail: true
+    Fail:
+      Marionette: true
   - Status: Marionette2
     Icon: EFST_MARIONETTE
     DurationLookup: CG_MARIONETTE
@@ -1322,7 +1318,8 @@ Body:
     Flags:
       RemoveOnMapWarp: true
       NoSave: true
-      OverlapFail: true
+    Fail:
+      Marionette2: true
   - Status: Changeundead
     Icon: EFST_PROPERTYUNDEAD
     DurationLookup: NPC_CHANGEUNDEAD
@@ -1665,7 +1662,8 @@ Body:
       NoSave: true
       NoRemoveOnDead: true
       RemoveOnMapWarp: true
-      OverlapFail: true
+    Fail:
+      Closeconfine2: true
   - Status: Dancing
     Icon: EFST_BDPLAYING
     DurationLookup: BD_ENCORE
@@ -2513,7 +2511,8 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveOnMapWarp: true
-      OverlapFail: true
+    Fail:
+      Bossmapinfo: true
   - Status: Lifeinsurance
     Icon: EFST_CASH_DEATHPENALTY
     States:
@@ -2682,16 +2681,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:
@@ -2873,7 +2874,6 @@ Body:
       RemoveOnLuxAnima: true
       BossResist: true
       Debuff: true
-      OverlapFail: true
     MinDuration: 10000
     Fail:
       Refresh: true
@@ -2894,7 +2894,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     MinDuration: 6000
     Fail:
       Refresh: true
@@ -2945,7 +2944,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Giantgrowth
     Icon: EFST_GIANTGROWTH
@@ -3006,7 +3004,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
   - Status: Adoramus
     Icon: EFST_ADORAMUS
     DurationLookup: AB_ADORAMUS
@@ -3184,7 +3181,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoSave: true
-      OverlapFail: true
       NoClearance: true
   - Status: Wugdash
     Icon: EFST_WUGDASH
@@ -3435,7 +3431,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
   - Status: Paralyse
     Icon: EFST_PARALYSE
     CalcFlags:
@@ -3449,7 +3444,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3472,7 +3466,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3495,7 +3488,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3518,7 +3510,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3541,7 +3532,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3567,7 +3557,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3588,7 +3577,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3660,7 +3648,6 @@ Body:
       Regen: true
     Flags:
       DisplayPc: true
-      OverlapFail: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -3672,7 +3659,6 @@ Body:
       Speed: true
     Flags:
       BossResist: true
-      OverlapFail: true
   - Status: Earthdrive
     Icon: EFST_EARTHDRIVE
     DurationLookup: LG_EARTHDRIVE
@@ -3721,7 +3707,6 @@ Body:
       BossResist: true
       StopWalking: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3902,7 +3887,6 @@ Body:
       RemoveOnDamaged: true
       NoSave: true
       Debuff: true
-      OverlapFail: true
     MinDuration: 5000
     Fail:
       Refresh: true
@@ -4119,7 +4103,6 @@ Body:
       DisplayPc: true
       BossResist: true
       StopWalking: true
-      OverlapFail: true
       Debuff: true
   - Status: Crescentelbow
     Icon: EFST_CRESCENTELBOW
@@ -4161,7 +4144,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
   - Status: Lightningwalk
     Icon: EFST_LIGHTNINGWALK
     DurationLookup: SR_LIGHTNINGWALK
@@ -4280,7 +4262,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -4530,7 +4511,6 @@ Body:
       Batk: true
       Watk: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4543,7 +4523,6 @@ Body:
       Aspd: true
       Hit: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4555,7 +4534,6 @@ Body:
     States:
       NoCast: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4568,7 +4546,6 @@ Body:
       Flee: true
       Speed: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4581,7 +4558,6 @@ Body:
       Cri: true
       Flee2: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4593,7 +4569,6 @@ Body:
     CalcFlags:
       MaxHp: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -5233,7 +5208,6 @@ Body:
       StopWalking: true
       NoSave: true
       RemoveOnMapWarp: true
-      OverlapFail: true
   - Status: Cbc
     Icon: EFST_CBC
     DurationLookup: MH_CBC
@@ -5362,14 +5336,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
@@ -5919,7 +5889,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_B
     Icon: EFST_REUSE_LIMIT_B
@@ -5929,7 +5898,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_C
     Icon: EFST_REUSE_LIMIT_C
@@ -5939,7 +5907,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_D
     Icon: EFST_REUSE_LIMIT_D
@@ -5949,7 +5916,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_E
     Icon: EFST_REUSE_LIMIT_E
@@ -5959,7 +5925,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_F
     Icon: EFST_REUSE_LIMIT_F
@@ -5969,7 +5934,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_G
     Icon: EFST_REUSE_LIMIT_G
@@ -5979,7 +5943,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_H
     Icon: EFST_REUSE_LIMIT_H
@@ -5989,7 +5952,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_Mtf
     Icon: EFST_REUSE_LIMIT_MTF
@@ -5999,7 +5961,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_Aspd_Potion
     Icon: EFST_REUSE_LIMIT_ASPD_POTION
@@ -6009,7 +5970,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Millenniumshield
     Icon: EFST_REUSE_MILLENNIUMSHIELD
@@ -6019,7 +5979,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Crushstrike
     Icon: EFST_REUSE_CRUSHSTRIKE
@@ -6029,7 +5988,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Stormblast
     Icon: EFST_REUSE_STORMBLAST
@@ -6039,7 +5997,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: All_Riding_Reuse_Limit
     Icon: EFST_ALL_RIDING_REUSE_LIMIT
@@ -6049,7 +6006,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_Ecl
     Icon: EFST_REUSE_LIMIT_ECL
@@ -6059,7 +6015,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_Recall
     Icon: EFST_REUSE_LIMIT_RECALL
@@ -6069,7 +6024,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Promote_Health_Reserch
     Icon: EFST_PROMOTE_HEALTH_RESERCH
@@ -6081,8 +6035,6 @@ Body:
       MaxSp: true
   - Status: Norecover_State
     Icon: EFST_HANDICAPSTATE_NORECOVER
-    Flags:
-      OverlapFail: true
   - Status: Suhide
     Icon: EFST_SUHIDE
     DurationLookup: SU_HIDE
@@ -6439,7 +6391,6 @@ Body:
       NoRemoveOnDead: true
       NoClearbuff: true
       NoBanishingBuster: true
-      OverlapFail: true
       NoDispell: true
       NoClearance: true
   - Status: Doram_Buf_02
@@ -6450,7 +6401,6 @@ Body:
       NoRemoveOnDead: true
       NoClearbuff: true
       NoBanishingBuster: true
-      OverlapFail: true
       NoDispell: true
       NoClearance: true
   - Status: Hiss
@@ -6939,7 +6889,6 @@ Body:
       NoBanishingBuster: true
       NoDispell: true
       NoClearance: true
-      OverlapFail: true
       NoRemoveOnDead: true
       NoClearbuff: true
   - Status: Ensemblefatigue

db/re/item_db_equip.yml

@@ -41773,8 +41773,6 @@ Body:
       bonus bMaxHP,50;
       bonus bMaxSP,10;
       skill "AL_RUWACH",1;
-    UnEquipScript: |
-      sc_end SC_RUWACH;
   - Id: 5213
     AegisName: Black_Bunny_Band
     Name: Sheila Hairnet
@@ -44957,8 +44955,6 @@ Body:
     Script: |
       bonus bVit,1;
       skill "AL_ANGELUS",1;
-    UnEquipScript: |
-      sc_end SC_ANGELUS;
   - Id: 5383
     AegisName: Hunting_Cap
     Name: Hunter's Cap

db/re/item_db_etc.yml

@@ -6820,8 +6820,6 @@ Body:
       DropEffect: CLIENT
     Script: |
       bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD") == 10),30;
-    UnEquipScript: |
-      sc_end SC_AUTOGUARD;
   - Id: 4300
     AegisName: Chimera_Card
     Name: Chimera Card

db/re/status.yml

@@ -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
@@ -1107,9 +1101,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
@@ -1321,7 +1316,8 @@ Body:
     Flags:
       RemoveOnMapWarp: true
       NoSave: true
-      OverlapFail: true
+    Fail:
+      Marionette: true
   - Status: Marionette2
     Icon: EFST_MARIONETTE
     DurationLookup: CG_MARIONETTE
@@ -1337,7 +1333,8 @@ Body:
     Flags:
       RemoveOnMapWarp: true
       NoSave: true
-      OverlapFail: true
+    Fail:
+      Marionette2: true
   - Status: Changeundead
     Icon: EFST_PROPERTYUNDEAD
     DurationLookup: NPC_CHANGEUNDEAD
@@ -1661,7 +1658,8 @@ Body:
       NoSave: true
       NoRemoveOnDead: true
       RemoveOnMapWarp: true
-      OverlapFail: true
+    Fail:
+      Closeconfine2: true
   - Status: Dancing
     Icon: EFST_BDPLAYING
     DurationLookup: BD_ENCORE
@@ -2624,7 +2622,8 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveOnMapWarp: true
-      OverlapFail: true
+    Fail:
+      Bossmapinfo: true
   - Status: Lifeinsurance
     Icon: EFST_CASH_DEATHPENALTY
     States:
@@ -2793,14 +2792,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:
@@ -2982,7 +2983,6 @@ Body:
       RemoveOnLuxAnima: true
       BossResist: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     MinDuration: 10000
     Fail:
@@ -3005,13 +3005,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
@@ -3055,8 +3055,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Refresh: true
   - Status: Giantgrowth
     Icon: EFST_GIANTGROWTH
     DurationLookup: RK_GIANTGROWTH
@@ -3115,7 +3116,8 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
+    Fail:
+      Abundance: true
   - Status: Adoramus
     Icon: EFST_ADORAMUS
     DurationLookup: AB_ADORAMUS
@@ -3295,8 +3297,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoSave: true
-      OverlapFail: true
       NoClearance: true
+    Fail:
+      Electricshocker: true
   - Status: Wugdash
     Icon: EFST_WUGDASH
     DurationLookup: RA_WUGDASH
@@ -3561,8 +3564,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
+    Fail:
+      Toxin: true
   - Status: Paralyse
     Icon: EFST_PARALYSE
     CalcFlags:
@@ -3576,7 +3580,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3600,7 +3603,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3624,7 +3626,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3648,7 +3649,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3672,7 +3672,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3699,7 +3698,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3721,7 +3719,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3796,18 +3793,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
@@ -3859,11 +3858,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
@@ -4045,11 +4044,11 @@ Body:
       RemoveOnDamaged: true
       NoSave: true
       Debuff: true
-      OverlapFail: true
     MinDuration: 5000
     Fail:
       Refresh: true
       Inspiration: true
+      Deepsleep: true
     End:
       Dancing: true
       Voiceofsiren: true
@@ -4262,8 +4261,9 @@ Body:
       DisplayPc: true
       BossResist: true
       StopWalking: true
-      OverlapFail: true
       Debuff: true
+    Fail:
+      Netherworld: true
   - Status: Crescentelbow
     Icon: EFST_CRESCENTELBOW
     DurationLookup: SR_CRESCENTELBOW
@@ -4306,7 +4306,8 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
+    Fail:
+      Cursedcircle_Target: true
   - Status: Lightningwalk
     Icon: EFST_LIGHTNINGWALK
     DurationLookup: SR_LIGHTNINGWALK
@@ -4423,10 +4424,10 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
+      Mandragora: true
   - Status: Stomachache
     Icon: EFST_STOMACHACHE
     CalcFlags:
@@ -4678,13 +4679,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
@@ -4692,25 +4693,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
@@ -4718,13 +4719,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
@@ -4732,26 +4733,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
@@ -5466,7 +5467,8 @@ Body:
     Flags:
       NoSave: true
       RemoveOnMapWarp: true
-      OverlapFail: true
+    Fail:
+      Tinder_Breaker2: true
   - Status: Cbc
     Icon: EFST_CBC
     DurationLookup: MH_CBC
@@ -5591,14 +5593,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
@@ -6162,8 +6164,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:
@@ -6172,8 +6175,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:
@@ -6182,8 +6186,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:
@@ -6192,8 +6197,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:
@@ -6202,8 +6208,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:
@@ -6212,8 +6219,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:
@@ -6222,8 +6230,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:
@@ -6232,8 +6241,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:
@@ -6242,8 +6252,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:
@@ -6252,8 +6263,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:
@@ -6262,8 +6274,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Millenniumshield: true
   - Status: Reuse_Crushstrike
     Icon: EFST_REUSE_CRUSHSTRIKE
     Flags:
@@ -6272,8 +6285,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Crushstrike: true
   - Status: Reuse_Stormblast
     Icon: EFST_REUSE_STORMBLAST
     Flags:
@@ -6282,8 +6296,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:
@@ -6292,8 +6307,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:
@@ -6302,8 +6318,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:
@@ -6312,8 +6329,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:
@@ -6324,8 +6342,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
@@ -6694,9 +6712,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:
@@ -6705,9 +6724,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
@@ -7222,9 +7242,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:

doc/status.txt

@@ -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.

sql-files/item_db_equip.sql

@@ -1333,7 +1333,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`armor_level`,`refineable`,`view`) VALUES (5209,'Yellow_Baseball_Cap','Love Dad Cap','Armor',20,300,2,true,1,true,263);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5210,'Flying_Angel','Flapping Angel Wing','Armor',20,300,1,true,1,10,true,264,100,true,true,true,'bonus bCastrate,-3;\nbonus bAspdRate,3;\nbonus bInt,1;\nbonus bAgi,1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5211,'Dress_Hat','Dress Hat','Armor',200,2,1,true,1,20,true,265,'bonus bMdef,7;\nbonus bStr,1;\nbonus bInt,1;\nbonus2 bAddClass,Class_All,2;\nbonus bMAtkRate,2;\nbonus bHealPower,5;\nif (getrefine()>=7) {\n   bonus2 bAddClass,Class_All,1;\n   bonus bMAtkRate,1;\n   bonus bHealPower,1;\n}');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`,`unequip_script`) VALUES (5212,'Satellite_Hairband','Satellite Hairband','Armor',1000,3,1,true,1,30,true,266,'bonus bMaxHP,50;\nbonus bMaxSP,10;\nskill "AL_RUWACH",1;','sc_end SC_RUWACH;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5212,'Satellite_Hairband','Satellite Hairband','Armor',1000,3,1,true,1,30,true,266,'bonus bMaxHP,50;\nbonus bMaxSP,10;\nskill "AL_RUWACH",1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5213,'Black_Bunny_Band','Sheila Hairnet','Armor',200,2,true,1,1,true,267,'bonus bAgi,2;\nbonus bMdef,3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`location_head_top`,`location_head_mid`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5214,'Moonlight_Flower_Hat','Moonlight Flower Hat','Armor',200,3,true,true,1,1,true,268,'bonus bDex,2;\nbonus3 bAutoSpell,"AL_INCAGI",1,50;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`armor_level`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5215,'Angelic_Chain_','Evolved Angel Wing','Armor',20,100,2,true,false,false,true,1,true,38,100,true,true,true,'bonus bMdef,3;\nbonus bDex,1;\nbonus bInt,1;\nbonus2 bSubRace,RC_Demon,3;');
@@ -1503,7 +1503,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5379,'Balloon_Hat','Tam','Armor',800,3,1,true,1,50,true,385,'bonus bMdef,2;\nbonus bMatkRate,2+(getrefine()/2);');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`armor_level`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5380,'Fish_Head_Hat','Fish Head Hat','Armor',20,400,1,true,1,true,386,100,true,true,true,'bonus3 bAutoSpell,"SA_FROSTWEAPON",1,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5381,'Santa_Poring_Hat','Santa Poring Hat','Armor',20,100,2,1,true,1,387,100,true,true,true,'bonus bMdef,2;\nbonus2 bAddEle,Ele_Dark,3;\nbonus2 bSubEle,Ele_Dark,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`,`unequip_script`) VALUES (5382,'Bell_Ribbon','Bell Ribbon','Armor',20,200,3,1,true,1,true,388,100,true,true,true,'bonus bVit,1;\nskill "AL_ANGELUS",1;','sc_end SC_ANGELUS;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5382,'Bell_Ribbon','Bell Ribbon','Armor',20,200,3,1,true,1,true,388,100,true,true,true,'bonus bVit,1;\nskill "AL_ANGELUS",1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5383,'Hunting_Cap','Hunter\'s Cap','Armor',20,250,3,1,true,false,false,true,1,50,true,389,100,true,true,true,'bonus bLuk,1;\nbonus2 bAddRace,RC_Brute,10;\nbonus2 bAddRace,RC_Player_Doram,10;\nbonus2 bAddRace,RC_DemiHuman,5;\nbonus2 bAddRace,RC_Player_Human,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5384,'Santa_Hat_1','Twin Pompom By JB','Armor',20,200,1,1,true,1,20,true,390,'bonus bLuk,3;\nskill "WZ_ESTIMATION",1;\nbonus3 bAutoSpell,"AL_INCAGI",1,500;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`,`unequip_script`) VALUES (5385,'Yoyo_Hat','Yoyo Hat','Armor',20,300,1,true,1,20,true,391,100,true,true,true,true,true,'skill "TF_HIDING", 1;','sc_end SC_HIDING;');

sql-files/item_db_etc.sql

@@ -583,7 +583,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`location_head_mid`,`location_head_low`,`flag_buyingstore`,`script`) VALUES (4296,'Cramp_Card','Cramp Card','Card',20,10,true,true,true,true,'bonus2 bGetZenyNum,500,1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_right_hand`,`flag_buyingstore`,`script`) VALUES (4297,'Cruiser_Card','Cruiser Card','Card',20,10,true,true,'bonus bCritAtkRate,10;\nbonus2 bCriticalAddRace,RC_Brute,7;\nbonus2 bCriticalAddRace,RC_Player_Doram,7;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`script`) VALUES (4298,'Cremy_Fear_Card','Creamy Fear Card','Card',20,10,true,true,'bonus2 bAddEffWhenHit,Eff_Confusion,600;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`script`,`unequip_script`) VALUES (4299,'Clock_Card','Clock Card','Card',20,10,true,true,'bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD") == 10),30;','sc_end SC_AUTOGUARD;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`script`) VALUES (4299,'Clock_Card','Clock Card','Card',20,10,true,true,'bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD") == 10),30;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`script`) VALUES (4300,'Chimera_Card','Chimera Card','Card',20,10,true,true,'bonus2 bAddEffWhenHit,Eff_Poison,300+600*(BaseJob == Job_Assassin);');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`script`) VALUES (4301,'Killer_Mantis_Card','Killer Mantis Card','Card',20,10,true,true,'bonus2 bAddEffWhenHit,Eff_Bleeding,600;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`script`) VALUES (4302,'Tao_Gunka_Card','Tao Gunka Card','Card',20,10,true,true,'bonus bMaxHPrate,100;\nbonus bDef,-50;\nbonus bMdef,-50;');

sql-files/item_db_re_equip.sql

@@ -1900,7 +1900,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`armor_level`,`refineable`,`view`) VALUES (5209,'Yellow_Baseball_Cap','Love Dad Cap','Armor',20,300,true,false,false,true,1,true,263);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5210,'Flying_Angel','Flapping Angel Wing','Armor',20,300,3,true,1,10,true,264,100,true,'bonus bVariableCastrate,-3;\nbonus bAspdRate,3;\nbonus bInt,1;\nbonus bAgi,1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5211,'Dress_Hat','Dress Hat','Armor',200,3,1,true,1,20,true,265,'bonus bMdef,7;\nbonus bStr,1;\nbonus bInt,1;\nbonus2 bAddClass,Class_All,2;\nbonus bMatkRate,2;\nbonus bHealPower,5;\nif (getrefine()>=7) {\n   bonus2 bAddClass,Class_All,1;\n   bonus bMatkRate,1;\n   bonus bHealPower,1;\n}');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`,`unequip_script`) VALUES (5212,'Satellite_Hairband','Satellite Hairband','Armor',1000,6,1,true,1,30,true,266,'bonus bMaxHP,50;\nbonus bMaxSP,10;\nskill "AL_RUWACH",1;','sc_end SC_RUWACH;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5212,'Satellite_Hairband','Satellite Hairband','Armor',1000,6,1,true,1,30,true,266,'bonus bMaxHP,50;\nbonus bMaxSP,10;\nskill "AL_RUWACH",1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5213,'Black_Bunny_Band','Sheila Hairnet','Armor',200,4,true,1,1,true,267,'bonus bAgi,2;\nbonus bMdef,3;\nbonus2 bAddMonsterDropItem,558,500;\nbonus2 bAddItemHealRate,558,2000;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`location_head_top`,`location_head_mid`,`armor_level`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5214,'Moonlight_Flower_Hat','Moonlight Flower Hat','Armor',200,3,true,true,1,1,true,268,100,true,'bonus bDex,2;\nbonus3 bAutoSpell,"AL_INCAGI",1,50;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`armor_level`,`refineable`,`view`,`script`) VALUES (5215,'Angelic_Chain_','Evolved Angel Wing','Armor',20,100,4,true,false,false,true,1,true,38,'bonus bMdef,3;\nbonus bDex,1;\nbonus bInt,1;\nbonus2 bSubRace,RC_Demon,3;');
@@ -2070,7 +2070,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5379,'Balloon_Hat','Tam','Armor',800,5,1,true,1,50,true,385,'bonus bMdef,2;\nbonus bMatkRate,2+(getrefine()/2);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`armor_level`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5380,'Fish_Head_Hat','Fish Head Hat','Armor',20,400,2,true,1,true,386,100,true,'bonus3 bAutoSpell,"SA_FROSTWEAPON",1,50;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5381,'Santa_Poring_Hat','Santa Poring Hat','Armor',20,100,4,1,true,1,387,100,true,'bonus bMdef,2;\nbonus2 bAddEle,Ele_Dark,3;\nbonus2 bSubEle,Ele_Dark,3;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`,`unequip_script`) VALUES (5382,'Bell_Ribbon','Bell Ribbon','Armor',20,200,5,1,true,1,true,388,100,true,'bonus bVit,1;\nskill "AL_ANGELUS",1;','sc_end SC_ANGELUS;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5382,'Bell_Ribbon','Bell Ribbon','Armor',20,200,5,1,true,1,true,388,100,true,'bonus bVit,1;\nskill "AL_ANGELUS",1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5383,'Hunting_Cap','Hunter\'s Cap','Armor',20,250,6,1,true,false,false,true,1,50,true,389,'bonus bLuk,1;\nbonus2 bAddRace,RC_Brute,10;\nbonus2 bAddRace,RC_Player_Doram,10;\nbonus2 bMagicAddRace,RC_Brute,5;\nbonus2 bMagicAddRace,RC_Player_Doram,5;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5384,'Santa_Hat_1','Twin Pompom By JB','Armor',20,200,2,1,true,1,20,true,390,100,true,'bonus bLuk,3;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`armor_level`,`equip_level_min`,`refineable`,`view`,`script`,`unequip_script`) VALUES (5385,'Yoyo_Hat','Yoyo Hat','Armor',20,300,2,true,1,20,true,391,'skill "TF_HIDING",1;','sc_end SC_HIDING;');

sql-files/item_db_re_etc.sql

@@ -585,7 +585,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`location_head_mid`,`location_head_low`,`flag_buyingstore`,`flag_dropeffect`,`script`) VALUES (4296,'Cramp_Card','Cramp Card','Card',20,10,true,true,true,true,'CLIENT','bonus2 bGetZenyNum,500,3;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_right_hand`,`flag_buyingstore`,`flag_dropeffect`,`script`) VALUES (4297,'Cruiser_Card','Cruiser Card','Card',20,10,true,true,'CLIENT','bonus bCritAtkRate,10;\nbonus2 bCriticalAddRace,RC_Brute,7;\nbonus2 bCriticalAddRace,RC_Player_Doram,7;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`flag_dropeffect`,`script`) VALUES (4298,'Cremy_Fear_Card','Creamy Fear Card','Card',20,10,true,true,'CLIENT','bonus2 bAddEffWhenHit,Eff_Confusion,600;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`flag_dropeffect`,`script`,`unequip_script`) VALUES (4299,'Clock_Card','Clock Card','Card',20,10,true,true,'CLIENT','bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD") == 10),30;','sc_end SC_AUTOGUARD;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`flag_dropeffect`,`script`) VALUES (4299,'Clock_Card','Clock Card','Card',20,10,true,true,'CLIENT','bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD") == 10),30;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`flag_dropeffect`,`script`) VALUES (4300,'Chimera_Card','Chimera Card','Card',20,10,true,true,'CLIENT','bonus2 bAddEffWhenHit,Eff_Poison,300+600*(BaseJob == Job_Assassin);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`flag_dropeffect`,`script`) VALUES (4301,'Killer_Mantis_Card','Killer Mantis Card','Card',20,10,true,true,'CLIENT','bonus2 bAddEffWhenHit,Eff_Bleeding,600;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_armor`,`flag_buyingstore`,`flag_dropeffect`,`script`) VALUES (4302,'Tao_Gunka_Card','Tao Gunka Card','Card',20,10,true,true,'CLIENT','bonus bMaxHPrate,100;\nbonus bDefRate,-50;\nbonus bMdefRate,-50;');

src/map/path.cpp

@@ -504,7 +504,7 @@ int distance_client(int dx, int dy)
 
 	//Bonus factor used by client
 	//This affects even horizontal/vertical lines so they are one cell longer than expected
-	temp_dist -= 0.0625;
+	temp_dist -= 0.1;
 
 	if(temp_dist < 0) temp_dist = 0;
 

src/map/script_constants.hpp

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

src/map/status.cpp

@@ -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:

src/map/status.hpp

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