* Added Somotology Laboratory F4 quest (written by Ziu, translated by Heris, uses some iRO dialogues).

* Updated quest_db with Somotology Laboratory F4 entries (5113-5125 are placeholders, may be incorrect).
* Moving of warp files, reducing the number of duplicates in pre-re/re paths.
* Added a note to documentation (bugreport:7065) and fixed a small mistake (bugreport:7068).
* Follow-up r17056, missing $ (bugreport:7067) and added a missing item.

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

4 files changed, 21 insertions, 22 deletions

diff --git a/db/quest_db.txt b/db/quest_db.txt
index 3c5839642..50dcc1dc4 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -514,6 +514,23 @@
 5098,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
 5099,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
 5100,0,0,0,0,0,0,0,"Unlocking the Ultimate Mediocrity"
+5109,0,0,0,0,0,0,0,"Light but Unconfirmed Rumor"
+5110,0,0,0,0,0,0,0,"The Rumored Character"
+5111,0,0,0,0,0,0,0,"To the Lab..."
+5112,259200,0,0,0,0,0,0,"Laboratory Restricted Access"
+5113,0,0,0,0,0,0,0,"[Rest] Lord Knight"
+5114,0,0,0,0,0,0,0,"[Rest] Paladin"
+5115,0,0,0,0,0,0,0,"[Rest] High Priest"
+5116,0,0,0,0,0,0,0,"[Rest] Champion"
+5117,0,0,0,0,0,0,0,"[Rest] High Wizard"
+5118,0,0,0,0,0,0,0,"[Rest] Professor"
+5119,0,0,0,0,0,0,0,"[Rest] Whitesmith"
+5120,0,0,0,0,0,0,0,"[Rest] Creator"
+5121,0,0,0,0,0,0,0,"[Rest] Assassin Cross"
+5122,0,0,0,0,0,0,0,"[Rest] Stalker"
+5123,0,0,0,0,0,0,0,"[Rest] Sniper"
+5124,0,0,0,0,0,0,0,"[Rest] Clown"
+5125,0,0,0,0,0,0,0,"[Rest] Gypsy"
 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"
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 4129ec62f..e79d0d373 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -3864,6 +3864,8 @@
 6441,Advanced_Lubrication,Advanced Lubrication,3,20,,0,,,,,,,,,,,,,{},{},{}
 6442,Octopus_Hunting_Skewer,Octopus Hunting Skewer,3,20,,0,,,,,,,,,,,,,{},{},{}
 //
+6451,Unknown_Fish,Unknown Fish,3,20,,0,,,,,,,,,,,,,{},{},{}
+//
 6469,Warrior's_Will,Warrior's Will,3,20,,10,,,,,,,,,,,,,{},{},{}
 6470,Blood_Thirst,Blood Thirst,3,20,,10,,,,,,,,,,,,,{},{},{}
 6471,Chills_Of_Death,Chills Of Death,3,20,,10,,,,,,,,,,,,,{},{},{}
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index 4e8ff9772..597547e68 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -1376,7 +1376,8 @@
 2241,B_TRENTINI,Gypsy Trentini,Gypsy Trentini,160,3894278,0,4463758,2563096,1,1070,1498,181,112,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,2231879,0,0,0,0,0,0,12623,9000,12616,9000,616,9000,6224,9000,18103,5000,18110,5000,1963,5000,0,0,0,0,0,0
 2242,MD_DESERT_WOLF,Desert Wolf,Desert Wolf,135,551578,0,0,0,1,1040,1158,151,39,93,69,63,61,82,42,10,12,1,6,20,0x37B5,200,1120,420,288,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
 2243,MD_DESERT_WOLF_B,Desert Wolf,Desert Wolf,130,274531,0,0,0,1,66,82,13,0,10,12,8,5,17,7,10,12,0,6,20,0x37B5,300,1600,900,240,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
