Full npc folder reorganization. (I hope I didn't break anything D:)

-Now common scripts goes to the main npc folder, and pre-re-only/re-only ones goes to their respective folders.
-NPCs with practically the same script but little differences have been left in the main folder and uses the command checkre() for the differences.
-For those NPCs with different coordinates but same script, the script has been left in the main folder but the NPCs splitted as duplicates.
-All pre-renewal files has been reverted back to their pre-renewal behavior.

TODO:
-Correct pre-re quest rewards.
-Check for pre-re/re differences in mapflags.

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

1 files changed, 8 insertions, 9 deletions

diff --git a/npc/pre-re/warps/fields/payon_fild.txt b/npc/pre-re/warps/fields/payon_fild.txt
index d991f2280..07c7bcd4f 100644
--- a/npc/pre-re/warps/fields/payon_fild.txt
+++ b/npc/pre-re/warps/fields/payon_fild.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Nana (1.0)
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.2
 //===== Compatible With: ===================================== 
 //= Any rAthena Mod
 //===== Description: ========================================= 
@@ -11,7 +11,6 @@
 //===== Additional Comments: ================================= 
 //= 1.1 Refixed payon field08 -> payon warp
 //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf]
-//= 1.3 Renewal warp adjustments.
 //============================================================ 
 
 //= Payon Field's ============================================
@@ -19,8 +18,8 @@ pay_fild01,13,152,0	warp	payf001	2,7,moc_fild03,299,170
 pay_fild01,278,14,0	warp	payf01	13,2,pay_fild02,83,382
 pay_fild01,353,14,0	warp	payf02	20,3,pay_fild02,160,381
 pay_fild01,379,201,0	warp	payf03	2,6,pay_fild07,23,207
-//pay_fild02,134,16,0	warp	payf04	5,2,pay_fild05,127,375
-//pay_fild02,16,175,0	warp	payf06	2,4,pay_fild11,294,135
+pay_fild02,134,16,0	warp	payf04	5,2,pay_fild05,127,375
+pay_fild02,16,175,0	warp	payf06	2,4,pay_fild11,294,135
 pay_fild02,167,390,0	warp	payf02-1	20,3,pay_fild01,354,18
 pay_fild02,284,108,0	warp	payf07	2,7,pay_fild03,20,110
 pay_fild02,83,386,0	warp	payf01-1	13,2,pay_fild01,278,18
@@ -30,9 +29,9 @@ pay_fild03,313,16,0	warp	payf09	4,2,pay_fild06,305,372
 pay_fild03,392,63,0	warp	payf005	2,7,alberta,19,233
 pay_fild04,17,165,0	warp	payf002	2,8,moc_fild01,376,162
 pay_fild04,194,17,0	warp	payf003	7,2,moc_fild02,350,336
-//pay_fild05,127,378,0	warp	payf04-1	4,2,pay_fild02,134,19
-//pay_fild05,271,284,0	warp	payf10	2,4,pay_fild06,31,288
-//pay_fild06,28,288,0	warp	payf10-1	2,2,pay_fild05,268,284
+pay_fild05,127,378,0	warp	payf04-1	4,2,pay_fild02,134,19
+pay_fild05,271,284,0	warp	payf10	2,4,pay_fild06,31,288
+pay_fild06,28,288,0	warp	payf10-1	2,2,pay_fild05,268,284
 pay_fild06,305,375,0	warp	payf09-1	6,2,pay_fild03,313,19
 pay_fild07,16,200,0	warp	payf03-1	3,3,pay_fild01,371,205
 pay_fild07,163,17,0	warp	payf08-1	5,2,pay_fild03,177,275
@@ -46,5 +45,5 @@ pay_fild09,16,91,0	warp	payf13-1	2,4,pay_fild08,259,91
 pay_fild10,112,382,0	warp	pay14-1	3,2,pay_fild09,112,19
 pay_fild10,16,290,0	warp	payf12-1	2,5,pay_fild07,379,290
 pay_fild10,99,13,0	warp	w1034	1,1,pay_fild10,148,252
-//pay_fild11,297,135,0	warp	payf06-1	2,4,pay_fild02,19,175
-//pay_fild11,38,330,0	warp	payf004	4,2,moc_fild03,179,19
+pay_fild11,297,135,0	warp	payf06-1	2,4,pay_fild02,19,175
+pay_fild11,38,330,0	warp	payf004	4,2,moc_fild03,179,19