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, 11 insertions, 12 deletions

diff --git a/npc/pre-re/warps/fields/geffen_fild.txt b/npc/pre-re/warps/fields/geffen_fild.txt
index 08b0e46e2..fd4350fe6 100644
--- a/npc/pre-re/warps/fields/geffen_fild.txt
+++ b/npc/pre-re/warps/fields/geffen_fild.txt
@@ -3,14 +3,13 @@
 //===== By: ==================================================
 //= Nana (1.0)
 //===== Current Version: =====================================
-//= 1.1
+//= 1.0
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Geffen Field's
 //===== Additional Comments: =================================
 //= No comment!
-//= 1.1 Renewal warp adjustments.
 //============================================================
 
 //= Geffen Field Warps =======================================
@@ -46,7 +45,7 @@ gef_fild07,18,191,0	warp	geff10	2,4,gef_fild08,357,187
 gef_fild07,40,19,0	warp	geff13	1,1,gef_fild13,41,369
 gef_fild08,200,355,0	warp	geff09-1	4,2,gef_fild06,218,20
 gef_fild08,360,187,0	warp	geff10-1	2,4,gef_fild07,21,191
-//gef_fild08,215,18,0	warp	geff14	1,1,gef_fild12,221,369
+gef_fild08,215,18,0	warp	geff14	1,1,gef_fild12,221,369
 gef_fild09,23,56,0	warp	geff18-1	1,1,gef_fild13,376,56
 gef_fild09,225,25,0	warp	geff11	3,2,gef_fild10,251,368
 gef_fild09,368,95,0	warp	geff01-1	4,2,gef_fild01,19,102
@@ -58,16 +57,16 @@ gef_fild10,138,284,0	warp	gef019	1,1,in_orcs01,29,114
 gef_fild10,215,51,0	warp	gef020	1,1,in_orcs01,162,53
 gef_fild10,223,205,0	warp	gef021	1,1,in_orcs01,108,89
 gef_fild10,63,337,0	warp	gef022	1,1,in_orcs01,30,157
-//gef_fild10,27,219,0	warp	geff19-1	1,1,gef_fild14,367,219
+gef_fild10,27,219,0	warp	geff19-1	1,1,gef_fild14,367,219
 gef_fild11,377,293,0	warp	gef023	2,4,prt_fild11,20,281
 gef_fild11,111,364,0	warp	geff12-1	6,3,gef_fild10,104,24
-//gef_fild12,221,374,0	warp	geff14-1	1,1,gef_fild08,215,25
-//gef_fild12,368,180,0	warp	geff15	1,1,gef_fild13,29,202
-//gef_fild12,372,50,0	warp	geff16	1,1,gef_fild13,29,59
-//gef_fild13,200,25,0	warp	geff17	1,1,gef_fild14,180,357
-//gef_fild13,25,202,0	warp	geff15-1	1,1,gef_fild12,364,180
-//gef_fild13,26,59,0	warp	geff16-1	1,1,gef_fild12,370,50
+gef_fild12,221,374,0	warp	geff14-1	1,1,gef_fild08,215,25
+gef_fild12,368,180,0	warp	geff15	1,1,gef_fild13,29,202
+gef_fild12,372,50,0	warp	geff16	1,1,gef_fild13,29,59
+gef_fild13,200,25,0	warp	geff17	1,1,gef_fild14,180,357
+gef_fild13,25,202,0	warp	geff15-1	1,1,gef_fild12,364,180
+gef_fild13,26,59,0	warp	geff16-1	1,1,gef_fild12,370,50
 gef_fild13,380,56,0	warp	geff18	1,1,gef_fild09,27,56
 gef_fild13,41,373,0	warp	geff13-1	1,1,gef_fild07,40,23
-//gef_fild14,180,360,0	warp	geff17-1	1,1,gef_fild13,200,29
-//gef_fild14,371,219,0	warp	geff19	1,1,gef_fild10,31,219
+gef_fild14,180,360,0	warp	geff17-1	1,1,gef_fild13,200,29
+gef_fild14,371,219,0	warp	geff19	1,1,gef_fild10,31,219