- dont use insignia if you are in the camp zone.

DerpleMQ2 · Mar 11, 2024 · 76b7322 · 76b7322
1 parent 92a5a75
commit 76b7322
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = 'e241c25 2024-03-10' }
+return { commitId = '92a5a75 2024-03-11' }
diff --git a/modules/movement.lua b/modules/movement.lua
@@ -191,6 +191,11 @@ function Module:GetCampData()
     return { returnToCamp = (self.settings.ReturnToCamp and self.TempSettings.CampZoneId == mq.TLO.Zone.ID()), campSettings = self.TempSettings, }
 end
 
+---@return boolean
+function Module:InCampZone()
+    return self.TempSettings.CampZoneId == mq.TLO.Zone.ID()
+end
+
 function Module:CampOff()
     self.settings.ReturnToCamp = false
     self:SaveSettings(false)

diff --git a/utils/rgmercs_utils.lua b/utils/rgmercs_utils.lua
@@ -198,11 +198,12 @@ function RGMercUtils.HandleDeath()
         end
     end
 
-    mq.delay("1m", function() return (not mq.TLO.Me.Zoning()) end)
+    mq.delay("2m", function() return (not mq.TLO.Me.Zoning()) end)
 
     RGMercsLogger.log_debug("Done zoning post death.")
 
-    if RGMercUtils.GetSetting('DoFellow') then
+    -- if we want do do fellowship but we arent in the fellowship zone (rezed)
+    if RGMercUtils.GetSetting('DoFellow') and not RGMercModules:ExecModule("Movement", "InCampZone") then
         RGMercsLogger.log_debug("Doing fellowship post death.")
         if mq.TLO.FindItem("Fellowship Registration Insignia").Timer.TotalSeconds() == 0 then
             mq.delay("30s", function() return (mq.TLO.Me.CombatState():lower() == "active") end)