[lua,sql] Rolanberry Fields NM audit

scripts/actions/mobskills/flurry_of_rage.lua

@@ -0,0 +1,24 @@
+-----------------------------------
+-- Flurry of Rage
+-- Deals multiple hits to a single target.
+-- Only used by Eldritch Edge, Malefic Fencer, and Nightmare Weapon.
+-----------------------------------
+---@type TMobSkill
+local mobskillObject = {}
+
+mobskillObject.onMobSkillCheck = function(target, mob, skill)
+    return 0
+end
+
+mobskillObject.onMobWeaponSkill = function(target, mob, skill)
+    local numhits = 2
+    local accmod = 1
+    local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, 1, xi.mobskills.physicalTpBonus.ACC_VARIES, 2, 2.5, 3)
+    local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded)
+
+    target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING)
+
+    return dmg
+end
+
+return mobskillObject

scripts/zones/Rolanberry_Fields/mobs/Black_Triple_Stars.lua

@@ -5,6 +5,16 @@
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobRoam = function(mob)
+    if VanadielHour() >= 6 and VanadielHour() < 18 then -- Despawn if its day
+        DespawnMob(mob:getID())
+    end
+end
+
+entity.onMobDespawn = function(mob)
+    UpdateNMSpawnPoint(mob:getID())
+end
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.magian.onMobDeath(mob, player, optParams, set{ 3 })
     xi.hunts.checkHunt(mob, player, 215)

scripts/zones/Rolanberry_Fields/mobs/Drooling_Daisy.lua

@@ -5,6 +5,10 @@
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobDespawn = function(mob)
+    UpdateNMSpawnPoint(mob:getID())
+end
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.hunts.checkHunt(mob, player, 216)
     xi.magian.onMobDeath(mob, player, optParams, set{ 152 })

scripts/zones/Rolanberry_Fields/mobs/Eldritch_Edge.lua

@@ -5,6 +5,18 @@
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addImmunity(xi.immunity.GRAVITY)
+    mob:addImmunity(xi.immunity.BIND)
+    mob:setMod(xi.mod.STORETP, 25)
+end
+
+entity.onMobDespawn = function(mob)
+    UpdateNMSpawnPoint(mob:getID())
+end
+
 entity.onMobDeath = function(mob, player, optParams)
     xi.hunts.checkHunt(mob, player, 218)
 end

scripts/zones/Rolanberry_Fields/mobs/Evil_Weapon.lua

@@ -19,7 +19,7 @@ entity.onMobDeath = function(mob, player, optParams)
 end
 
 entity.onMobDespawn = function(mob)
-    xi.mob.phOnDespawn(mob, eldritchPHTable, 20, math.random(5400, 7200)) -- 90 to 120 minutes
+    xi.mob.phOnDespawn(mob, eldritchPHTable, 10, 5400) -- 90 minute minimum
 end
 
 return entity

scripts/zones/Rolanberry_Fields/mobs/Ravenous_Crawler.lua

@@ -5,8 +5,16 @@
 ---@type TMobEntity
 local entity = {}
 
-entity.onMobInitialize = function(mob)
-    mob:addMod(xi.mod.REGAIN, 100)
+entity.onMobSpawn = function(mob)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:addImmunity(xi.immunity.GRAVITY)
+    mob:addImmunity(xi.immunity.BIND)
+    mob:setMod(xi.mod.STORETP, 25)
+end
+
+entity.onMobDespawn = function(mob)
+    UpdateNMSpawnPoint(mob:getID())
 end
 
 entity.onMobDeath = function(mob, player, optParams)

scripts/zones/Rolanberry_Fields/mobs/Silk_Caterpillar.lua

@@ -0,0 +1,12 @@
+-----------------------------------
+-- Area: Rolanberry Fields
+--   NM: Silk Caterpillar
+-----------------------------------
+---@type TMobEntity
+local entity = {}
+
+entity.onMobDespawn = function(mob)
+    UpdateNMSpawnPoint(mob:getID())
+end
+
+return entity

scripts/zones/Rolanberry_Fields/mobs/Simurgh.lua

@@ -2,11 +2,32 @@
 -- Area: Rolanberry Fields (110)
 --  HNM: Simurgh
 -----------------------------------
