Merge pull request #5962 from isotor/fradubio_lottery

Make Fradubio lottery spawn off Fraelissa
DarkstarProject · Jun 1, 2019 · 48c40f3 · 48c40f3
2 parents 64cc8c4 + 5c39d98
commit 48c40f3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/scripts/zones/Jugner_Forest/IDs.lua b/scripts/zones/Jugner_Forest/IDs.lua
@@ -36,6 +36,10 @@ zones[dsp.zone.JUGNER_FOREST] =
         {
             [17203437] = 17203475,
         },
+        FRADUBIO_PH =
+        {
+            [17203447] = 17203448,
+        },
         KING_ARTHRO = 17203216,
         FRAELISSA   = 17203447,
     },

diff --git a/scripts/zones/Jugner_Forest/mobs/Fradubio.lua b/scripts/zones/Jugner_Forest/mobs/Fradubio.lua
@@ -1,16 +1,11 @@
 ----------------------------------
 -- Area: Jugner_Forest
---  NM:  Fradubio
--- !pos 76.573 -0.901 -246.241 104
+--   NM:  Fradubio
 -----------------------------------
 
 function onMobDeath(mob, player, isKiller)
-end;
+end
 
 function onMobDespawn(mob)
-
-    -- Set Fradubio spawnpoint and respawn time (21-24 hours)
-    UpdateNMSpawnPoint(mob:getID());
-    mob:setRespawnTime(math.random(75600,86400));
-
-end;
+    UpdateNMSpawnPoint(mob:getID())
+end
diff --git a/scripts/zones/Jugner_Forest/mobs/Fraelissa.lua b/scripts/zones/Jugner_Forest/mobs/Fraelissa.lua
@@ -1,13 +1,14 @@
 -----------------------------------
--- Area: Jugner Forest (104)
+-- Area: Jugner Forest
 --   NM: Fraelissa
--- !pos 9.320 -0.493 -371.654 104
 -----------------------------------
 
 function onMobDeath(mob, player, isKiller)
 end
 
 function onMobDespawn(mob)
     UpdateNMSpawnPoint(mob:getID())
-    mob:setRespawnTime(math.random(3600, 4500)) -- 60 to 75 minutes
+    if not dsp.mob.phOnDespawn(mob, ID.mob.FRADUBIO_PH, 10, math.random(75600, 86400)) then -- 21-24 hours
+        mob:setRespawnTime(math.random(3600, 4500)) -- 60 to 75 minutes
+    end
 end