PR: Added the C++ backbone for updating Digging Zones

DarkstarProject · Dec 23, 2019 · 0fddecd · 0fddecd
1 parent 7afec44
commit 0fddecd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/src/map/lua/luautils.cpp b/src/map/lua/luautils.cpp
@@ -4428,6 +4428,23 @@ namespace luautils
         return canDig;
     }
 
+    int32 UpdateDigZones()
+    {
+        lua_prepscript("scripts/globals/chocobo_digging.lua");
+
+        if (prepFile(File, "updateDigZones"))
+            return false;
+
+        if (lua_pcall(LuaHandle, 0, 0, 0))
+        {
+            ShowError("luautils::UpdateDigZones: %s\n", lua_tostring(LuaHandle, -1));
+            lua_pop(LuaHandle, 1);
+            return false;
+        }
+
+        return 0;
+    }
+
     /************************************************************************
     *   Loads a Lua function with a fallback hierarchy                      *
     *                                                                       *

diff --git a/src/map/lua/luautils.h b/src/map/lua/luautils.h
@@ -281,6 +281,7 @@ namespace luautils
     int32 OnPlayerLevelDown(CCharEntity* PChar);
 
     bool OnChocoboDig(CCharEntity* PChar, bool pre);                           // chocobo digging, pre = check
+    int32 UpdateDigZones();                                                     // updating chocobo digging zones with items
     bool LoadEventScript(CCharEntity* PChar, const char* functionName);    // Utility method: checks for and loads a lua function for events
 
     uint16 GetDespoilDebuff(uint16 itemId);                                   // Ask the database for an effectId based on Item despoiled (returns 0 if not in db)

diff --git a/src/map/time_server.cpp b/src/map/time_server.cpp
@@ -76,9 +76,16 @@ int32 time_server(time_point tick,CTaskMgr::CTask* PTask)
 
             CVanaTime::getInstance()->lastVHourlyUpdate = tick;
         }
+    }
 
+    // every irl minute
+    if (tick > (CVanaTime::getInstance()->lastMinute + 60s))
+    {
+        luautils::UpdateDigZones();
+        CVanaTime::getInstance()->lastMinute = tick;
     }
 
+
     //Midnight
     if (CVanaTime::getInstance()->getSysHour() == 0 && CVanaTime::getInstance()->getSysMinute() == 0)
     {

diff --git a/src/map/vana_time.h b/src/map/vana_time.h
@@ -93,6 +93,7 @@ class CVanaTime
     time_point   lastVDailyUpdate;
     time_point   lastConquestTally;
     time_point   lastMidnight;
+    time_point   lastMinute;
 
 private: