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, 14 insertions, 95 deletions

diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf
index 936d96e55..9a3c96975 100644
--- a/npc/pre-re/scripts_jobs.conf
+++ b/npc/pre-re/scripts_jobs.conf
@@ -1,95 +1,14 @@
-// --------------------------------------------------------------
-// -                        Job  Scripts                        -
-// --------------------------------------------------------------
-
-// --------------------------------------------------------------
-// ------------------------- Job Quests -------------------------
-// -- Novice
-npc: npc/pre-re/jobs/novice/novice.txt
-npc: npc/pre-re/jobs/novice/supernovice.txt
-//npc: npc/re/jobs/novice/supernovice_ex.txt
-// -- 1-1
-npc: npc/pre-re/jobs/1-1/thief.txt
-npc: npc/pre-re/jobs/1-1/archer.txt
-npc: npc/pre-re/jobs/1-1/mage.txt
-npc: npc/pre-re/jobs/1-1/merchant.txt
-npc: npc/pre-re/jobs/1-1/acolyte.txt
-npc: npc/pre-re/jobs/1-1/swordman.txt
-// -- 2-1
-npc: npc/pre-re/jobs/2-1/blacksmith.txt
-npc: npc/pre-re/jobs/2-1/knight.txt
-npc: npc/pre-re/jobs/2-1/hunter.txt
-npc: npc/pre-re/jobs/2-1/priest.txt
-npc: npc/pre-re/jobs/2-1/wizard.txt
-npc: npc/pre-re/jobs/2-1/assassin.txt
-// -- 2-2
-npc: npc/pre-re/jobs/2-2/rogue.txt
-npc: npc/pre-re/jobs/2-2/alchemist.txt
-npc: npc/pre-re/jobs/2-2/sage.txt
-npc: npc/pre-re/jobs/2-2/crusader.txt
-npc: npc/pre-re/jobs/2-2/monk.txt
-npc: npc/pre-re/jobs/2-2/dancer.txt
-npc: npc/pre-re/jobs/2-2/bard.txt
-// -- Transcended Quest (2-x -> High Novice)
-npc: npc/pre-re/jobs/valkyrie.txt
-// -- Transcended (2-1a)
-npc: npc/pre-re/jobs/2-1a/AssassinCross.txt
-npc: npc/pre-re/jobs/2-1a/LordKnight.txt
-npc: npc/pre-re/jobs/2-1a/HighPriest.txt
-npc: npc/pre-re/jobs/2-1a/HighWizard.txt
-npc: npc/pre-re/jobs/2-1a/WhiteSmith.txt
-npc: npc/pre-re/jobs/2-1a/Sniper.txt
-// -- Transcended (2-2a)
-npc: npc/pre-re/jobs/2-2a/Champion.txt
-npc: npc/pre-re/jobs/2-2a/Clown.txt
-npc: npc/pre-re/jobs/2-2a/Creator.txt
-npc: npc/pre-re/jobs/2-2a/Gypsy.txt
-npc: npc/pre-re/jobs/2-2a/Paladin.txt
-npc: npc/pre-re/jobs/2-2a/Professor.txt
-npc: npc/pre-re/jobs/2-2a/Stalker.txt
-// -- 1-1E
-npc: npc/pre-re/jobs/1-1e/gunslinger.txt
-npc: npc/pre-re/jobs/1-1e/ninja.txt
-npc: npc/pre-re/jobs/1-1e/taekwon.txt
-// -- 2-1E
-npc: npc/pre-re/jobs/2-1e/StarGladiator.txt
-// -- 2-2E
-npc: npc/pre-re/jobs/2-2e/SoulLinker.txt
-// -- 3-1
-//npc: npc/re/jobs/3-1/archbishop.txt
-//npc: npc/re/jobs/3-1/mechanic.txt
-//npc: npc/re/jobs/3-1/ranger.txt
-//npc: npc/re/jobs/3-1/rune_knight.txt
-//npc: npc/re/jobs/3-1/warlock.txt
-//npc: npc/re/jobs/3-1/guillotine.txt
-// -- 3-2
-//npc: npc/re/jobs/3-2/minstrel.txt
-//npc: npc/re/jobs/3-2/wanderer.txt
-//npc: npc/re/jobs/3-2/royal_guard.txt
-//npc: npc/re/jobs/3-2/sorcerer.txt
-//npc: npc/re/jobs/3-2/sura.txt
-//npc: npc/re/jobs/3-2/shadow_chaser.txt
-//npc: npc/re/jobs/3-2/genetic.txt
-// --------------------------------------------------------------
-// ------------------------ Skill Quests ------------------------
-npc: npc/pre-re/quests/skills/acolyte_skills.txt
-npc: npc/pre-re/quests/skills/alchemist_skills.txt
-npc: npc/pre-re/quests/skills/archer_skills.txt
-npc: npc/pre-re/quests/skills/assassin_skills.txt
-npc: npc/pre-re/quests/skills/bard_skills.txt
-npc: npc/pre-re/quests/skills/blacksmith_skills.txt
-npc: npc/pre-re/quests/skills/crusader_skills.txt
-npc: npc/pre-re/quests/skills/dancer_skills.txt
-npc: npc/pre-re/quests/skills/hunter_skills.txt
-npc: npc/pre-re/quests/skills/knight_skills.txt
-npc: npc/pre-re/quests/skills/mage_skills.txt
-npc: npc/pre-re/quests/skills/merchant_skills.txt
-npc: npc/pre-re/quests/skills/monk_skills.txt
-npc: npc/pre-re/quests/skills/novice_skills.txt
-npc: npc/pre-re/quests/skills/priest_skills.txt
-npc: npc/pre-re/quests/skills/rogue_skills.txt
-npc: npc/pre-re/quests/skills/sage_skills.txt
-npc: npc/pre-re/quests/skills/swordman_skills.txt
-npc: npc/pre-re/quests/skills/thief_skills.txt
-npc: npc/pre-re/quests/skills/wizard_skills.txt
-// --------------------------------------------------------------
+// --------------------------------------------------------------

+// -                   Pre-Renewal Job Scripts                  -

+// --------------------------------------------------------------

+

+// ------------------------- Job Quests -------------------------

+// - 1-1

+npc: npc/pre-re/jobs/1-1/acolyte.txt

+npc: npc/pre-re/jobs/1-1/archer.txt

+npc: npc/pre-re/jobs/1-1/mage.txt

+npc: npc/pre-re/jobs/1-1/merchant.txt

+npc: npc/pre-re/jobs/1-1/swordman.txt

+npc: npc/pre-re/jobs/1-1/thief.txt

+// - Novice

+npc: npc/pre-re/jobs/novice/novice.txt