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

5 files changed, 68 insertions, 129 deletions

diff --git a/npc/re/mobs/dungeons/iz_dun.txt b/npc/re/mobs/dungeons/iz_dun.txt
index b56f8eed3..8518d020d 100644
--- a/npc/re/mobs/dungeons/iz_dun.txt
+++ b/npc/re/mobs/dungeons/iz_dun.txt
@@ -3,14 +3,13 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.3a
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester]
 //= 1.2 More accurate spawns [Playtester]
 //= 1.3 Added Izlude Dungeon F6 spawns [Chilly]
-//= 1.3a Moved Izlude Dungeon F6 spawns to separate file. [Kenpachi]
 //============================================================
 
 //==================================================
@@ -109,3 +108,12 @@ iz_dun04,42,129,0,0	monster	Hydra	1068,1,312000,150000,0
 iz_dun04,80,233,0,0	monster	Hydra	1068,1,318000,150000,0
 iz_dun04,69,243,0,0	monster	Hydra	1068,1,321000,150000,0
 iz_dun04,33,115,0,0	monster	Hydra	1068,1,321000,150000,0
+
+//==================================================
+// iz_dun05 - Undersea Tunnel F6
+//==================================================
+iz_dun05,0,0,0,0	monster	King Dramoh	2198,20,0,0,0
+iz_dun05,0,0,0,0	monster	Sropho	2201,50,0,0,0
+iz_dun05,0,0,0,0	monster	Pot Dofle	2203,30,0,0,0
+iz_dun05,0,0,0,0	monster	Sedora	2204,50,0,0,0
+iz_dun05,0,0,0,0	boss_monster	Kraken	2202,1,7200000,600000,1
diff --git a/npc/re/mobs/dungeons/iz_dun_re.txt b/npc/re/mobs/dungeons/iz_dun_re.txt
deleted file mode 100644
index 43ade6c10..000000000
--- a/npc/re/mobs/dungeons/iz_dun_re.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-//===== rAthena Script =======================================
-//= Byalan Dungeon Monster Spawn Script
-//===== By: ==================================================
-//= Athena (1.0)
-//===== Current Version: =====================================
-//= 1.3a
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Additional Comments: =================================
-//= 1.3 Added Izlude Dungeon F6 spawns [Chilly]
-//= 1.3a Moved Izlude Dungeon F6 spawns to separate file. [Kenpachi]
-//============================================================
-
-//==================================================
-// iz_dun05 - Undersea Tunnel F6
-//==================================================
-iz_dun05,0,0,0,0	monster	King Dramoh	2198,20,0,0,0
-iz_dun05,0,0,0,0	monster	Sropho	2201,50,0,0,0
-iz_dun05,0,0,0,0	monster	Pot Dofle	2203,30,0,0,0
-iz_dun05,0,0,0,0	monster	Sedora	2204,50,0,0,0
-iz_dun05,0,0,0,0	boss_monster	Kraken	2202,1,7200000,600000,1
diff --git a/npc/re/mobs/dungeons/lhz_dun.txt b/npc/re/mobs/dungeons/lhz_dun.txt
index cc0a53f16..54495a614 100644
--- a/npc/re/mobs/dungeons/lhz_dun.txt
+++ b/npc/re/mobs/dungeons/lhz_dun.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 // The Prometheus Project, rAthena dev team
 //===== Current Version: =====================================
-//= 1.9a
+//= 1.9
 //===== Compatible With: =====================================
 //= Any Athena
 //===== Additional Comments: =================================
@@ -22,7 +22,6 @@
 //= 1.7a Added dummy event to keep from causnig warnings. [L0ne_W0lf]
 //= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf]
 //= 1.9 Added Bio4 spawns. [Chilly]
-//= 1.9a Moved Bio4 spawns to separate file. [Kenpachi]
 //============================================================
 
 //==================================================
@@ -105,3 +104,60 @@ OnMyMVPDead:
 OnMy99Dead:
 	end;
 }
+
+//========================================================================================
+// lhz_dun04 - Bio-life Labs 4F
+//========================================================================================
+lhz_dun04,0,0,0,0	monster	Randel	2221,50,5000,0,0
+lhz_dun04,0,0,0,0	monster	Flamel	2222,50,5000,0,0
+lhz_dun04,0,0,0,0	monster	Celia	2223,50,5000,0,0
+lhz_dun04,0,0,0,0	monster	Chen	2224,50,5000,0,0
+lhz_dun04,0,0,0,0	monster	Gertie	2225,50,5000,0,0
+lhz_dun04,0,0,0,0	monster	Alphoccio	2226,50,5000,0,0
+lhz_dun04,0,0,0,0	monster	Trentini	2227,50,5000,0,0
+lhz_dun04,0,0,0,0	monster	Paladin Randel	2228,1,2700000,2400000,1
+lhz_dun04,0,0,0,0	monster	Creator Flamel	2229,1,3000000,2700000,1
+lhz_dun04,0,0,0,0	monster	Professor Celia	2230,1,2580000,2340000,1
+lhz_dun04,0,0,0,0	monster	Champion Chen	2231,1,2700000,2500000,1
+lhz_dun04,0,0,0,0	monster	Stalker Gertie	2232,1,3300000,3000000,1
+lhz_dun04,0,0,0,0	monster	Clown Alphoccio	2233,1,2580000,2460000,1
+lhz_dun04,0,0,0,0	monster	Gypsy Trentini	2234,1,2580000,2460000,1
+
+lhz_dun04,0,0,0	script	mvp_lhz_dun04	-1,{
+OnTimer6000000: // delay1 = 6000000 ms (100 min)
+	stopnpctimer;
+	sleep rand(0,30)*60000; // 0 to 30 minutes
+OnInit:
+	// Select Coordinates to summon a random MVP on
+	switch(rand(1,7)) {
+		case 1:  set .@x,77;   set .@y,251;  break;
+		case 2:  set .@x,147;  set .@y,224;  break;
+		case 3:  set .@x,219;  set .@y,219;  break;
+		case 4:  set .@x,244;  set .@y,120;  break;
+		case 5:  set .@x,149;  set .@y,41;   break;
+		case 6:  set .@x,53;   set .@y,109;  break;
+		case 7:  set .@x,149;  set .@y,151;  break;
+	}
+	set .@mob,rand(2235,2241);
+	monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead";
+
+	// Select Coordinates to summon a random 99 on
+	switch(rand(1,7)) {
+		case 1:  set .@x2,77;   set .@y2,251;  break;
+		case 2:  set .@x2,147;  set .@y2,224;  break;
+		case 3:  set .@x2,219;  set .@y2,219;  break;
+		case 4:  set .@x2,244;  set .@y2,120;  break;
+		case 5:  set .@x2,149;  set .@y2,41;   break;
+		case 6:  set .@x2,53;   set .@y2,109;  break;
+		case 7:  set .@x2,149;  set .@y2,151;  break;
+	}
+	set .@mob2,rand(2228,2234);
+	monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead";
+	end;
+
+OnMyMVPDead:
+	killmonster "lhz_dun04",strnpcinfo(3)+"::OnMy99Dead";
+	initnpctimer;
+OnMy99Dead:
+	end;
+}
diff --git a/npc/re/mobs/dungeons/lhz_dun_re.txt b/npc/re/mobs/dungeons/lhz_dun_re.txt
deleted file mode 100644
index 3a6deb5d0..000000000
--- a/npc/re/mobs/dungeons/lhz_dun_re.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-//===== rAthena Script =======================================
-//= Lighthalzen Dungeon(Biolabs) Monster Spawn Script
-//===== By: ==================================================
-// The Prometheus Project, rAthena dev team
-//===== Current Version: =====================================
-//= 1.9a
-//===== Compatible With: =====================================
-//= Any Athena
-//===== Additional Comments: =================================
-//= 1.9 Added Bio4 spawns. [Chilly]
-//= 1.9a Moved Bio4 spawns to separate file. [Kenpachi]
-//============================================================
-
-//========================================================================================
-// lhz_dun04 - Bio-life Labs 4F
-//========================================================================================
-lhz_dun04,0,0,0,0	monster	Randel	2221,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Flamel	2222,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Celia	2223,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Chen	2224,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Gertie	2225,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Alphoccio	2226,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Trentini	2227,50,5000,0,0
-lhz_dun04,0,0,0,0	monster	Paladin Randel	2228,1,2700000,2400000,1
-lhz_dun04,0,0,0,0	monster	Creator Flamel	2229,1,3000000,2700000,1
-lhz_dun04,0,0,0,0	monster	Professor Celia	2230,1,2580000,2340000,1
-lhz_dun04,0,0,0,0	monster	Champion Chen	2231,1,2700000,2500000,1
-lhz_dun04,0,0,0,0	monster	Stalker Gertie	2232,1,3300000,3000000,1
-lhz_dun04,0,0,0,0	monster	Clown Alphoccio	2233,1,2580000,2460000,1
-lhz_dun04,0,0,0,0	monster	Gypsy Trentini	2234,1,2580000,2460000,1
-
-lhz_dun04,0,0,0	script	mvp_lhz_dun04	-1,{
-OnTimer6000000: // delay1 = 6000000 ms (100 min)
-	stopnpctimer;
-	sleep rand(0,30)*60000; // 0 to 30 minutes
-OnInit:
-	// Select Coordinates to summon a random MVP on
-	switch(rand(1,7)) {
-		case 1:  set .@x,77;   set .@y,251;  break;
-		case 2:  set .@x,147;  set .@y,224;  break;
-		case 3:  set .@x,219;  set .@y,219;  break;
-		case 4:  set .@x,244;  set .@y,120;  break;
-		case 5:  set .@x,149;  set .@y,41;   break;
-		case 6:  set .@x,53;   set .@y,109;  break;
-		case 7:  set .@x,149;  set .@y,151;  break;
-	}
-	set .@mob,rand(2235,2241);
-	monster "lhz_dun04",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,strnpcinfo(3)+"::OnMyMVPDead";
-
-	// Select Coordinates to summon a random 99 on
-	switch(rand(1,7)) {
-		case 1:  set .@x2,77;   set .@y2,251;  break;
-		case 2:  set .@x2,147;  set .@y2,224;  break;
-		case 3:  set .@x2,219;  set .@y2,219;  break;
-		case 4:  set .@x2,244;  set .@y2,120;  break;
-		case 5:  set .@x2,149;  set .@y2,41;   break;
-		case 6:  set .@x2,53;   set .@y2,109;  break;
-		case 7:  set .@x2,149;  set .@y2,151;  break;
-	}
-	set .@mob2,rand(2228,2234);
-	monster "lhz_dun04",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,strnpcinfo(3)+"::OnMy99Dead";
-	end;
-
-OnMyMVPDead:
-	killmonster "lhz_dun04",strnpcinfo(3)+"::OnMy99Dead";
-	initnpctimer;
-OnMy99Dead:
-	end;
-}
diff --git a/npc/re/mobs/dungeons/yggdrasil.txt b/npc/re/mobs/dungeons/yggdrasil.txt
deleted file mode 100644
index b3d401ac5..000000000
--- a/npc/re/mobs/dungeons/yggdrasil.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-//===== rAthena Script =======================================
-//= Yggdrasil Tree Monster Spawn Script
-//===== By: ==================================================
-//= Athena (1.0)
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Additional Comments: =================================
-//= 1.0 Splitted from Nifflheim fields [DracoRPG]
-//= 1.1 Official kRO 10.1 spawns [Playtester]
-//============================================================
-
-//==================================================
-// yggdrasil01 - Hvergelmir's Fountain (Trunk of Yggdrasil)
-//==================================================
-yggdrasil01,234,256,10,10	monster	Blue Plant	1079,5,1800000,600000,0
-yggdrasil01,273,234,3,3	monster	Shining Plant	1083,1,1800000,600000,0
-yggdrasil01,143,257,20,10	monster	Shining Plant	1083,5,1200000,600000,0
-yggdrasil01,98,238,20,15	monster	Yellow Plant	1081,5,1200000,600000,0
-yggdrasil01,98,238,20,15	monster	White Plant	1082,5,1200000,600000,0
-yggdrasil01,47,207,20,20	monster	Blue Plant	1079,5,1200000,600000,0
-yggdrasil01,61,258,3,3	monster	Shining Plant	1083,1,1800000,600000,0
-yggdrasil01,132,199,20,5	monster	Blue Plant	1079,5,1200000,600000,0
-yggdrasil01,209,218,2,2	monster	Shining Plant	1083,1,1200000,600000,0
-yggdrasil01,192,186,2,2	monster	Shining Plant	1083,1,1800000,1200000,0
-yggdrasil01,169,176,3,3	monster	Shining Plant	1083,1,1200000,600000,0
-yggdrasil01,169,176,3,3	monster	Green Plant	1080,1,60000,30000,0
-yggdrasil01,94,111,5,2	monster	Shining Plant	1083,1,1200000,600000,0
-yggdrasil01,51,118,10,3	monster	Shining Plant	1083,1,1200000,600000,0
-yggdrasil01,133,54,3,3	monster	Shining Plant	1083,1,1200000,600000,0
-yggdrasil01,257,63,10,10	monster	Shining Plant	1083,3,1800000,1200000,0
-yggdrasil01,0,0,0,0	monster	Shining Plant	1083,10,3600000,2300000,0
-yggdrasil01,0,0,0,0	monster	Green Plant	1080,25,60000,30000,0
-yggdrasil01,0,0,0,0	monster	Red Plant	1078,15,60000,30000,0