* Added Veins town NPCs, mail box, and second guide.

- Updated warps for Veins. Outstanding warps are quest related.
* Minor updates to other warp files.

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

5 files changed, 102 insertions, 86 deletions

diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt
index de563a229..9e3c5723f 100644
--- a/npc/warps/cities/ayothaya.txt
+++ b/npc/warps/cities/ayothaya.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= Muad_Dib, L0ne_W0lf (1.0)
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5a
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Episode 8+
 //===== Description: =========================================
 //= Warp Points for Ayothaya
 //===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.5a Cleared up a few misnamed warps. [L0ne_W0lf]
 //============================================================
 
 ayothaya,130,97,0	warp	ayo_tool1-1	1,1,ayo_in01,43,183
@@ -24,8 +25,8 @@ ayothaya,177,90,0	warp	ayo_weapon2-1	1,1,ayo_in01,95,175
 ayo_in01,98,175,0	warp	ayo_weapon2-2	1,1,ayothaya,180,90
 ayothaya,173,77,0	warp	ayo_weapon3-1	1,1,ayo_in01,85,152
 ayo_in01,85,149,0	warp	ayo_weapon3-2	1,1,ayothaya,173,74
-ayothaya,229,69,0	warp	ayo_pubGate_pub	1,1,ayo_in01,137,192
-ayo_in01,137,195,0	warp	ayo_pub_pubGate	1,1,ayothaya,229,72
+ayothaya,229,69,0	warp	ayo_pub1-1	1,1,ayo_in01,137,192
+ayo_in01,137,195,0	warp	ayo_pub1-2	1,1,ayothaya,229,72
 ayothaya,202,161,0	warp	ayo_inn1-1	1,1,ayo_in01,31,108
 ayo_in01,31,111,0	warp	ayo_inn1-2	1,1,ayothaya,202,164
 ayothaya,211,150,0	warp	ayo_inn2-1	1,1,ayo_in01,47,94
@@ -42,10 +43,10 @@ ayo_in01,13,82,0	warp	ayo_stairSW1-1	1,1,ayo_in01,18,14
 ayo_in01,21,14,0	warp	ayo_roomSW1-2	1,1,ayo_in01,17,82
 ayo_in01,48,82,0	warp	ayo_stairSE1-1	1,1,ayo_in01,63,14
 ayo_in01,60,14,0	warp	ayo_roomSE1-2	1,1,ayo_in01,45,82
-ayothaya,111,109,0	warp	ayo_house11-1	1,1,ayo_in01,180,129
-ayo_in01,177,129,0	warp	ayo_house111-2	1,1,ayothaya,111,106
-ayothaya,62,104,0	warp	ayo_house21-1	1,1,ayo_in01,191,183
-ayo_in01,194,183,0	warp	ayo_house21-2	1,1,ayothaya,65,104
+ayothaya,111,109,0	warp	ayo_house1_1-1	1,1,ayo_in01,180,129
+ayo_in01,177,129,0	warp	ayo_house1_1-2	1,1,ayothaya,111,106
+ayothaya,62,104,0	warp	ayo_house2_1-1	1,1,ayo_in01,191,183
+ayo_in01,194,183,0	warp	ayo_house2_1-2	1,1,ayothaya,65,104
 ayothaya,208,283,0	warp	ayo_shrine1-1	1,1,ayo_in02,100,152
 ayo_in02,100,148,0	warp	ayo_shrine1-2	1,1,ayothaya,208,280
 ayothaya,276,176,0	warp	ayo_fild1-1	1,1,ayo_fild01,37,241
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index 39b3cc3a5..c508dc696 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= erKURITA & RockmanEXE
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -15,6 +15,7 @@
 //= 1.1 Added warp to Veins Field [Playtester]
 //= 1.2 Fully official rachel warps [Playtester]
 //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf]
+//= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf]
 //============================================================
 
 rachel,150,249,0	warp	rachel01	1,1,ra_temple,120,30
@@ -105,7 +106,7 @@ ra_temsky,62,139,0	warp	rachel73	1,1,ra_temsky,91,143
 
 rachel,25,125,0	warp	rachel74	1,1,ra_fild11,353,226
 rachel,275,125,0	warp	rachel75	1,1,ra_fild12,40,226
-rachel,130,20,0	warp	rachel76	1,1,ve_fild02,196,379
+rachel,130,21,0	warp	rachel76	1,1,ve_fild02,195,377
 
 que_rachel,130,93,0	warp	rachel77	1,1,que_rachel,239,258
 que_rachel,206,93,0	warp	rachel78	1,1,que_rachel,312,258
