diff options
| author | Dastgir Pojee <dastgirpojee@rocketmail.com> | 2013-10-17 21:39:11 +0530 |
|---|---|---|
| committer | Dastgir Pojee <dastgirpojee@rocketmail.com> | 2013-10-17 21:39:11 +0530 |
| commit | b2c9f9de564065019684fcf22ed020b943fc5bbe (patch) | |
| tree | d27ede8e334382211743c1e34a73a9db67778d38 /db/pre-re | |
| parent | 97979fe1e577aebe77e978c248a08b33b2c0c1a2 (diff) | |
| parent | 9128feccf3bddda94a7f8a170305565416815b40 (diff) | |
| download | hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.gz hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.bz2 hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.tar.xz hercules-b2c9f9de564065019684fcf22ed020b943fc5bbe.zip | |
Merge remote-tracking branch 'upstream/master' into SkidConst
Diffstat (limited to 'db/pre-re')
| -rw-r--r-- | db/pre-re/item_db.txt | 1 | ||||
| -rw-r--r-- | db/pre-re/item_delay.txt | 34 |
2 files changed, 34 insertions, 1 deletions
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index 779c3c495..4f91b462c 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 |