From 33cde8cd1511f7ad2677b003e5abb535eb7822cc Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 24 May 2006 17:29:58 +0000 Subject: - Corrected item script for dead branch and poring box - Removed that npc-warp warning as requested by Playtester. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6732 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/item_db.txt | 4 ++-- src/map/npc.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/db/item_db.txt b/db/item_db.txt index 601092bb1..c199be3dc 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -2354,13 +2354,13 @@ 12101,Citron,Citron,0,,10,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12102,Grilled_Skewer,Grilled Skewer,0,,10,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} // New Monster Summoners & Item Givers -12103,Bloody_Branch,Bloody Branch,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-3,1,""; },{},{} +12103,Bloody_Branch,Bloody Branch,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",-1,-1,"--ja--",-3,1,""; },{},{} 12104,Random_Quiver,Random Quiver,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Quiver),1; },{},{} 12105,Taming_Item_Giftset,Taming Item Giftset,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Taming),3; },{},{} 12106,Jewel_Box,Jewel Case,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Jewel),1; },{},{} 12107,Wrapped_Mask,Wrapped Mask,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Mask),1; },{},{} 12108,Bundle_of_Spells,Bundle of Spells,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Scroll),5; },{},{} -12109,Poring_Box,Poring Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-2,1,""; },{},{} +12109,Poring_Box,Poring Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",-1,-1,"--ja--",-2,1,""; },{},{} 12110,First_Aid_Box,First Aid Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Potion),5; },{},{} 12111,Wrapped_Food,Wrapped Food,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Fruit),1; getitem groupranditem(IG_Meat),1; getitem groupranditem(IG_Fish),1; },{},{} 12112,Tropical_Sograt,Tropical Sograt,0,,500,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Curse,10000,1; },{},{} diff --git a/src/map/npc.c b/src/map/npc.c index 5bded2f3c..0d28b9699 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2930,7 +2930,8 @@ int do_init_npc(void) memset(script_event, 0, sizeof(script_event)); npc_read_event_script(); //Debug function to locate all endless loop warps. - npc_debug_warps(); +// Warps debugging removed by request of Playtester. [Skotlex] +// npc_debug_warps(); add_timer_func_list(npc_event_timer,"npc_event_timer"); add_timer_func_list(npc_event_do_clock,"npc_event_do_clock"); -- cgit v1.2.3-70-g09d2