Merge branch 'dev' into rec079

Author: louis1706

.github/README.md

@@ -1,3 +1,4 @@
+<div align="center"><img src="https://github.com/user-attachments/assets/5ea95992-2aeb-47c3-bd29-c966285276e0" height=75 alt="Exiled SCPSL, SCP Secret Laboratory Exiled, Exiled SCP: Secret Laboratory, Modding Framework, Mods, Exiled Mod SCPSL"/></div>
 <h1 align="center">Exiled</h1>
 <h6 align="center">EXtended In-runtime Library for External Development</h6>
 <div align="center">
@@ -111,5 +112,5 @@ Localized READMEs
   </div>
 </div>
 
-<h5 align="center">This repo is a fork of <a href="https://github.com/Exiled-Team/EXILED">Exiled-Team/EXILED</a> after the old repository was taken hostage by the old lead developer.</h5>
+<h5 align="center">This repo is a fork of <a href="https://github.com/Exiled-Team/EXILED">Exiled-Team/EXILED</a> after changes in project leadership.</h5>
 <h6 align="center">You can access the commit this update was forked from <a href="https://github.com/Exiled-Team/EXILED/tree/8b03fe7d9d2fe7ebffd5e6d1d038fc3881cdeb70">here</a>.</h6>

.github/labeler.yml

@@ -13,29 +13,28 @@ Scripts: # Add the 'Scripts' label
 
 regarding-events: # Add the 'Events' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.Events/** # Any Modifications to events
+  - any-glob-to-any-file: EXILED/Exiled.Events/** # Any Modifications to events
 
 regarding-api: # Add the 'API' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.API/** # Any modifications to the API
+  - any-glob-to-any-file: EXILED/Exiled.API/** # Any modifications to the API
 
 regarding-transpiler: # Add the 'transpiler' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.Events/Patches/**/* # Any modifications to transpiler files
+  - any-glob-to-any-file: EXILED/Exiled.Events/Patches/**/* # Any modifications to transpiler files
 
 CustomModules: # Add the 'CustomModules' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.CustomModules/** # Any modifications to CustomModules
