summaryrefslogtreecommitdiff
path: root/npc/mobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/mobs')
-rw-r--r--npc/mobs/fields/morocc.txt29
1 files changed, 16 insertions, 13 deletions
diff --git a/npc/mobs/fields/morocc.txt b/npc/mobs/fields/morocc.txt
index a866a5dd2..f84fd8e14 100644
--- a/npc/mobs/fields/morocc.txt
+++ b/npc/mobs/fields/morocc.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Athena (1.0)
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
@@ -12,6 +12,8 @@
//= 1.3 Added Morroc field 20, 21, and 22 spawns, as [L0ne_W0lf]
//= 1.4 Updated spawns to reflect episode 12.1. [L0ne_W0lf]
//= 1.5 Fixed Pheeroni spawn location. [Kisuka]
+//= 1.6 Added Satan MOrroc static spawn. [L0ne_W0lf]
+//= Added 30s spawn time for all Morroc Shadows.
//============================================================
//==================================================
@@ -296,10 +298,10 @@ moc_fild20,0,0,0,0 monster Drops 1113,30,0,0,0
moc_fild20,0,0,0,0 monster Scorpion 1001,70,0,0,0
moc_fild20,0,0,0,0 monster Picky 1050,50,0,0,0
moc_fild20,0,0,0,0 monster Picky 1049,50,0,0,0
-moc_fild20,0,0,0,0 monster Morroc's Shadow 1918,1,0,0,0
-moc_fild20,0,0,0,0 monster Morroc's Shadow 1919,1,0,0,0
-moc_fild20,0,0,0,0 monster Morroc's Shadow 1920,1,0,0,0
-moc_fild20,0,0,0,0 monster Morroc's Shadow 1921,1,0,0,0
+moc_fild20,0,0,0,0 monster Morroc's Shadow 1918,1,30000,0,0
+moc_fild20,0,0,0,0 monster Morroc's Shadow 1919,1,30000,0,0
+moc_fild20,0,0,0,0 monster Morroc's Shadow 1920,1,30000,0,0
+moc_fild20,0,0,0,0 monster Morroc's Shadow 1921,1,30000,0,0
//==================================================
// moc_fild21 - Dimensional Gorge
@@ -307,15 +309,16 @@ moc_fild20,0,0,0,0 monster Morroc's Shadow 1921,1,0,0,0
moc_fild21,0,0,0,0 monster Golem 1040,61,0,0,0
moc_fild21,0,0,0,0 monster Stalactic Golem 1278,46,0,0,0
moc_fild21,0,0,0,0 monster Lava Golem 1366,46,0,0,0
-moc_fild21,0,0,0,0 monster Morroc's Shadow 1918,46,0,0,0
-moc_fild21,0,0,0,0 monster Morroc's Shadow 1919,46,0,0,0
-moc_fild21,0,0,0,0 monster Morroc's Shadow 1920,46,0,0,0
-moc_fild21,0,0,0,0 monster Morroc's Shadow 1921,34,0,0,0
+moc_fild21,0,0,0,0 monster Morroc's Shadow 1918,46,30000,0,0
+moc_fild21,0,0,0,0 monster Morroc's Shadow 1919,46,30000,0,0
+moc_fild21,0,0,0,0 monster Morroc's Shadow 1920,46,30000,0,0
+moc_fild21,0,0,0,0 monster Morroc's Shadow 1921,34,30000,0,0
//==================================================
// moc_fild22 - Dimensional Gorge
//==================================================
-moc_fild22,0,0,0,0 monster Morroc's Shadow 1918,60,0,0,0
-moc_fild22,0,0,0,0 monster Morroc's Shadow 1919,60,0,0,0
-moc_fild22,0,0,0,0 monster Morroc's Shadow 1920,60,0,0,0
-moc_fild22,0,0,0,0 monster Morroc's Shadow 1921,25,0,0,0
+moc_fild22,0,0,0,0 monster Morroc's Shadow 1918,60,30000,0,0
+moc_fild22,0,0,0,0 monster Morroc's Shadow 1919,60,30000,0,0
+moc_fild22,0,0,0,0 monster Morroc's Shadow 1920,60,30000,0,0
+moc_fild22,0,0,0,0 monster Morroc's Shadow 1921,25,30000,0,0
+moc_fild22,0,0,0,0 monster Woudned Satan Morroc 1917,1,43200000,3600000,1