-mixins = { require('scripts/mixins/rage') }
+mixins = { require('scripts/mixins/rage'), require("scripts/mixins/job_special") }
 -----------------------------------
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+    mob:setMod(xi.mod.EVA, 400)
+end
+
+entity.onMobFight = function(mob, target)
+    local drawInTable =
+    {
+        conditions =
+        {
+            target:checkDistance(mob) > mob:getMeleeRange(),
+        },
+        position = mob:getPos(),
+        offset = 5,
+        degrees = 180,
+        wait = 3,
+    }
+    utils.drawIn(target, drawInTable)
+end
+
 entity.onMobDeath = function(mob, player, optParams)
     player:addTitle(xi.title.SIMURGH_POACHER)
 end

sql/mob_droplist.sql

@@ -2806,11 +2806,10 @@ INSERT INTO `mob_droplist` VALUES (284,0,0,1000,4382,60);         -- Frost Turni
 INSERT INTO `mob_droplist` VALUES (285,0,0,1000,2891,@UNCOMMON); -- Dried Chigoe (Uncommon, 10%)
 
 -- ZoneID: 110 - Black Triple Stars
-INSERT INTO `mob_droplist` VALUES (286,0,0,1000,922,160);    -- Bat Wing (16.0%)
-INSERT INTO `mob_droplist` VALUES (286,0,0,1000,891,70);     -- Bat Fang (7.0%)
-INSERT INTO `mob_droplist` VALUES (286,0,0,1000,891,40);     -- Bat Fang (4.0%)
-INSERT INTO `mob_droplist` VALUES (286,0,0,1000,891,20);     -- Bat Fang (2.0%)
-INSERT INTO `mob_droplist` VALUES (286,0,0,1000,930,@VRARE); -- Vial Of Beastman Blood (Very Rare, 1%)
+INSERT INTO `mob_droplist` VALUES (286,0,0,1000,891,@VCOMMON);  -- Bat Fang (Very common, 24%)
+INSERT INTO `mob_droplist` VALUES (286,0,0,1000,891,@VCOMMON);  -- Bat Fang (Very common, 24%)
+INSERT INTO `mob_droplist` VALUES (286,0,0,1000,891,@VCOMMON);  -- Bat Fang (Very common, 24%)
+INSERT INTO `mob_droplist` VALUES (286,0,0,1000,891,@VCOMMON);  -- Bat Fang (Very common, 24%)
 
 -- ZoneID:  88 - Black Wolf
 -- ZoneID:  89 - Black Wolf
@@ -5928,11 +5927,11 @@ INSERT INTO `mob_droplist` VALUES (711,0,0,1000,4357,@UNCOMMON); -- Crawler Egg
 INSERT INTO `mob_droplist` VALUES (711,2,0,1000,816,0);          -- Spool Of Silk Thread (Steal)
 
 -- ZoneID: 110 - Drooling Daisy
-INSERT INTO `mob_droplist` VALUES (712,0,0,1000,920,450);     -- Malboro Vine (45.0%)
-INSERT INTO `mob_droplist` VALUES (712,0,0,1000,920,230);     -- Malboro Vine (23.0%)
-INSERT INTO `mob_droplist` VALUES (712,0,0,1000,920,@COMMON); -- Malboro Vine (Common, 15%)
-INSERT INTO `mob_droplist` VALUES (712,0,0,1000,13838,130);   -- Dodge Headband (13.0%)
-INSERT INTO `mob_droplist` VALUES (712,2,0,1000,920,0);       -- Malboro Vine (Steal)
+INSERT INTO `mob_droplist` VALUES (712,0,0,1000,920,@COMMON);   -- Malboro Vine (Common, 15%)
+INSERT INTO `mob_droplist` VALUES (712,0,0,1000,920,@COMMON);   -- Malboro Vine (Common, 15%)
+INSERT INTO `mob_droplist` VALUES (712,0,0,1000,920,@COMMON);   -- Malboro Vine (Common, 15%)
+INSERT INTO `mob_droplist` VALUES (712,0,0,1000,13838,@COMMON); -- Dodge Headband (Common, 15%)
+INSERT INTO `mob_droplist` VALUES (712,2,0,1000,920,0);         -- Malboro Vine (Steal)
 
 -- ZoneID: 136 - Dryptotaur
 INSERT INTO `mob_droplist` VALUES (713,0,0,1000,1621,80); -- Taurus Wing (8.0%)
