From 146d75b350ed4575942655ae50c5c010875a4034 Mon Sep 17 00:00:00 2001 From: Atemo Date: Wed, 14 Apr 2021 00:31:51 +0200 Subject: [PATCH] Fixed items using F_CashPartyCall (#5859) Fixed #5835 Thanks to @Melk3000 ! --- db/re/item_db_usable.yml | 6 +++--- npc/other/CashShop_Functions.txt | 1 + sql-files/item_db_re_usable.sql | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/db/re/item_db_usable.yml b/db/re/item_db_usable.yml index 04ff0e52d7..92798d1327 100644 --- a/db/re/item_db_usable.yml +++ b/db/re/item_db_usable.yml @@ -5988,7 +5988,7 @@ Body: - Id: 12212 AegisName: Giant_Fly_Wing Name: Giant Fly Wing - Type: Usable + Type: DelayConsume Buy: 2 Weight: 10 Trade: @@ -8904,7 +8904,7 @@ Body: - Id: 12438 AegisName: F_Giant_Fly_Wing Name: F Giant Fly Wing - Type: Usable + Type: DelayConsume Buy: 2 Weight: 10 Script: | @@ -9471,7 +9471,7 @@ Body: - Id: 12494 AegisName: E_Giant_Fly_Wing Name: E Giant Fly Wing - Type: Usable + Type: DelayConsume Buy: 2 Weight: 10 Script: | diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 8a35efa8d3..e05724088c 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -52,6 +52,7 @@ function script F_CashStore { // - No arguments. function script F_CashPartyCall { itemskill "AL_TELEPORT",1; + sleep2 1; // a slight delay seems necessary after itemskill if (is_party_leader() == true) warpparty "Leader", 0, 0, getcharid(1), strcharinfo(3), 3, 3; return; diff --git a/sql-files/item_db_re_usable.sql b/sql-files/item_db_re_usable.sql index d9e8e70452..5d02b0df1e 100644 --- a/sql-files/item_db_re_usable.sql +++ b/sql-files/item_db_re_usable.sql @@ -519,7 +519,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`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12209,'Insurance','Life Insurance','Usable',2,10,100,true,true,true,true,true,true,true,'sc_start SC_LIFEINSURANCE,1800000,0;'); 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 (12210,'Bubble_Gum','Bubble Gum','Usable',2,10,60000,'Reuse_Limit_D',100,true,true,true,true,true,true,true,'sc_start SC_ITEMBOOST,1800000,200;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12211,'Kafra_Card','Kafra Card','Usable',2,10,100,true,true,true,true,true,true,true,'callfunc "F_CashStore";'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12212,'Giant_Fly_Wing','Giant Fly Wing','Usable',2,10,100,true,true,true,true,true,true,true,'callfunc "F_CashPartyCall";'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12212,'Giant_Fly_Wing','Giant Fly Wing','DelayConsume',2,10,100,true,true,true,true,true,true,true,'callfunc "F_CashPartyCall";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12213,'Neuralizer','Neuralizer','Delayconsume',2,100,true,true,true,true,true,true,true,'callfunc "F_CashReset";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12214,'Convex_Mirror','Convex Mirror','Usable',2,10,100,true,true,true,true,true,true,true,'sc_start SC_BOSSMAPINFO,600000,0;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`nouse_override`,`nouse_sitting`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12215,'Blessing_10_Scroll','LV10 Blessing Scroll','Usable',2,10,100,true,100,true,true,true,true,true,true,true,'skilleffect "AL_BLESSING",0;\nsc_start SC_BLESSING,240000,10;'); @@ -742,7 +742,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`fla REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`script`) VALUES (12435,'Black_Thing','Black Mass','Usable',50,'sc_start SC_STOMACHACHE,60000,rand(5,10);'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`,`script`) VALUES (12436,'Vitata500','Vitata 500','Healing',10,50,true,'sc_start2 SC_VITATA_500,500000,20,5;\nitemheal 0,200;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`,`script`) VALUES (12437,'Enrich_Celermine_Juice','Concentrated Ceromain Soup','Usable',10,50,true,'sc_start SC_EXTRACT_SALAMINE_JUICE,500000,10;'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12438,'F_Giant_Fly_Wing','F Giant Fly Wing','Usable',2,10,'callfunc "F_CashPartyCall";'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12438,'F_Giant_Fly_Wing','F Giant Fly Wing','DelayConsume',2,10,'callfunc "F_CashPartyCall";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12439,'F_Battle_Manual','F Old Battle Manual','Usable',2,10,'sc_start SC_EXPBOOST,1800000,50;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12440,'F_Insurance','F Insurance','Usable',2,10,'sc_start SC_LIFEINSURANCE,1800000,0;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12441,'F_Bubble_Gum','F Old Bubble Gum','Usable',2,10,'sc_start SC_ITEMBOOST,1800000,100;'); @@ -796,7 +796,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`,`script`) VALUES (12491,'Curious_Snowball','Curious Snowball','Usable',20,'callfunc "F_Snowball";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_container`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12492,'Crumpled_Paper','Crumpled Paper','Usable',2,10,true,100,true,true,true,true,true,true,true,'getrandgroupitem(IG_Crumpled_Paper,1);'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`flag_container`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12493,'Lucky_Egg_C4','Lucky Egg C4','Usable',10,true,100,true,true,true,true,true,true,true,'getgroupitem(IG_Lucky_Egg_C4);'); -REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12494,'E_Giant_Fly_Wing','E Giant Fly Wing','Usable',2,10,'callfunc "F_CashPartyCall";'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12494,'E_Giant_Fly_Wing','E Giant Fly Wing','DelayConsume',2,10,'callfunc "F_CashPartyCall";'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12495,'E_Battle_Manual','E Battle Manual','Usable',2,10,'sc_start SC_EXPBOOST,1800000,50;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (12496,'E_Insurance','E Insurance','Usable',2,10,'sc_start SC_LIFEINSURANCE,1800000,0;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (12497,'E_Bubble_Gum','E Bubble Gum','Usable',2,10,100,true,true,true,true,true,true,true,'sc_start SC_ITEMBOOST,1800000,100;');