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

6 files changed, 0 insertions, 523 deletions

diff --git a/npc/pre-re/jobs/2-1a/AssassinCross.txt b/npc/pre-re/jobs/2-1a/AssassinCross.txt
deleted file mode 100644
index 0776825fb..000000000
--- a/npc/pre-re/jobs/2-1a/AssassinCross.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== By: ==================================================
-//= Nana
-//= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
-//= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
-
-valkyrie,44,58,5	script	Assassin Cross#Valkyrie	725,{
-	if (ADVJOB == 0 || Upper != 1) {
-		set .@karma_d,rand(1,10);
-		if (.@karma_d > 4) {
-			mes "[Assassin Cross]";
-			mes "Congratulations...";
-			next;
-			mes "[Assassin Cross]";
-			mes "...";
-			next;
-			mes "[Assassin Cross]";
-			mes "...";
-			mes "......";
-			next;
-			mes "[Assassin Cross]";
-			mes "...";
-			mes "......";
-			mes "Honor to";
-			mes "the warriors.";
-			close;
-		}
-		mes "[Assassin Cross]";
-		mes "We are the warriors";
-		mes "of the desert. Nobody";
-		mes "looks down upon us.";
-		mes "Nobody...";
-		close;
-	}
-	else if (ADVJOB == Job_Assassin_Cross && Class == Job_Thief_High && JobLevel > 39) {
-		mes "[Assassin Cross]";
-		mes "The time has come.";
-		mes "The world needs you...";
-		mes "More than ever.";
-		next;
-		mes "[Assassin Cross]";
-		mes "I ask that you continue to live in the shadows, but as an even greater Assassin with a new appearance.";
-		next;
-		mes "[Assassin Cross]";
-		mes "Will you become";
-		mes "an Assassin Cross?";
-		next;
-		if (select("No.:Yes.") == 1) {
-			mes "[Assassin Cross]";
-			mes "When you are";
-			mes "ready, come back.";
-			next;
-			mes "[Assassin Cross]";
-			mes "Honor to";
-			mes "the warriors.";
-			close;
-		}
-		if (SkillPoint) {
-			mes "[Assassin Cross]";
-			mes "You still haven't";
-			mes "learned everything";
-			mes "that you can.";
-			next;
-			mes "[Assassin Cross]";
-			mes "Use all your";
-			mes "Skill Points";
-			mes "and then come back.";
-			close;
-		}
-		jobchange Job_Assassin_Cross;
-		set ADVJOB,0;
-		mes "[Assassin Cross]";
-		mes "Congratulations.";
-		mes "As an Assassin Cross,";
-		mes "I hope that you fight for a brighter future within the darkness.";
-		close;
-	}
-	mes "[Assassin Cross]";
-	mes "Welcome";
-	mes "to Valhalla,";
-	mes "the Hall of Honor.";
-	next;
-	mes "[Assassin Cross]";
-	mes "Please make";
-	mes "yourself comfortable";
-	mes "while you are here.";
-	mes "Honor to the warriors.";
-	close;
-}
diff --git a/npc/pre-re/jobs/2-1a/HighPriest.txt b/npc/pre-re/jobs/2-1a/HighPriest.txt
deleted file mode 100644
index ae96a122e..000000000
--- a/npc/pre-re/jobs/2-1a/HighPriest.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== By: ==================================================
-//= Nana
-//= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
-//= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
-
-valkyrie,44,42,5	script	High Priest#Valkyrie	60,{
-	if (ADVJOB == 0 || Upper != 1) {
-		set .@karma_d,rand(1,10);
-		if (.@karma_d > 4) {
-			mes "[High Priest]";
-			mes "Congratulations.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		mes "[High Priest]";
-		mes "Through the power";
-		mes "of holiness, may we";
-		mes "find peace, strength";
-		mes "and protection. Deliver";
-		mes "us from the forces of evil...";
-		close;
-	}
-	else if (ADVJOB == Job_High_Priest && Class == Job_Acolyte_High && JobLevel > 39) {
-		mes "[High Priest]";
-		mes "Our world is in";
-		mes "need of people of";
-		mes "talent and conviction.";
-		mes "Please continue your";
-		mes "good works as an even";
-		mes "greater hero of holiness...";
-		next;
-		mes "[High Priest]";
-		mes "Would you like";
-		mes "to become a High Priest?";
-		next;
-		if (select("No.:Yes.") == 1) {
-			mes "[High Priest]";
-			mes "When you're ready,";
-			mes "feel free to come back.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		if (SkillPoint) {
-			mes "[High Priest]";
-			mes "It is still possible for you to learn more skills. Please use";
-			mes "all of your remaining Skill Points before returning to me.";
-			close;
-		}
-		jobchange Job_High_Priest;
-		set ADVJOB,0;
-		mes "[High Priest]";
-		mes "Congratulations.";
-		mes "As a High Priest,";
-		mes "I hope you will guide";
-		mes "others upon the path";
-		mes "to holiness...";
-		close;
-	}
-	mes "[High Priest]";
-	mes "Welcome";
-	mes "to Valhalla,";
-	mes "the Hall of Honor.";
-	next;
-	mes "[High Priest]";
-	mes "Please make";
-	mes "yourself comfortable";
-	mes "while you are here.";
-	mes "Honor to the warriors!";
-	close;
-}
diff --git a/npc/pre-re/jobs/2-1a/HighWizard.txt b/npc/pre-re/jobs/2-1a/HighWizard.txt
deleted file mode 100644
index 58f1bfce8..000000000
--- a/npc/pre-re/jobs/2-1a/HighWizard.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== By: ==================================================
-//= Nana
-//= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
-//= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
-
-valkyrie,44,47,5	script	High Wizard#Valkyrie	735,{
-	if (ADVJOB == 0 ||  Upper != 1) {
-		set .@karma_d,rand(1,10);
-		if (.@karma_d > 4) {
-			mes "[High Wizard]";
-			mes "Congratulations.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		mes "[High Wizard]";
-		mes "We High Wizards have";
-		mes "the responsibility of";
-		mes "using our destructive magic";
-		mes "for the right purposes.";
-		next;
-		mes "[High Wizard]";
-		mes "A lifetime of training";
-		mes "is required before becoming";
-		mes "a High Wizard. Can you imagine";
-		mes "what would happen if our power";
-		mes "was placed in the wrong hands?!";
-		close;
-	}
-	else if (ADVJOB == Job_High_Wizard && Class == Job_Mage_High && JobLevel > 39) {
-		mes "[High Wizard]";
-		mes "It is time.";
-		mes "And Rune-Midgard has";
-		mes "need of those who can";
-		mes "wield the strongest of magic...";
-		next;
-		mes "[High Wizard]";
-		mes "Would you like to";
-		mes "become a High Wizard?";
-		next;
-		if (select("No.:Yes.") == 1) {
-			mes "[High Wizard]";
-			mes "When you're ready,";
-			mes "feel free to come back.";
-			mes "Honors to the warriors!";
-			close;
-		}
-		if (SkillPoint) {
-			mes "[High Wizard]";
-			mes "It is still possible for you to learn more skills. Please use";
-			mes "all of your remaining Skill Points before returning to me.";
-			close;
-		}
-		jobchange Job_high_Wizard;
-		set ADVJOB,0;
-		mes "[High Wizard]";
-		mes "Congratulations.";
-		mes "As a High Wizard,";
-		mes "I hope use you use";
-		mes "your powers to bring";
-		mes "peace to the oppressed.";
-		close;
-	}
-	mes "[High Wizard]";
-	mes "Welcome";
-	mes "to Valhalla,";
-	mes "the Hall of Honor.";
-	next;
-	mes "[High Wizard]";
-	mes "Please make";
-	mes "yourself comfortable";
-	mes "while you are here.";
-	mes "Honor to the warriors!";
-	close;
-}
diff --git a/npc/pre-re/jobs/2-1a/LordKnight.txt b/npc/pre-re/jobs/2-1a/LordKnight.txt
deleted file mode 100644
index ba998483e..000000000
--- a/npc/pre-re/jobs/2-1a/LordKnight.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== By: ==================================================
-//= Nana
-//= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
-//= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
-
-valkyrie,44,39,5	script	Lord Knight#Valkyrie	56,{
-	if (ADVJOB == 0 || Upper != 1) {
-		set .@karma_d,rand(1,10);
-		if (.@karma_d > 4) {
-			mes "[Lord Knight]";
-			mes "Congratulations.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		mes "[Lord Knight]";
-		mes "We Knights have an";
-		mes "awesome responsibility...";
-		mes "To serve and protect.";
-		next;
-		mes "[Lord Knight]";
-		mes "Even at the cost";
-		mes "of our own lives,";
-		mes "we must safeguard the";
-		mes "well being of our comrades.";
-		close;
-	}
-	else if (ADVJOB == Job_Lord_Knight && Class == Job_Swordman_High && JobLevel > 39) {
-		mes "[Lord Knight]";
-		mes "Your time has come!";
-		mes "The world still needs you.";
-		mes "Please continue your life";
-		mes "as a hero with a new appearance.";
-		next;
-		mes "[Lord Knight]";
-		mes "Would you like";
-		mes "to become a Lord Knight?";
-		next;
-		if (select("No.:Yes.") == 1) {
-			mes "[Lord Knight]";
-			mes "When you're ready,";
-			mes "feel free to come back.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		if (SkillPoint) {
-			mes "[Lord Knight]";
-			mes "It is still possible for you to learn more skills. Please use";
-			mes "all of your remaining Skill Points before returning to me.";
-			close;
-		}
-		jobchange Job_Lord_Knight;
-		set ADVJOB,0;
-		mes "[Lord Knight]";
-		mes "Congratulations!";
-		mes "As a Lord Knight,";
-		mes "I hope that you will be";
-		mes "at the forefront of battle,";
-		mes "and lead your allies to victory!";
-		close;
-	}
-	mes "[Lord Knight]";
-	mes "Welcome";
-	mes "to Valhalla,";
-	mes "the Hall of Honor.";
-	next;
-	mes "[Lord Knight]";
-	mes "Please make";
-	mes "yourself comfortable";
-	mes "while you are here.";
-	mes "Honor to the warriors!";
-	close;
-}
diff --git a/npc/pre-re/jobs/2-1a/Sniper.txt b/npc/pre-re/jobs/2-1a/Sniper.txt
deleted file mode 100644
index cf5f4881e..000000000
--- a/npc/pre-re/jobs/2-1a/Sniper.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== By: ==================================================
-//= Nana
-//= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
-//= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
-
-valkyrie,44,55,5	script	Sniper#Valkyrie	727,{
-	if (ADVJOB == 0 || Upper != 1) {
-		set .@karma_d,rand(1,10);
-		if (.@karma_d > 4) {
-			mes "[Sniper]";
-			mes "Congratulations.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		mes "[Sniper]";
-		mes "One shot.";
-		mes "One kill.";
-		mes "It's not so hard";
-		mes "once you develop the";
-		mes "vision for that style";
-		mes "of battling.";
-		close;
-	}
-	else if (ADVJOB == Job_Sniper && Class == Job_Archer_High && JobLevel > 39) {
-		mes "[Sniper]";
-		mes "The world is in";
-		mes "need of mighty Bowmen";
-		mes "like you. Are you ready for";
-		mes "the awesome responsibility?";
-		next;
-		mes "[Sniper]";
-		mes "Are you willing to";
-		mes "take the next step and";
-		mes "become a Sniper?";
-		next;
-		if (select("No.:Yes.") == 1) {
-			mes "[Sniper]";
-			mes "When you're ready,";
-			mes "feel free to come back.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		if (SkillPoint) {
-			mes "[Sniper]";
-			mes "It is still possible for you to learn more skills. Please use";
-			mes "all of your remaining Skill Points before returning to me.";
-			close;
-		}
-		jobchange Job_Sniper;
-		set ADVJOB,0;
-		mes "[Sniper]";
-		mes "Congratulations!";
-		mes "As a Sniper, I hope";
-		mes "that the minions of evil";
-		mes "will never be safe so";
-		mes "long as they are in";
-		mes "your sight!";
-		close;
-	}
-	mes "[Sniper]";
-	mes "Welcome";
-	mes "to Valhalla,";
-	mes "the Hall of Honor.";
-	next;
-	mes "[Sniper]";
-	mes "Please make";
-	mes "yourself comfortable";
-	mes "while you are here.";
-	mes "Honor to the warriors!";
-	close;
-}
diff --git a/npc/pre-re/jobs/2-1a/WhiteSmith.txt b/npc/pre-re/jobs/2-1a/WhiteSmith.txt
deleted file mode 100644
index 42ac6164b..000000000
--- a/npc/pre-re/jobs/2-1a/WhiteSmith.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== By: ==================================================
-//= Nana
-//= finished, optimized and tested by Lupus
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= rAthena 1.0 +
-//===== Description: ========================================= 
-//= Advance Class jobchanger after kRO Normals.
-//===== Additional Comments: ================================= 
-//= v1.1 Made all into functions, additional checks, etc. [Lupus]
-//= v1.2 Made numbers into constants. [Vicious]
-//= 1.3 Now saves/restores all the quest skills [Lupus]
-//============================================================ 
-
-valkyrie,44,50,5	script	MasterSmith#Valkyrie	731,{
-	if (ADVJOB == 0 || Upper != 1) {
-		set .@karma_d,rand(1,10);
-		if (.@karma_d > 4) {
-			mes "[MasterSmith]";
-			mes "Congratulations.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		mes "[MasterSmith]";
-		mes "Ah...";
-		mes "The pinnacle";
-		mes "of craftsmanship.";
-		mes "That's the work of";
-		mes "a MasterSmith.";
-		next;
-		mes "[MasterSmith]";
-		mes "Once you're the";
-		mes "the best of the best,";
-		mes "you begin forging with";
-		mes "the goal of discovering";
-		mes "new and better ways of";
-		mes "crafting...";
-		close;
-	}
-	else if (ADVJOB == Job_WhiteSmith && Class == Job_Merchant_High && JobLevel > 39) {
-		mes "[MasterSmith]";
-		mes "The time has come!";
-		mes "Our world needs brave,";
-		mes "hard-working adventurers";
-		mes "like you...";
-		next;
-		mes "[MasterSmith]";
-		mes "Would you like to";
-		mes "become a MasterSmith?";
-		next;
-		if (select("No.:Yes.") == 1) {
-			mes "[MasterSmith]";
-			mes "When you're ready,";
-			mes "feel free to come back.";
-			mes "Honor to the warriors!";
-			close;
-		}
-		if (SkillPoint) {
-			mes "[MasterSmith]";
-			mes "It is still possible for you to learn more skills. Please use";
-			mes "all of your remaining Skill Points before returning to me.";
-			close;
-		}
-		jobchange Job_Whitesmith;
-		set ADVJOB,0;
-		mes "[MasterSmith]";
-		mes "Congratulations!";
-		mes "As a MasterSmith,";
-		mes "I hope you will forge";
-		mes "a path towards a brighter";
-		mes "future for Rune-Midgard.";
-		close;
-	}
-	mes "[MasterSmith]";
-	mes "Welcome";
-	mes "to Valhalla,";
-	mes "the Hall of Honor.";
-	next;
-	mes "[MasterSmith]";
-	mes "Please make";
-	mes "yourself comfortable";
-	mes "while you are here.";
-	mes "Honor to the warriors!";
-	close;
-}