diff options
| author | Dastgir <dastgir@users.noreply.github.com> | 2015-06-05 21:15:39 +0530 |
|---|---|---|
| committer | Dastgir <dastgir@users.noreply.github.com> | 2015-06-05 21:15:39 +0530 |
| commit | cbb4a14ba44a611be94b3e54094a7980bdb7ba26 (patch) | |
| tree | f528405af63bdf2db32fdaa8f881da61a8b0014b /npc/re | |
| parent | 3d05cf3a3cf9c72e9bd2a3c93a3477837b80b9b3 (diff) | |
| parent | 37e47973a81957469be3c73d49a928188160747e (diff) | |
| download | hercules-cbb4a14ba44a611be94b3e54094a7980bdb7ba26.tar.gz hercules-cbb4a14ba44a611be94b3e54094a7980bdb7ba26.tar.bz2 hercules-cbb4a14ba44a611be94b3e54094a7980bdb7ba26.tar.xz hercules-cbb4a14ba44a611be94b3e54094a7980bdb7ba26.zip | |
Merge pull request #533 from dastgir/guild_change
Renamed guild and guild2 folder
Diffstat (limited to 'npc/re')
| -rw-r--r-- | npc/re/scripts_main.conf | 4 | ||||
| -rw-r--r-- | npc/re/scripts_woe.conf (renamed from npc/re/scripts_guild.conf) | 4 | ||||
| -rw-r--r-- | npc/re/woe-fe/invest_main.txt (renamed from npc/re/guild/invest_main.txt) | 0 | ||||
| -rw-r--r-- | npc/re/woe-fe/invest_npc.txt (renamed from npc/re/guild/invest_npc.txt) | 0 |
4 files changed, 4 insertions, 4 deletions
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 |