Skip to content

[lua] Remove duplicate QM logic from Zilart Kings QMs #10596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xaver-DaRed merged 1 commit into from
Jul 25, 2026
Merged

[lua] Remove duplicate QM logic from Zilart Kings QMs #10596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/zones/Behemoths_Dominion/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ zones[xi.zone.BEHEMOTHS_DOMINION] =
},
npc =
{
BEHEMOTH_QM = GetFirstID('qm2'),
BEHEMOTH_QM = GetFirstID('qm_behemoth'),
CERMET_HEADSTONE = GetFirstID('Cermet_Headstone'),
},
}
Expand Down
9 changes: 0 additions & 9 deletions scripts/zones/Behemoths_Dominion/mobs/Behemoth.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-- Area: Behemoth's Dominion
-- HNM: Behemoth
-----------------------------------
local ID = zones[xi.zone.BEHEMOTHS_DOMINION]
mixins = { require('scripts/mixins/rage') }
-----------------------------------
---@type TMobEntity
Expand All @@ -24,9 +23,6 @@ entity.onMobSpawn = function(mob)
mob:setMod(xi.mod.ATT, 211)
mob:setMod(xi.mod.DARK_SLEEP_RES_RANK, 11)
mob:setMod(xi.mod.STUN_RES_RANK, 10)

-- Despawn the ???
GetNPCByID(ID.npc.BEHEMOTH_QM):setStatus(xi.status.DISAPPEAR)
end

entity.onMobRoam = function(mob)
Expand Down Expand Up @@ -61,9 +57,4 @@ entity.onMobDeath = function(mob, player, optParams)
end
end

entity.onMobDespawn = function(mob)
-- Respawn the ???
GetNPCByID(ID.npc.BEHEMOTH_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
end

return entity
8 changes: 0 additions & 8 deletions scripts/zones/Behemoths_Dominion/mobs/King_Behemoth.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-- Area: Behemoth's Dominion
-- HNM: King Behemoth
-----------------------------------
local ID = zones[xi.zone.BEHEMOTHS_DOMINION]
mixins = { require('scripts/mixins/rage') }
-----------------------------------
---@type TMobEntity
Expand Down Expand Up @@ -31,8 +30,6 @@ entity.onMobSpawn = function(mob)
mob:setMod(xi.mod.ATT, 462)
mob:setMod(xi.mod.DEF, 500)
mob:setMod(xi.mod.EVA, 370)
-- Despawn the ???
GetNPCByID(ID.npc.BEHEMOTH_QM):setStatus(xi.status.DISAPPEAR)
end

entity.onMobRoam = function(mob)
Expand Down Expand Up @@ -89,9 +86,4 @@ entity.onMobDeath = function(mob, player, optParams)
end
end

entity.onMobDespawn = function(mob)
-- Respawn the ???
GetNPCByID(ID.npc.BEHEMOTH_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
end

return entity
2 changes: 1 addition & 1 deletion ...pts/zones/Behemoths_Dominion/npcs/qm2.lua → ...s/Behemoths_Dominion/npcs/qm_behemoth.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-----------------------------------
-- Area: Behemoth's Dominion
-- NPC: qm2 (???)
-- NPC: qm_behemoth (???)
-- Spawns Behemoth or King Behemoth
-- !pos -267 -19 74 127
-----------------------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dragons_Aery/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ zones[xi.zone.DRAGONS_AERY] =
},
npc =
{
FAFNIR_QM = GetFirstID('qm0'),
FAFNIR_QM = GetFirstID('qm_fafnir'),
},
}

Expand Down
9 changes: 0 additions & 9 deletions scripts/zones/Dragons_Aery/mobs/Fafnir.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-- Area: Dragons Aery
-- HNM: Fafnir
-----------------------------------
local ID = zones[xi.zone.DRAGONS_AERY]
mixins = { require('scripts/mixins/rage') }
-----------------------------------
---@type TMobEntity
Expand All @@ -23,9 +22,6 @@ entity.onMobSpawn = function(mob)
mob:setMod(xi.mod.ATT, 489) -- 550 Total Attack
mob:setMod(xi.mod.REGEN, 20) -- 1% every 90s
mob:setMod(xi.mod.STUN_RES_RANK, 10)

-- Despawn the ???
GetNPCByID(ID.npc.FAFNIR_QM):setStatus(xi.status.DISAPPEAR)
end

entity.onMobFight = function(mob, target)
Expand Down Expand Up @@ -57,9 +53,4 @@ entity.onMobDeath = function(mob, player, optParams)
end
end

