Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Split item_delay.txt into pre-re/re paths.

Browse Source 
* Fixed a typo in "Father Bamph" NPC. (bugreport:8163)
http://rathena.org/board/tracker/issue-8163-father-bamph/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
This commit is contained in:
Euphy 2013-10-19 10:46:22 -04:00
parent af108b20c4
commit 100bd4a28a
6 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
db/item_delay.txt → db/pre-re/item_delay.txt
View File

2
db/re/item_db.txt
View File

@ -8407,4 +8407,4 @@
22558,Lucky_Bag,Lucky Bag,11,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
22559,Mock_Strawberry,Mock Strawberry,11,20,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 50,50; itemskill "SM_ENDURE",3; },{},{}
22571,Easter_Egg,Easter Egg,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ /* itemskill "RK_LUXANIMA",1; */ },{},{}
22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}

29
db/re/item_delay.txt Normal file
View File

@ -0,0 +1,29 @@
// 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
// FIX ME! Delays need confirmation.
12968,300000 // Emergency_Scroll1
12969,300000 // Emergency_Scroll2
12970,300000 // Emergency_Scroll3

2
npc/quests/quests_prontera.txt
View File

@ -2896,7 +2896,7 @@ prt_church,185,106,3 script Father Bamph 60,{
mes "to cover your Airship fee.";
mes "Thank you, and good luck.";
set aru_monas,6;
set Zeny, Zeny + (checkre(0))?5000:1500;
set Zeny, Zeny + (checkre(0)?5000:1500);
changequest 17002,17003;
close;
}

2
sql-files/item_db_re.sql
View File

@ -8438,5 +8438,5 @@ REPLACE INTO `item_db_re` VALUES (22514,'Candy_Holder','Candy Holder',11,20,NULL
REPLACE INTO `item_db_re` VALUES (22558,'Lucky_Bag','Lucky Bag',11,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22559,'Mock_Strawberry','Mock Strawberry',11,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'percentheal 50,50; itemskill "SM_ENDURE",3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22571,'Easter_Egg','Easter Egg',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22540,'Runstone_Luxanima','Lux Anima Rune',11,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'/* itemskill "RK_LUXANIMA",1; */',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (22540,'Runstone_Luxanima','Lux Anima Rune',11,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,56,2,NULL,NULL,NULL,NULL,NULL,'itemskill "RK_LUXANIMA",1;',NULL,NULL);

2
src/map/itemdb.c
View File

@ -1358,7 +1358,7 @@ static void itemdb_read(void) {
sv_readdb(db_path, "item_avail.txt", ',', 2, 2, -1, &itemdb_read_itemavail);
sv_readdb(db_path, DBPATH"item_noequip.txt", ',', 2, 2, -1, &itemdb_read_noequip);
sv_readdb(db_path, DBPATH"item_trade.txt", ',', 3, 3, -1, &itemdb_read_itemtrade);
sv_readdb(db_path, "item_delay.txt", ',', 2, 2, -1, &itemdb_read_itemdelay);
sv_readdb(db_path, DBPATH"item_delay.txt", ',', 2, 2, -1, &itemdb_read_itemdelay);
sv_readdb(db_path, "item_stack.txt", ',', 3, 3, -1, &itemdb_read_stack);
sv_readdb(db_path, DBPATH"item_buyingstore.txt", ',', 1, 1, -1, &itemdb_read_buyingstore);
sv_readdb(db_path, "item_nouse.txt", ',', 3, 3, -1, &itemdb_read_nouse);