Update status_effects.lua

Author: sabarjp

status_effects.lua

@@ -9,6 +9,64 @@ function status_effects:initialize()
   self.is_initialized = true
 end
 
+function status_effects:get_id_from_player_name(player_name)
+  local player = self.party_player_ids[player_name]
+
+  if player then
+    return player
+  else
+    return -1
+  end
+end
+
+function status_effects:update_target_zone(target_id, zone)
+  if target_id == -1 then
+    -- we don't know who it is, have to skip :(
+    return
+  end
+
+  local existing_zone = self.target_zone[target_id]
+
+  if existing_zone and zone == existing_zone then
+    -- Zone hasn't changed, nothing to do
+    return
+  end
+
+  -- Handle buffs if the zone has changed
+  if existing_zone then
+    --print(target_id .. ' - Zone has changed from ' .. existing_zone .. ' to ' .. zone .. ', removing JA buffs.')
+
+    if self.buffs[target_id] then
+      for buff_id, spell_table in pairs(self.buffs[target_id]) do
+        for composite_key in pairs(spell_table) do
+          local key_type = composite_key:match("^(%a+):%d+$")
+
+          --print(key_type .. ' ' .. composite_key)
+
+          if key_type == 'ja' then
+            spell_table[composite_key] = nil -- Remove JA buff
+
+            -- Clean up empty buff_id entry
+            if next(spell_table) == nil then
+              self.buffs[target_id][buff_id] = nil
+            end
+          end
+        end
+      end
+
+      -- Clean up empty target_id entry
+      if next(self.buffs[target_id]) == nil then
+        self.buffs[target_id] = nil
+      end
+    end
+  else
+    --print('Not tracking target zone yet, setting to ' .. zone)
+  end
+
+  -- Update the zone
+  self.target_zone[target_id] = zone
+end
+
 function status_effects:update()
   for target_id, target_buffs in pairs(self.buffs) do
     for buff_id, spell_table in pairs(target_buffs) do
@@ -455,7 +513,7 @@ function status_effects:add_buff_ma(target_id, spell_id, buff_id, type, actor_id
         -- Find the shortest duration song
         table.sort(bard_songs, function(a, b) return a.duration < b.duration end)
         local shortest_song = bard_songs[1]
-        self.buffs[target_id][shortest_song.buff_id][shortest_song.spell_id] = nil -- Replace it
+        self.buffs[target_id][shortest_song.buff_id][shortest_song.composite_id] = nil -- Replace it
 
         -- Clean up if the spell table is empty
         if next(self.buffs[target_id][shortest_song.buff_id]) == nil then
@@ -822,6 +880,15 @@ windower.register_event('prerender', function()
   end
 end)
 
+windower.register_event('incoming chunk', function(id, original, modified, injected, blocked)
+  if id == 0x01D then -- complete load
+    local info = windower.ffxi.get_info()
+    status_effects.current_zone = (info.mog_house and -1) or windower.ffxi.get_info().zone
+    status_effects:update_target_zone(windower.ffxi.get_player().id, status_effects.current_zone)
+    status_effects:remove_all_non_party_buffs()
+  end
+end)
+
 windower.register_event('incoming chunk', function(id, data)
   if status_effects.is_initialized then
     if id == 0x028 then