Merge branch 'base' into base

.github/workflows/build.yml

@@ -78,7 +78,7 @@ jobs:
         for changed_file in ${{ steps.changed-files.outputs.all }}; do
           if [[ -f $changed_file ]]; then
             if [[ $changed_file == *.cpp ]]; then
-              bash tools/ci/cpp.sh ${changed_file} 2>> cpp_checks.txt || true
+              bash tools/ci/cpp.sh ${changed_file} 2>> cpp_checks.txt >> cpp_checks.txt || true
             fi
           fi
         done
@@ -181,6 +181,34 @@ jobs:
         fi
         exit 0
 
+  Linux_LuaLanguageServer:
+    needs: Sanity_Checks
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0 # Or else we don't get full blame information
+    - name: Install Dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y software-properties-common cmake libmariadb-dev-compat libluajit-5.1-dev libzmq3-dev zlib1g-dev libssl-dev binutils-dev
+        pip install -r tools/requirements.txt
+    - name: Run Lua Language Server
+      run: |
+        python3 tools/ci/lua_lang_server.py
+    - name: Upload Lua Language Server Output
+      if: hashFiles('lua_lang_errors.txt') != ''
+      uses: actions/upload-artifact@v4
+      with:
+        name: lua_lang_errors
+        path: lua_lang_errors.txt
+    - name: Check Output
+      run: |
+        if [ -f lua_lang_errors.txt ]; then
+            cat lua_lang_errors.txt
+            exit 1
+        fi
+
   Linux_Clang15_64bit:
     needs: Sanity_Checks
     runs-on: ubuntu-22.04

.gitignore

@@ -132,10 +132,10 @@ UpgradeLog*.XML
 *.app
 
 # Generated executables
-/xi_connect
-/xi_map
-/xi_search
-/xi_world
+/xi_connect*
+/xi_map*
+/xi_search*
+/xi_world*
 
 # Generated files, mostly autotools-related
 .deps
@@ -170,6 +170,9 @@ log/leaks.txt
 .vs
 /win32/.vs/xi/v15
 .luarc.json
+lua-language-server*
+check.json
+lua_lang_errors.txt
 
 # VSCode
 .vscode

.vscode/c_cpp_properties.json