entity.onMobDespawn = function(mob)
-- Respawn the ???
GetNPCByID(ID.npc.FAFNIR_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
end

return entity
8 changes: 0 additions & 8 deletions scripts/zones/Dragons_Aery/mobs/Nidhogg.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-- Area: Dragons Aery
-- HNM: Nidhogg
-----------------------------------
local ID = zones[xi.zone.DRAGONS_AERY]
mixins = { require('scripts/mixins/rage') }
-----------------------------------
---@type TMobEntity
Expand All @@ -26,8 +25,6 @@ entity.onMobSpawn = function(mob)
mob:setMod(xi.mod.REGAIN, 100) -- Ability every 30 seconds below 25% HP
mob:setMod(xi.mod.REGEN, 20) -- 1% every 90s
mob:setMod(xi.mod.STUN_RES_RANK, 10)
-- Despawn the ???
GetNPCByID(ID.npc.FAFNIR_QM):setStatus(xi.status.DISAPPEAR)
end

entity.onMobFight = function(mob, target)
Expand Down Expand Up @@ -70,9 +67,4 @@ entity.onMobDeath = function(mob, player, optParams)
end
end

entity.onMobDespawn = function(mob)
-- Respawn the ???
GetNPCByID(ID.npc.FAFNIR_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
end

return entity
4 changes: 2 additions & 2 deletions scripts/zones/Dragons_Aery/npcs/qm0.lua → ...pts/zones/Dragons_Aery/npcs/qm_fafnir.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
-----------------------------------
-- Area: Dragons Aery
-- NPC: qm0 (???)
-- NPC: qm_fafnir (???)
-- Spawns Fafnir or Nidhogg
-- !pos -81 32 2 178
-- !pos 82 6 42 154
-----------------------------------
local ID = zones[xi.zone.DRAGONS_AERY]
-----------------------------------
Expand Down
9 changes: 0 additions & 9 deletions scripts/zones/Valley_of_Sorrows/mobs/Adamantoise.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-- Area: Valley of Sorrows
-- HNM: Adamantoise
-----------------------------------
local ID = zones[xi.zone.VALLEY_OF_SORROWS]
mixins =
{
require('scripts/mixins/rage'),
Expand All @@ -29,9 +28,6 @@ entity.onMobInitialize = function(mob)
end

entity.onMobSpawn = function(mob)
-- Despawn the ???
GetNPCByID(ID.npc.ADAMANTOISE_QM):setStatus(xi.status.DISAPPEAR)

mob:setMod(xi.mod.DEF, 4112)
mob:setMod(xi.mod.ATT, 450)
mob:setMod(xi.mod.DMGMAGIC, -3500)
Expand All @@ -45,9 +41,4 @@ entity.onMobDeath = function(mob, player, optParams)
end
end

entity.onMobDespawn = function(mob)
-- Respawn the ???
GetNPCByID(ID.npc.ADAMANTOISE_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
end

return entity
9 changes: 0 additions & 9 deletions scripts/zones/Valley_of_Sorrows/mobs/Aspidochelone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-- Area: Valley of Sorrows
-- HNM: Aspidochelone
-----------------------------------
local ID = zones[xi.zone.VALLEY_OF_SORROWS]
mixins =
{
require('scripts/mixins/rage'),
Expand Down Expand Up @@ -51,9 +50,6 @@ entity.onMobInitialize = function(mob)
end

entity.onMobSpawn = function(mob)
-- Despawn the ???
GetNPCByID(ID.npc.ADAMANTOISE_QM):setStatus(xi.status.DISAPPEAR)

mob:setMobAbilityEnabled(true)
mob:setAutoAttackEnabled(true)
mob:setAnimationSub(0)
Expand Down Expand Up @@ -116,9 +112,4 @@ entity.onMobDeath = function(mob, player, optParams)
end
end

entity.onMobDespawn = function(mob)
-- Respawn the ???
GetNPCByID(ID.npc.ADAMANTOISE_QM):updateNPCHideTime(xi.settings.main.FORCE_SPAWN_QM_RESET_TIME)
end

return entity
4 changes: 2 additions & 2 deletions sql/npc_list.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18576,7 +18576,7 @@ INSERT INTO `npc_list` VALUES (17293844,'Before_Delkfutts_Tower','Before Delkfut
-- ------------------------------------------------------------

INSERT INTO `npc_list` VALUES (17297458,'NPC[32]','',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,0);
INSERT INTO `npc_list` VALUES (17297459,'qm2','???',0,-269.350,-19.778,74.269,1,50,50,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'ABYSSEA',0);
INSERT INTO `npc_list` VALUES (17297459,'qm_behemoth','???',0,-269.350,-19.778,74.269,1,50,50,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'ABYSSEA',0);
INSERT INTO `npc_list` VALUES (17297460,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,0,50,50,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);
INSERT INTO `npc_list` VALUES (17297461,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,0,50,50,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);
INSERT INTO `npc_list` VALUES (17297462,'Treasure_Casket','Treasure Casket',0,0.000,0.000,0.000,0,50,50,0,4,4,2,3,0x0000C50300000000000000000000000000000000,0,NULL,0);
Expand Down Expand Up @@ -22338,7 +22338,7 @@ INSERT INTO `npc_list` VALUES (17404444,'Mandragora_Warden_???','Mandragora Ward
-- ------------------------------------------------------------

INSERT INTO `npc_list` VALUES (17408032,'NPC[20]','',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,0);
INSERT INTO `npc_list` VALUES (17408033,'qm0','???',0,82.326,6.870,42.042,1,50,50,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,NULL,0);
INSERT INTO `npc_list` VALUES (17408033,'qm_fafnir','???',0,82.326,6.870,42.042,1,50,50,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,NULL,0);
INSERT INTO `npc_list` VALUES (17408034,'Achieve_Master','Achieve Master',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,'SOA',0);
INSERT INTO `npc_list` VALUES (17408035,'NPC[23]','',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,0);
INSERT INTO `npc_list` VALUES (17408036,'Unity_Master','Unity Master',0,0.000,0.000,0.000,0,50,50,0,0,96,2,2051,0x0000340000000000000000000000000000000000,0,'SOA',0);
Expand Down
Loading