diff --git a/npc/warps/cities/veins.txt b/npc/warps/cities/veins.txt
index 13641e521..69fe1c32d 100644
--- a/npc/warps/cities/veins.txt
+++ b/npc/warps/cities/veins.txt
@@ -3,49 +3,57 @@
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
-//= 1.3a
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
+//= [Aegis COnversion]
 //= Warp Points for Veins
 //===== Additional Comments: =================================
+//= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf
+//============================================================
+
+veins,230,166,0	warp	ve_Tool1-1	1,1,ve_in,251,287
+ve_in,251,283,0	warp	ve_Tool1-2	1,1,veins,230,161
+ve_in,261,315,0	warp	ve_Tool2-1	1,1,ve_in,177,297
+ve_in,177,293,0	warp	ve_Tool2-2	1,1,ve_in,261,311
+veins,150,179,0	warp	ve_Weapon1-1	1,1,ve_in,349,223
+ve_in,349,219,0	warp	ve_Weapon1-2	1,1,veins,150,175
+ve_in,347,250,0	warp	ve_Weapon2-1	1,1,ve_in,282,223
+ve_in,286,223,0	warp	ve_Weapon2-2	1,1,ve_in,352,250
+veins,114,278,0	warp	ve_Inn1-1	1,1,ve_in,183,207
+ve_in,183,203,0	warp	ve_Inn1-2	1,1,veins,110,278
+veins,128,270,0	warp	ve_Inn2-1	1,1,ve_in,201,211
+ve_in,206,211,0	warp	ve_Inn2-2	1,1,veins,128,266
+veins,130,238,0	warp	ve_Inn3-1	1,1,ve_in,99,219
+ve_in,99,215,0	warp	ve_Inn3-2	1,1,veins,127,235
+ve_in,76,229,0	warp	ve_Inn4-1	1,1,ve_in,75,160
+ve_in,71,160,0	warp	ve_Inn4-2	1,1,ve_in,72,229
+veins,148,220,0	warp	ve_Bar1-1	1,1,ve_in,252,127
+ve_in,256,127,0	warp	ve_Bar1-2	1,1,veins,150,215
+ve_in,224,115,0	warp	ve_Bar2-1	1,1,ve_in,313,114
+ve_in,309,114,0	warp	ve_Bar2-2	1,1,ve_in,220,115
+veins,197,260,0	warp	ve_Church1-1	1,1,ve_in,351,321
+ve_in,351,317,0	warp	ve_Church1-2	1,1,veins,197,255
+veins,88,173,0	warp	ve_House1_1-1	1,1,ve_in,77,295
+ve_in,77,291,0	warp	ve_House1_1-2	1,1,veins,88,168
+ve_in,98,299,0	warp	ve_House1_2-1	1,1,ve_in,124,372
+ve_in,128,372,0	warp	ve_House1_2-2	1,1,ve_in,102,299
+veins,337,231,0	warp	ve_House2_1-1	1,1,ve_in,194,374
+ve_in,194,369,0	warp	ve_House2_1-2	1,1,veins,331,231
+veins,267,230,0	warp	ve_factory1-1	1,1,ve_in02,17,19
+ve_in02,13,19,0	warp	ve_factory1-2	1,1,veins,269,225
+veins,143,25,0	warp	veins1-1	1,1,ve_fild07,147,366
+ve_fild07,147,371,0	warp	veins1-2	1,1,veins,146,28
+veins,218,361,0	warp	veins2-1	1,1,ve_fild06,148,225
+ve_fild06,153,220,0	warp	veins2-2	1,1,veins,218,355
+
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Removed Rachel City warp [Playtester]
 //= 1.2 Updated veins warp based on jA info [$ephiroth]
 //= 1.3 Update some missing warps [$ephiroth]
 //= 1.3a Update some missing warps [$ephiroth]
 //============================================================