@@ -0,0 +1,40 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}/ext/**",
+                "${workspaceFolder}/src/**"
+            ],
+            "defines": [],
+            "cStandard":"c23",
+            "cppStandard": "c++23",
+            "intelliSenseMode": "${default}"
+        },
+        {
+            "name": "OSX",
+            "includePath": [
+                "${workspaceFolder}/ext/**",
+                "${workspaceFolder}/src/**"
+            ],
+            "defines": [],
+            "cStandard":"c23",
+            "cppStandard": "c++23",
+            "intelliSenseMode": "${default}",
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/ext/**",
+                "${workspaceFolder}/src/**"
+            ],
+            "defines": [],
+            "cStandard":"c23",
+            "cppStandard": "c++23",
+            "intelliSenseMode": "${default}",
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -10,8 +10,10 @@
     "editor.renderControlCharacters": true,
     "editor.trimAutoWhitespace": true,
 
-    "Lua.workspace.maxPreload": 20000,
     "Lua.diagnostics.globals": [
+        "bit",
+        "fmt",
+
         "xi",
         "ai",
         "os",
@@ -23,6 +25,7 @@
         "npcUtil",
         "item_utils",
 
+        "Module",
         "super",
 
         "mixins",
@@ -59,25 +62,6 @@
 
         "removeSleepEffects",
 
-        "SANDORIA",
-        "BASTOK",
-        "WINDURST",
-        "ZILART",
-        "TOAU",
-        "WOTG",
-        "COP",
-        "ASSAULT",
-        "CAMPAIGN",
-        "ACP",
-        "AMK",
-        "ASA",
-        "SOA",
-        "ROV",
-
-        "QUEST_AVAILABLE",
-        "QUEST_ACCEPTED",
-        "QUEST_COMPLETED",
-
         "GetMissionLogInfo",
         "GetQuestLogInfo",
         "finishMissionTimeline",
@@ -86,58 +70,6 @@
         "getMissionRankPoints",
         "getMissionMask",
 
-        "SANDORIA",
-        "BASTOK",
-        "WINDURST",
-        "JEUNO",
-        "OTHER_AREAS",
-        "OUTLANDS",
-        "AHT_URHGAN",
-        "CRYSTAL_WAR",
-        "ABYSSEA",
-        "ADOULIN",
-        "COALITION",
-
-        "SANDORIA",
-        "BASTOK",
-        "WINDURST",
-        "JEUNO",
-        "SELBINA",
-        "MHAURA",
-        "RABAO",
-        "KAZHAM",
-        "NORG",
-        "OTHER_AREAS_LOG",
-        "TAVNAZIA",
-        "OUTLANDS",
-        "ZILART",
-        "COP",
-        "TOAU",
-        "AHT_URHGAN",
-        "ASSAULT",
-        "WOTG",
-        "CRYSTAL_WAR",
-        "CAMPAIGN",
-        "ACP",
-        "AMK",
-        "ASA",
-        "ABYSSEA",
-        "ABYSSEA_KONSCHTAT",
-        "ABYSSEA_TAHRONGI",
-        "ABYSSEA_LATHEINE",
-        "ABYSSEA_MISAREAUX",
-        "ABYSSEA_VUNKERL",
-        "ABYSSEA_ATTOHWA",
-        "ABYSSEA_ALTEPA",
-        "ABYSSEA_GRAUBERG",
-        "ABYSSEA_ULEGUERAND",
-        "SOA",
-        "ADOULIN",
-        "COALITION",
-        "ROV",
-        "QUEST_LOGS",
-        "MISSION_LOGS",
-
         "TradeBCNM",
         "EventTriggerBCNM",
         "EventUpdateBCNM",
@@ -288,8 +220,6 @@
 
         "FormMagicBurst",
 
-        "BOMB_TOSS_HPP",
-
         "AbilityFinalAdjustments",
 
         "getSummoningSkillOverCap",
@@ -298,72 +228,12 @@
         "AvatarPhysicalMove",
         "avatarMiniFightCheck",
 
-        "TP_ACC_VARIES",
-        "TP_ATK_VARIES",
-        "TP_CRIT_VARIES",
-        "TP_DMG_BONUS",
-        "TP_DMG_VARIES",
-        "TP_MAB_BONUS",
-        "TP_MACC_BONUS",
-        "TP_NO_EFFECT",
-        "TP_RANGED",
-
-        "MOBPARAM_1_SHADOW",
-        "MOBPARAM_2_SHADOW",
-        "MOBPARAM_3_SHADOW",
-        "MOBPARAM_4_SHADOW",
-        "MOBPARAM_BLUNT",
-        "MOBPARAM_WIPE_SHADOWS",
-        "MOBPARAM_IGNORE_SHADOWS",
-        "MOBPARAM_DARK",
-        "MOBPARAM_LIGHT",
-        "MOBDRAIN_HP",
-        "MOBDRAIN_MP",
-        "MOBDRAIN_TP",
-        "MOBTYPE_NORMAL",
-        "MOBTYPE_0X01",
-        "MOBTYPE_NOTORIOUS",
-        "MOBTYPE_FISHED",
-        "MOBTYPE_CALLED",
-        "MOBTYPE_BATTLEFIELD",
-        "MOBTYPE_EVENT",
-
-        "MOBSKILL_MAGICAL",
-        "MOBSKILL_PHYSICAL",
-
         "getMedalRank",
         "getBastokNotesItem",
         "getSandOriaNotesItem",
         "getWindurstNotesItem",
         "getSigilTimeStamp",
 
-        "TPMOD_NONE",
-        "TPMOD_CHANCE",
-        "TPMOD_CRITICAL",
-        "TPMOD_DAMAGE",
-        "TPMOD_ACC",
-        "TPMOD_ATTACK",
-        "TPMOD_DURATION",
-        "SC_NONE",
-        "SC_IMPACTION",
-        "SC_TRANSFIXION",
-        "SC_DETONATION",
-        "SC_REVERBERATION",
-        "SC_SCISSION",
-        "SC_INDURATION",
-        "SC_LIQUEFACTION",
-        "SC_COMPRESSION",
-        "SC_FUSION",
-        "SC_FRAGMENTATION",
-        "SC_DISTORTION",
-        "SC_GRAVITATION",
-        "SC_DARKNESS",
-        "SC_LIGHT",
-        "SC_LIGHT_II",
-        "SC_DARKNESS_II",
-        "INT_BASED",
-        "CHR_BASED",
-        "MND_BASED",
         "BluePhysicalSpell",
         "BlueMagicalSpell",
         "BlueFinalAdjustments",
@@ -378,14 +248,6 @@
 
         "doRoyalPalaceArmorCheck",
 
-        "MOGLOCKER_START_TS",
-        "MOGLOCKER_ALZAHBI_VALID_DAYS",
-        "MOGLOCKER_ALLAREAS_VALID_DAYS",
-        "MOGLOCKER_ACCESS_TYPE_ALZAHBI",
-        "MOGLOCKER_ACCESS_TYPE_ALLAREAS",
-        "MOGLOCKER_PLAYERVAR_ACCESS_TYPE",
-        "MOGLOCKER_PLAYERVAR_EXPIRY_TIMESTAMP",
-
         "GarbageCollectStep",
         "GarbageCollectFull",
         "GetZone",
@@ -458,15 +320,25 @@
         "GetItemIDByName",
         "GetContainerFilenamesList",
         "GetElevatorState",
+        "GetRecentFishers",
+
+        "SendToJailOffline",
+        "GetPlayerIDByName",
+        "PlayerHasValidSession",
+
+        "GetSynergyRecipeByID",
+        "GetSynergyRecipeByTrade",
     ],
     "Lua.diagnostics.disable": [
         "lowercase-global"
     ],
     "Lua.diagnostics.ignoredFiles": "Disable",
+    "Lua.diagnostics.workspaceEvent": "OnSave",
     "Lua.hint.enable": true,
     "Lua.hint.setType": true,
     "Lua.runtime.version": "LuaJIT",
-    "Lua.workspace.preloadFileSize": 10000,
+    "Lua.workspace.preloadFileSize": 100000,
+    "Lua.workspace.maxPreload": 100000,
     "Lua.workspace.ignoreDir": [
         ".vscode",
         "tools/ci/tests/stylecheck.lua"
@@ -576,6 +448,15 @@
         "ranges": "cpp",
         "span": "cpp",
         "expected": "cpp",
-        "string_view": "cpp"
+        "string_view": "cpp",
+        "cfenv": "cpp",
+        "cwctype": "cpp",
+        "scoped_allocator": "cpp",
+        "pointers": "cpp",
+        "*.inc": "cpp",
+        "__config": "cpp",
+        "__hash_table": "cpp",
+        "__node_handle": "cpp",
+        "__verbose_abort": "cpp"
     },
 }

CODE_OF_CONDUCT.md

@@ -31,6 +31,7 @@ Examples of unacceptable behavior include:
 
 * The use of sexualized language or imagery, and sexual attention or advances of
   any kind
+* The use of innapropriate violent language or imagery
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or email address,
@@ -131,3 +132,9 @@ For answers to common questions about this code of conduct, see the FAQ at
 [Mozilla CoC]: https://github.com/mozilla/diversity
 [FAQ]: https://www.contributor-covenant.org/faq
 [translations]: https://www.contributor-covenant.org/translations
+
+## Modifications
+
+The following additions have been made to the underlying Contributor Covenant v2.1:
+
+- `Our Standards: unacceptable behavior: The use of innapropriate violent language or imagery`

CONTRIBUTING.md

@@ -37,6 +37,7 @@
 - Cite your sources. This can be comments in your code or your commit messages. Pull Request descriptions and comments will get lost over time.
 - If you're commiting work on someone else's behalf, use git's `--author` argument or GitHub's `Co-Authored-By:` feature so they get the credit they deserve.
 - Make your commit messages meaningful, or amend/rebase once you're ready to push.
+- If you want to report or resolve an exploitable issue please try and get in contact with staff privately. Staff are pretty easy to find across different Discords or by the emails their commits are attributed with. This software is used by many live servers with active players, and we want to distribute fixes for exploits in a responsible and private fashion before they're published to the public.
 
 ## Issue Report Contributions