From df31f87d5553ead1929668526d7d95a787aea594 Mon Sep 17 00:00:00 2001 From: Atemo Date: Tue, 1 Jun 2021 22:55:33 +0200 Subject: [PATCH] Added missing item script for Holy_Egg_Hat (ID: 5551) (#5986) Fixed #5963 Thanks to @Everade ! --- db/re/item_db_equip.yml | 2 ++ sql-files/item_db_re_equip.sql | 2 +- sql-files/item_db_re_usable.sql | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 6c9e89d099..3fa025d221 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -46265,6 +46265,8 @@ Body: NoGuildStorage: true NoMail: true NoAuction: true + Script: | + bonus3 bAutoSpellWhenHit,"AL_HEAL",1,20; - Id: 5552 AegisName: Fest_Lord_Circlet Name: Festival Grand Circlet diff --git a/sql-files/item_db_re_equip.sql b/sql-files/item_db_re_equip.sql index b26fcb48ba..9ef1d700b1 100644 --- a/sql-files/item_db_re_equip.sql +++ b/sql-files/item_db_re_equip.sql @@ -2223,7 +2223,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_low`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5548,'Scarlet_Rose','Scarlet Rose','Armor',20,100,true,1,534,100,true,'bonus2 bAddClass,Class_All,1;\nbonus bMatkRate,1;\nbonus bMaxSP,30;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5549,'Taurus_Diadem','Taurus Diadem','Armor',20,300,6,true,70,true,535,100,true,'bonus bDex,2;\nbonus bMatkRate,2;\nbonus bDelayrate,-2;\nif (getrefine()>6) {\n bonus bMatkRate,1;\n bonus bDex,1;\n}'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5550,'Taurus_Crown','Taurus Crown','Armor',20,300,6,true,70,true,536,100,true,'bonus bAgi,2;\nbonus2 bSubClass,Class_All,2;\nbonus bDelayrate,-2;\nbonus2 bAddEff,Eff_Stun,2000;\nif (getrefine()>6) {\n bonus2 bSubClass,Class_All,1;\n bonus bStr,1;\n}'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`defense`,`location_head_top`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (5551,'Holy_Egg_Hat','Holy Egg Hat','Armor',20,4,true,true,537,100,true,true,true,true,true,true,true); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`defense`,`location_head_top`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5551,'Holy_Egg_Hat','Holy Egg Hat','Armor',20,4,true,true,537,100,true,true,true,true,true,true,true,'bonus3 bAutoSpellWhenHit,"AL_HEAL",1,20;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`defense`,`location_head_top`,`view`,`script`) VALUES (5552,'Fest_Lord_Circlet','Festival Grand Circlet','Armor',10,true,93,'bonus bStr,3;\nbonus bInt,3;\nbonus bMdef,3;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`defense`,`location_head_top`,`view`,`script`) VALUES (5553,'Fest_Bunny_Band','Festival Bunny Band','Armor',14,true,15,'bonus bMdef,4;\nbonus2 bSubRace,RC_DemiHuman,9;\nbonus2 bSubRace,RC_Player_Human,9;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5554,'Octopus_Hat','Octopus Hat','Armor',20,200,3,true,true,538,100,true,'bonus bMdef,3;\nbonus3 bAutoSpell,"SM_PROVOKE",5,10;\nbonus bUnbreakableHelm;'); diff --git a/sql-files/item_db_re_usable.sql b/sql-files/item_db_re_usable.sql index 07e9dbd94c..1d5200e1b7 100644 --- a/sql-files/item_db_re_usable.sql +++ b/sql-files/item_db_re_usable.sql @@ -283,9 +283,9 @@ 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`,`script`) VALUES (11588,'Fresh_Strawberries','Fresh Strawberries','Healing',10,10,'itemheal rand(32,56),rand(16,28);'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`,`script`) VALUES (11589,'Iceflake','Cold Snow Cone','Healing',20,50,true,'percentheal 5,5;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`,`script`) VALUES (11590,'Meat_Skewer5','Skewer No.5','Healing',5000,300,true,'itemheal rand(760,810),10;'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (11592,'Trance_Candy_R','Trans Candy Red','Healing',20,30,'itemheal 45,0;\ntransform 1507,600000,SC_MTF_MHP,1000;\nspecialeffect2 EF_CLOAKING;\nshowscript "Trans-Form-!! Bloody Murderer Fo-rm!!";'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (11593,'Trance_Candy_B','Trans Candy Blue','Healing',20,30,'itemheal 45,0;\ntransform 1102,600000,SC_MTF_MSP,100;\nspecialeffect2 EF_CLOAKING;\nshowscript "Trans-Form-!!! Bathory Fo-rm!!";'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (11594,'Trance_Candy_Y','Trans Candy Yellow','Healing',20,30,'itemheal 45,0;\ntransform 1130,600000,SC_MTF_PUMPKIN,2000;\nspecialeffect2 EF_CLOAKING;\nshowscript "Trans-Form-!! Jack Fo-rm!!";'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (11592,'Trance_Candy_R','Trans Candy Red','Healing',20,30,'itemheal 45,0;\ntransform 1507,600000,SC_MTF_MHP,20;\nspecialeffect2 EF_CLOAKING;\nshowscript "Trans-Form-!! Bloody Murderer Fo-rm!!";'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (11593,'Trance_Candy_B','Trans Candy Blue','Healing',20,30,'itemheal 45,0;\ntransform 1102,600000,SC_MTF_MSP,20;\nspecialeffect2 EF_CLOAKING;\nshowscript "Trans-Form-!!! Bathory Fo-rm!!";'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (11594,'Trance_Candy_Y','Trans Candy Yellow','Healing',20,30,'itemheal 45,0;\ntransform 1130,600000,SC_MTF_PUMPKIN,2000,100;\nspecialeffect2 EF_CLOAKING;\nshowscript "Trans-Form-!! Jack Fo-rm!!";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (11595,'Trance_Candy_G','Trans Candy Green','Healing',20,30,'itemheal 45,0;\ntransform 1508,600000,SC_MTF_HITFLEE,10,20;\nspecialeffect2 EF_CLOAKING;\nshowscript "Trans-Form-!! Cube Fo-rm!!";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (11596,'Blood_In_Skull','Blood In Skull','Healing',20,50,'itemheal rand(600,800),0;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (11597,'Iron_Bug','Iron Worm','Healing',10,10,true); @@ -969,7 +969,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`,`delay_duration`,`delay_status`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12660,'Trans_Scroll_Mavka','Transformation Scroll(Mavka)','Usable',20,10,10000,'Reuse_Limit_Mtf',100,true,true,true,true,true,true,true,'transform 1884,1200000,SC_MTF_RANGEATK,25;\nshowscript "Traaaansformation-!! Mavka form!!";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`delay_duration`,`delay_status`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12661,'Trans_Scroll_Marduk','Transformation Scroll(Marduk)','Usable',20,10,10000,'Reuse_Limit_Mtf',100,true,true,true,true,true,true,true,'transform 1140,1200000,SC_MTF_MATK,25;\nshowscript "Traaaansformation-!! Marduk form!!";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`delay_duration`,`delay_status`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12662,'Trans_Scroll_Banshee','Transformation Scroll(Banshee)','Usable',20,10,10000,'Reuse_Limit_Mtf',100,true,true,true,true,true,true,true,'transform 1867,1200000,SC_MTF_MATK,25;\nshowscript "Traaaansformation-!! Banshee form!!";'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`delay_duration`,`delay_status`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12663,'Trans_Scroll_Poring','Transformation Scroll(Poring)','Usable',20,10,10000,'Reuse_Limit_Mtf',100,true,true,true,true,true,true,true,'transform 1002,1200000,SC_MTF_CRIDAMAGE,25;\nshowscript "Traaaansformation-!! Poring form!!";'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`delay_duration`,`delay_status`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12663,'Trans_Scroll_Poring','Transformation Scroll(Poring)','Usable',20,10,10000,'Reuse_Limit_Mtf',100,true,true,true,true,true,true,true,'transform 1002,1200000,SC_MTF_CRIDAMAGE,5;\nshowscript "Traaaansformation-!! Poring form!!";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`delay_duration`,`delay_status`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12664,'Trans_Scroll_Golem','Transformation Scroll(Golem)','Usable',20,10,10000,'Reuse_Limit_Mtf',100,true,true,true,true,true,true,true,'transform 1040,1200000,SC_MTF_MLEATKED,5,20,2;\nshowscript "Traaaansformation-!! Golem form!!";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`) VALUES (12665,'Grovel_Buff','Grovel Buff','Usable'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12666,'Thai_Perfume_MATK','Thai Perfume MATK','Usable',20,10,'specialeffect2 EF_MAGICALATTHIT;\nbonus_script "{ bonus bMatk,24; }",600,0,0,EFST_SKF_MATK;'); @@ -3064,7 +3064,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`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22592,'Happy_Call_Box','Happy Call Box','Cash',10,100,true,true,true,true,true,true,true,true); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`) VALUES (22605,'Gingerbread2','Ginger Bread','Usable',10,10); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22610,'New_Beginnings_Box','New Beginnings Box','Usable',10,10,100,true,true,true,true,true,true,true,'getitem 12803,1;\ngetitem 12802,1;\ngetitem 12809,1;'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (22611,'Packing_Envelope','Packed Envelope','Delayconsume',10,10,'/* TODO */'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (22611,'Packing_Envelope','Packed Envelope','Usable',10,10,'.@r = rand(1,10);\nif (.@r == 1)\n sc_start SC_PACKING_ENVELOPE1,30000,33; // +atk\nelse if (.@r == 2)\n sc_start SC_PACKING_ENVELOPE2,30000,33; // +matk\nelse if (.@r == 3)\n sc_start SC_PACKING_ENVELOPE3,30000,3; // +hp%\nelse if (.@r == 4)\n sc_start SC_PACKING_ENVELOPE4,30000,3; // +sp%\nelse if (.@r == 5)\n sc_start SC_PACKING_ENVELOPE5,30000,33; // +flee\nelse if (.@r == 6)\n sc_start SC_PACKING_ENVELOPE6,30000,3; // +aspd\nelse if (.@r == 7)\n sc_start SC_PACKING_ENVELOPE7,30000,33; // +def\nelse if (.@r == 8)\n sc_start SC_PACKING_ENVELOPE8,30000,33; // +mdef\nelse if (.@r == 9)\n sc_start SC_PACKING_ENVELOPE9,30000,33; // +crit\nelse\n sc_start SC_PACKING_ENVELOPE10,30000,33; // +hit'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (22612,'Decomposition_Potion','Corrupt Reagents','Delayconsume',10,50,'specialeffect2 EF_VENOMDUST;\nshowscript "Yeah! Zombie night! Yeah!!";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (22613,'Contaminated_Reagents','Contaminated Reagents','Delayconsume',10,50,'/* TODO */'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22614,'Premium_Manual','Premium Manual','Usable',2,100,true,true,true,true,true,true,true,true,'sc_start SC_EXPBOOST,8640000,50;\nsc_start SC_ITEMBOOST,8640000,200;');