summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
authorEuphy <euphy@rathena.org>2013-06-20 22:29:03 -0400
committerEuphy <euphy@rathena.org>2013-06-20 22:29:03 -0400
commit86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (patch)
treedf955a23899586104e67359dc490891221b2875b /npc/re
parentcaa8a41b40a5ce3c96eb793619ff75f191ca558b (diff)
parent0f7c29113d7d898150108d66d1358f15bb018e0a (diff)
downloadhercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.gz
hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.bz2
hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.xz
hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: conf/plugins.conf db/pre-re/skill_tree.txt db/re/skill_tree.txt db/sc_config.txt npc/mobs/citycleaners.txt src/map/atcommand.c src/map/battle.c src/map/clif.c src/map/map.c src/map/packets.h src/map/pc.c src/map/script.c src/map/skill.c src/map/status.c src/map/storage.c src/map/trade.h Merged master.
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/instances/HazyForest.txt16
-rw-r--r--npc/re/mobs/dungeons/gld_re.txt4
-rw-r--r--npc/re/scripts_monsters.conf2
3 files changed, 11 insertions, 11 deletions
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index cb65f11d7..cecdadd20 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -1,18 +1,18 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Hazy Forest
-//===== By: ==================================================
+//===== By: ==================================================
//= Euphy
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Compatible With: =====================================
+//= Hercules
+//===== Description: =========================================
//= [Official Conversion]
//= Cross through the Hazy Forest to reach the Bifrost.
//= Contains the Wandering Guardian quest.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First version. [Euphy]
-//============================================================
+//============================================================
// Instance Creation
//============================================================
diff --git a/npc/re/mobs/dungeons/gld_re.txt b/npc/re/mobs/dungeons/gld_re.txt
index 29955c381..1280755a7 100644
--- a/npc/re/mobs/dungeons/gld_re.txt
+++ b/npc/re/mobs/dungeons/gld_re.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Renewal Guild Monster Spawn Script
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
-//= rAthena SVN
+//= Hercules
//===== Additional Comments: =================================
//= 1.0 First version, Hall of Abyss update. [Euphy]
//============================================================
diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf
index 25811f8b3..46ab419d8 100644
--- a/npc/re/scripts_monsters.conf
+++ b/npc/re/scripts_monsters.conf
@@ -18,7 +18,7 @@ npc: npc/re/mobs/dungeons/ein_dun.txt
npc: npc/re/mobs/dungeons/gef_dun.txt
npc: npc/re/mobs/dungeons/gefenia.txt
npc: npc/re/mobs/dungeons/glastheim.txt
-npc: npc/re/mobs/dungeons/gld_dun.txt
+npc: npc/re/mobs/dungeons/gld_re.txt
npc: npc/re/mobs/dungeons/gld_dunSE.txt
npc: npc/re/mobs/dungeons/gon_dun.txt
npc: npc/re/mobs/dungeons/ice_dun.txt