@@ -17807,7 +17806,7 @@ INSERT INTO `mob_droplist` VALUES (2247,0,0,1000,3259,160); -- High-Quality Blac
 
 -- ZoneID: 110 - Silk Caterpillar
 INSERT INTO `mob_droplist` VALUES (2248,0,0,1000,4526,@ALWAYS); -- Silkworm Egg (Always, 100%)
-INSERT INTO `mob_droplist` VALUES (2248,0,0,1000,816,70);       -- Spool Of Silk Thread (7.0%)
+INSERT INTO `mob_droplist` VALUES (2248,0,0,1000,816,@COMMON);  -- Spool Of Silk Thread (Common, 15%)
 
 -- ZoneID: 228 - Silverhook
 INSERT INTO `mob_droplist` VALUES (2249,0,0,1000,18395,320); -- Seawolf Cudgel (32.0%)
@@ -24272,7 +24271,7 @@ INSERT INTO `mob_droplist` VALUES (2991,0,0,1000,15851,@RARE); -- Kushas Ring (R
 INSERT INTO `mob_droplist` VALUES (2992,0,0,1000,15941,384); -- Headlong Belt (38.4%)
 
 -- ZoneID: 110 - Eldritch Edge
-INSERT INTO `mob_droplist` VALUES (2993,0,0,1000,16037,59); -- Helenuss Earring (5.9%)
+INSERT INTO `mob_droplist` VALUES (2993,0,0,1000,16037,@RARE); -- Helenuss Earring (Rare, 5%)
 
 -- ZoneID: 120 - Blighting Brand
 INSERT INTO `mob_droplist` VALUES (2994,0,0,1000,16038,70); -- Cassandras Earring (7.0%)
@@ -24634,7 +24633,7 @@ INSERT INTO `mob_droplist` VALUES (3095,0,0,1000,16022,238); -- Fidelity Earring
 INSERT INTO `mob_droplist` VALUES (3096,0,0,1000,16033,209); -- Sylph Earring (20.9%)
 
 -- ZoneID: 110 - Ravenous Crawler
-INSERT INTO `mob_droplist` VALUES (3097,0,0,1000,16020,265); -- Survivor Earring (26.5%)
+INSERT INTO `mob_droplist` VALUES (3097,0,0,1000,16020,@VCOMMON); -- Survivor Earring (Very common, 24%)
 
 -- ZoneID: 112 - Barbaric Weapon
 INSERT INTO `mob_droplist` VALUES (3098,0,0,1000,15056,212); -- Rovers Gloves (21.2%)

sql/mob_groups.sql

@@ -7893,7 +7893,7 @@ INSERT INTO `mob_groups` VALUES (37,1266,110,'Evil_Spirit',330,1,796,0,0,35,38,0
 INSERT INTO `mob_groups` VALUES (38,5729,110,'Eldritch_Edge',0,32,2993,5096,0,55,55,0);
 INSERT INTO `mob_groups` VALUES (39,1124,110,'Drooling_Daisy',0,32,712,0,0,39,40,0);
 INSERT INTO `mob_groups` VALUES (40,6658,110,'Goblin_Digger',330,0,1040,0,0,28,32,0);
-INSERT INTO `mob_groups` VALUES (41,3630,110,'Simurgh',0,128,2255,45000,0,58,58,0);
+INSERT INTO `mob_groups` VALUES (41,3630,110,'Simurgh',0,128,2255,46200,0,58,58,0);
 INSERT INTO `mob_groups` VALUES (42,3745,110,'Sprite',0,128,0,0,0,61,63,0);
 INSERT INTO `mob_groups` VALUES (43,4107,110,'Urayuli',0,128,0,0,0,1,1,0);
 INSERT INTO `mob_groups` VALUES (44,726,110,'Chuglix_Berrypaws',0,128,0,0,0,1,1,0);

sql/mob_pools.sql

@@ -5784,7 +5784,7 @@ INSERT INTO `mob_pools` VALUES (5725,'Hyakinthos','Hyakinthos',178,0x0000C708000
 INSERT INTO `mob_pools` VALUES (5726,'Ankou','Ankou',227,0x0000340200000000000000000000000000000000,4,4,10,240,100,0,1,0,0,2,0,0,188,1163,0,0,147,0,0,227,227);
 INSERT INTO `mob_pools` VALUES (5727,'Chonchon','Chonchon',70,0x0000200100000000000000000000000000000000,1,1,11,240,100,0,1,0,1,2,6150,0,238,131,0,0,0,0,0,70,70);
 INSERT INTO `mob_pools` VALUES (5728,'Ashu_Talif_Crew_cor','Ashu_Talif_Crew',359,0x0500690700000000000000000000000000000000,17,17,3,360,100,0,1,0,1,18,0,0,1,1155,0,0,0,0,0,359,359);
-INSERT INTO `mob_pools` VALUES (5729,'Eldritch_Edge','Eldritch_Edge',110,0x0000C30100000000000000000000000000000000,1,1,3,240,100,0,1,0,0,2,0,0,375,1667,8,0,0,0,0,110,110);
+INSERT INTO `mob_pools` VALUES (5729,'Eldritch_Edge','Eldritch_Edge',110,0x0000C30100000000000000000000000000000000,1,1,3,240,100,0,1,0,0,2,0,0,375,1667,8,0,0,0,0,238,110);
 INSERT INTO `mob_pools` VALUES (5730,'Blighting_Brand','Blighting_Brand',110,0x0000C30100000000000000000000000000000000,5,5,3,240,100,0,1,0,1,2,0,0,375,131,8,0,148,0,0,110,110);
 INSERT INTO `mob_pools` VALUES (5731,'Belladonna','Belladonna',207,0x0000E80700000000000000000000000000000000,1,1,7,240,100,0,1,0,0,2,6150,0,1,641,8,0,0,0,0,207,207);
 INSERT INTO `mob_pools` VALUES (5732,'Xuu_Bhoqas_Avatar','Xuu_Bhoqas_Avatar',34,0x0000170300000000000000000000000000000000,4,4,7,240,100,0,0,0,1,8,0,32,1,155,0,0,0,0,0,34,34);
@@ -6081,7 +6081,7 @@ INSERT INTO `mob_pools` VALUES (6019,'shantotto_ii','Shantotto',153,0x0000260C00
 -- Reserved for future Trust 6022
 -- Reserved for future Trust 6023
 INSERT INTO `mob_pools` VALUES (6024,'Qoofim','Qoofim',197,0x00005C0100000000000000000000000000000000,1,1,7,240,100,0,0,0,1,2,6150,0,0,131,0,0,0,0,0,197,197);
-INSERT INTO `mob_pools` VALUES (6025,'Ravenous_Crawler','Ravenous_Crawler',79,0x00008C0100000000000000000000000000000000,1,1,11,240,100,0,0,0,1,2,6150,0,0,131,0,0,0,0,0,79,79);
+INSERT INTO `mob_pools` VALUES (6025,'Ravenous_Crawler','Ravenous_Crawler',79,0x00008C0100000000000000000000000000000000,1,1,11,240,100,0,0,0,1,2,6150,0,0,131,0,0,0,0,0,163,79);
 INSERT INTO `mob_pools` VALUES (6026,'Big_Jaw_noaggro','Big_Jaw',197,0x00005C0100000000000000000000000000000000,1,1,7,240,100,0,0,0,0,0,0,0,0,129,0,0,0,0,0,197,197);
 INSERT INTO `mob_pools` VALUES (6027,'Barbaric_Weapon','Barbaric_Weapon',110,0x0000C30100000000000000000000000000000000,1,1,3,240,100,0,1,0,0,2,6150,0,231,643,8,0,0,0,0,110,110);
 INSERT INTO `mob_pools` VALUES (6028,'Seaboard_Vulture','Seaboard_Vulture',55,0x0000BD0100000000000000000000000000000000,1,1,2,240,100,0,0,0,0,0,0,0,232,131,8,0,0,0,0,55,55);

sql/mob_skill_lists.sql

@@ -654,7 +654,7 @@ INSERT INTO `mob_skill_lists` VALUES ('Coeurl_CoP',161,483); -- charged_whisker
 INSERT INTO `mob_skill_lists` VALUES ('Coeurl_WoTG',162,652); -- blaster
 INSERT INTO `mob_skill_lists` VALUES ('Coeurl_WoTG',162,653); -- chaotic_eye
 INSERT INTO `mob_skill_lists` VALUES ('Coeurl_WoTG',162,483); -- charged_whisker
--- 163: free
+INSERT INTO `mob_skill_lists` VALUES ('RavenousCrawler',163,344); -- Sticky Thread
 INSERT INTO `mob_skill_lists` VALUES ('Hydra',164,1828);
 INSERT INTO `mob_skill_lists` VALUES ('Hydra',164,1829);
 INSERT INTO `mob_skill_lists` VALUES ('Hydra',164,1830);
@@ -1028,7 +1028,7 @@ INSERT INTO `mob_skill_lists` VALUES ('Structure_Exoplate',237,998);
 INSERT INTO `mob_skill_lists` VALUES ('Structure_Exoplate',237,999);
 INSERT INTO `mob_skill_lists` VALUES ('Structure_Exoplate',237,1000);
 INSERT INTO `mob_skill_lists` VALUES ('Structure_Exoplate',237,1001);
--- 238: free
+INSERT INTO `mob_skill_lists` VALUES ('Eldritch_Edge',238,397); -- Flurry of rage
 INSERT INTO `mob_skill_lists` VALUES ('Thunderclaw_Thuban',239,378); -- thunderbolt
 INSERT INTO `mob_skill_lists` VALUES ('Tauri',240,498);
 INSERT INTO `mob_skill_lists` VALUES ('Tauri',240,499);

sql/mob_skills.sql

@@ -411,7 +411,7 @@ INSERT INTO `mob_skills` VALUES (393,137,'sonic_boom',1,0.0,12.5,2000,1500,4,0,0
 INSERT INTO `mob_skills` VALUES (394,138,'blood_drain',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (395,139,'jet_stream',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);
 -- INSERT INTO `mob_skills` VALUES (396,140,'smite_of_fury',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);
--- INSERT INTO `mob_skills` VALUES (397,141,'flurry_of_rage',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);
+INSERT INTO `mob_skills` VALUES (397,276,'flurry_of_rage',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);
 -- INSERT INTO `mob_skills` VALUES (398,142,'whispers_of_ire',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (399,143,'scratch',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);
 INSERT INTO `mob_skills` VALUES (400,144,'triple_attack',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);

sql/mob_spawn_mods.sql

@@ -320,6 +320,7 @@ INSERT INTO `mob_spawn_mods` VALUES (17215494,55,288,1); -- IDLE_DESPAWN: 288
 -- Simurgh
 INSERT INTO `mob_spawn_mods` VALUES (17228242,1,21000,1); -- GIL_MIN: 21000
 INSERT INTO `mob_spawn_mods` VALUES (17228242,2,31300,1); -- GIL_MAX: 31300
+INSERT INTO `mob_spawn_mods` VALUES (17228242,15,2550,1); -- MUG_GIL: 2550 (https://ffxiclopedia.fandom.com/wiki/Simurgh)
 
 -- Chuglix Berrypaws
 INSERT INTO `mob_spawn_mods` VALUES (17228249,55,180,1); -- IDLE_DESPAWN: 180

sql/nm_spawn_points.sql

@@ -1885,10 +1885,48 @@ INSERT INTO `nm_spawn_points` VALUES (17223797,1,11.309,23.904,-337.923);
 INSERT INTO `nm_spawn_points` VALUES (17223889,0,184.993,24.499,-41.790);
 INSERT INTO `nm_spawn_points` VALUES (17224019,0,-351.884,24.014,513.531);
 INSERT INTO `nm_spawn_points` VALUES (17224104,0,467.436,24.500,-342.082); -- Bo'Who Warmonger
-INSERT INTO `nm_spawn_points` VALUES (17227972,0,5.000,-15.000,-142.000); -- Black Triple Stars (north)
-INSERT INTO `nm_spawn_points` VALUES (17227992,0,76.000,-15.000,-209.000); -- Black Triple Stars (south)
+-- Silk Caterpillar
+INSERT INTO `nm_spawn_points` VALUES (17227782,0,340.000,0.380,179.000);
+INSERT INTO `nm_spawn_points` VALUES (17227782,1,344.537,-0.297,151.739);
+INSERT INTO `nm_spawn_points` VALUES (17227782,2,324.745,0.191,174.566);
+INSERT INTO `nm_spawn_points` VALUES (17227782,3,305.389,1.418,193.677);
+INSERT INTO `nm_spawn_points` VALUES (17227782,4,326.271,1.934,214.137);
+INSERT INTO `nm_spawn_points` VALUES (17227782,5,348.977,1.111,210.698);
+INSERT INTO `nm_spawn_points` VALUES (17227782,6,380.297,-0.248,167.144);
+-- Black Triple Stars (north)
+INSERT INTO `nm_spawn_points` VALUES (17227972,0,5.000,-15.000,-142.000);
+INSERT INTO `nm_spawn_points` VALUES (17227972,1,11.6486,-16.2799,-126.1807);
+INSERT INTO `nm_spawn_points` VALUES (17227972,2,-13.8340,-15.6163,-110.8065);
+INSERT INTO `nm_spawn_points` VALUES (17227972,3,-15.0231,-15.5000,-161.6972);
+INSERT INTO `nm_spawn_points` VALUES (17227972,4,2.7218,15.61,-171.8897);
+INSERT INTO `nm_spawn_points` VALUES (17227972,5,26.9494,15.84,-169.8851);
+INSERT INTO `nm_spawn_points` VALUES (17227972,6,39.7787,-16.0000,-152.1433);
+-- Black Triple Stars (south)
+INSERT INTO `nm_spawn_points` VALUES (17227992,0,76.000,-15.000,-209.000);
+INSERT INTO `nm_spawn_points` VALUES (17227992,1,56.6320,-16.1863,-173.7146);
+INSERT INTO `nm_spawn_points` VALUES (17227992,2,36.2832,-15.4751,-180.7261);
+INSERT INTO `nm_spawn_points` VALUES (17227992,3,15.1839,-15.6165,-190.5430);
+INSERT INTO `nm_spawn_points` VALUES (17227992,4,49.2504,-15.4354,-211.6089);
+INSERT INTO `nm_spawn_points` VALUES (17227992,5,66.1772,-14.6771,-230.8883);
+INSERT INTO `nm_spawn_points` VALUES (17227992,6,87.6647,-15.7779,-255.6142);
+-- Ravenous Crawler
+INSERT INTO `nm_spawn_points` VALUES (17228086,0,-488.800,-8.000,-37.888);
+INSERT INTO `nm_spawn_points` VALUES (17228086,1,-454.893,-8.368,-81.525);
+INSERT INTO `nm_spawn_points` VALUES (17228086,2,-491.944,-15.695,-125.229);
+INSERT INTO `nm_spawn_points` VALUES (17228086,3,-493.331,-15.787,-90.428);
+INSERT INTO `nm_spawn_points` VALUES (17228086,4,-521.266,-15.929,-74.551);
+INSERT INTO `nm_spawn_points` VALUES (17228086,5,-513.025,-16.239,-49.851);
+INSERT INTO `nm_spawn_points` VALUES (17228086,6,-527.306,-16.432,-19.056);
+INSERT INTO `nm_spawn_points` VALUES (17228086,7,-562.343,-16.082,-35.952);
+-- Eldritch Edge
 INSERT INTO `nm_spawn_points` VALUES (17228150,0,395.000,-24.000,-147.000);
 INSERT INTO `nm_spawn_points` VALUES (17228150,1,388.000,-37.859,-162.602);
+INSERT INTO `nm_spawn_points` VALUES (17228150,2,394.874,-23.888,-146.595);
+INSERT INTO `nm_spawn_points` VALUES (17228150,3,377.940,-29.295,-150.296);
+INSERT INTO `nm_spawn_points` VALUES (17228150,4,431.561,-20.440,-59.401);
+INSERT INTO `nm_spawn_points` VALUES (17228150,5,436.784,-22.906,-70.260);
+INSERT INTO `nm_spawn_points` VALUES (17228150,6,440.469,-28.826,-48.646);
+INSERT INTO `nm_spawn_points` VALUES (17228150,7,403.583,-24.000,-159.456);
 INSERT INTO `nm_spawn_points` VALUES (17228236,0,-691.786,-34.802,-335.763);
 INSERT INTO `nm_spawn_points` VALUES (17228236,1,-753.224,-30.894,-377.288);
 INSERT INTO `nm_spawn_points` VALUES (17228236,2,-690.129,-31.695,-358.295);