From b857e2749a2a32306419842c75dfe84743a5aa55 Mon Sep 17 00:00:00 2001 From: Aleos Date: Tue, 17 May 2022 12:41:25 -0400 Subject: [PATCH 1/3] Resolves some statuses ending early from items (#5817) * Partial fix for #5766. * Items that Auto Guard, Ruwach, or Angelus skills should stay active when the item is removed. Thanks to @mrjnumber1! --- db/pre-re/item_db_equip.yml | 4 ---- db/pre-re/item_db_etc.yml | 2 -- db/re/item_db_equip.yml | 4 ---- db/re/item_db_etc.yml | 2 -- sql-files/item_db_equip.sql | 4 ++-- sql-files/item_db_etc.sql | 2 +- sql-files/item_db_re_equip.sql | 4 ++-- sql-files/item_db_re_etc.sql | 2 +- 8 files changed, 6 insertions(+), 18 deletions(-) diff --git a/db/pre-re/item_db_equip.yml b/db/pre-re/item_db_equip.yml index 34e121ca80..b2f35b2953 100644 --- a/db/pre-re/item_db_equip.yml +++ b/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 diff --git a/db/pre-re/item_db_etc.yml b/db/pre-re/item_db_etc.yml index 4e86587d74..be4fba4cca 100644 --- a/db/pre-re/item_db_etc.yml +++ b/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 diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 2726a68f5f..d9a7ee8b37 100644 --- a/db/re/item_db_equip.yml +++ b/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 diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml index 844eb0b0fa..6ca14104a5 100644 --- a/db/re/item_db_etc.yml +++ b/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 diff --git a/sql-files/item_db_equip.sql b/sql-files/item_db_equip.sql index 5bd06569f5..932d9fc55c 100644 --- a/sql-files/item_db_equip.sql +++ b/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;'); diff --git a/sql-files/item_db_etc.sql b/sql-files/item_db_etc.sql index cafc5acd04..134f3355c4 100644 --- a/sql-files/item_db_etc.sql +++ b/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;'); diff --git a/sql-files/item_db_re_equip.sql b/sql-files/item_db_re_equip.sql index 66c772564a..02d321d83f 100644 --- a/sql-files/item_db_re_equip.sql +++ b/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;'); diff --git a/sql-files/item_db_re_etc.sql b/sql-files/item_db_re_etc.sql index a564d4555b..b267052373 100644 --- a/sql-files/item_db_re_etc.sql +++ b/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;'); From d9ae335edf1cbd8812fad10c9bbdd5dede2d330d Mon Sep 17 00:00:00 2001 From: Playtester Date: Tue, 17 May 2022 18:47:31 +0200 Subject: [PATCH 2/3] Official client range distance offset (#6950) - Fixed the client range distance offset which is really 1.1 and not 1.0625 - This fixes the issue that when you sometimes tried to use a skill, nothing happened -> the client didn't make you move closer but the server said you are not in range yet - I originally got an incorrect value through testing, because I didn't know that the client calculates range in a 3D room rather than in a 2D room, now I retested on a completely flat map; fully confirmed and official now - See also #6949 --- src/map/path.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/path.cpp b/src/map/path.cpp index 09fd5e6f69..4b2596ebd5 100644 --- a/src/map/path.cpp +++ b/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; From f1b181ec9cce264e2ecf7afc627934462fc775d9 Mon Sep 17 00:00:00 2001 From: Aleos Date: Tue, 17 May 2022 16:45:07 -0400 Subject: [PATCH 3/3] Removes SCF_OVERLAPFAIL in favor of Fail list (#6865) * Removes the SCF_OVERLAPFAIL status flag in favor of adding the status to the Fail list. * Confirmed that Burning does renew itself. --- db/pre-re/status.yml | 79 ++++-------------- db/re/status.yml | 151 ++++++++++++++++++++--------------- doc/status.txt | 3 +- src/map/script_constants.hpp | 1 - src/map/status.cpp | 2 - src/map/status.hpp | 1 - 6 files changed, 101 insertions(+), 136 deletions(-) diff --git a/db/pre-re/status.yml b/db/pre-re/status.yml index a56e6ac703..cbed9d210a 100644 --- a/db/pre-re/status.yml +++ b/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 @@ -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 diff --git a/db/re/status.yml b/db/re/status.yml index 4cc7adc4fd..1cf02de73c 100644 --- a/db/re/status.yml +++ b/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 @@ -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: diff --git a/doc/status.txt b/doc/status.txt index d27addbb55..791a4aed52 100644 --- a/doc/status.txt +++ b/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. diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index 8d0ce8f5b8..776215cef8 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -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); diff --git a/src/map/status.cpp b/src/map/status.cpp index 9f4151199c..73aa606158 100644 --- a/src/map/status.cpp +++ b/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: diff --git a/src/map/status.hpp b/src/map/status.hpp index 6f7840bf9d..f28f111a1e 100644 --- a/src/map/status.hpp +++ b/src/map/status.hpp @@ -2827,7 +2827,6 @@ enum e_status_change_flag : uint16 { SCF_REMOVEONCHANGEMAP, SCF_REMOVEONMAPWARP, SCF_REMOVECHEMICALPROTECT, - SCF_OVERLAPFAIL, SCF_OVERLAPIGNORELEVEL, SCF_SENDOPTION, SCF_ONTOUCH,