Merge pull request #293 from MrDave1999/dev

9.5.2 Release

.github/workflows/artifacts.yml

@@ -5,6 +5,8 @@ on:
     types: [published]
 env:
   DOTNET_VERSION: '8.x'
+  RUNTIME_VERSION: '8.0.11'
+  OPENMP_VERSION: '1.4.0.2779'
 
 jobs:
   build:
@@ -16,34 +18,51 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
+      - name: Download .NET Runtime
+        run: wget https://download.visualstudio.microsoft.com/download/pr/34670006-7e69-4750-9012-cf1e15bc83d1/c4c887089dbea784726b26facaae336a/dotnet-runtime-${{ env.RUNTIME_VERSION }}-win-x86.zip
+      - name: Unzip .NET Runtime
+        run: unzip dotnet-runtime-${{ env.RUNTIME_VERSION }}-win-x86.zip
       - name: Download open.mp Server
-        run: wget https://github.com/MrDave1999/env.server/releases/download/omp-server/open.mp-win-x86.zip
+        run: wget https://github.com/openmultiplayer/open.mp/releases/download/v${{ env.OPENMP_VERSION }}/open.mp-win-x86.zip
       - name: Unzip open.mp Server
-        run: unzip open.mp-win-x86.zip -d ctf-gamemode-windows
+        run: unzip open.mp-win-x86.zip -d ctf-win
       - name: Move contents of Server to root directory
         run: |
