Merge pull request LandSandBoat#4735 from LandSandBoat/vscode_updates

[misc] Update VSCode settings
Xaver-DaRed · Nov 18, 2023 · 480de76 · 480de76
2 parents cdf95bf + 98f38bb
commit 480de76
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 9 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,11 +1,17 @@
 {
     "recommendations": [
-        "koihik.vscode-lua-format",
         "jkiviluoto.tws",
         "sumneko.lua",
         "wwm.better-align",
         "tomblind.local-lua-debugger-vscode",
         "ms-python.python",
-        "ms-python.black-formatter"
+        "ms-python.black-formatter",
+        "eamodio.gitlens",
+        "donjayamanne.githistory",
+        "josetr.cmake-language-support-vscode",
+        "ms-vscode.cpptools-themes",
+        "ms-vscode.cpptools-extension-pack",
+        "ms-vscode.cpptools",
+        "jeff-hykin.better-cpp-syntax"
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -450,14 +450,27 @@
         "BuildString",
         "SendLuaFuncStringToZone",
         "GetFirstID",
+        "GetTableOfIDs",
+        "NextConquestTally",
+        "NextJstDay",
+        "GetEntityByID",
+        "GetItemByID",
+        "GetItemIDByName",
+        "GetContainerFilenamesList",
+        "GetElevatorState",
     ],
     "Lua.diagnostics.disable": [
         "lowercase-global"
     ],
+    "Lua.diagnostics.ignoredFiles": "Disable",
     "Lua.hint.enable": true,
     "Lua.hint.setType": true,
     "Lua.runtime.version": "LuaJIT",
     "Lua.workspace.preloadFileSize": 10000,
+    "Lua.workspace.ignoreDir": [
+        ".vscode",
+        "tools/ci/tests/stylecheck.lua"
+    ],
     "[python]": {
         "editor.defaultFormatter": "ms-python.black-formatter",
         "editor.formatOnSave": true

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,6 +91,9 @@ add_definitions(
     -DSOL_PRINT_ERRORS=0
 )
 
+# For external libs
+set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
+
 add_subdirectory(ext)
 
 include(ClangTidy)

diff --git a/scripts/globals/abyssea/atma_fabricant.lua b/scripts/globals/abyssea/atma_fabricant.lua
@@ -6,7 +6,7 @@ require('scripts/globals/abyssea')
 xi = xi or {}
 xi.atmaFabricant = xi.atmaFabricant or {}
 
-xi.atmaFabricant.onTrade = function(player, npc)
+xi.atmaFabricant.onTrade = function(player, npc, trade)
 end
 
 xi.atmaFabricant.onTrigger = function(player, npc)

diff --git a/scripts/globals/abyssea/sturdypyxis/chest.lua b/scripts/globals/abyssea/sturdypyxis/chest.lua
@@ -69,7 +69,7 @@ end
 -----------------------------------
 -- Desc: Messages sent to all players in a party in the zone
 -----------------------------------
-xi.pyxis.messageChest = function(player, messageid, param1, param2, param3, param4)
+xi.pyxis.messageChest = function(player, messageid, param1, param2, param3, param4, npc)
     local alliance = player:getAlliance()
 
     for _, member in ipairs(alliance) do

diff --git a/scripts/globals/abyssea/sturdypyxis/npc.lua b/scripts/globals/abyssea/sturdypyxis/npc.lua
@@ -88,7 +88,7 @@ xi.pyxis.npc.onPyxisTrade = function(player, npc, trade)
             player:tradeComplete()
             xi.pyxis.getDrops(npc, dropType, chestTier)
             xi.pyxis.messageChest(player, ID.text.TRADE_KEY_OPEN, 2490, 0, 0, 0, npc)
-            xi.pyxis.openChest(player, npc, dropType)
+            xi.pyxis.openChest(player, npc)
         end
     end
 end

diff --git a/scripts/globals/teleports/survival_guide.lua b/scripts/globals/teleports/survival_guide.lua
@@ -132,7 +132,7 @@ xi.survivalGuide.onEventUpdate = function(player, csid, option, npc)
     end
 end
 
-xi.survivalGuide.onEventFinish = function(player, eventId, option)
+xi.survivalGuide.onEventFinish = function(player, eventId, option, npc)
     if
         eventId == 8500 and
         bit.band(option, 0xFF) == optionMap.TELEPORT

diff --git a/scripts/globals/trust.lua b/scripts/globals/trust.lua
@@ -438,7 +438,7 @@ end
 -- For debugging and lining up teamwork messages
 xi.trust.dumpMessages = function(mob, pageOffset)
     for i = 0, 20 do
-        xi.trust.message(mob, pageOffset, i)
+        xi.trust.message(mob, pageOffset)
     end
 end
 

diff --git a/scripts/quests/ahtUrhgan/Rock_Bottom.lua b/scripts/quests/ahtUrhgan/Rock_Bottom.lua
@@ -51,7 +51,7 @@ quest.sections =
                     elseif
                         not player:needToZone() and
                         quest:getVar(player, 'Prog') == 2 and
-                        npcUtil.tradeHas(trade, { xi.item.MYTHRIL_PICK, xi.item.MYTHRIL_PICK_HQ }, true, true)
+                        npcUtil.tradeHas(trade, { xi.item.MYTHRIL_PICK, xi.item.MYTHRIL_PICK_HQ }, true)
                     then
                         return quest:progressEvent(9, { [0] = trade:getItemId() })
                     end

diff --git a/src/common/debug_linux.cpp b/src/common/debug_linux.cpp
@@ -1,3 +1,4 @@
+#ifdef __linux__
 #include <csignal>
 #include <sys/ptrace.h>
 #include <sys/resource.h>
@@ -79,3 +80,4 @@ bool debug::isRunningUnderDebugger()
     }
     return underDebugger;
 }
+#endif // __linux__
diff --git a/src/common/debug_osx.cpp b/src/common/debug_osx.cpp
@@ -1,3 +1,4 @@
+#ifdef __APPLE__
 #include <csignal>
 #include <sys/ptrace.h>
 #include <sys/resource.h>
@@ -85,3 +86,4 @@ bool debug::isRunningUnderDebugger()
     }
     return underDebugger;
 }
+#endif // __APPLE__
diff --git a/src/common/debug_windows.cpp b/src/common/debug_windows.cpp
@@ -1,4 +1,5 @@
-#include "debug.h"
+#ifdef _WIN32
+#include "debug.h"
 
 #include "WheatyExceptionReport.h"
 
@@ -13,3 +14,4 @@ bool debug::isRunningUnderDebugger()
 {
     return IsDebuggerPresent();
 }
+#endif // _WIN32