* Added Dewata and El Dicastes town (\cities\) and quest (\quests\) NPCs.

* db\quest_db.txt updated with Dewata and El Dicastes quests.
* Fixed minor bug with Arch Bishop check in Thanatos Tower (bugreport:5942)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16234 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 195 insertions, 2 deletions

diff --git a/db/quest_db.txt b/db/quest_db.txt
index 9a13d96d3..f5310d1a4 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -447,6 +447,39 @@
 
 5000,0,0,0,0,0,0,0,"The Crow of the Fate - 7"
 
+// Dewata [Euphy]
+5035,0,0,0,0,0,0,0,"Help the old man!"
+5036,0,0,0,0,0,0,0,"Help the old man!"
+5037,0,0,0,0,0,0,0,"Help the old man!"
+5038,0,0,0,0,0,0,0,"Help the old man!"
+5039,0,0,0,0,0,0,0,"Help the old man!"
+5040,0,0,0,0,0,0,0,"Help the old man!"
+5041,0,0,0,0,0,0,0,"Help the old man!"
+5042,0,0,0,0,0,0,0,"Help the old man!"
+5043,300,0,0,0,0,0,0,"Help the old man!"
+5044,86400,0,0,0,0,0,0,"Help the old man!"
+5045,0,0,0,0,0,0,0,"Help the old man!"
+5046,0,0,0,0,0,0,0,"Help the old man!"
+5047,0,0,0,0,0,0,0,"Help the old man!"
+5048,0,0,0,0,0,0,0,"Help the old man!"
+5049,0,0,0,0,0,0,0,"Help the old man!"
+5050,0,0,0,0,0,0,0,"Help the old man!"
+5051,0,0,0,0,0,0,0,"Help the old man!"
+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"
+9155,0,0,0,0,0,0,0,"Getting materials for the Jaty Crown"
+9156,0,0,0,0,0,0,0,"Make the Jaty Crown"
+9157,0,0,0,0,0,0,0,"Reward from Sage, Kasyapa"
+9158,0,0,0,0,0,0,0,"Delivery of Good News(1)"
+9159,0,0,0,0,0,0,0,"Back to Paiko"
+9160,0,0,0,0,0,0,0,"Delivery of Good News(2)"
+9161,0,0,0,0,0,0,0,"Back to Paiko"
+9162,0,0,0,0,0,0,0,"Delivery of Good News(3)"
+9163,0,0,0,0,0,0,0,"Back to Paiko"
+9164,0,0,0,0,0,0,0,"Delivery of Good News(4)"
+9165,0,0,0,0,0,0,0,"Reward from Paiko for success of Jaty Crown"
+
 6000,0,0,0,0,0,0,0,"Job Change to Taekwon"
 6001,0,0,0,0,0,0,0,"Job Change to Taekwon"
 6002,0,0,0,0,0,0,0,"Job Change to Taekwon"
@@ -648,6 +681,30 @@
 
 7181,0,0,0,0,0,0,0,"Karakas's ring"
 
+// El Dicastes [Euphy]
+7182,0,0,0,0,0,0,0,"Sapha's Visit"
+7183,0,0,0,0,0,0,0,"Invitation from Sapha"
+7184,0,0,0,0,0,0,0,"To El Dicastes!"
+7185,0,0,0,0,0,0,0,"Inspector Doha"
+7186,0,0,0,0,0,0,0,"Secret Order from Doha - Investigation"
+7187,0,0,0,0,0,0,0,"Secret Order from Doha - Shay"
+7188,0,0,0,0,0,0,0,"Information Gathering - in the Plaza"
+7189,0,0,0,0,0,0,0,"Information Gathering - in the Factory"
+7190,0,0,0,0,0,0,0,"Information Gathering - at the Guards"
+7191,0,0,0,0,0,0,0,"Shay's designation - BK"
+7192,0,0,0,0,0,0,0,"BK's Information"
+7193,0,0,0,0,0,0,0,"Dimensional Crack Investigation"
+7194,0,0,0,0,0,0,0,"What's this bloodstain?"
+7195,0,0,0,0,0,0,0,"What's this skin piece?"
+7196,0,0,0,0,0,0,0,"What's this suspicious magic power?"
+7197,0,0,0,0,0,0,0,"Sapha Certifications?"
+7198,0,0,0,0,0,0,0,"Audience with Ahat"
+7199,0,0,0,0,0,0,0,"Secret Order from Ahat"
+7200,82800,0,0,0,0,0,0,"Cheshire's call"
+7201,0,0,0,0,0,0,0,"Removing traces"
+7202,0,0,0,0,0,0,0,"Secret order from Doha - Collect proof"
+7203,0,0,0,0,0,0,0,"Secret order from Doha - Final Report"
+
 // Paradise Gear Advanced Quests [Chilly]
 7214,0,0,0,0,0,0,0,"Paradise Advanced: Romeo Training"
 7215,0,1278,3,0,0,0,0,"Paradise Advanced: Romeo Hunt 1"
