From f943c061b5c29bf906830c8ff9e9114f00a88951 Mon Sep 17 00:00:00 2001 From: malufett Date: Wed, 16 Oct 2013 21:01:07 +0800 Subject: Fixed Bug#7770 -split 'item_delay.txt'. Follow up @ 9692bc034537693d331148ae8bd15153265c6cf0 -implement PACKET_ZC_SHOWSCRIPT. Special thanks to Kyeme and super awesome Yommy. Signed-off-by: malufett --- db/item_delay.txt | 44 -------------------------------------------- db/pre-re/item_db.txt | 1 - db/pre-re/item_delay.txt | 34 ++++++++++++++++++++++++++++++++++ db/re/item_delay.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 45 deletions(-) delete mode 100644 db/item_delay.txt create mode 100644 db/pre-re/item_delay.txt create mode 100644 db/re/item_delay.txt (limited to 'db') diff --git a/db/item_delay.txt b/db/item_delay.txt deleted file mode 100644 index 8905edb11..000000000 --- a/db/item_delay.txt +++ /dev/null @@ -1,44 +0,0 @@ -// Item Delay Database -// There is a max concurrent number of entries modifiable in src/map/itemdb.h as MAX_ITEMDELAYS -// -// Structure: -// Item ID,Delay in Milliseconds - -//12202,60000 //Str_Dish10_ -//12203,60000 //Agi_Dish10_ -//12204,60000 //Int_Dish10_ -//12205,60000 //Dex_Dish10_ -//12206,60000 //Luk_Dish10_ -//12207,60000 //Vit_Dish10_ -12208,60000 //Battle_Manual -12210,60000 //Bubble_Gum -14538,300000 //Glass_Of_Illusion -14586,180000 //Spark_Candy -607,5000 // Yggdrasil_Berry -608,3000 // Yggdrasil_Seed - -// Bifrost Items -11522,1000 // Red_Raffle_Sap -11523,2000 // Yellow_Raffle_Sap -11524,3000 // White_Raffle_Sap -11525,5000 // Mora_Hip_Tea - -12622,3000 // Reins_Of_Mount - -//12580,0 // Vending_Search_Scroll -//12581,0 // Vending_Search_Scroll2 -//12591,0 // Vending_Search_Scroll3 - -12725,120000 // Runstone_Nosiege,Nauthiz Rune -12726,30000 // Runstone_Rhydo,Raido Rune -12727,60000 // Runstone_Verkana,Berkana Rune -12732,1000 // Runstone_Pertz,Wyrd Rune -22540,60000 // Runstone_Luxanima,Lux Anima Rune - -12658, 10000 // Transformation Scroll(Deviruchi) -12659, 10000 // Transformation Scroll(Raydric) -12660, 10000 // Transformation Scroll(Mavka) -12661, 10000 // Transformation Scroll(Marduk) -12662, 10000 // Transformation Scroll(Banshee) -12663, 10000 // Transformation Scroll(Poring) -12664, 10000 // Transformation Scroll(Golem) \ No newline at end of file diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index a293a951c..09e70de5d 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -5128,7 +5128,6 @@ 12580,Vending_Search_Scroll,Universal Catalog Silver,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,0; },{},{} 12581,Vending_Search_Scroll2,Universal Catalog Gold,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{} 12591,Uni_Catalog_Bz,Universal Catalog Bronze,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ searchstores 10,1; },{},{} -12622,Boarding_Halter,Halter Lead,11,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ setmounting(); },{},{} 12701,Old_Blue_Box_F,Old Blue Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12702,Old_Bleu_Box,Old Navy Box,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem 12702,1; getrandgroupitem 12702,1; },{},{} 12703,Holy_Egg_2,Holy Egg,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} diff --git a/db/pre-re/item_delay.txt b/db/pre-re/item_delay.txt new file mode 100644 index 000000000..3e24f9d31 --- /dev/null +++ b/db/pre-re/item_delay.txt @@ -0,0 +1,34 @@ +// Item Delay Database +// There is a max concurrent number of entries modifiable in src/map/itemdb.h as MAX_ITEMDELAYS +// +// Structure: +// Item ID,Delay in Milliseconds + +//12202,60000 //Str_Dish10_ +//12203,60000 //Agi_Dish10_ +//12204,60000 //Int_Dish10_ +//12205,60000 //Dex_Dish10_ +//12206,60000 //Luk_Dish10_ +//12207,60000 //Vit_Dish10_ +12208,60000 //Battle_Manual +12210,60000 //Bubble_Gum +14538,300000 //Glass_Of_Illusion +14586,180000 //Spark_Candy +607,5000 // Yggdrasil_Berry +608,3000 // Yggdrasil_Seed + +// Bifrost Items +11522,1000 // Red_Raffle_Sap +11523,2000 // Yellow_Raffle_Sap +11524,3000 // White_Raffle_Sap +11525,5000 // Mora_Hip_Tea + +//12580,0 // Vending_Search_Scroll +//12581,0 // Vending_Search_Scroll2 +//12591,0 // Vending_Search_Scroll3 + +12725,120000 // Runstone_Nosiege,Nauthiz Rune +12726,30000 // Runstone_Rhydo,Raido Rune +12727,60000 // Runstone_Verkana,Berkana Rune +12732,1000 // Runstone_Pertz,Wyrd Rune +22540,60000 // Runstone_Luxanima,Lux Anima Rune diff --git a/db/re/item_delay.txt b/db/re/item_delay.txt new file mode 100644 index 000000000..8905edb11 --- /dev/null +++ b/db/re/item_delay.txt @@ -0,0 +1,44 @@ +// Item Delay Database +// There is a max concurrent number of entries modifiable in src/map/itemdb.h as MAX_ITEMDELAYS +// +// Structure: +// Item ID,Delay in Milliseconds + +//12202,60000 //Str_Dish10_ +//12203,60000 //Agi_Dish10_ +//12204,60000 //Int_Dish10_ +//12205,60000 //Dex_Dish10_ +//12206,60000 //Luk_Dish10_ +//12207,60000 //Vit_Dish10_ +12208,60000 //Battle_Manual +12210,60000 //Bubble_Gum +14538,300000 //Glass_Of_Illusion +14586,180000 //Spark_Candy +607,5000 // Yggdrasil_Berry +608,3000 // Yggdrasil_Seed + +// Bifrost Items +11522,1000 // Red_Raffle_Sap +11523,2000 // Yellow_Raffle_Sap +11524,3000 // White_Raffle_Sap +11525,5000 // Mora_Hip_Tea + +12622,3000 // Reins_Of_Mount + +//12580,0 // Vending_Search_Scroll +//12581,0 // Vending_Search_Scroll2 +//12591,0 // Vending_Search_Scroll3 + +12725,120000 // Runstone_Nosiege,Nauthiz Rune +12726,30000 // Runstone_Rhydo,Raido Rune +12727,60000 // Runstone_Verkana,Berkana Rune +12732,1000 // Runstone_Pertz,Wyrd Rune +22540,60000 // Runstone_Luxanima,Lux Anima Rune + +12658, 10000 // Transformation Scroll(Deviruchi) +12659, 10000 // Transformation Scroll(Raydric) +12660, 10000 // Transformation Scroll(Mavka) +12661, 10000 // Transformation Scroll(Marduk) +12662, 10000 // Transformation Scroll(Banshee) +12663, 10000 // Transformation Scroll(Poring) +12664, 10000 // Transformation Scroll(Golem) \ No newline at end of file -- cgit v1.2.3-70-g09d2