-
-//= Veins City ===============================================
-veins,218,361,0	warp	veinswarp0501	1,1,ve_fild06,148,225
-veins,143,25,0	warp	veinswarp0502	1,1,ve_fild07,147,366
-veins,197,260,0	warp	veinswarp1001	1,1,ve_in,351,321
-ve_in,351,317,0	warp	veinswarp1002	1,1,veins,197,255
-veins,114,278,0	warp	veinswarp1003	1,1,ve_in,183,207
-ve_in,183,203,0	warp	veinswarp1004	1,1,veins,110,278
-veins,128,270,0	warp	veinswarp1005	1,1,ve_in,201,211
-ve_in,206,211,0	warp	veinswarp1006	1,1,veins,128,266
-veins,130,238,0	warp	veinswarp1007	1,1,ve_in,99,219
-ve_in,99,215,0	warp	veinswarp1008	1,1,veins,127,235
-ve_in,76,229,0	warp	veinswarp1009	1,1,ve_in,75,160
-ve_in,71,160,0	warp	veinswarp1010	1,1,ve_in,72,229
-veins,150,179,0	warp	veinswarp1011	1,1,ve_in,349,223
-ve_in,349,219,0	warp	veinswarp1012	1,1,veins,150,175
-ve_in,347,250,0	warp	veinswarp1013	1,1,ve_in,282,223
-ve_in,286,223,0	warp	veinswarp1014	1,1,ve_in,352,250
-veins,230,166,0	warp	veinswarp1015	1,1,ve_in,251,287
-ve_in,251,283,0	warp	veinswarp1016	1,1,veins,230,161
-ve_in,261,315,0	warp	veinswarp1017	1,1,ve_in,177,297
-ve_in,177,293,0	warp	veinswarp1018	1,1,ve_in,261,311
-veins,148,220,0	warp	veinswarp1019	1,1,ve_in,252,127
-ve_in,256,127,0	warp	veinswarp1020	1,1,veins,150,215
-ve_in,224,115,0	warp	veinswarp1021	1,1,ve_in,313,114
-ve_in,309,114,0	warp	veinswarp1022	1,1,ve_in,220,115
-veins,88,173,0	warp	veinswarp1023	1,1,ve_in,77,295
-ve_in,77,291,0	warp	veinswarp1024	1,1,veins,88,168
-ve_in,98,299,0	warp	veinswarp1025	1,1,ve_in,124,372
-ve_in,128,372,0	warp	veinswarp1026	1,1,ve_in,102,299
-veins,337,231,0	warp	veinswarp1027	1,1,ve_in,194,374
-ve_in,194,369,0	warp	veinswarp1028	1,1,veins,331,231
-veins,267,230,0	warp	veinswarp1029	1,1,ve_in02,17,19
-ve_in02,13,19,0	warp	veinswarp1030	1,1,veins,269,225
diff --git a/npc/warps/dungeons/thor_v.txt b/npc/warps/dungeons/thor_v.txt
index 97a7be547..50889886d 100644
--- a/npc/warps/dungeons/thor_v.txt
+++ b/npc/warps/dungeons/thor_v.txt
@@ -3,22 +3,26 @@
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version 
 //===== Description: =========================================
 //= Warp Points for Thor's Volcano Dungeon
 //===== Additional Comments: =================================
+//= 1.3 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf
+//============================================================
+
+ve_fild03,168,240,0	warp	thor_v1-1	1,1,thor_v01,21,229
+thor_v01,21,224,0	warp	thor_v1-2	1,1,ve_fild03,168,235
+thor_v01,201,37,0	warp	thor_v2-1	1,1,thor_v02,78,203
+thor_v02,192,60,0	warp	thor_v2-2	1,1,thor_v03,35,262
+thor_v02,73,203,0	warp	thor_v3-1	1,1,thor_v01,196,37
+thor_v03,30,262,0	warp	thor_v3-2	1,1,thor_v02,187,58
+
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= 1.0 Initial version [$ephiroth]
 //= 1.1 Updated warps, according to Japan site [$ephiroth]
 //= 1.2 Updated more warps to thor_camp [$ephiroth]
-//============================================================
-
-//= Thor's Volcano Dungeon====================================
-thor_v01,21,223,0	warp	veinswarp0504	1,1,ve_fild03,168,238
-thor_v01,202,34,0	warp	veinswarp4001	1,1,thor_v02,74,205
-thor_v02,72,206,0	warp	veinswarp4002	1,1,thor_v01,199,34
-thor_v02,191,55,0	warp	veinswarp4003	1,1,thor_v03,31,272
-thor_v03,28,272,0	warp	veinswarp4004	1,1,thor_v02,190,57
-thor_v02,143,78,0	warp	veinswarp4005	1,1,thor_camp,284,289
-thor_camp,288,289,0	warp	veinswarp4006	1,1,thor_v02,146,86
+//============================================================ 
diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt
index e98cfef35..145b12dd4 100644
--- a/npc/warps/fields/veins_fild.txt
+++ b/npc/warps/fields/veins_fild.txt
@@ -3,45 +3,47 @@
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Veins Field
 //===== Additional Comments: =================================
-//= 1.0 Initial version [$ephiroth]
-//= 1.1 Updated more warps [$ephiroth]
-//= 1.2 Removed some unofficial warps [Playtester]
-//= 1.3 Added random Veins exit [Playtester]
+//= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf
 //============================================================
 