@@ -1269,6 +1326,25 @@
 11157,0,0,0,0,0,0,0,"Helmes valley "
 11158,0,0,0,0,0,0,0,"On the way for meditation"
 
+11159,0,0,0,0,0,0,0,"Story of Brian"
+11160,0,0,0,0,0,0,0,"Story of John"
+11161,0,0,0,0,0,0,0,"Story of Tyler"
+11162,0,0,0,0,0,0,0,"Story of Rose"
+11163,0,0,0,0,0,0,0,"Story of Bain"
+11164,0,0,0,0,0,0,0,"Story of Lash"
+11165,0,0,0,0,0,0,0,"Delivered to Brian"
+11166,0,0,0,0,0,0,0,"Delivered to John"
+11167,0,0,0,0,0,0,0,"Delivered to Tyler"
+11168,0,0,0,0,0,0,0,"Delivered to Rose"
+11169,0,0,0,0,0,0,0,"Delivered to Bain"
+11170,0,0,0,0,0,0,0,"Delivered to Lash"
+11171,0,0,0,0,0,0,0,"Request from Frede"
+11172,0,0,0,0,0,0,0,"Request from Frede"
+11173,0,0,0,0,0,0,0,"Request from Frede"
+11174,0,0,0,0,0,0,0,"Supply Shortage"
+11175,7200,0,0,0,0,0,0,"Supply Shortage"
+11176,0,0,0,0,0,0,0,"For my friends"
+
 12000,0,0,0,0,0,0,0,"An old friend"
 12001,0,0,0,0,0,0,0,"Digotz, Maku's old friend"
 12002,0,0,0,0,0,0,0,"Messenger of Friendship"
@@ -1360,6 +1436,118 @@
 12096,0,0,0,0,0,0,0,"Towards Karakas"
 12097,0,0,0,0,0,0,0,"Basic preparation"
 12098,0,0,0,0,0,0,0,"Tour of dungeon"