+  - any-glob-to-any-file: EXILED/Exiled.CustomModules/** # Any modifications to CustomModules
 
 Installer: # Add the 'Installer' label
 - changed-files:
-  - any-glob-to-any-file: Exiled.Installer/** # Any modifications to the Installer
+  - any-glob-to-any-file: EXILED/Exiled.Installer/** # Any modifications to the Installer
 
 Localization: # Add the 'Localization' label
 - changed-files:
-  - any-glob-to-any-file: Localization/** # Any modifications to Localization
+  - any-glob-to-any-file: EXILED/Localization/** # Any modifications to Localization
 
-GitHub_Actions: # Add the 'GitHub' label
+GitHub: # Add the 'GitHub' label
 - changed-files:
   - any-glob-to-any-file: .github/** # Any modifications to github related files
-

.github/pull_request_template.md

@@ -0,0 +1,35 @@
+## Description
+**Describe the changes** 
+
+
+**What is the current behavior?** (You can also link to an open issue here)
+
+
+**What is the new behavior?** (if this is a feature change)
+
+
+**Does this PR introduce a breaking change?** (What changes might users need to make in their application due to this PR?)
+
+
+**Other information**:
+
+<br />
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Documentations
+<br />
+
+## Submission checklist
+<!--- Put an `x` in all the boxes that apply: -->
+- [ ] I have checked the project can be compiled
+- [ ] I have tested my changes and it worked as expected
+
+### Patches (if there are any changes related to Harmony patches)
+- [ ] I have checked no IL patching errors in the console
+
+### Other
+- [ ] Still requires more testing

.github/workflows/dev.yml

@@ -14,9 +14,9 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://Exiled-Official.github.io/SL-References/Dev.zip
+  EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
-  EXILED_DLL_ARCHIVER_URL: https://github.com/Exiled-Official/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
+  EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
 
 jobs:
 

.github/workflows/docs.yml

@@ -4,55 +4,65 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    branches:
-      - master
 
-defaults:
-  run:
-    working-directory: ./EXILED
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  actions: read
+  pages: write
+  id-token: write
 
 env:
-  EXILED_REFERENCES_URL: https://misaka-zerotwo.github.io/SL-References/Master.zip
+  EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Master.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+# Important due to https://t.ly/5DZAy
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
 
 jobs:
-  build_and_publish_docs:
-    runs-on: windows-latest
-    
+  publish-docs:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2.3.4
-        
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v1.7.2
-
-      - name: Setup Nuget
-        uses: iRebbok/setup-nuget@master
-        
-      - name: Get references
-        shell: pwsh
-        run: |
-          Invoke-WebRequest -Uri ${{ EXILED_REFERENCES_URL }} -OutFile ${{ github.workspace }}/EXILED/References.zip
-          Expand-Archive -Path References.zip -DestinationPath ${{ env.EXILED_REFERENCES_PATH }}
-        
-      - name: Download DocFX
-        uses: crazy-max/ghaction-chocolatey@v1
-        with:
-          args: install docfx --pre
-          
-      - name: Run DocFX
-        env:
-          EXILED_REFERENCES: ${{ env.EXILED_REFERENCES_PATH }}
-        run: docfx docfx.json; docfx docfx.json
-        
-      - name: Deploy to GitHub Pages
-        if: github.event_name == 'push' && success() #Only publishes on push to master to avoid docs mishaps
-        uses: crazy-max/ghaction-github-pages@v2
-        with:
-          target_branch: gh-pages
-          build_dir: _site
-          keep_history: true
-          jekyll: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Dotnet Setup
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.x
+
+    - run: dotnet tool update -g docfx
+
+    - name: Setup .NET Core SDK
+      uses: actions/setup-dotnet@v1.7.2
+
+    - name: Setup Nuget
+      uses: iRebbok/setup-nuget@master
+
+    - name: Get references
+      shell: pwsh
+      run: |
+        Invoke-WebRequest -Uri $env:EXILED_REFERENCES_URL -OutFile $env:GITHUB_WORKSPACE/EXILED/References.zip
+        Expand-Archive -Path $env:GITHUB_WORKSPACE/EXILED/References.zip -DestinationPath $env:EXILED_REFERENCES_PATH
+
+    - run: docfx EXILED/docs/docfx.json
+      env:
+        EXILED_REFERENCES: ${{ env.EXILED_REFERENCES_PATH }}
+
+    - name: Upload artifact
+      uses: actions/upload-pages-artifact@v3
+      with:
+        # Upload entire repository
+        path: 'EXILED/docs/_site'
+
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v4

.github/workflows/main.yml

@@ -13,7 +13,7 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://Exiled-Official.github.io/SL-References/Master.zip
+  EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Master.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
 
 jobs:

.github/workflows/labeler.yml renamed to .github/workflows/pull_request_opened.yml

@@ -20,3 +20,10 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         configuration-path: .github/labeler.yml
         sync-labels: true
+  assign-author:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      
+    steps:
+      - uses: toshimaru/auto-author-assign@v2.1.1

.github/workflows/release.yml

@@ -11,9 +11,9 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://Exiled-Official.github.io/SL-References/Master.zip
+  EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
-  EXILED_DLL_ARCHIVER_URL: https://github.com/Exiled-Official/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
+  EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
 
 jobs:
   build:

EXILED/Exiled.API/Extensions/MirrorExtensions.cs

@@ -25,6 +25,7 @@ namespace Exiled.API.Extensions
     using PlayerRoles;
     using PlayerRoles.FirstPersonControl;
     using PlayerRoles.PlayableScps.Scp049.Zombies;
+    using PlayerRoles.Voice;
     using RelativePositioning;
 
     using Respawning;
@@ -181,6 +182,18 @@ public static void PlayGunSound(this Player player, Vector3 position, ItemType i
             player.Connection.Send(message);
         }
 
+        /// <summary>
+        /// Sets <see cref="Features.Intercom.DisplayText"/> that only the <paramref name="target"/> player can see.
+        /// </summary>
+        /// <param name="target">Only this player can see Display Text.</param>
+        /// <param name="text">Text displayed to the player.</param>
+        public static void SetIntercomDisplayTextForTargetOnly(this Player target, string text) => target.SendFakeSyncVar(IntercomDisplay._singleton.netIdentity, typeof(IntercomDisplay), nameof(IntercomDisplay.Network_overrideText), text);
+
+        /// <summary>
+        /// Resync <see cref="Features.Intercom.DisplayText"/>.
+        /// </summary>
+        public static void ResetIntercomDisplayText() => ResyncSyncVar(IntercomDisplay._singleton.netIdentity, typeof(IntercomDisplay), nameof(IntercomDisplay.Network_overrideText));
+
         /// <summary>
         /// Sets <see cref="Room.Color"/> of a <paramref name="room"/> that only the <paramref name="target"/> player can see.
         /// </summary>

EXILED/Exiled.API/Features/Items/Jailbird.cs

@@ -7,11 +7,14 @@
 
 namespace Exiled.API.Features.Items
 {
+    using System;
+
     using Exiled.API.Features.Pickups;
     using Exiled.API.Interfaces;
     using InventorySystem.Items.Autosync;
     using InventorySystem.Items.Jailbird;
     using Mirror;
+    using UnityEngine;
 
     using JailbirdPickup = Pickups.JailbirdPickup;
 
@@ -114,12 +117,35 @@ public JailbirdWearState WearState
             get => Base._deterioration.WearState;
             set
             {
-                if (JailbirdDeteriorationTracker.ReceivedStates.ContainsKey(Serial))
-                    JailbirdDeteriorationTracker.ReceivedStates[Serial] = value;
+                TotalDamageDealt = GetDamage(value);
+                TotalCharges = GetCharge(value);
                 Base._deterioration.RecheckUsage();
             }
         }
 
+        /// <summary>
+        /// Calculates the damage corresponding to a given <see cref="JailbirdWearState"/>.
+        /// </summary>
+        /// <param name="wearState">The wear state to calculate damage for.</param>
+        /// <returns>The amount of damage associated with the specified wear state.</returns>
+        public float GetDamage(JailbirdWearState wearState)
+        {
+            foreach (Keyframe keyframe in Base._deterioration._damageToWearState.keys)
+            {
+                if (Base._deterioration.FloatToState(keyframe.value) == wearState)
+                    return keyframe.time;
+            }
+
+            throw new Exception("Wear state not found in damage to wear state mapping.");
+        }
+
+        /// <summary>
+        /// Gets the charge needed to reach a specific <see cref="JailbirdWearState"/>.
+        /// </summary>
+        /// <param name="wearState">The desired wear state to calculate the charge for.</param>
+        /// <returns>The charge value required to achieve the specified wear state.</returns>
+        public int GetCharge(JailbirdWearState wearState) => (int)wearState;
+
         /// <summary>
         /// Breaks the Jailbird.
         /// </summary>