Skip to content

[lua] Stop conquest hourly messages in Dynamis #11404

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
Sep 7, 2026
Merged

[lua] Stop conquest hourly messages in Dynamis #11404

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
55 changes: 24 additions & 31 deletions scripts/globals/conquest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ xi = xi or {}
xi.conquest = xi.conquest or {}

-----------------------------------
-- (LOCAL) constants
-- (GLOBAL) constants
-----------------------------------

local conquestConstants =
xi.conquest.constants =
{
TALLY_START = 0,
TALLY_END = 1,
Expand Down Expand Up @@ -1939,56 +1939,49 @@ xi.conquest.sendConquestTallyUpdateMessage = function(player, messageBase, owner
end

xi.conquest.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
-- onConquestUpdate is called for zones in city regions as well
-- in such cases, owner and influence is undetermined, so we call a city specific method.
local regionId = zone:getRegionID()
if regionId > xi.region.TAVNAZIANARCH and regionId < xi.region.DYNAMIS then
xi.conquest.onCityConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
return
end

local messageBase = zones[zone:getID()].text.CONQUEST_BASE
local players = zone:getPlayers()

-----------------------------------
-- WARNING: This is iterating every player in a zone, be careful not
-- : to put expensive operations like db reads in here!
-----------------------------------
for _, player in pairs(players) do
if updatetype == conquestConstants.TALLY_START then
if updatetype == xi.conquest.constants.TALLY_START then
for _, player in pairs(players) do
xi.conquest.sendConquestTallyStartMessage(player, messageBase)

elseif updatetype == conquestConstants.TALLY_END then
end
elseif updatetype == xi.conquest.constants.TALLY_END then
for _, player in pairs(players) do
xi.conquest.sendConquestTallyEndMessage(player, messageBase, owner, ranking, isConquestAlliance)

elseif updatetype == conquestConstants.UPDATE then
end
elseif updatetype == xi.conquest.constants.UPDATE then
for _, player in pairs(players) do
xi.conquest.sendConquestTallyUpdateMessage(player, messageBase, owner, ranking, influence, isConquestAlliance)
end
end
end

xi.conquest.onCityConquestUpdate = function(zone, updatetype, ranking, isconquestAlliance)
local messageBase = zones[zone:getID()].text.CONQUEST_BASE
local players = zone:getPlayers()

-----------------------------------
-- Once per zone logic
-----------------------------------

-- Triggers regional npc updates for city zones only
if updatetype == conquestConstants.TALLY_END then
xi.conquest.toggleRegionalNPCs(zone)
xi.conquest.onNonRegionConquestUpdate = function(zone, updatetype, ranking, isconquestAlliance)
if
updatetype ~= xi.conquest.constants.TALLY_START and
updatetype ~= xi.conquest.constants.TALLY_END
then
return
end

local messageBase = zones[zone:getID()].text.CONQUEST_BASE
local players = zone:getPlayers()

-----------------------------------
-- WARNING: This is iterating every player in a zone, be careful not
-- : to put expensive operations like db reads in here!
-----------------------------------
for _, player in pairs(players) do
if updatetype == conquestConstants.TALLY_START then
if updatetype == xi.conquest.constants.TALLY_START then
for _, player in pairs(players) do
xi.conquest.sendConquestTallyStartMessage(player, messageBase)

elseif updatetype == conquestConstants.TALLY_END then
end
elseif updatetype == xi.conquest.constants.TALLY_END then
for _, player in pairs(players) do
xi.conquest.sendCityConquestTallyEndMessage(player, messageBase, ranking, isconquestAlliance)
end
end
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Bastok_Markets/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Bastok_Mines/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Chateau_dOraguille/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Bastok/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Beaucedine/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Buburimu/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Jeuno/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Qufim/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-San_dOria/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Tavnazia/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Valkurm/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Windurst/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Dynamis-Xarcabard/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Heavens_Tower/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Lower_Jeuno/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Metalworks/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ zoneObject.afterZoneIn = function(player)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Northern_San_dOria/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
5 changes: 4 additions & 1 deletion scripts/zones/Port_Bastok/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ zoneObject.onInitialize = function(zone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
if updatetype == xi.conquest.constants.TALLY_END then
xi.conquest.toggleRegionalNPCs(zone)
end
end

zoneObject.onZoneIn = function(player, prevZone)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Port_Jeuno/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTransportEvent = function(player, prevZoneId, transportName)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Port_San_dOria/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Port_Windurst/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTransportEvent = function(player, prevZoneId, transportName)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/RuLude_Gardens/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
5 changes: 4 additions & 1 deletion scripts/zones/Southern_San_dOria/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
if updatetype == xi.conquest.constants.TALLY_END then
xi.conquest.toggleRegionalNPCs(zone)
end
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Upper_Jeuno/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Windurst_Walls/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
2 changes: 1 addition & 1 deletion scripts/zones/Windurst_Waters/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
5 changes: 4 additions & 1 deletion scripts/zones/Windurst_Woods/Zone.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ zoneObject.onZoneIn = function(player, prevZone)
end

zoneObject.onConquestUpdate = function(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onConquestUpdate(zone, updatetype, influence, owner, ranking, isConquestAlliance)
xi.conquest.onNonRegionConquestUpdate(zone, updatetype, ranking, isConquestAlliance)
if updatetype == xi.conquest.constants.TALLY_END then
xi.conquest.toggleRegionalNPCs(zone)
end
end

zoneObject.onTriggerAreaEnter = function(player, triggerArea)
Expand Down
Loading