+12099,0,2014,10,0,0,0,0,"Remove Root Cause"
+12100,0,1994,12,0,0,0,0,"Violent Winged Insect"
+12101,0,2013,5,0,0,0,0,"Work Interference"
+12102,0,1993,10,0,0,0,0,"Intelligent Snakes"
+12103,0,1992,1,0,0,0,0,"Legendary Creature"
+12104,0,1987,15,0,0,0,0,"Insects with an Appetite"
+12105,0,2024,10,0,0,0,0,"Moving Rocks"
+12106,0,1995,15,0,0,0,0,"A child on a flower"
+12107,0,2015,10,0,0,0,0,"Twisted Love"
+12108,0,1988,12,0,0,0,0,"Dangerous Plant Removal"
+12109,0,1999,14,0,0,0,0,"Larva Extermination"
+12110,0,2016,7,0,0,0,0,"Demon of Water"
+12111,0,1986,10,0,0,0,0,"Bird with ugly face"
+12117,0,0,0,0,0,0,0,"Withered Flower"
+12118,0,0,0,0,0,0,0,"Welcomed Mineral"
+12119,0,0,0,0,0,0,0,"Valuable Textile"
+12120,0,0,0,0,0,0,0,"Curious Meat"
+12121,0,0,0,0,0,0,0,"Materials to Clear Snow"
+12122,0,0,0,0,0,0,0,"Best Cooler Material"
+12123,0,0,0,0,0,0,0,"Best Paint"
+12124,0,0,0,0,0,0,0,"Rare Valuable"
+12125,0,0,0,0,0,0,0,"Armory Material"
+12126,0,0,0,0,0,0,0,"Advanced Armory Material"
+12127,0,0,0,0,0,0,0,"Supervisor's Tool"
+12128,0,0,0,0,0,0,0,"Preparation for Heating"
+12129,0,0,0,0,0,0,0,"Suspicious Food"
+12130,0,0,0,0,0,0,0,"Useful Material"
+12131,0,0,0,0,0,0,0,"Essential Material for Construction"
+12132,0,0,0,0,0,0,0,"Essential Material for Construction 2"
+12133,0,0,0,0,0,0,0,"Decoration arrangement"
+12134,0,0,0,0,0,0,0,"Instant Receptacle"
+12135,0,0,0,0,0,0,0,"Not enough medicine"
+12136,0,0,0,0,0,0,0,"Honey robber"
+12137,0,0,0,0,0,0,0,"Tools for Experiment"
+12138,0,0,0,0,0,0,0,"Fine Gift Samples"
+12139,0,0,0,0,0,0,0,"Respect for Taste!"
+12140,0,0,0,0,0,0,0,"Courtesy for Regulars"
+12141,0,0,0,0,0,0,0,"Special Package"
+12142,0,0,0,0,0,0,0,"Dangerous Request"
+12143,0,0,0,0,0,0,0,"Strange Trend"
+12144,0,0,0,0,0,0,0,"Unknown Usage"
+12145,0,0,0,0,0,0,0,"Other World Cuisine"
+12146,0,0,0,0,0,0,0,"Filling in Cracks"
+12147,0,0,0,0,0,0,0,"Adhesive Material"
+12148,0,0,0,0,0,0,0,"Bait for Tatacho Hunting"
+12149,0,0,0,0,0,0,0,"Swordmanship Practice"
+12150,0,0,0,0,0,0,0,"Pretty reddish vegetable"
+12151,0,0,0,0,0,0,0,"Tenacity of the pub owner"
+12152,0,0,0,0,0,0,0,"Tastes like home cooking"
+12153,0,0,0,0,0,0,0,"Hazardous plant when burnt"
+12154,0,0,0,0,0,0,0,"Unexpectedly Normal"
+12155,0,0,0,0,0,0,0,"Gift with heart"
+12156,0,0,0,0,0,0,0,"Respect personal appetite!"
+12157,0,0,0,0,0,0,0,"Resolution of the pub owner"
+12158,0,0,0,0,0,0,0,"Rage of the pub owner"
+12159,82800,0,0,0,0,0,0,"Quest record from Laponte"
+12160,82800,0,0,0,0,0,0,"Quest record from Kalipo"
+12161,82800,0,0,0,0,0,0,"Quest record from Pura"
+12162,82800,0,0,0,0,0,0,"Quest record from Tragis"
+12163,82800,0,0,0,0,0,0,"Quest record from Calyon"
+12164,82800,0,0,0,0,0,0,"Quest record from Moltuka"
+12165,21600,0,0,0,0,0,0,"Dizziness"
+12166,0,0,0,0,0,0,0,"Tree Root Doc."
+12167,0,0,0,0,0,0,0,"Reptile Tongue Doc."
+12168,0,0,0,0,0,0,0,"Scorpion Tail Doc."
+12169,0,0,0,0,0,0,0,"Stem Doc."
+12170,0,0,0,0,0,0,0,"Pointed Scale Doc."
+12171,0,0,0,0,0,0,0,"Resin Doc."
+12172,0,0,0,0,0,0,0,"Spawn Doc."
+12173,0,0,0,0,0,0,0,"Jellopy Doc."
+12174,0,0,0,0,0,0,0,"Fish Tail Doc."
+12175,0,0,0,0,0,0,0,"Worm Peeling Doc."
+12176,0,0,0,0,0,0,0,"Gill Doc."
+12177,0,0,0,0,0,0,0,"Tooth of Bat Doc."
+12178,0,0,0,0,0,0,0,"Fluff Doc."
+12179,0,0,0,0,0,0,0,"Chrysalis Doc."
+12180,0,0,0,0,0,0,0,"Feather of Birds Doc."
+12181,0,0,0,0,0,0,0,"Talon Document Doc."
+12182,0,0,0,0,0,0,0,"Sticky Webfoot Doc."
+12183,0,0,0,0,0,0,0,"Animal Skin Doc."
+12184,0,0,0,0,0,0,0,"Wolf Claw Doc."
+12185,0,0,0,0,0,0,0,"Mushroom Spore Doc."
+12186,0,0,0,0,0,0,0,"Orc's Fang Doc."
+12187,0,0,0,0,0,0,0,"Evil Horn Doc."
+12188,0,0,0,0,0,0,0,"Powder of Butterfly Doc."
+12189,0,0,0,0,0,0,0,"Bill of Birds Doc."
+12190,0,0,0,0,0,0,0,"Snake Scale Doc."
+12191,0,0,0,0,0,0,0,"Insect Feeler Doc."
+12192,0,0,0,0,0,0,0,"Immortal Heart Doc."
+12193,0,0,0,0,0,0,0,"Rotten Bandage Doc."
+12194,0,0,0,0,0,0,0,"Decayed Nail Doc."
+12195,0,0,0,0,0,0,0,"Horrendous Mouth Doc."
+12196,0,0,0,0,0,0,0,"Tentacle Doc."
+12197,0,0,0,0,0,0,0,"Shell Doc."
+12198,0,0,0,0,0,0,0,"Scale Shell Doc."
+12199,0,0,0,0,0,0,0,"Venom Canine Doc."
+12200,0,0,0,0,0,0,0,"Sticky Mucus Doc."
+12201,0,0,0,0,0,0,0,"Bee Sting Doc."
+12202,0,0,0,0,0,0,0,"Grasshopper's Leg Doc."
+12203,0,0,0,0,0,0,0,"Royal Jelly Doc."
+12204,0,0,0,0,0,0,0,"Yoyo Tail Doc."
+12205,0,0,0,0,0,0,0,"Solid Shell Doc."
+12206,0,0,0,0,0,0,0,"Yam Doc."
+12207,0,0,0,0,0,0,0,"Raccoon Leaf Doc."
+12208,0,0,0,0,0,0,0,"Snail's Shell Doc."
+12209,0,0,0,0,0,0,0,"Horn Doc."
+12210,0,0,0,0,0,0,0,"Bear's Footskin Doc."
+12211,0,0,0,0,0,0,0,"Feather Doc."
+12212,0,0,0,0,0,0,0,"Red Herb Doc."
+12213,0,0,0,0,0,0,0,"Carrot Doc."
+12214,0,0,0,0,0,0,0,"Cactus Needle Doc."
+12215,0,0,0,0,0,0,0,"Stone Heart Doc."
 12217,0,0,0,0,0,0,0,"Request - Traces of wild boar hunt"
 12218,0,0,0,0,0,0,0,"How to make lava elixir"
 12219,0,0,0,0,0,0,0,"How to creat flame elixir"
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 7fc59c6ce..b9906d7fb 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -25,6 +25,7 @@
 //= 2.1 Replaced effect numerics with constants. [Samuray22]
 //= 2.2 Updated the whole Script to match with latest available official file. [Masao]
 //= 2.3 Added continue and break in switch case. [JayPee]
