Merge pull request #533 from dastgir/guild_change

Renamed guild and guild2 folder

44 files changed, 62 insertions, 62 deletions

diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index 824fa4a4f..ec5bb3d81 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -11,8 +11,8 @@
 //= and "rewards" function originally by Goddameit.
 //===== Additional Comments: =================================
 //= Be sure to disable the default agit controllers!
-//== npc\guild\agit_controller.txt
-//== npc\guild2\agit_start_se.txt
+//== npc\woe-fe\agit_controller.txt
+//== npc\woe-se\agit_start_se.txt
 //============================================================
 
 // Information NPC
diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf
index 8e75dd332..737099ec8 100644
--- a/npc/pre-re/scripts_main.conf
+++ b/npc/pre-re/scripts_main.conf
@@ -27,7 +27,7 @@ npc: npc/other/CashShop_Functions.txt
 
 // ------------------- Common Script Files ----------------------
 import: npc/scripts.conf
-import: npc/scripts_guild.conf
+import: npc/scripts_woe.conf
 import: npc/scripts_jobs.conf
 import: npc/scripts_mapflags.conf
 import: npc/scripts_monsters.conf
diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf
index 28f514d19..3e0bceecc 100644
--- a/npc/re/scripts_main.conf
+++ b/npc/re/scripts_main.conf
@@ -27,7 +27,7 @@ npc: npc/other/CashShop_Functions.txt
 
 // ------------------- Common Script Files ----------------------
 import: npc/scripts.conf
-import: npc/scripts_guild.conf
+import: npc/scripts_woe.conf
 import: npc/scripts_jobs.conf
 import: npc/scripts_mapflags.conf
 import: npc/scripts_monsters.conf
@@ -35,7 +35,7 @@ import: npc/scripts_warps.conf
 
 // ------------------- Renewal Script Files ---------------------
 import: npc/re/scripts.conf
-import: npc/re/scripts_guild.conf
+import: npc/re/scripts_woe.conf
 import: npc/re/scripts_jobs.conf
 import: npc/re/scripts_monsters.conf
 import: npc/re/scripts_warps.conf
diff --git a/npc/re/scripts_guild.conf b/npc/re/scripts_woe.conf
index e5c01e436..c3a2ecccf 100644
--- a/npc/re/scripts_guild.conf
+++ b/npc/re/scripts_woe.conf
@@ -4,5 +4,5 @@
 
 // ----------------------- War of Emperium ----------------------
 // - Hall of Abyss