-         mv ctf-gamemode-windows/Server/** ctf-gamemode-windows
-         rmdir ctf-gamemode-windows/Server
-      - name: Add plugins to server.cfg file
+         mv ctf-win/Server/** ctf-win
+         rmdir ctf-win/Server
+      - name: Remove files
         run: |
-         echo "" >> ctf-gamemode-windows/server.cfg 
-         echo "plugins SampSharp streamer" >> ctf-gamemode-windows/server.cfg
-      - name: Build game mode
+         rm -rf ctf-win/gamemodes ctf-win/qawno
+         rmdir ctf-win/filterscripts ctf-win/models ctf-win/scriptfiles
+         rm -f ctf-win/config.json
+      - name: Publish the project to the bin directory
         run: dotnet publish src/Host -c Release -o bin --framework=net8.0
+      - name: Create empty directories
+        run: |
+          mkdir ctf-win/gamemodes ctf-win/plugins
+          mkdir ctf-win/codepages ctf-win/filterscripts
+          mkdir ctf-win/runtime
       - name: Copy artifacts
         run: |
-          mkdir ctf-gamemode-windows/plugins ctf-gamemode-windows/filterscripts
-          cp -r bin ctf-gamemode-windows
-          cp plugins/*.dll ctf-gamemode-windows/plugins
-          cp filterscripts/*.amx ctf-gamemode-windows/filterscripts
-          cp -r scripts ctf-gamemode-windows
+          cp -r bin ctf-win
+          cp gamemodes/empty.amx ctf-win/gamemodes
+          cp plugins/*.dll ctf-win/plugins
+          cp codepages/*.txt ctf-win/codepages
+          cp filterscripts/*.amx ctf-win/filterscripts
+          cp -r scripts ctf-win
+          cp -r shared/Microsoft.NETCore.App/${{ env.RUNTIME_VERSION }}/** ctf-win/runtime
+          cp server.cfg.example ctf-win/server.cfg
+      - name: Replace .so with .dll in server.cfg
+        run: |
+         sed -i 's/libSampSharp.so/SampSharp.dll/' ctf-win/server.cfg
+         sed -i 's/streamer.so/streamer.dll/' ctf-win/server.cfg
       - name: Create .env file
         run: cp .env.example .env
       - name: Copy .env file
-        run: cp .env ctf-gamemode-windows
+        run: cp .env ctf-win
       - name: Create compressed file
-        run: zip -r ctf-gamemode-windows.zip ctf-gamemode-windows
+        run: zip -r ctf-win.zip ctf-win
       - name: Upload artifacts to release
         uses: softprops/action-gh-release@v2
         with:
-          files: ctf-gamemode-windows.zip
+          files: ctf-win.zip

.vscode/launch.json

@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/samp-server.exe",
+            "program": "${workspaceFolder}/omp-server.exe",
             "args": [],
             "cwd": "${workspaceFolder}",
             "stopAtEntry": false,

Dockerfile

@@ -29,7 +29,7 @@ FROM ubuntu:22.04 AS tools
 RUN apt-get update && apt-get install -y --no-install-recommends wget
 
 WORKDIR /open-mp
-ENV OPEN_MP_VERSION="1.3.1.2748"
+ENV OPEN_MP_VERSION="1.4.0.2779"
 RUN wget https://github.com/openmultiplayer/open.mp/releases/download/v${OPEN_MP_VERSION}/open.mp-linux-x86.tar.gz --no-check-certificate \
     && tar -xf open.mp-linux-x86.tar.gz \
     && rm -f open.mp-linux-x86.tar.gz

README.md

@@ -174,7 +174,7 @@ These concepts have been applied to this project:
 ## Deployment without Docker
 
 - You must download [Visual C++ Redistributable x86](https://www.microsoft.com/en-us/download/details.aspx?id=48145) to load plugins such as SampSharp and Streamer.
-- You need to download the [ctf-gamemode-windows.zip](https://github.com/MrDave1999/Capture-The-Flag/releases/latest) file that contains the files to run the game mode.
+- You need to download the [ctf-win.zip](https://github.com/MrDave1999/Capture-The-Flag/releases/latest) file that contains the files to run the game mode.
 - Once downloaded, modify the `.env` file according to your needs.
 - Run the `omp-server.exe`.
 
@@ -312,16 +312,17 @@ See the [scripts](https://github.com/MrDave1999/Capture-The-Flag/tree/dev/script
 - Area66 by DragonZafiro.
 - d_dust5, SA_Hill, de_aztec and de_dust2_small by Elorreli.
 - Compound and cs_rockwar by Amirab. 
-- DesertGlory, fy_iceworld2 and de_dust2_x3 by TheYoungCapone.
+- DesertGlory, fy_iceworld2 and de_dust2x3 by TheYoungCapone.
 - EntryMap and TheConstruction by B4MB1[MC].
 - fy_iceworld by Sleyer.
 - fy_snow by UnuAlex.
 - fy_snow2 by mihaibr.
 - de_dust2 by JamesT85.
 - Aim_Headshot by haubitze.
 - Aim_Headshot2 by Niktia_Ruchkov.
-- de_dust2_x1 by SpikY_.
-- de_dust2_x2 by Amads.
+- de_dust2x1 by SpikY_.
+- de_dust2x2 by Amads.
+- de_dust2x4 textured by excamunicado.
 - WarZone by Samarchai.
 - cs_assault by Ghost-X.
 - GateToHell and TheWild by Zniper.

filterscripts/de_dust2_x1.pwn → filterscripts/de_dust2x1.pwn

@@ -1,5 +1,5 @@
 #include <open.mp>
-#define FILTER_SCRIPT_NAME "de_dust2_x1"
+#define FILTER_SCRIPT_NAME "de_dust2x1"
 #include "objects"
 
 public OnFilterScriptInit()

filterscripts/de_dust2_x2.pwn → filterscripts/de_dust2x2.pwn

@@ -1,5 +1,5 @@
 #include <open.mp>
-#define FILTER_SCRIPT_NAME "de_dust2_x2"
+#define FILTER_SCRIPT_NAME "de_dust2x2"
 #include "objects"
 
 public OnFilterScriptInit()

filterscripts/de_dust2_x3.pwn → filterscripts/de_dust2x3.pwn

@@ -1,5 +1,5 @@
 #include <open.mp>
-#define FILTER_SCRIPT_NAME "de_dust2_x3"
+#define FILTER_SCRIPT_NAME "de_dust2x3"
 #include "objects"
 
 public OnFilterScriptInit()