+//= 2.4a Fixed a minor bug with Arch Bishop checks. [Euphy]
 //============================================================
 
 hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
@@ -3111,11 +3112,11 @@ OnTouch:
 		warp "thana_step",69,369;
 		end;
 	}
-	else if ((Class == Job_Rune_Knight) || (Class == Job_Archbishop) || (Class == Job_Warlock) || (Class == Job_Mechanic) || (Class == Job_Ranger) || (Class == Job_Guillotine_Cross) || (Class == Job_Royal_Guard) || (Class == Job_Sura) || (Class == Job_Sorcerer) || (Class == Job_Shadow_Chaser) || (Class == Job_Genetic) || (Class == Job_Wanderer) || (Class == Job_Minstrel)) {
+	else if ((Class == Job_Rune_Knight) || (Class == Job_Arch_Bishop) || (Class == Job_Warlock) || (Class == Job_Mechanic) || (Class == Job_Ranger) || (Class == Job_Guillotine_Cross) || (Class == Job_Royal_Guard) || (Class == Job_Sura) || (Class == Job_Sorcerer) || (Class == Job_Shadow_Chaser) || (Class == Job_Genetic) || (Class == Job_Wanderer) || (Class == Job_Minstrel)) {
 		warp "thana_step",69,369;
 		end;
 	}
-	else if ((Class == Job_Rune_Knight_T) || (Class == Job_Archbishop_T) || (Class == Job_Warlock_T) || (Class == Job_Mechanic_T) || (Class == Job_Ranger_T) || (Class == Job_Guillotine_Cross_T) || (Class == Job_Royal_Guard_T) || (Class == Job_Sura_T) || (Class == Job_Sorcerer_T) || (Class == Job_Shadow_Chaser_T) || (Class == Job_Genetic_T) || (Class == Job_Wanderer_T) || (Class == Job_Minstrel_T)) {
+	else if ((Class == Job_Rune_Knight_T) || (Class == Job_Arch_Bishop_T) || (Class == Job_Warlock_T) || (Class == Job_Mechanic_T) || (Class == Job_Ranger_T) || (Class == Job_Guillotine_Cross_T) || (Class == Job_Royal_Guard_T) || (Class == Job_Sura_T) || (Class == Job_Sorcerer_T) || (Class == Job_Shadow_Chaser_T) || (Class == Job_Genetic_T) || (Class == Job_Wanderer_T) || (Class == Job_Minstrel_T)) {
 		warp "thana_step",69,369;
 		end;
 	}
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 3478705ab..a2d6affac 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -10,6 +10,8 @@ npc: npc/cities/amatsu.txt
 npc: npc/cities/ayothaya.txt
 npc: npc/cities/brasilis.txt
 npc: npc/cities/comodo.txt
+npc: npc/cities/dewata.txt
+npc: npc/cities/dicastes.txt
 npc: npc/cities/einbech.txt
 npc: npc/cities/einbroch.txt
 npc: npc/cities/geffen.txt
@@ -94,6 +96,8 @@ npc: npc/quests/quests_amatsu.txt
 npc: npc/quests/quests_ayothaya.txt
 npc: npc/quests/quests_brasilis.txt
 npc: npc/quests/quests_comodo.txt
+npc: npc/quests/quests_dewata.txt
+npc: npc/quests/quests_dicastes.txt
 npc: npc/quests/quests_ein.txt
 npc: npc/quests/quests_geffen.txt
 npc: npc/quests/quests_gonryun.txt