summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/mobs/citycleaners.txt4
-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
4 files changed, 15 insertions, 11 deletions
diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt
index 876017fd4..62a0f2c12 100644
--- a/npc/mobs/citycleaners.txt
+++ b/npc/mobs/citycleaners.txt
@@ -47,4 +47,8 @@ einbech,0,0,0,0 monster Tarou 1175,5,1800000,1500000,0
//==================================================
payon_in02,23,68,5,5 monster Thief Bug Egg 1048,7,1200000,600000,0
+<<<<<<< HEAD
job3_war01,19,33,5,5 monster Thief Bug Egg 1213,1,12,60,0
+=======
+job3_war01,19,33,5,5 monster Thief Bug Egg 1048,1,12,60,0
+>>>>>>> upstream/master
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