From 495de13f1762fd7d921fe28864a7631b7490b508 Mon Sep 17 00:00:00 2001 From: CriticalXI Date: Thu, 16 Jan 2025 16:18:41 -0700 Subject: [PATCH] [lua, sql] Xarcabard NM Audit --- .../zones/Xarcabard/mobs/Barbaric_Weapon.lua | 21 +++++++++++-- .../zones/Xarcabard/mobs/Boreal_Coeurl.lua | 30 +++++++++++++++++- scripts/zones/Xarcabard/mobs/Boreal_Hound.lua | 31 ++++++++++++++++++- scripts/zones/Xarcabard/mobs/Boreal_Tiger.lua | 29 ++++++++++++++++- scripts/zones/Xarcabard/mobs/Duke_Focalor.lua | 9 ++++++ scripts/zones/Xarcabard/mobs/Ereshkigal.lua | 4 +++ scripts/zones/Xarcabard/mobs/Evil_Eye.lua | 5 --- scripts/zones/Xarcabard/mobs/Lost_Soul.lua | 7 ----- .../zones/Xarcabard/mobs/Timeworn_Warrior.lua | 7 +++++ sql/mob_droplist.sql | 25 +++++++-------- sql/mob_family_system.sql | 2 +- sql/mob_groups.sql | 6 ++-- sql/mob_pools.sql | 8 ++--- sql/mob_resistances.sql | 2 +- sql/mob_skill_lists.sql | 3 +- sql/mob_spawn_points.sql | 2 +- sql/nm_spawn_points.sql | 8 +++-- 17 files changed, 155 insertions(+), 44 deletions(-) diff --git a/scripts/zones/Xarcabard/mobs/Barbaric_Weapon.lua b/scripts/zones/Xarcabard/mobs/Barbaric_Weapon.lua index d03cfa1029b..9c8f4d74de7 100644 --- a/scripts/zones/Xarcabard/mobs/Barbaric_Weapon.lua +++ b/scripts/zones/Xarcabard/mobs/Barbaric_Weapon.lua @@ -1,17 +1,32 @@ ----------------------------------- -- Area: Xarcabard -- NM: Barbaric Weapon --- TODO: "Gains a Dread Spikes effect whenever Whirl of Rage is used." +-- WOTG Nov 2009 NM: Immune to Bind, Sleep, Gravity. Uses only 1 TP move. ----------------------------------- ---@type TMobEntity local entity = {} -entity.onMobInitialize = function(mob) - mob:setMod(xi.mod.STORETP, 50) -- "Possesses extremely high Store TP." +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, 80) +end + +entity.onMobWeaponSkill = function(target, mob, skill) + -- Gains Dread Spikes effect when using Whirl of Rage TP move + if skill:getID() == 514 then + mob:addStatusEffectEx(xi.effect.DREAD_SPIKES, 0, 10, 0, 180, 0, 310, 1, 0, true) + end end entity.onMobDeath = function(mob, player, optParams) xi.hunts.checkHunt(mob, player, 318) end +entity.onMobDespawn = function(mob) + UpdateNMSpawnPoint(mob:getID()) +end + return entity diff --git a/scripts/zones/Xarcabard/mobs/Boreal_Coeurl.lua b/scripts/zones/Xarcabard/mobs/Boreal_Coeurl.lua index d2f89023bf5..ab808d2841b 100644 --- a/scripts/zones/Xarcabard/mobs/Boreal_Coeurl.lua +++ b/scripts/zones/Xarcabard/mobs/Boreal_Coeurl.lua @@ -5,7 +5,6 @@ -- !pos 580 -9 290 112 ----------------------------------- local ID = zones[xi.zone.XARCABARD] -mixins = { require('scripts/mixins/draw_in') } ----------------------------------- ---@type TMobEntity local entity = {} @@ -87,6 +86,8 @@ entity.onMobEngage = function(mob) end entity.onMobSpawn = function(mob) + mob:setMobMod(xi.mobMod.ALWAYS_AGGRO, 1) + mob:setMod(xi.mod.FASTCAST, 30) mob:setSpeed(baseSpeed) -- Failsafe to make sure NPC is down when NM is up if xi.settings.main.OLDSCHOOL_G2 then @@ -94,6 +95,33 @@ entity.onMobSpawn = function(mob) end end +entity.onMobFight = function(mob, target) + local drawInTable = + { + conditions = + { + target:getZPos() < 260, + }, + position = mob:getPos(), + offset = 5, + degrees = 180, + wait = 2, + } + + if drawInTable.conditions[1] then + mob:setMobMod(xi.mobMod.NO_MOVE, 1) + -- If player is farther than melee range, then deaggro. Otherwise draw-in + if mob:checkDistance(target) > 10 then + mob:setMobMod(xi.mobMod.NO_MOVE, 0) + mob:disengage() + else + utils.drawIn(target, drawInTable) + end + else + mob:setMobMod(xi.mobMod.NO_MOVE, 0) + end +end + entity.onMobDeath = function(mob, player, optParams) if xi.settings.main.OLDSCHOOL_G2 then -- show ??? for desired duration diff --git a/scripts/zones/Xarcabard/mobs/Boreal_Hound.lua b/scripts/zones/Xarcabard/mobs/Boreal_Hound.lua index 5c7e0685531..509a3f2de48 100644 --- a/scripts/zones/Xarcabard/mobs/Boreal_Hound.lua +++ b/scripts/zones/Xarcabard/mobs/Boreal_Hound.lua @@ -5,7 +5,6 @@ -- !pos -21 -25 -490 112 ----------------------------------- local ID = zones[xi.zone.XARCABARD] -mixins = { require('scripts/mixins/draw_in') } ----------------------------------- ---@type TMobEntity local entity = {} @@ -89,6 +88,9 @@ entity.onMobEngage = function(mob) end entity.onMobSpawn = function(mob) + mob:setMobMod(xi.mobMod.ALWAYS_AGGRO, 1) + mob:addImmunity(xi.immunity.SILENCE) + mob:addImmunity(xi.immunity.PARALYZE) mob:setSpeed(baseSpeed) -- Failsafe to make sure NPC is down when NM is up if xi.settings.main.OLDSCHOOL_G2 then @@ -96,6 +98,33 @@ entity.onMobSpawn = function(mob) end end +entity.onMobFight = function(mob, target) + local drawInTable = + { + conditions = + { + target:getXPos() > -11 and target:getZPos() > -465, + }, + position = mob:getPos(), + offset = 5, + degrees = 180, + wait = 2, + } + + if drawInTable.conditions[1] then + mob:setMobMod(xi.mobMod.NO_MOVE, 1) + -- If player is farther than melee range, then deaggro. Otherwise draw-in + if mob:checkDistance(target) > 10 then + mob:setMobMod(xi.mobMod.NO_MOVE, 0) + mob:disengage() + else + utils.drawIn(target, drawInTable) + end + else + mob:setMobMod(xi.mobMod.NO_MOVE, 0) + end +end + entity.onMobDeath = function(mob, player, optParams) if xi.settings.main.OLDSCHOOL_G2 then -- show ??? for desired duration diff --git a/scripts/zones/Xarcabard/mobs/Boreal_Tiger.lua b/scripts/zones/Xarcabard/mobs/Boreal_Tiger.lua index 8427d476140..5761ec693b4 100644 --- a/scripts/zones/Xarcabard/mobs/Boreal_Tiger.lua +++ b/scripts/zones/Xarcabard/mobs/Boreal_Tiger.lua @@ -5,7 +5,6 @@ -- !pos 341 -29 370 112 ----------------------------------- local ID = zones[xi.zone.XARCABARD] -mixins = { require('scripts/mixins/draw_in') } ----------------------------------- ---@type TMobEntity local entity = {} @@ -84,6 +83,7 @@ entity.onMobEngage = function(mob) end entity.onMobSpawn = function(mob) + mob:setMobMod(xi.mobMod.ALWAYS_AGGRO, 1) mob:setSpeed(baseSpeed) -- Failsafe to make sure NPC is down when NM is up if xi.settings.main.OLDSCHOOL_G2 then @@ -91,6 +91,33 @@ entity.onMobSpawn = function(mob) end end +entity.onMobFight = function(mob, target) + local drawInTable = + { + conditions = + { + target:getZPos() < 335, + }, + position = mob:getPos(), + offset = 5, + degrees = 180, + wait = 2, + } + + if drawInTable.conditions[1] then + mob:setMobMod(xi.mobMod.NO_MOVE, 1) + -- If player is farther than melee range, then deaggro. Otherwise draw-in + if mob:checkDistance(target) > 10 then + mob:setMobMod(xi.mobMod.NO_MOVE, 0) + mob:disengage() + else + utils.drawIn(target, drawInTable) + end + else + mob:setMobMod(xi.mobMod.NO_MOVE, 0) + end +end + entity.onMobDeath = function(mob, player, optParams) if xi.settings.main.OLDSCHOOL_G2 then -- show ??? for desired duration diff --git a/scripts/zones/Xarcabard/mobs/Duke_Focalor.lua b/scripts/zones/Xarcabard/mobs/Duke_Focalor.lua index d5102920fa1..fa785f79110 100644 --- a/scripts/zones/Xarcabard/mobs/Duke_Focalor.lua +++ b/scripts/zones/Xarcabard/mobs/Duke_Focalor.lua @@ -1,6 +1,7 @@ ----------------------------------- -- Area: Xarcabard -- NM: Duke Focalor +-- WOTG Nov 2009 NM: Immune to Bind, Sleep, Gravity. Uses only 1 TP move. ----------------------------------- ---@type TMobEntity local entity = {} @@ -9,6 +10,14 @@ entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.ADD_EFFECT, 1) end +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, 80) +end + entity.onAdditionalEffect = function(mob, target, damage) return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.HP_DRAIN) end diff --git a/scripts/zones/Xarcabard/mobs/Ereshkigal.lua b/scripts/zones/Xarcabard/mobs/Ereshkigal.lua index 7f22cfba6ec..32491a94ed5 100644 --- a/scripts/zones/Xarcabard/mobs/Ereshkigal.lua +++ b/scripts/zones/Xarcabard/mobs/Ereshkigal.lua @@ -9,6 +9,10 @@ entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.ADD_EFFECT, 1) end +entity.onMobSpawn = function(mob) + mob:addImmunity(xi.immunity.PARALYZE) +end + entity.onAdditionalEffect = function(mob, target, damage) return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENDARK) end diff --git a/scripts/zones/Xarcabard/mobs/Evil_Eye.lua b/scripts/zones/Xarcabard/mobs/Evil_Eye.lua index c387fab59b8..616b4815f94 100644 --- a/scripts/zones/Xarcabard/mobs/Evil_Eye.lua +++ b/scripts/zones/Xarcabard/mobs/Evil_Eye.lua @@ -11,11 +11,6 @@ local entity = {} local shadowEyePHTable = { [ID.mob.SHADOW_EYE - 6] = ID.mob.SHADOW_EYE, - [ID.mob.SHADOW_EYE - 5] = ID.mob.SHADOW_EYE, - [ID.mob.SHADOW_EYE - 4] = ID.mob.SHADOW_EYE, - [ID.mob.SHADOW_EYE - 3] = ID.mob.SHADOW_EYE, - [ID.mob.SHADOW_EYE - 2] = ID.mob.SHADOW_EYE, - [ID.mob.SHADOW_EYE - 1] = ID.mob.SHADOW_EYE, } entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Xarcabard/mobs/Lost_Soul.lua b/scripts/zones/Xarcabard/mobs/Lost_Soul.lua index ec49453f11b..70ba5cbb859 100644 --- a/scripts/zones/Xarcabard/mobs/Lost_Soul.lua +++ b/scripts/zones/Xarcabard/mobs/Lost_Soul.lua @@ -11,13 +11,6 @@ local entity = {} local timewornPHTable = { [ID.mob.TIMEWORN_WARRIOR - 4] = ID.mob.TIMEWORN_WARRIOR, - [ID.mob.TIMEWORN_WARRIOR - 3] = ID.mob.TIMEWORN_WARRIOR, - [ID.mob.TIMEWORN_WARRIOR - 2] = ID.mob.TIMEWORN_WARRIOR, - [ID.mob.TIMEWORN_WARRIOR - 1] = ID.mob.TIMEWORN_WARRIOR, - [ID.mob.TIMEWORN_WARRIOR + 1] = ID.mob.TIMEWORN_WARRIOR, - [ID.mob.TIMEWORN_WARRIOR + 2] = ID.mob.TIMEWORN_WARRIOR, - [ID.mob.TIMEWORN_WARRIOR + 3] = ID.mob.TIMEWORN_WARRIOR, - [ID.mob.TIMEWORN_WARRIOR + 4] = ID.mob.TIMEWORN_WARRIOR, } entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Xarcabard/mobs/Timeworn_Warrior.lua b/scripts/zones/Xarcabard/mobs/Timeworn_Warrior.lua index 255b92a804b..c289608b0ee 100644 --- a/scripts/zones/Xarcabard/mobs/Timeworn_Warrior.lua +++ b/scripts/zones/Xarcabard/mobs/Timeworn_Warrior.lua @@ -1,6 +1,7 @@ ----------------------------------- -- Area: Xarcabard -- NM: Timeworn Warrior +-- WOTG Nov 2009 NM: Immune to Bind, Sleep, Gravity. ----------------------------------- ---@type TMobEntity local entity = {} @@ -9,6 +10,12 @@ entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.ADD_EFFECT, 1) end +entity.onMobSpawn = function(mob) + mob:addImmunity(xi.immunity.LIGHT_SLEEP) + mob:addImmunity(xi.immunity.GRAVITY) + mob:addImmunity(xi.immunity.BIND) +end + entity.onAdditionalEffect = function(mob, target, damage) return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.HP_DRAIN) end diff --git a/sql/mob_droplist.sql b/sql/mob_droplist.sql index a095020f388..c18d9130fe8 100644 --- a/sql/mob_droplist.sql +++ b/sql/mob_droplist.sql @@ -2633,7 +2633,7 @@ INSERT INTO `mob_droplist` VALUES (265,0,0,1000,16360,@VRARE); -- Etoile Tight INSERT INTO `mob_droplist` VALUES (265,2,0,1000,1449,0); -- Tukuku Whiteshell (Steal) -- ZoneID: 112 - Biast -INSERT INTO `mob_droplist` VALUES (266,0,0,1000,15221,560); -- Patrocluss Helm (56.0%) +INSERT INTO `mob_droplist` VALUES (266,0,0,1000,15221,@VCOMMON); -- Patrocluss Helm (Very Common, 24%) -- ZoneID: 82 - Biddybug INSERT INTO `mob_droplist` VALUES (267,0,0,1000,2506,320); -- Ladybug Wing (32.0%) @@ -6560,11 +6560,11 @@ INSERT INTO `mob_droplist` VALUES (787,0,0,1000,14018,@UNCOMMON); -- Gigas Brace INSERT INTO `mob_droplist` VALUES (787,0,0,1000,12290,30); -- Maple Shield (3.0%) -- ZoneID: 112 - Ereshkigal -INSERT INTO `mob_droplist` VALUES (788,0,0,1000,825,500); -- Square Of Cotton Cloth (50.0%) -INSERT INTO `mob_droplist` VALUES (788,0,0,1000,15467,380); -- Lucent Cape (38.0%) -INSERT INTO `mob_droplist` VALUES (788,0,0,1000,825,330); -- Square Of Cotton Cloth (33.0%) -INSERT INTO `mob_droplist` VALUES (788,0,0,1000,940,210); -- Revival Tree Root (21.0%) -INSERT INTO `mob_droplist` VALUES (788,2,0,1000,825,0); -- Square Of Cotton Cloth (Steal) +INSERT INTO `mob_droplist` VALUES (788,0,0,1000,15467,@VCOMMON); -- Lucent Cape (Very Common, 24%) +INSERT INTO `mob_droplist` VALUES (788,0,0,1000,825,@UNCOMMON); -- Square Of Cotton Cloth (Uncommon, 10%) +INSERT INTO `mob_droplist` VALUES (788,0,0,1000,825,@UNCOMMON); -- Square Of Cotton Cloth (Uncommon, 10%) +INSERT INTO `mob_droplist` VALUES (788,0,0,1000,940,@UNCOMMON); -- Revival Tree Root (Uncommon, 10%) +INSERT INTO `mob_droplist` VALUES (788,2,0,1000,825,0); -- Square Of Cotton Cloth (Steal) -- ZoneID: 218 - Ergdrake INSERT INTO `mob_droplist` VALUES (789,0,0,1000,1122,200); -- Wyvern Skin (20.0%) @@ -17627,10 +17627,9 @@ INSERT INTO `mob_droplist` VALUES (2224,0,0,1000,812,@UNCOMMON); -- Deathstone ( INSERT INTO `mob_droplist` VALUES (2225,0,0,1000,1621,80); -- Taurus Wing (8.0%) -- ZoneID: 112 - Shadow Eye -INSERT INTO `mob_droplist` VALUES (2226,0,0,1000,921,@ALWAYS); -- Bottle Of Ahriman Tears (Always, 100%) -INSERT INTO `mob_droplist` VALUES (2226,0,0,1000,557,130); -- Ahriman Lens (13.0%) -INSERT INTO `mob_droplist` VALUES (2226,0,0,1000,13114,@UNCOMMON); -- Moon Amulet (Uncommon, 10%) -INSERT INTO `mob_droplist` VALUES (2226,0,0,1000,935,80); -- Ahriman Wing (8.0%) +INSERT INTO `mob_droplist` VALUES (2226,0,0,1000,921,@ALWAYS); -- Bottle Of Ahriman Tears (Always, 100%) +INSERT INTO `mob_droplist` VALUES (2226,0,0,1000,13114,@VCOMMON); -- Moon Amulet (Very Common, 24%) +INSERT INTO `mob_droplist` VALUES (2226,0,0,1000,935,@COMMON); -- Ahriman Wing (Common, 15%) -- ZoneID: 15 - Shadow Funguar INSERT INTO `mob_droplist` VALUES (2227,0,0,1000,4373,120); -- Woozyshroom (12.0%) @@ -24086,7 +24085,7 @@ INSERT INTO `mob_droplist` VALUES (2941,0,0,1000,19043,@VCOMMON); -- Tenax Strap INSERT INTO `mob_droplist` VALUES (2942,0,0,1000,2832,218); -- Samwells Shank (21.8%) -- ZoneID: 112 - Duke Focalor -INSERT INTO `mob_droplist` VALUES (2943,0,0,1000,2852,228); -- Ingot Of Tenebrium (22.8%) +INSERT INTO `mob_droplist` VALUES (2943,0,0,1000,2852,@VCOMMON); -- Ingot Of Tenebrium (Very Common, 24%) -- ZoneID: 7 - Sargas INSERT INTO `mob_droplist` VALUES (2944,0,0,1000,2811,250); -- Aptant Of Primus (25.0%) @@ -24520,7 +24519,7 @@ INSERT INTO `mob_droplist` VALUES (3060,0,0,1000,16300,333); -- Wit Pendant (33. INSERT INTO `mob_droplist` VALUES (3061,0,0,1000,2838,@VCOMMON); -- Square Of Ephemeral Cloth (Very Common, 24%) -- ZoneID: 112 - Timeworn Warrior -INSERT INTO `mob_droplist` VALUES (3062,0,0,1000,19238,154); -- Jasper Tathlum (15.4%) +INSERT INTO `mob_droplist` VALUES (3062,0,0,1000,19238,@COMMON); -- Jasper Tathlum (Common, 15%) -- ZoneID: 105 - Eyegouger INSERT INTO `mob_droplist` VALUES (3063,0,0,1000,16021,@VCOMMON); -- Brawn Earring (Very Common, 24%) @@ -24640,7 +24639,7 @@ INSERT INTO `mob_droplist` VALUES (3096,0,0,1000,16033,209); -- Sylph Earring (2 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%) +INSERT INTO `mob_droplist` VALUES (3098,0,0,1000,15056,@COMMON); -- Rovers Gloves (Common, 15%) -- ZoneID: 98 - Herensugue INSERT INTO `mob_droplist` VALUES (3099,0,0,1000,2828,86); -- Herensugue Skin (8.6%) diff --git a/sql/mob_family_system.sql b/sql/mob_family_system.sql index ee1e80e3f31..013f66db068 100644 --- a/sql/mob_family_system.sql +++ b/sql/mob_family_system.sql @@ -446,7 +446,7 @@ INSERT INTO `mob_family_system` VALUES (395,'Doll-Calcabrina',53,'Doll',3,'Arcan INSERT INTO `mob_family_system` VALUES (396,'Worm-Bedrock_Barry',148,'Worm',1,'Amorph',0.00,0,70,200,4,3,5,4,3,4,4,1,3,1,5,4.0,2,0); INSERT INTO `mob_family_system` VALUES (397,'Quadav-Qu_Vho_Deathhurler',116,'Quadav',7,'Beastmen',1.00,40,112,110,2,3,4,4,4,5,3,1,3,1,3,6.0,258,0); INSERT INTO `mob_family_system` VALUES (398,'Sheep-Slumbering_Samwell',90,'Sheep',6,'Beast',1.00,40,120,110,3,4,4,4,5,4,4,1,3,1,3,4.0,1,0); -INSERT INTO `mob_family_system` VALUES (399,'Demon-Duke_Focalor',9,'Demon',9,'Demon',0.00,50,110,140,1,2,4,4,1,2,4,1,3,1,3,8.0,257,0); +-- 399 Free INSERT INTO `mob_family_system` VALUES (400,'Crab-Tegmine',48,'Crab',2,'Aquan',0.00,40,108,120,4,4,3,5,4,4,4,1,3,1,3,6.0,2,0); INSERT INTO `mob_family_system` VALUES (401,'Doll-Martinet',53,'Doll',3,'Arcana',1.00,40,108,90,1,3,3,5,6,6,5,1,3,1,3,2.0,288,0); INSERT INTO `mob_family_system` VALUES (402,'Scorpion-Aqrabuamelu',128,'Scorpion',20,'Vermin',3.00,40,90,120,3,5,4,4,4,4,4,1,3,1,3,4.0,258,0); diff --git a/sql/mob_groups.sql b/sql/mob_groups.sql index 65e1e88c910..e5cc346ade5 100644 --- a/sql/mob_groups.sql +++ b/sql/mob_groups.sql @@ -8018,7 +8018,7 @@ INSERT INTO `mob_groups` VALUES (7,2043,112,'Ice_Elemental',330,4,1347,0,0,48,50 INSERT INTO `mob_groups` VALUES (8,868,112,'Cursed_Weapon',330,0,548,0,0,43,45,0); INSERT INTO `mob_groups` VALUES (9,913,112,'Dark_Elemental',330,4,568,0,0,48,50,0); INSERT INTO `mob_groups` VALUES (10,991,112,'Demon_Pawn',330,0,621,0,0,48,52,0); -INSERT INTO `mob_groups` VALUES (11,6027,112,'Barbaric_Weapon',0,32,3098,8500,0,73,74,0); +INSERT INTO `mob_groups` VALUES (11,6027,112,'Barbaric_Weapon',0,32,3098,6700,0,73,74,0); INSERT INTO `mob_groups` VALUES (12,5851,112,'Timeworn_Warrior',0,32,3062,5000,0,57,58,0); INSERT INTO `mob_groups` VALUES (13,1252,112,'Ereshkigal',86400,0,788,3000,0,48,50,0); INSERT INTO `mob_groups` VALUES (14,453,112,'Blizzard_Gigas',330,0,296,0,0,45,48,0); @@ -8028,10 +8028,10 @@ INSERT INTO `mob_groups` VALUES (17,1594,112,'Gigass_Tiger',0,128,0,0,0,38,42,0) INSERT INTO `mob_groups` VALUES (18,1874,112,'Hail_Gigas',330,0,1269,0,0,45,48,0); INSERT INTO `mob_groups` VALUES (19,997,112,'Demon_Wizard',330,0,621,0,0,48,52,0); INSERT INTO `mob_groups` VALUES (20,988,112,'Demon_Knight',330,0,616,0,0,48,52,0); -INSERT INTO `mob_groups` VALUES (21,5423,112,'Duke_Focalor',5400,0,2943,0,0,52,58,0); +INSERT INTO `mob_groups` VALUES (21,5423,112,'Duke_Focalor',5400,0,2943,4400,0,51,53,0); INSERT INTO `mob_groups` VALUES (22,995,112,'Demon_Warlock',330,0,624,0,0,50,52,0); INSERT INTO `mob_groups` VALUES (23,994,112,'Demons_Elemental',0,128,0,0,0,43,45,0); -INSERT INTO `mob_groups` VALUES (24,3576,112,'Shadow_Eye',0,32,2226,0,0,48,49,0); +INSERT INTO `mob_groups` VALUES (24,3576,112,'Shadow_Eye',0,32,2226,6800,0,48,49,0); INSERT INTO `mob_groups` VALUES (25,693,112,'Chaos_Elemental',0,128,452,0,0,42,42,0); INSERT INTO `mob_groups` VALUES (26,510,112,'Boreal_Hound',300,0,0,26000,0,53,53,0); INSERT INTO `mob_groups` VALUES (27,509,112,'Boreal_Coeurl',300,0,0,26000,0,53,53,0); diff --git a/sql/mob_pools.sql b/sql/mob_pools.sql index a24cb26c29b..58d5981821c 100644 --- a/sql/mob_pools.sql +++ b/sql/mob_pools.sql @@ -1305,7 +1305,7 @@ INSERT INTO `mob_pools` VALUES (1248,'Epialtes','Epialtes',126,0x000080020000000 INSERT INTO `mob_pools` VALUES (1249,'Eraser','Eraser',85,0x0000300100000000000000000000000000000000,1,1,0,240,100,0,1,0,0,0,0,0,1393,1157,0,0,0,0,0,85,85); INSERT INTO `mob_pools` VALUES (1250,'Erdgeist','Erdgeist',121,0x0000700100000000000000000000000000000000,4,4,12,240,100,0,1,1,1,16,0,0,561,3203,0,0,28,0,0,121,121); INSERT INTO `mob_pools` VALUES (1251,'Eremix_Snottynostril','Eremix_Snottynostril',373,0x0000420400000000000000000000000000000000,4,4,11,240,100,0,1,0,1,2,0,32,0,1183,0,0,2,0,0,373,373); -INSERT INTO `mob_pools` VALUES (1252,'Ereshkigal','Ereshkigal',121,0x0000700100000000000000000000000000000000,4,4,12,240,100,0,1,0,0,2,32,32,0,1181,0,0,28,0,0,121,121); +INSERT INTO `mob_pools` VALUES (1252,'Ereshkigal','Ereshkigal',121,0x0000700100000000000000000000000000000000,4,4,12,240,100,0,1,0,0,2,0,32,0,1181,0,0,28,0,0,121,121); INSERT INTO `mob_pools` VALUES (1253,'Ergdrake','Ergdrake',266,0x00008E0100000000000000000000000000000000,1,1,3,240,100,0,1,0,0,0,0,0,1,131,0,0,0,0,0,266,266); INSERT INTO `mob_pools` VALUES (1254,'Eriri_Samariri','Eriri_Samariri',196,0x0000150700000000000000000000000000000000,4,4,5,150,100,0,1,1,1,0,0,0,0,3,0,0,2,0,0,196,196); INSERT INTO `mob_pools` VALUES (1255,'Erlik','Erlik',121,0x0000700100000000000000000000000000000000,4,4,12,240,100,0,1,0,0,0,0,0,193,1155,0,0,28,0,0,121,121); @@ -5476,7 +5476,7 @@ INSERT INTO `mob_pools` VALUES (5419,'Tococo','Tococo',55,0x0000BC01000000000000 INSERT INTO `mob_pools` VALUES (5420,'QuVho_Deathhurler','QuVho_Deathhurler',397,0x0000860200000000000000000000000000000000,7,1,2,265,100,0,1,0,1,2,0,32,872,155,0,0,0,0,0,397,397); INSERT INTO `mob_pools` VALUES (5421,'Amanita','Amanita',116,0x0000780100000000000000000000000000000000,1,1,11,240,100,0,1,0,1,2,6808,0,400,1665,0,0,0,0,0,116,116); INSERT INTO `mob_pools` VALUES (5422,'Slumbering_Samwell','Slumbering_Samwell',398,0x0000540100000000000000000000000000000000,1,1,7,240,100,0,0,0,1,2,0,32,82,155,0,0,0,0,0,398,398); -INSERT INTO `mob_pools` VALUES (5423,'Duke_Focalor','Duke_Focalor',399,0x0000E40200000000000000000000000000000000,1,1,4,240,100,0,1,0,1,2,0,32,88,139,0,0,0,0,0,399,399); +INSERT INTO `mob_pools` VALUES (5423,'Duke_Focalor','Duke_Focalor',169,0x0000E40200000000000000000000000000000000,1,1,4,240,100,0,1,0,1,2,0,32,88,139,0,0,0,0,0,399,169); INSERT INTO `mob_pools` VALUES (5424,'Sargas','Sargas',217,0x00001C0100000000000000000000000000000000,1,1,7,280,100,0,1,0,1,2,6158,0,139,139,0,0,0,0,0,217,217); INSERT INTO `mob_pools` VALUES (5425,'Tegmine','Tegmine',400,0x0000640100000000000000000000000000000000,7,1,4,240,100,0,1,0,0,2,6246,0,305,643,8,0,0,0,0,400,400); INSERT INTO `mob_pools` VALUES (5426,'Martinet','Martinet',401,0x0000300100000000000000000000000000000000,1,1,12,240,100,0,1,0,0,2,6150,0,231,131,4,0,0,0,0,401,401); @@ -5906,7 +5906,7 @@ INSERT INTO `mob_pools` VALUES (5847,'Drumskull_Zogdregg','Drumskull_Zogdregg',3 INSERT INTO `mob_pools` VALUES (5848,'Slippery_Sucker','Slippery_Sucker',172,0x0000140100000000000000000000000000000000,1,1,7,240,100,0,0,0,1,2,6166,0,0,131,0,0,0,0,0,172,172); INSERT INTO `mob_pools` VALUES (5849,'Gloom_Eye','Gloom_Eye',4,0x0000080100000000000000000000000000000000,1,1,11,240,100,0,1,0,0,2,6150,0,0,129,16,0,0,0,0,50,4); INSERT INTO `mob_pools` VALUES (5850,'Quu_Xijo_the_Illusory','Quu_Xijo_the_Illusory',360,0x00004C0200000000000000000000000000000000,13,13,2,240,100,0,1,0,1,2,6160,32,0,667,8,0,7,0,0,360,360); -INSERT INTO `mob_pools` VALUES (5851,'Timeworn_Warrior','Timeworn_Warrior',227,0x00003C0200000000000000000000000000000000,1,1,5,240,100,0,1,0,0,2,6150,0,0,0,0,0,0,0,0,0,227); +INSERT INTO `mob_pools` VALUES (5851,'Timeworn_Warrior','Timeworn_Warrior',227,0x00003C0200000000000000000000000000000000,1,1,5,240,100,0,1,0,0,2,0,0,0,0,0,0,0,0,0,0,227); INSERT INTO `mob_pools` VALUES (5852,'Eyegouger','Eyegouger',55,0x0000BC0100000000000000000000000000000000,1,1,2,240,100,0,0,0,1,2,6150,0,0,1155,0,0,0,0,0,55,55); INSERT INTO `mob_pools` VALUES (5853,'Humbaba','Humbaba',126,0x0000C40200000000000000000000000000000000,1,1,11,240,100,0,1,0,1,2,6150,32,0,155,0,0,0,0,0,126,126); INSERT INTO `mob_pools` VALUES (5854,'Dynast_Beetle','Dynast_Beetle',49,0x0000980100000000000000000000000000000000,7,7,8,240,100,0,1,0,1,2,6278,0,0,131,0,0,0,0,0,49,49); @@ -6083,7 +6083,7 @@ INSERT INTO `mob_pools` VALUES (6019,'shantotto_ii','Shantotto',153,0x0000260C00 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,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 (6027,'Barbaric_Weapon','Barbaric_Weapon',110,0x0000C30100000000000000000000000000000000,1,1,3,240,100,0,1,0,0,2,0,0,231,643,8,0,0,0,0,417,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); INSERT INTO `mob_pools` VALUES (6029,'Kraken_fished','Kraken',218,0x0000600100000000000000000000000000000000,2,2,7,360,100,0,1,0,0,4,0,0,0,131,0,0,0,0,0,218,218); INSERT INTO `mob_pools` VALUES (6030,'Kraken_fished_NM','Kraken',218,0x0000600100000000000000000000000000000000,2,2,7,360,100,0,1,0,0,6,0,0,0,131,0,0,0,0,0,218,218); diff --git a/sql/mob_resistances.sql b/sql/mob_resistances.sql index ede3967a668..e10a7bd52bf 100644 --- a/sql/mob_resistances.sql +++ b/sql/mob_resistances.sql @@ -419,7 +419,7 @@ INSERT INTO `mob_resistances` VALUES (395,'Doll-Calcabrina',1.0,1.0,1.0,1.0,0,0, INSERT INTO `mob_resistances` VALUES (396,'Worm-Bedrock_Barry',1.0,1.0,1.0,1.0,0,0,0,0,0,0,0,0,0,-2,-2,-3,2,-2,-2,-3,0); INSERT INTO `mob_resistances` VALUES (397,'Quadav-Qu_Vho_Deathhurler',1.0,1.0,1.0,1.0,0,0,0,0,0,0,0,0,0,0,-2,-2,-2,-3,0,-2,-2); INSERT INTO `mob_resistances` VALUES (398,'Sheep-Slumbering_Samwell',1.0,1.0,1.0,1.0,0,0,0,0,0,0,0,0,0,-2,0,-2,-2,-3,-3,-2,-2); -INSERT INTO `mob_resistances` VALUES (399,'Demon - Duke_Focalor',1.0,1.0,1.0,1.0,0,0,0,0,0,0,0,0,0,3,11,3,3,3,3,11,3); +-- 399 Free INSERT INTO `mob_resistances` VALUES (400,'Crab-Tegmine',1.0,1.0,1.0,1.0,0,0,0,0,0,0,0,0,0,-2,-3,-2,-2,-3,2,-2,-2); INSERT INTO `mob_resistances` VALUES (401,'Doll-Martinet',1.0,1.0,1.0,1.0,0,0,0,0,0,0,0,0,0,2,2,2,2,-3,2,2,2); INSERT INTO `mob_resistances` VALUES (402,'Scorpion -Aqrabuamelu',1.0,1.0,1.0,1.0,0,0,0,0,0,0,0,0,0,0,-3,0,0,-2,-2,-3,0); diff --git a/sql/mob_skill_lists.sql b/sql/mob_skill_lists.sql index 557e2be248e..ca4086a61fb 100644 --- a/sql/mob_skill_lists.sql +++ b/sql/mob_skill_lists.sql @@ -1948,7 +1948,8 @@ INSERT INTO `mob_skill_lists` VALUES ('Two-faced_Flan',416,1822); INSERT INTO `mob_skill_lists` VALUES ('Two-faced_Flan',416,1823); INSERT INTO `mob_skill_lists` VALUES ('Two-faced_Flan',416,1824); INSERT INTO `mob_skill_lists` VALUES ('Two-faced_Flan',416,1825); --- 417 to 435: free +INSERT INTO `mob_skill_lists` VALUES ('Barbaric_Weapon',417,514); -- Whirl of Rage +-- 418 to 435: free INSERT INTO `mob_skill_lists` VALUES ('Bloodlapper',436,2162); INSERT INTO `mob_skill_lists` VALUES ('Ghillie_Dhu',437,685); INSERT INTO `mob_skill_lists` VALUES ('Highlander_Lizard',438,371); diff --git a/sql/mob_spawn_points.sql b/sql/mob_spawn_points.sql index 252eb6cc717..ab6e93b6eed 100644 --- a/sql/mob_spawn_points.sql +++ b/sql/mob_spawn_points.sql @@ -39204,7 +39204,7 @@ INSERT INTO `mob_spawn_points` VALUES (17236176,'Evil_Eye','Evil Eye',4,-233.593 INSERT INTO `mob_spawn_points` VALUES (17236177,'Evil_Eye','Evil Eye',4,-255.674,-14.83,-17.943,184); INSERT INTO `mob_spawn_points` VALUES (17236178,'Evil_Eye','Evil Eye',4,-236.923,-12.164,-33.878,93); INSERT INTO `mob_spawn_points` VALUES (17236179,'Evil_Eye','Evil Eye',4,-242.547,-11.594,16.76,126); -INSERT INTO `mob_spawn_points` VALUES (17236180,'Shadow_Eye','Shadow Eye',24,-238.000,-12.000,83.000,127); +INSERT INTO `mob_spawn_points` VALUES (17236180,'Shadow_Eye','Shadow Eye',24,-236.734,-11.177,-23.543,127); INSERT INTO `mob_spawn_points` VALUES (17236181,'Demon_Pawn','Demon Pawn',10,-228.561,-10.890,-127.956,63); INSERT INTO `mob_spawn_points` VALUES (17236182,'Demon_Pawn','Demon Pawn',10,-283.275,-20.379,-81.644,108); INSERT INTO `mob_spawn_points` VALUES (17236183,'Demon_Wizard','Demon Wizard',19,-277.136,-20.172,-122.657,127); diff --git a/sql/nm_spawn_points.sql b/sql/nm_spawn_points.sql index 7989ce09444..fc553b231c9 100644 --- a/sql/nm_spawn_points.sql +++ b/sql/nm_spawn_points.sql @@ -2232,6 +2232,10 @@ INSERT INTO `nm_spawn_points` VALUES (17232117,47,-224.000,-80.000,-130.000); INSERT INTO `nm_spawn_points` VALUES (17232117,48,134.000,-21.200,133.000); INSERT INTO `nm_spawn_points` VALUES (17232117,49,297.000,20.000,446.000); INSERT INTO `nm_spawn_points` VALUES (17236027,0,57.000,-21.108,-24.000); -- Barbaric Weapon +INSERT INTO `nm_spawn_points` VALUES (17236027,1,49.105,-17.595,-6.8771); +INSERT INTO `nm_spawn_points` VALUES (17236027,2,65.671,-19.058,-12.3478); +INSERT INTO `nm_spawn_points` VALUES (17236027,3,82.766,-15.533,-27.2944); +INSERT INTO `nm_spawn_points` VALUES (17236027,4,61.546,-21.743,-30.5311); INSERT INTO `nm_spawn_points` VALUES (17236045,0,47.210,-24.020,-367.510); -- Timeworn Warrior INSERT INTO `nm_spawn_points` VALUES (17236146,0,36.000,-36.000,160.000); INSERT INTO `nm_spawn_points` VALUES (17236146,1,42.000,-35.998,154.000); @@ -2283,7 +2287,7 @@ INSERT INTO `nm_spawn_points` VALUES (17236146,46,44.000,-36.000,119.000); INSERT INTO `nm_spawn_points` VALUES (17236146,47,47.000,-36.000,126.000); INSERT INTO `nm_spawn_points` VALUES (17236146,48,46.000,-35.690,137.000); INSERT INTO `nm_spawn_points` VALUES (17236146,49,37.000,-35.998,153.000); -INSERT INTO `nm_spawn_points` VALUES (17236180,0,-238.000,-12.000,83.000); -- Shadow Eye +INSERT INTO `nm_spawn_points` VALUES (17236180,0,-236.734,-11.177,-23.543); -- Shadow Eye INSERT INTO `nm_spawn_points` VALUES (17240376,0,-283.874,-0.660,485.504); INSERT INTO `nm_spawn_points` VALUES (17240376,1,-272.224,-0.942,461.321); INSERT INTO `nm_spawn_points` VALUES (17240376,2,-268.000,-0.558,440.000); @@ -7050,7 +7054,7 @@ INSERT INTO `nm_spawn_points` VALUES (17293485,0,-341.691,-21.0,39.305); INSERT INTO `nm_spawn_points` VALUES (17293485,1,-338.898,-21.028,45.62); INSERT INTO `nm_spawn_points` VALUES (17293485,2,-286.022,-21.102,75.4); INSERT INTO `nm_spawn_points` VALUES (17293485,3,-226.756,-20.846,32.378); -INSERT INTO `nm_spawn_points` VALUES (17293485,4,-202.11,-20.31,-10.47); -- This is the spot Atkorkamuy always spawns on server reboot even if this isn't in the db +INSERT INTO `nm_spawn_points` VALUES (17293485,4,-202.11,-20.31,-10.47); -- This is the spot Atkorkamuy always spawns on server reboot even if this isn't in the db /*!40000 ALTER TABLE `nm_spawn_points` ENABLE KEYS */; UNLOCK TABLES;