summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
committerMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
commite3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch)
tree20cfd05dd6fc2e3e53173ef059f045cee1526d58 /db
parent491892212d338903179909b89a5bfc2385e52261 (diff)
downloadhercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip
Update to last rAthena npc.
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'db')
-rw-r--r--db/quest_db.txt62
-rw-r--r--db/re/mob_db.txt12
2 files changed, 40 insertions, 34 deletions
diff --git a/db/quest_db.txt b/db/quest_db.txt
index 32cc64f2f..42cd3c651 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -57,7 +57,7 @@
1183,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
1184,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
1185,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
-1186,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1186,0,2313,15,0,0,0,0,"Get Rid of Bakonawa"
1187,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
1188,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
1189,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
@@ -583,7 +583,7 @@
4226,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
4227,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
-4229,86400,0,0,0,0,0,0,"Devil in the Cave"
+4229,82800,0,0,0,0,0,0,"Devil in the Cave"
4254,0,0,0,0,0,0,0,"Fairy with a stomache"
4255,0,0,0,0,0,0,0,"Revenge!"
@@ -640,7 +640,9 @@
5052,0,0,0,0,0,0,0,"Traditional Weapon"
5053,0,0,0,0,0,0,0,"Traditional Weapon"
5054,0,0,0,0,0,0,0,"Traditional Weapon"
-
+5055,0,2071,15,0,0,0,0,"Local Rising - Headless Horse"
+5056,0,1584,15,0,0,0,0,"Local Rising - Tamruan"
+5057,0,0,0,0,0,0,0,"Local Rising - Ready the Festival"
5058,0,0,0,0,0,0,0,"The mood of the players-(1)"
5059,0,0,0,0,0,0,0,"The mood of the players-(2)"
5060,180,0,0,0,0,0,0,"Cat Shock"
@@ -860,7 +862,7 @@
7120,0,0,0,0,0,0,0,"Novice Training"
7121,0,0,0,0,0,0,0,"Novice Training"
7122,0,1002,1,0,0,0,0,"First battle - Poring Hunt"
-7123,0,1050,2,0,0,0,0,"Battle Basics -Swordman"
+7123,0,1049,2,0,0,0,0,"Battle Basics -Swordman"
7124,0,1063,5,0,0,0,0,"Battle Basics -Mage"
//7125,0,0,0,0,0,0,0,"not used"
7126,0,0,0,0,0,0,0,"Selling items"
@@ -896,7 +898,7 @@
7155,0,0,0,0,0,0,0,"The training course 'conquer the orc dungeon!' - complete a quest"
7156,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - start"
7157,0,1264,15,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 1"
-7158,0,1065,10,0,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 2"
+7158,0,1065,10,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 2"
7159,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - Complete a quest"
7160,0,0,0,0,0,0,0,"Mysterious Cryptogram"
@@ -949,6 +951,8 @@
7206,0,0,0,0,0,0,0,"New Day for Cheshire"
7207,0,0,0,0,0,0,0,"Cheshire's Box"
7208,86400,0,0,0,0,0,0,"Wait for Cheshire?"
+7209,0,0,0,0,0,0,0,"Forget the box."
+7210,0,0,0,0,0,0,0,"Daily delivery"
// Misty Forest Labyrinth
7211,9000,0,0,0,0,0,0,"Misty Forest Labyrinth Exploration"
@@ -1107,7 +1111,7 @@
7364,0,0,0,0,0,0,0,"Deliver Holy Item to Middle-aged Man"
7365,0,0,0,0,0,0,0,"Better than My Old Button-2"
7366,0,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-1"
-7367,0,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-2"
+7367,600,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-2"
7368,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Pedro"
7369,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Nardo"
7370,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Pandoi"
@@ -1115,13 +1119,13 @@
7372,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Talah"
7373,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Romel"
7374,0,0,0,0,0,0,0,"Love and Spiritual Protection for All"
-7375,0,0,0,0,0,0,0,"Love and Spiritual Protection Continues"
+7375,82800,0,0,0,0,0,0,"Love and Spiritual Protection Continues"
7376,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-1"
7377,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-2"
-7378,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-Regular Trades"
+7378,82800,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-Regular Trades"
7379,0,0,0,0,0,0,0,"Peace Preacher"
7380,0,0,0,0,0,0,0,"To Smith a Traditional Spiritual Protection"
-7381,0,0,0,0,0,0,0,"High Demand on Spiritual Protection Material"
+7381,82800,0,0,0,0,0,0,"High Demand on Spiritual Protection Material"
7382,0,0,0,0,0,0,0,"Deliver to Pedro"
7383,0,0,0,0,0,0,0,"Deliver to Nardo"
7384,0,0,0,0,0,0,0,"Deliver to Pandoi"
@@ -1130,27 +1134,27 @@
7387,0,0,0,0,0,0,0,"Deliver to Romel"
7388,0,0,0,0,0,0,0,"Maries's Child"
7389,0,0,0,0,0,0,0,"Give the Shirt to Maries's Child"
-7390,0,0,0,0,0,0,0,"Worried about Maries's Child"
+7390,82800,0,0,0,0,0,0,"Worried about Maries's Child"
7391,0,0,0,0,0,0,0,"Jejeling and Jejellopy"
-7392,0,0,0,0,0,0,0,"Collect Jejellopy Regularly"
-7393,0,0,0,0,0,0,0,"Shiny Silver Blade"
-7394,0,0,0,0,0,0,0,"Shiny Tomorrow"
-7395,0,0,0,0,0,0,0,"Ghost on the Perry Ship"
-7396,0,0,0,0,0,0,0,"Angry Soul on Perry Ship"
+7392,86400,0,0,0,0,0,0,"Collect Jejellopy Regularly"
+7393,0,2314,10,2311,10,0,0,"Shiny Silver Blade"
+7394,82800,0,0,0,0,0,0,"Shiny Tomorrow"
+7395,0,0,0,0,0,0,0,"Ghost on the Ferry Ship"
+7396,0,0,0,0,0,0,0,"Angry Soul on Ferry Ship"
7397,0,0,0,0,0,0,0,"Mumbaki Phong's Advice"
7398,0,0,0,0,0,0,0,"Offering Bouquet Recommended by Mumbaki"
7399,0,0,0,0,0,0,0,"Soul Diwata's Story"
7400,0,0,0,0,0,0,0,"Mumbaki of Port Malaya"
-7401,0,0,0,0,0,0,0,"All Aboard for Perry Sailing"
+7401,82800,0,0,0,0,0,0,"All Aboard for Perry Sailing"
7402,0,0,0,0,0,0,0,"Bouquet for Diwata"
7403,0,0,0,0,0,0,0,"Stabilized Perry"
-7404,0,0,0,0,0,0,0,"Get Rid of Jejeling"
-7405,0,0,0,0,0,0,0,"Get Rid of Jejeling - Same Time Tomorrow"
+7404,0,2316,20,0,0,0,0,"Get Rid of Jejeling"
+7405,82800,0,0,0,0,0,0,"Get Rid of Jejeling - Same Time Tomorrow"
7406,0,0,0,0,0,0,0,"Agree to Collecting Bones!"
7407,0,0,0,0,0,0,0,"Purified Bone"
-7408,0,0,0,0,0,0,0,"Agree to Come Back Tomorrow?"
-7409,0,0,0,0,0,0,0,"Cannot Meet Eyes with Him!"
-7410,0,0,0,0,0,0,0,"Teach Another Lesson Tomorrow!"
+7408,82800,0,0,0,0,0,0,"Agree to Come Back Tomorrow?"
+7409,0,2309,10,0,0,0,0,"Cannot Meet Eyes with Him!"
+7410,82800,0,0,0,0,0,0,"Teach Another Lesson Tomorrow!"
// Eclage
7411,0,0,0,0,0,0,0,"The traveler, Fome's story"
@@ -1497,10 +1501,10 @@
9058,0,0,0,0,0,0,0,"O'Riley's Request"
9059,0,0,0,0,0,0,0,"Happy St. Patrick's Day"
9117,0,0,0,0,0,0,0,"Lina's Curse"
-9118,0,0,0,0,0,0,0,"Lina's Curse - Deviruchi Hunt"
-9119,0,0,0,0,0,0,0,"Lina's Curse - Wraith Dead Hunt"
-9120,0,0,0,0,0,0,0,"Lina's Curse - Dullahan Hunt"
-9121,0,0,0,0,0,0,0,"Lina's Curse - Nightmare Terror Hunt"
+9118,0,1109,50,0,0,0,0,"Lina's Curse - Deviruchi Hunt"
+9119,0,1291,50,0,0,0,0,"Lina's Curse - Wraith Dead Hunt"
+9120,0,1504,50,0,0,0,0,"Lina's Curse - Dullahan Hunt"
+9121,0,1379,50,0,0,0,0,"Lina's Curse - Nightmare Terror Hunt"
9122,0,0,0,0,0,0,0,"Lina's Curse"
9123,0,0,0,0,0,0,0,"Lina's Curse"
9024,0,0,0,0,0,0,0,"An errand boy from Einbroch"
@@ -1534,9 +1538,9 @@
9172,0,0,0,0,0,0,0,"Enchanted Items"
9173,72000,0,0,0,0,0,0,"Tutorial Timer Cooldown"
-9222,0,0,0,0,0,0,0,"Get Rid of Bangungot from Hospital 2F"
-9223,0,0,0,0,0,0,0,"Will there be Peace at the Hospital?"
-9224,0,0,0,0,0,0,0,"Explore Hospital 2F"
+9222,0,2327,1,0,0,0,0,"Get Rid of Bangungot from Hospital 2F"
+9223,604800,0,0,0,0,0,0,"Will there be Peace at the Hospital?"
+9224,3600,0,0,0,0,0,0,"Explore Hospital 2F"
9225,0,0,0,0,0,0,0,"Mystery Robbery Incident 1"
9226,0,0,0,0,0,0,0,"Mystery Robbery Incident 2"
@@ -1964,7 +1968,7 @@
11306,0,0,0,0,0,0,0,"Nurse at Port Malaya-23"
11307,0,0,0,0,0,0,0,"Nurse at Port Malaya-24"
11308,0,0,0,0,0,0,0,"Nurse at Port Malaya-25"
-11309,0,0,0,0,0,0,0,"Nurse at Port Malaya-26"
+11309,0,2327,1,0,0,0,0,"Nurse at Port Malaya-26"
11310,0,0,0,0,0,0,0,"Eclage's Entrance"
11311,0,0,0,0,0,0,0,"Eclage's Entrance"
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index 86c854b26..7bf4cff0e 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -1557,12 +1557,14 @@
//2405,WEAK_SKELETON
//2406,WEAK_SKEL_SOLDIER
//2407,SAILOR_SKELETON
-//2408,DUMMY_10
-//2409,DUMMY_50
-//2410,DUMMY_100
-//2411,DUMMY_150
+
+2408,DUMMY_10,Dummy 10,Dummy 10,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,20,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2409,DUMMY_50,Dummy 50,Dummy 50,50,99999999,1,0,0,0,0,0,50,50,0,0,0,0,0,0,0,200,1,0,20,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2410,DUMMY_100,Dummy 100,Dummy 100,100,99999999,1,0,0,0,0,0,90,90,0,0,0,0,0,0,0,200,1,0,20,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2411,DUMMY_150,Dummy 150,Dummy 150,150,99999999,1,0,0,0,0,0,120,120,0,0,0,0,0,0,0,200,1,0,20,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2412,E_VALKIWI
-//2413,DUMMY_10_FIRE
+2413,DUMMY_10_FIRE,Dummy 10,Dummy 10,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,23,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
//2414,RUNAWAY_BOOK
//2415,L_SEYREN
//2416,L_EREMES