Merge b78cbfe665 into fcfd5a3549

README.md

@@ -1,14 +1,19 @@
 # Parkers eggs repo
 
-## End of Life / Continuation Message
+> [!WARNING]
+> 
+> End of Life / Continuation Message
+> ---
+> 
+> ***Notice:*** This repository will transition to read-only mode starting on **May 13, 2024**.
+>
+> This change is necessary to facilitate the upcoming Pelican Panel Egg System integration.
 
-**Important Notice:** This repository will transition to read-only mode starting on May 13, 2024.
+> [!IMPORTANT]
-
+>
-This change is necessary to facilitate the upcoming Pelican Panel Egg System integration.
+> ### Action Required:
-
+>
-### Action Required:
+> If you have any open issues or pull requests that are still relevant or needed, please consider migrating them to the new repositories.
-
-If you have any open issues or pull requests that are still relevant or needed, please consider migrating them to the new repositories.
 
 ### Repository Restructuring:
 

game_eggs/eft/README.md

@@ -12,30 +12,21 @@ Run the server once to generate the necessary config files for the coop mod, the
 
 An Escape From Tarkov BepInEx module designed to be used with the SIT.Aki-Server-Mod with the ultimate goal of "Offline" Coop
 
-Installation instructions are provided in [the project's README.md file](https://github.com/stayintarkov/StayInTarkov.Client#client-install).
-
-**2024-02-05 Note, please read**:
-> NOTE: As of 05/02/2024 the downgraders used by the manager and in the link provided for the manual install will not downgrade to the correct version and/or fail. Please check the SIT Discord for the latest EFT downgrader
-
-What this means: the user needs to manually downgrade EFT's version with a patch matching the live game's version from ([the SIT discord linked in the SIT repo](https://github.com/stayintarkov/StayInTarkov.Client#support)) in the #downgrade-eft channel.
-
 To install the SIT client:
 - Install the live Escape from Tarkov game from the official launcher.
-- Install the [SIT Manager](https://github.com/stayintarkov/SIT.Manager) from the repo.
+- Install the [SIT Manager](https://github.com/stayintarkov/SIT.Manager.avalonia) from the repo.
-- Copy the live EFT installation to a different location. This copy will be used in the following steps as the SIT game client.
+- Afterwards, follow the instructions here [`SIT Manager Method`](https://docs.stayintarkov.com/en/install.html#).
-- Obtain the downgrade patcher from the discord, and extract the contents (`Aki_Patches` directory and `patcher.exe`) to the root folder of the game copy.
-- Run `patcher.exe` to downgrade EFT.
-- Afterwards, follow the instructions after the second bullet point under [`SIT Manager Method`](https://github.com/stayintarkov/StayInTarkov.Client?tab=readme-ov-file#sit-manager-method), where the `SIT\game` directory will be the game copy previously made.
 
 
 ## Server Ports
 
 Ports required to run the server in a table format.
 
-| Port              | default |
+| Port                 | default |
-|-------------------|---------|
+|----------------------|---------|
-| Game              | 6969    |
+| Game                 | 6969    |
-| SIT Mod Websocket | 6970    |
+| SIT Mod Websocket    | 6970    |
+| Nat Helper WebSocket | 6971    |
 
 ## Server components
 

game_eggs/eft/egg-stay-in-tarkov.json

@@ -4,8 +4,8 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2024-02-21T09:23:22-05:00",
+    "exported_at": "2024-04-24T16:58:22+02:00",
-    "name": "Singleplayer Tarkov",
+    "name": "Stay In Tarkov",
     "author": "dino@papertots.page",
     "description": "The Stay in Tarkov project was born due to Battlestate Games' (BSG) reluctance to create the pure PvE version of Escape from Tarkov. The project's aim is simple, create a Cooperation PvE experience that retains progression.",
     "features": null,
@@ -22,22 +22,12 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Singleplayer Tarkov Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nNODE_VERSION=lts\r\n\r\n# Working directory for build requirements\r\ncd ${HOME}\r\n\r\n# Install git-lfs python3\r\napt update && apt install -yq git-lfs python3 jq\r\n\r\n# Install NodeJS\r\ncurl -fsSL https:\/\/deb.nodesource.com\/setup_${NODE_VERSION}.x | bash - && apt-get install -y nodejs\r\n\r\n# Clone the SPT AKI repo\r\ngit clone https:\/\/dev.sp-tarkov.com\/SPT-AKI\/Server.git server\r\ncd ${HOME}\/server && git checkout ${SPT_VERSION}\r\n\r\n# Obtaining server files\r\ncd ${HOME}\/server\/project\/\r\ngit-lfs fetch --all && git-lfs pull\r\n\r\n# Install npm dependencies and build\r\nnpm install && npm run build:release\r\nmv ${HOME}\/server\/project\/build\/* \/mnt\/server\/\r\n\r\n# Obtain SIT coop mod\r\nmkdir \/mnt\/server\/user \r\nmkdir \/mnt\/server\/user\/mods \r\ncd \/mnt\/server\/user\/mods\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n    echo -e \"using anon api call\"\r\nelse\r\n    echo -e \"user and oauth token set\"\r\n    alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n## Get SIT coop mod release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${SIT_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${SIT_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${SIT_VERSION}\" ] || [ \"${SIT_VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${SIT_NAME})\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${SIT_VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${SIT_VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${SIT_VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${SIT_NAME})\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\nwget ${DOWNLOAD_URL} -O ${SIT_NAME}\r\nunzip -o ${SIT_NAME}\r\nrm ${SIT_NAME}",
+            "script": "#!\/bin\/bash\r\n# Stay In Tarkov Server Installation Script\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Install git-lfs python3\r\napt update && apt install -yq git-lfs python3 jq tar\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n    echo -e \"using anon api call\"\r\nelse\r\n    echo -e \"user and oauth token set\"\r\n    alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n## Get SIT coop mod release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${SIT_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${SIT_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${SIT_VERSION}\" ] || [ \"${SIT_VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i linux)\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${SIT_VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${SIT_VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${SIT_VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i linux)\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\nwget ${DOWNLOAD_URL} -O ${SIT_NAME}\r\ntar -xvzf ${SIT_NAME}\r\nrm ${SIT_NAME}",
             "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
     "variables": [
-        {
-            "name": "SPT-AKI Version",
-            "description": "Version of the SPT-AKI version to use, by git hash\/tag\r\n\r\nSPT-AKI: https:\/\/dev.sp-tarkov.com\/SPT-AKI\/Server",
-            "env_variable": "SPT_VERSION",
-            "default_value": "40b999d04c68f1f52ab152d163c086a1c50f489b",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "required|string",
-            "field_type": "text"
-        },
         {
             "name": "SITCoop Version",
             "description": "Version of the SIT co-op mod for the server. Use \"latest\" for latest release, or the github release\/tag\/hash.\r\n\r\nSITCoop: https:\/\/github.com\/stayintarkov\/SIT.Aki-Server-Mod",
@@ -62,7 +52,7 @@
             "name": "SIT Mod asset name",
             "description": "SIT mod release file's asset name.",
             "env_variable": "SIT_NAME",
-            "default_value": "SITCoop.zip",
+            "default_value": "SITCoop.tar.gz",
             "user_viewable": false,
             "user_editable": false,
             "rules": "required|string",
@@ -89,4 +79,4 @@
             "field_type": "text"
         }
     ]
-}
+}