-npc: npc/re/guild/invest_main.txt
-npc: npc/re/guild/invest_npc.txt
+npc: npc/re/woe-fe/invest_main.txt
+npc: npc/re/woe-fe/invest_npc.txt
diff --git a/npc/re/guild/invest_main.txt b/npc/re/woe-fe/invest_main.txt
index 9ed49ce7a..9ed49ce7a 100644
--- a/npc/re/guild/invest_main.txt
+++ b/npc/re/woe-fe/invest_main.txt
diff --git a/npc/re/guild/invest_npc.txt b/npc/re/woe-fe/invest_npc.txt
index a1d564e00..a1d564e00 100644
--- a/npc/re/guild/invest_npc.txt
+++ b/npc/re/woe-fe/invest_npc.txt
diff --git a/npc/scripts_guild.conf b/npc/scripts_guild.conf
deleted file mode 100644
index 90c066fcb..000000000
--- a/npc/scripts_guild.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-// --------------------------------------------------------------
-// -                         Guild Wars                         -
-// --------------------------------------------------------------
-
-// ----------------------- War of Emperium ----------------------
-// - Guild WoE time settings
-npc: npc/guild/agit_controller.txt
-// - Guild NPC Template file
-npc: npc/guild/agit_main.txt
-// - Al De Baran
-npc: npc/guild/aldeg_cas01.txt
-npc: npc/guild/aldeg_cas02.txt
-npc: npc/guild/aldeg_cas03.txt
-npc: npc/guild/aldeg_cas04.txt
-npc: npc/guild/aldeg_cas05.txt
-// - Geffen
-npc: npc/guild/gefg_cas01.txt
-npc: npc/guild/gefg_cas02.txt
-npc: npc/guild/gefg_cas03.txt
-npc: npc/guild/gefg_cas04.txt
-npc: npc/guild/gefg_cas05.txt
-// - Payon
-npc: npc/guild/payg_cas01.txt
-npc: npc/guild/payg_cas02.txt
-npc: npc/guild/payg_cas03.txt
-npc: npc/guild/payg_cas04.txt
-npc: npc/guild/payg_cas05.txt
-// - Prontera
-npc: npc/guild/prtg_cas01.txt
-npc: npc/guild/prtg_cas02.txt
-npc: npc/guild/prtg_cas03.txt
-npc: npc/guild/prtg_cas04.txt
-npc: npc/guild/prtg_cas05.txt
-// - Treasure Room Protection
-//npc: npc/guild/trs_rp.txt
-
-// --------------- War of Emperium Second Edition ---------------
-// - WoE SE time settings
-npc: npc/guild2/agit_start_se.txt
-// - Guild NPC Template file
-npc: npc/guild2/agit_main_se.txt
-// - Town Flags
-npc: npc/guild2/guild_flags.txt
-// - Arunafeltz
-npc: npc/guild2/arug_cas01.txt
-npc: npc/guild2/arug_cas02.txt
-npc: npc/guild2/arug_cas03.txt
-npc: npc/guild2/arug_cas04.txt
-npc: npc/guild2/arug_cas05.txt
-// - Schwaltzvalt
-npc: npc/guild2/schg_cas01.txt
-npc: npc/guild2/schg_cas02.txt
-npc: npc/guild2/schg_cas03.txt
-npc: npc/guild2/schg_cas04.txt
-npc: npc/guild2/schg_cas05.txt
diff --git a/npc/scripts_woe.conf b/npc/scripts_woe.conf
new file mode 100644
index 000000000..42f567c65
--- /dev/null
+++ b/npc/scripts_woe.conf
@@ -0,0 +1,55 @@
+// --------------------------------------------------------------
+// -                         Guild Wars                         -
+// --------------------------------------------------------------
+
+// ----------------------- War of Emperium ----------------------
+// - Guild WoE time settings
+npc: npc/woe-fe/agit_controller.txt
+// - Guild NPC Template file
+npc: npc/woe-fe/agit_main.txt
+// - Al De Baran
+npc: npc/woe-fe/aldeg_cas01.txt
+npc: npc/woe-fe/aldeg_cas02.txt
+npc: npc/woe-fe/aldeg_cas03.txt
+npc: npc/woe-fe/aldeg_cas04.txt
+npc: npc/woe-fe/aldeg_cas05.txt
+// - Geffen
+npc: npc/woe-fe/gefg_cas01.txt
+npc: npc/woe-fe/gefg_cas02.txt
+npc: npc/woe-fe/gefg_cas03.txt
+npc: npc/woe-fe/gefg_cas04.txt
+npc: npc/woe-fe/gefg_cas05.txt
+// - Payon
+npc: npc/woe-fe/payg_cas01.txt
+npc: npc/woe-fe/payg_cas02.txt
+npc: npc/woe-fe/payg_cas03.txt
+npc: npc/woe-fe/payg_cas04.txt
+npc: npc/woe-fe/payg_cas05.txt
+// - Prontera
+npc: npc/woe-fe/prtg_cas01.txt
+npc: npc/woe-fe/prtg_cas02.txt
+npc: npc/woe-fe/prtg_cas03.txt
+npc: npc/woe-fe/prtg_cas04.txt
+npc: npc/woe-fe/prtg_cas05.txt
+// - Treasure Room Protection
+//npc: npc/woe-fe/trs_rp.txt
+
+// --------------- War of Emperium Second Edition ---------------
+// - WoE SE time settings
+npc: npc/woe-se/agit_start_se.txt
+// - Guild NPC Template file
+npc: npc/woe-se/agit_main_se.txt
+// - Town Flags
+npc: npc/woe-se/guild_flags.txt
+// - Arunafeltz
+npc: npc/woe-se/arug_cas01.txt
+npc: npc/woe-se/arug_cas02.txt
+npc: npc/woe-se/arug_cas03.txt
+npc: npc/woe-se/arug_cas04.txt
+npc: npc/woe-se/arug_cas05.txt
+// - Schwaltzvalt
+npc: npc/woe-se/schg_cas01.txt
+npc: npc/woe-se/schg_cas02.txt
+npc: npc/woe-se/schg_cas03.txt
+npc: npc/woe-se/schg_cas04.txt
+npc: npc/woe-se/schg_cas05.txt
diff --git a/npc/guild/agit_controller.txt b/npc/woe-fe/agit_controller.txt
index 8d038c322..8d038c322 100644
--- a/npc/guild/agit_controller.txt
+++ b/npc/woe-fe/agit_controller.txt
diff --git a/npc/guild/agit_main.txt b/npc/woe-fe/agit_main.txt
index 527bebce4..527bebce4 100644
--- a/npc/guild/agit_main.txt
+++ b/npc/woe-fe/agit_main.txt
diff --git a/npc/guild/aldeg_cas01.txt b/npc/woe-fe/aldeg_cas01.txt
index e72b121c5..e72b121c5 100644
--- a/npc/guild/aldeg_cas01.txt
+++ b/npc/woe-fe/aldeg_cas01.txt
diff --git a/npc/guild/aldeg_cas02.txt b/npc/woe-fe/aldeg_cas02.txt
index 938e511da..938e511da 100644
--- a/npc/guild/aldeg_cas02.txt
+++ b/npc/woe-fe/aldeg_cas02.txt
diff --git a/npc/guild/aldeg_cas03.txt b/npc/woe-fe/aldeg_cas03.txt
index c595a8681..c595a8681 100644
--- a/npc/guild/aldeg_cas03.txt
+++ b/npc/woe-fe/aldeg_cas03.txt
diff --git a/npc/guild/aldeg_cas04.txt b/npc/woe-fe/aldeg_cas04.txt
index 6a6b9d7ec..6a6b9d7ec 100644
--- a/npc/guild/aldeg_cas04.txt
+++ b/npc/woe-fe/aldeg_cas04.txt
diff --git a/npc/guild/aldeg_cas05.txt b/npc/woe-fe/aldeg_cas05.txt
index 93a78d7fb..93a78d7fb 100644
--- a/npc/guild/aldeg_cas05.txt
+++ b/npc/woe-fe/aldeg_cas05.txt
diff --git a/npc/guild/gefg_cas01.txt b/npc/woe-fe/gefg_cas01.txt
index 6127e62f9..6127e62f9 100644
--- a/npc/guild/gefg_cas01.txt
+++ b/npc/woe-fe/gefg_cas01.txt
diff --git a/npc/guild/gefg_cas02.txt b/npc/woe-fe/gefg_cas02.txt
index 45530849a..45530849a 100644
--- a/npc/guild/gefg_cas02.txt
+++ b/npc/woe-fe/gefg_cas02.txt
diff --git a/npc/guild/gefg_cas03.txt b/npc/woe-fe/gefg_cas03.txt
index a206c8bac..a206c8bac 100644
--- a/npc/guild/gefg_cas03.txt
+++ b/npc/woe-fe/gefg_cas03.txt
diff --git a/npc/guild/gefg_cas04.txt b/npc/woe-fe/gefg_cas04.txt
index 06d37361a..06d37361a 100644
--- a/npc/guild/gefg_cas04.txt
+++ b/npc/woe-fe/gefg_cas04.txt
diff --git a/npc/guild/gefg_cas05.txt b/npc/woe-fe/gefg_cas05.txt
index 81ebd3905..81ebd3905 100644
--- a/npc/guild/gefg_cas05.txt
+++ b/npc/woe-fe/gefg_cas05.txt
diff --git a/npc/guild/payg_cas01.txt b/npc/woe-fe/payg_cas01.txt
index 1deee9a4f..1deee9a4f 100644
--- a/npc/guild/payg_cas01.txt
+++ b/npc/woe-fe/payg_cas01.txt
diff --git a/npc/guild/payg_cas02.txt b/npc/woe-fe/payg_cas02.txt
index 92db92c09..92db92c09 100644
--- a/npc/guild/payg_cas02.txt
+++ b/npc/woe-fe/payg_cas02.txt
diff --git a/npc/guild/payg_cas03.txt b/npc/woe-fe/payg_cas03.txt
index e0e649308..e0e649308 100644
--- a/npc/guild/payg_cas03.txt
+++ b/npc/woe-fe/payg_cas03.txt
diff --git a/npc/guild/payg_cas04.txt b/npc/woe-fe/payg_cas04.txt
index 498bc1aed..498bc1aed 100644
--- a/npc/guild/payg_cas04.txt
+++ b/npc/woe-fe/payg_cas04.txt
diff --git a/npc/guild/payg_cas05.txt b/npc/woe-fe/payg_cas05.txt
index 7b667c4ca..7b667c4ca 100644
--- a/npc/guild/payg_cas05.txt
+++ b/npc/woe-fe/payg_cas05.txt
diff --git a/npc/guild/prtg_cas01.txt b/npc/woe-fe/prtg_cas01.txt
index 961453ccd..961453ccd 100644
--- a/npc/guild/prtg_cas01.txt
+++ b/npc/woe-fe/prtg_cas01.txt
diff --git a/npc/guild/prtg_cas02.txt b/npc/woe-fe/prtg_cas02.txt
index 315478ba1..315478ba1 100644
--- a/npc/guild/prtg_cas02.txt
+++ b/npc/woe-fe/prtg_cas02.txt
diff --git a/npc/guild/prtg_cas03.txt b/npc/woe-fe/prtg_cas03.txt
index 4b52dbb7f..4b52dbb7f 100644
--- a/npc/guild/prtg_cas03.txt
+++ b/npc/woe-fe/prtg_cas03.txt
diff --git a/npc/guild/prtg_cas04.txt b/npc/woe-fe/prtg_cas04.txt
index 8936b8451..8936b8451 100644
--- a/npc/guild/prtg_cas04.txt
+++ b/npc/woe-fe/prtg_cas04.txt
diff --git a/npc/guild/prtg_cas05.txt b/npc/woe-fe/prtg_cas05.txt
index 3b9652783..3b9652783 100644
--- a/npc/guild/prtg_cas05.txt
+++ b/npc/woe-fe/prtg_cas05.txt
diff --git a/npc/guild/trs_rp.txt b/npc/woe-fe/trs_rp.txt
index d96bd694e..d96bd694e 100644
--- a/npc/guild/trs_rp.txt
+++ b/npc/woe-fe/trs_rp.txt
diff --git a/npc/guild2/agit_main_se.txt b/npc/woe-se/agit_main_se.txt
index bad6b27f7..bad6b27f7 100644
--- a/npc/guild2/agit_main_se.txt
+++ b/npc/woe-se/agit_main_se.txt
diff --git a/npc/guild2/agit_start_se.txt b/npc/woe-se/agit_start_se.txt
index 74f03cb28..74f03cb28 100644
--- a/npc/guild2/agit_start_se.txt
+++ b/npc/woe-se/agit_start_se.txt
diff --git a/npc/guild2/arug_cas01.txt b/npc/woe-se/arug_cas01.txt
index be190c77f..be190c77f 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/woe-se/arug_cas01.txt
diff --git a/npc/guild2/arug_cas02.txt b/npc/woe-se/arug_cas02.txt
index bf7f639eb..bf7f639eb 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/woe-se/arug_cas02.txt
diff --git a/npc/guild2/arug_cas03.txt b/npc/woe-se/arug_cas03.txt
index 0a1665566..0a1665566 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/woe-se/arug_cas03.txt
diff --git a/npc/guild2/arug_cas04.txt b/npc/woe-se/arug_cas04.txt
index e6d734684..e6d734684 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/woe-se/arug_cas04.txt
diff --git a/npc/guild2/arug_cas05.txt b/npc/woe-se/arug_cas05.txt
index e4848b346..e4848b346 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/woe-se/arug_cas05.txt
diff --git a/npc/guild2/guild_flags.txt b/npc/woe-se/guild_flags.txt
index bfbca227d..bfbca227d 100644
--- a/npc/guild2/guild_flags.txt
+++ b/npc/woe-se/guild_flags.txt
diff --git a/npc/guild2/schg_cas01.txt b/npc/woe-se/schg_cas01.txt
index ba9da886b..ba9da886b 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/woe-se/schg_cas01.txt
diff --git a/npc/guild2/schg_cas02.txt b/npc/woe-se/schg_cas02.txt
index 798fb9c8b..798fb9c8b 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/woe-se/schg_cas02.txt
diff --git a/npc/guild2/schg_cas03.txt b/npc/woe-se/schg_cas03.txt
index 77d50195e..77d50195e 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/woe-se/schg_cas03.txt
diff --git a/npc/guild2/schg_cas04.txt b/npc/woe-se/schg_cas04.txt
index dd81e16c6..dd81e16c6 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/woe-se/schg_cas04.txt
diff --git a/npc/guild2/schg_cas05.txt b/npc/woe-se/schg_cas05.txt
index ca69a2dd6..ca69a2dd6 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/woe-se/schg_cas05.txt