-2244,QUEST_CHEN,Champion Chen,Champion Chen,160,3481505,2000,4409293,4689861,1,1700,3000,201,543,126,74,71,123,99,65,10,12,1,7,68,0x37B5,180,1152,384,288,2204693,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
+// Fix me! 2244 needs new info.
+2244,QUEST_CHEN,Champion Chen,Champion Chen,99,15000,2000,0,0,1,1700,3000,216,134,126,74,71,123,99,65,10,12,1,7,68,0x37B5,180,1152,384,288,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
 2245,EXP_TEST,Exp Test,Exp Test,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,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
 2246,Q_WOOTAN_FIGHTER,Wootan Fighter,Wootan Fighter,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,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
 2247,Q_INCREASE_SOIL,Increase Soil,Mi Gao,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,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
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
index 575563537..3610f95c3 100644
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -7513,27 +7513,6 @@
 2241,Gypsy Trentini@NPC_CRITICALSLASH,attack,170,1,2000,0,5000,yes,target,always,0,,,,,,,
 2241,Gypsy Trentini@NPC_STUNATTACK,attack,179,5,2000,0,5000,yes,target,always,0,,,,,,,
 2241,Gypsy Trentini@NPC_WINDATTACK,attack,187,5,2000,0,5000,yes,target,always,0,,,,,,,
-2244,Champion Chen@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
-2244,Champion Chen@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
-2244,Champion Chen@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
-2244,Champion Chen@AL_INCAGI,idle,29,10,10000,1000,240000,no,self,myhpltmaxrate,99,,,,,,,
-2244,Champion Chen@AL_INCAGI,chase,29,10,10000,1000,240000,no,self,myhpltmaxrate,100,,,,,,,
-2244,Champion Chen@AL_INCAGI,idle,29,10,10000,1000,240000,no,friend,friendhpltmaxrate,100,,,,,,,
-2244,Champion Chen@AL_INCAGI,chase,29,10,10000,1000,240000,no,friend,friendhpltmaxrate,100,,,,,,,
-2244,Champion Chen@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
-2244,Champion Chen@MO_BODYRELOCATION,chase,264,1,3000,0,5000,yes,target,always,0,,,,,,,
-2244,Champion Chen@MO_EXTREMITYFIST,attack,271,5,10000,500,10000,no,target,always,0,,,,,,6,
-2244,Champion Chen@NPC_COMBOATTACK,chase,171,5,2000,0,5000,yes,target,always,0,,,,,,7,
-2244,Champion Chen@NPC_COMBOATTACK,attack,171,5,2000,0,5000,yes,target,always,0,,,,,,7,
-2244,Champion Chen@AL_HEAL,idle,28,11,3000,0,1500,yes,friend,friendhpltmaxrate,99,,,,,,3,
-2244,Champion Chen@AL_HEAL,idle,28,11,3000,0,1500,yes,self,myhpltmaxrate,99,,,,,,3,
-2244,Champion Chen@AL_HEAL,chase,28,11,3000,0,1500,yes,friend,friendhpltmaxrate,99,,,,,,3,
-2244,Champion Chen@AL_HEAL,chase,28,11,3000,0,1500,yes,self,myhpltmaxrate,99,,,,,,3,
-2244,Champion Chen@AL_HEAL,attack,28,11,3000,0,1500,yes,friend,friendhpltmaxrate,99,,,,,,3,
-2244,Champion Chen@AL_HEAL,attack,28,11,3000,0,1500,yes,self,myhpltmaxrate,99,,,,,,3,
-2244,Champion Chen@NPC_CRITICALSLASH,attack,170,1,2000,0,5000,yes,target,always,0,,,,,,,
-2244,Champion Chen@NPC_STUNATTACK,attack,179,5,2000,0,5000,yes,target,always,0,,,,,,,
-2244,Champion Chen@NPC_WATERATTACK,attack,184,5,2000,0,5000,yes,target,always,0,,,,,,,
 
 // Guild Dungeon F2
 // currently not enough info about the new guild dungeon mob's skills to finish