-//= Veins Field (ve_fild) ====================================
-ve_fild02,196,382,0	warp	veinswarp5001	1,1,rachel,130,23
-ve_fild06,154,219,0	warp	veinswarp5002	1,1,veins,218,358
-ve_fild07,147,372,0	warp	veinswarp5003	1,1,veins,146,27
-ve_fild03,168,241,0	warp	veinswarp5004	1,1,thor_v01,21,226
-ve_fild01,243,369,0	warp	veinswarp5005	1,1,ra_fild11,232,29
-ra_fild11,232,26,0	warp	veinswarp5006	1,1,ve_fild01,243,366
-ve_fild01,367,263,0	warp	veinswarp5007	1,1,ve_fild02,33,259
-ve_fild02,30,259,0	warp	veinswarp5008	1,1,ve_fild01,364,263
-ve_fild01,351,95,0	warp	veinswarp5009	1,1,ve_fild02,76,133	
-ve_fild02,73,133,0	warp	veinswarp5010	1,1,ve_fild01,348,95
-ve_fild01,185,19,0	warp	veinswarp5011	1,1,ve_fild04,174,337
-ve_fild04,174,340,0	warp	veinswarp5012	1,1,ve_fild01,185,22
-ve_fild02,385,309,0	warp	veinswarp5013	1,1,ra_fild13,31,311
-ra_fild13,28,311,0	warp	veinswarp5014	1,1,ve_fild02,382,309
-ve_fild03,355,222,0	warp	veinswarp5015	1,1,ve_fild04,46,249
-ve_fild04,43,249,0	warp	veinswarp5016	1,1,ve_fild03,353,221
-ve_fild03,222,42,0	warp	veinswarp5017	1,1,ve_fild05,204,330
-ve_fild05,206,331,0	warp	veinswarp5018	1,1,ve_fild03,222,45
-
-ve_fild05,359,192,0	warp	veinswarp5019	1,1,ve_fild06,84,179
-ve_fild04,115,49,0	warp	veinswarp5020	1,1,ve_fild06,84,179
-
-ve_fild06,88,176,0	script	veinswarp5021	45,1,1,{
+ve_fild01,366,267,0	warp	ve_fild1-1	1,1,ve_fild02,36,263
+ve_fild01,184,20,0	warp	ve_fild1-2	1,1,ve_fild04,174,334
+ra_fild11,233,27,0	warp	ve_fild1-3	1,1,ve_fild01,243,363
+ve_fild01,243,368,0	warp	ve_fild1-4	1,1,ra_fild11,232,32
+ve_fild01,350,92,0	warp	ve_fild1-5	1,1,ve_fild02,78,133
+ra_fild13,29,308,0	warp	ve_fild2-1	1,1,ve_fild02,380,308
+ve_fild02,385,308,0	warp	ve_fild2-2	1,1,ra_fild13,34,308
+ve_fild02,195,382,0	warp	ve_fild2-3	1,1,rachel,130,25
+ve_fild02,31,263,0	warp	ve_fild2-4	1,1,ve_fild01,361,267
+ve_fild02,73,133,0	warp	ve_fild2-5	1,1,ve_fild01,345,92
+ve_fild03,355,223,0	warp	ve_fild3-1	1,1,ve_fild04,49,249
+ve_fild03,222,43,0	warp	ve_fild3-2	1,1,ve_fild05,200,325
+ve_fild04,174,339,0	warp	ve_fild4-1	1,1,ve_fild01,184,25
+ve_fild04,44,249,0	warp	ve_fild4-2	1,1,ve_fild03,350,220
+ve_fild04,115,50,0	warp	ve_fild4-3	1,1,ve_fild06,80,183
+ve_fild05,200,330,0	warp	ve_fild5-1	1,1,ve_fild03,222,48
+ve_fild05,359,192,0	warp	ve_fild5-2	1,1,ve_fild06,80,183
+ve_fild06,153,220,0	warp	ve_fild6-1	1,1,veins,218,355
+ve_fild06,81,177,0	script	ve_fild6-2	45,1,1,{
 	if (rand(2))
-		warp "ve_fild04",115,52;
+		warp "ve_fild04",115,55;
 	else
-		warp "ve_fild05",354,192;
+		warp "ve_fild05",354,191;
 	end;
 }
+ve_fild07,147,371,0	warp	ve_fild7-1	1,1,veins,146,28
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 Initial version [$ephiroth]
+//= 1.1 Updated more warps [$ephiroth]
+//= 1.2 Removed some unofficial warps [Playtester]
+//= 1.3 Added random Veins exit [Playtester]
+//============================================================