Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a0a27254ad | ||
|
|
2e9e86d5da | ||
|
|
21a243dfed | ||
|
|
878da2a325 | ||
|
|
85ad08f579 | ||
|
|
ca3bbb004b | ||
|
|
f13ecd4516 | ||
|
|
d9bd46e6e0 | ||
|
|
269659b8da | ||
|
|
14097808d8 | ||
|
|
6fe4432c6e | ||
|
|
4f11c8e550 | ||
|
|
1ac2374eff | ||
|
|
b5cb885262 | ||
|
|
d55ef94fd9 | ||
|
|
1f4640fccd | ||
|
|
faf90c1841 | ||
|
|
efbacc57d1 | ||
|
|
458585c37f | ||
|
|
b3c5fa3e2b | ||
|
|
2fb730cb8c | ||
|
|
87e1708d6b | ||
|
|
2695f25242 | ||
|
|
81dea35778 | ||
|
|
704abac924 | ||
|
|
033227eb83 | ||
|
|
388dd99f60 | ||
|
|
986db8acb8 | ||
|
|
1b94cbdd8d | ||
|
|
b2e2106912 | ||
|
|
3858d482e9 | ||
|
|
5e42a54bbf | ||
|
|
7766d47bda | ||
|
|
31dbcfdb4f | ||
|
|
43e2b69d66 | ||
|
|
7a0e0d1285 | ||
|
|
36d797b391 | ||
|
|
4e0b6440d9 | ||
|
|
eec90dae91 | ||
|
|
4e1c256fbe |
@@ -9,12 +9,10 @@ Also known as "The Cycle: Frontier".
|
|||||||
- [1. Prerequisites](#1-prerequisites)
|
- [1. Prerequisites](#1-prerequisites)
|
||||||
- [1.1 How to download Season 2 client from SteamDB using Steam console](#11-how-to-download-season-2-client-from-steamdb-using-steam-console)
|
- [1.1 How to download Season 2 client from SteamDB using Steam console](#11-how-to-download-season-2-client-from-steamdb-using-steam-console)
|
||||||
- [2. Unpack `Prospect.Server.Api`](#2-unpack-prospectserverapi)
|
- [2. Unpack `Prospect.Server.Api`](#2-unpack-prospectserverapi)
|
||||||
- [3. Patch the `hosts` file](#3-patch-the-hosts-file)
|
- [3. Generate and import SSL certificate](#3-generate-and-import-ssl-certificate)
|
||||||
- [4. Generate and import SSL certificate](#4-generate-and-import-ssl-certificate)
|
- [4. Extract `LoaderPack` to the game](#4-extract-loaderpack-to-the-game)
|
||||||
- [5. Add `steam_appid` to the game](#5-add-steam_appid-to-the-game)
|
- [5. Run the server](#5-run-the-server)
|
||||||
- [6. Copy the `Prospect.Client.Loader` to the game](#6-copy-the-prospectclientloader-to-the-game)
|
- [6. Run the game](#6-run-the-game)
|
||||||
- [7. Run the server](#7-run-the-server)
|
|
||||||
- [8. Run the game](#8-run-the-game)
|
|
||||||
- [Troubleshooting and FAQ](#troubleshooting-and-faq)
|
- [Troubleshooting and FAQ](#troubleshooting-and-faq)
|
||||||
- [How to remove the certificate?](#how-to-remove-the-certificate)
|
- [How to remove the certificate?](#how-to-remove-the-certificate)
|
||||||
- [`generate_ssl.exe` is flagged as a virus](#generate_sslexe-is-flagged-as-a-virus)
|
- [`generate_ssl.exe` is flagged as a virus](#generate_sslexe-is-flagged-as-a-virus)
|
||||||
@@ -30,10 +28,7 @@ Also known as "The Cycle: Frontier".
|
|||||||
* [x] EULA acceptance
|
* [x] EULA acceptance
|
||||||
* [x] Tutorial
|
* [x] Tutorial
|
||||||
* [x] Single-player station (Season 2 and Season 3):
|
* [x] Single-player station (Season 2 and Season 3):
|
||||||
* [ ] Onboarding
|
* [x] Onboarding
|
||||||
* [x] Talk to Badum
|
|
||||||
* [x] Equip items
|
|
||||||
* [ ] Deploy to Fortuna
|
|
||||||
* [ ] Matchmaking and deployment
|
* [ ] Matchmaking and deployment
|
||||||
* [x] Solo
|
* [x] Solo
|
||||||
* [ ] Squad
|
* [ ] Squad
|
||||||
@@ -42,16 +37,15 @@ Also known as "The Cycle: Frontier".
|
|||||||
* [x] Inventory and loadout
|
* [x] Inventory and loadout
|
||||||
* [ ] Loadout presets (Season 3)
|
* [ ] Loadout presets (Season 3)
|
||||||
* [x] Quests
|
* [x] Quests
|
||||||
* [ ] Job boards
|
|
||||||
* [x] Faction progression
|
* [x] Faction progression
|
||||||
* [ ] Season pass
|
* [ ] Season pass
|
||||||
* [ ] Shops
|
* [ ] Aurum Shops
|
||||||
* [ ] Daily shop
|
* [ ] Daily shop
|
||||||
* [ ] Weekly shop
|
* [ ] Weekly shop
|
||||||
* [ ] Shop rotation
|
* [ ] Shop rotation
|
||||||
* [x] Daily login
|
* [x] Daily login
|
||||||
* [x] Character appearance and emotes
|
* [x] Character appearance and emotes
|
||||||
* [x] Shops
|
* [x] Item Shops
|
||||||
* [x] Crafting station
|
* [x] Crafting station
|
||||||
* [x] Quarters
|
* [x] Quarters
|
||||||
* [x] Player balance
|
* [x] Player balance
|
||||||
@@ -60,18 +54,17 @@ Also known as "The Cycle: Frontier".
|
|||||||
* [x] Vivox login
|
* [x] Vivox login
|
||||||
* [x] Vivox create and join channel
|
* [x] Vivox create and join channel
|
||||||
* [ ] Proximity voice works
|
* [ ] Proximity voice works
|
||||||
* [ ] Game mechanics
|
* [x] Game mechanics
|
||||||
* [x] Can deploy through terminal
|
* [x] Can deploy through terminal
|
||||||
* [x] Can deploy with loadout
|
* [x] Can deploy with loadout
|
||||||
* [ ] Can evac
|
* [x] Can evac
|
||||||
* [ ] Can do quests
|
* [x] Can do quests (except PvP)
|
||||||
* [ ] Can gain/lose loot
|
* [x] Can gain/lose loot
|
||||||
* [ ] Can use Alien Forge.
|
* [x] Can use Alien Forge
|
||||||
* [ ] Map content
|
* [x] Map content
|
||||||
* [x] Bright Sands
|
* [x] Bright Sands
|
||||||
* [x] Crescent Falls
|
* [x] Crescent Falls
|
||||||
* [x] Tharis Island
|
* [x] Tharis Island
|
||||||
* [ ] Alien Forge
|
|
||||||
|
|
||||||
## Running locally
|
## Running locally
|
||||||
|
|
||||||
@@ -91,21 +84,17 @@ Before you start, you'll need the following software downloaded and installed:
|
|||||||
|
|
||||||
1. [MongoDB Community Edition](https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.4-signed.msi).
|
1. [MongoDB Community Edition](https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.4-signed.msi).
|
||||||
|
|
||||||
1. [Latest `Prospect.Server.Api`](https://github.com/deiteris/Prospect/releases) from the Releases section.
|
1. [`Prospect.Server.Api` and `LoaderPack`](https://github.com/deiteris/Prospect/releases) from the Releases section:
|
||||||
|
|
||||||
1. [Latest `Prospect.Client.Loader`](https://github.com/deiteris/Prospect/releases) from the Releases section.
|
- For Season 3 (the latest Steam game client), use Build 6.
|
||||||
|
|
||||||
1. [.NET Runtime 8.0](https://aka.ms/dotnet-core-applaunch?missing_runtime=true&arch=x64&rid=win-x64&os=win10&apphost_version=8.0.11) installed.
|
- For Season 2 game client, use the latest version.
|
||||||
|
|
||||||
1. [ASP.NET Core 8.0](https://aka.ms/dotnet-core-applaunch?framework=Microsoft.AspNetCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10) installed.
|
|
||||||
|
|
||||||
1. The Cycle: Frontier game client:
|
1. The Cycle: Frontier game client:
|
||||||
|
|
||||||
- The latest version from [Steam](https://steamcommunity.com/app/868270).
|
- The latest version from [Steam](https://steamcommunity.com/app/868270).
|
||||||
|
|
||||||
- Season 2 client. See [download instructions below](#11-how-to-download-season-2-client-from-steamdb-using-steam-console).
|
- Season 2 client version `4623363103423775682` from SteamDB. See [download instructions below](#11-how-to-download-season-2-client-from-steamdb-using-steam-console).
|
||||||
|
|
||||||
- Any other version, even Season 1 works.
|
|
||||||
|
|
||||||
#### 1.1 How to download Season 2 client from SteamDB using Steam console
|
#### 1.1 How to download Season 2 client from SteamDB using Steam console
|
||||||
|
|
||||||
@@ -130,17 +119,7 @@ Before you start, you'll need the following software downloaded and installed:
|
|||||||
|
|
||||||
Use your favorite ZIP archiver and unzip the `Prospect.Server.Api.zip` downloaded from this repository.
|
Use your favorite ZIP archiver and unzip the `Prospect.Server.Api.zip` downloaded from this repository.
|
||||||
|
|
||||||
### 3. Patch the `hosts` file
|
### 3. Generate and import SSL certificate
|
||||||
|
|
||||||
To be able to connect to the locally running server, you must replace the IP address of `2EA46.playfabapi.com` that the game uses. Do the following:
|
|
||||||
|
|
||||||
1. Open Notepad as Administrator.
|
|
||||||
|
|
||||||
1. Click **File** > **Open...** and select `C:\Windows\System32\drivers\etc\hosts`.
|
|
||||||
|
|
||||||
1. At the end of the file, add `127.0.0.1 2EA46.playfabapi.com` on a new line. Do not add the `#` character!
|
|
||||||
|
|
||||||
### 4. Generate and import SSL certificate
|
|
||||||
|
|
||||||
> [!IMPORTANT]
|
> [!IMPORTANT]
|
||||||
> Do not share the generated certificate! Generated certificate includes a private key that may be used to generate other certificates and compromise your security.
|
> Do not share the generated certificate! Generated certificate includes a private key that may be used to generate other certificates and compromise your security.
|
||||||
@@ -162,42 +141,26 @@ to successfully communicate with the local server. Do the following:
|
|||||||
|
|
||||||
1. Select **Place all certificates in the following store** > **Browse...**. Choose **Trusted Root Certification Authorities** and click **OK**. Click **Next**.
|
1. Select **Place all certificates in the following store** > **Browse...**. Choose **Trusted Root Certification Authorities** and click **OK**. Click **Next**.
|
||||||
|
|
||||||
1. Click **Finish**. A **Security Warning** popup may appear, make sure it specifies `2EA46.playfabapi.com` certification authority and click **Yes**.
|
1. Click **Finish**. A **Security Warning** popup may appear, make sure it specifies `127.0.0.1` certification authority and click **Yes**.
|
||||||
|
|
||||||
### 5. Add `steam_appid` to the game
|
### 4. Extract `LoaderPack` to the game
|
||||||
|
|
||||||
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
||||||
|
|
||||||
1. Right-click in the folder > **New** > **Text Document**, and name it `steam_appid`.
|
1. Open the `LoaderPack` archive.
|
||||||
|
|
||||||
1. Open `steam_appid` and enter `480`.
|
1. Drag and drop the contents of the `LoaderPack` archive to the game.
|
||||||
|
|
||||||
1. Save and close the file.
|
|
||||||
|
|
||||||
### 6. Copy the `Prospect.Client.Loader` to the game
|
|
||||||
|
|
||||||
> [!NOTE]
|
|
||||||
> The current version of the loader will fix loot and mob spawning only for the following game client versions:
|
|
||||||
>
|
|
||||||
> - SteamDB Manifest `4623363103423775682`.
|
|
||||||
> - The latest Steam client version.
|
|
||||||
|
|
||||||
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
|
||||||
|
|
||||||
1. Copy the downloaded `Prospect.Client.Loader` file into the folder.
|
|
||||||
|
|
||||||
1. Create a shortcut for the `Prospect.Client.Loader` that you will use later to launch the game.
|
1. Create a shortcut for the `Prospect.Client.Loader` that you will use later to launch the game.
|
||||||
|
|
||||||
### 7. Run the server
|
### 5. Run the server
|
||||||
|
|
||||||
Now you are all set! Open the folder with `Prospect.Server.Api` and run `Prospect.Server.Api.exe`. It will open a console if it runs successfully.
|
Now you are all set! Open the folder with `Prospect.Server.Api` and run `Prospect.Server.Api.exe`. It will open a console if it runs successfully.
|
||||||
|
|
||||||
> [!IMPORTANT]
|
> [!IMPORTANT]
|
||||||
> Do not close the console when you run the game.
|
> Do not close the console when you run the game.
|
||||||
>
|
|
||||||
> If the console does not open, make sure you have [.NET Runtime 8.0](https://aka.ms/dotnet-core-applaunch?missing_runtime=true&arch=x64&rid=win-x64&os=win10&apphost_version=8.0.11) and [ASP.NET Core 8.0](https://aka.ms/dotnet-core-applaunch?framework=Microsoft.AspNetCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10) installed.
|
|
||||||
|
|
||||||
### 8. Run the game
|
### 6. Run the game
|
||||||
|
|
||||||
Once the server is running, make sure that Steam is running and open The Cycle: Frontier using the shortcut you've created before.
|
Once the server is running, make sure that Steam is running and open The Cycle: Frontier using the shortcut you've created before.
|
||||||
|
|
||||||
@@ -211,7 +174,7 @@ If you've installed the certificate for the **Current User**:
|
|||||||
|
|
||||||
1. Expand **Trusted Root Certification Authorities** and select **Certificates**.
|
1. Expand **Trusted Root Certification Authorities** and select **Certificates**.
|
||||||
|
|
||||||
1. Find `2EA46.playfabapi.com`, right-click it > **Delete**.
|
1. Find `127.0.0.1`, right-click it > **Delete**.
|
||||||
|
|
||||||
If you've installed the certificate for the **Local Machine**, repeat the same steps but instead open `certlm.msc`.
|
If you've installed the certificate for the **Local Machine**, repeat the same steps but instead open `certlm.msc`.
|
||||||
|
|
||||||
@@ -238,17 +201,14 @@ Make sure that:
|
|||||||
|
|
||||||
### Login Failed. Error code: 5
|
### Login Failed. Error code: 5
|
||||||
|
|
||||||
Make sure that:
|
Make sure that `Prospect.Server.Api` server is running.
|
||||||
|
|
||||||
* `Prospect.Server.Api` server is running.
|
If the server is running, press `Alt+Tab` to a game console that opens when you start the game and check for the following:
|
||||||
* The `C:\Windows\System32\drivers\etc\hosts` file contains `127.0.0.1 2EA46.playfabapi.com` and that the file is **saved**.
|
|
||||||
|
|
||||||
If the server works and the `hosts` file is saved, press `Alt+Tab` to a game console that opens when you start the game and check for the following:
|
|
||||||
|
|
||||||
* `libcurl error 7 (Couldn't connect to server)` - indicates that the `Prospect.Server.Api` is not running.
|
* `libcurl error 7 (Couldn't connect to server)` - indicates that the `Prospect.Server.Api` is not running.
|
||||||

|

|
||||||
|
|
||||||
* `InvalidAPIEndpoint` - indicates that the `hosts` file was not updated properly.
|
* `InvalidAPIEndpoint` - indicates that you are running the game using the original shortcut and not using `Prospect.Client.Loader`.
|
||||||

|

|
||||||
|
|
||||||
* `libcurl error 60 (Peer certificate cannot be authenticated with given CA certificates)` - indicates that the certificate was not installed correctly. Make sure that the certificate is present in `certmgr.msc` and there is only one certificate. Try removing the certificate and importing it again by following step 4.
|
* `libcurl error 60 (Peer certificate cannot be authenticated with given CA certificates)` - indicates that the certificate was not installed correctly. Make sure that the certificate is present in `certmgr.msc` and there is only one certificate. Try removing the certificate and importing it again by following step 4.
|
||||||
|
|||||||
@@ -0,0 +1,119 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<VCProjectVersion>16.0</VCProjectVersion>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<ProjectGuid>{a9ba7d25-f239-4320-a0dc-85e8001fd669}</ProjectGuid>
|
||||||
|
<RootNamespace>ProspectAgent</RootNamespace>
|
||||||
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="Shared">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(ProjectDir)bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(ProjectDir)bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<VcpkgUseStatic>true</VcpkgUseStatic>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<VcpkgUseStatic>true</VcpkgUseStatic>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg">
|
||||||
|
<VcpkgEnableManifest>true</VcpkgEnableManifest>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>_DEBUG;PROSPECTAGENT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableUAC>false</EnableUAC>
|
||||||
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;PROSPECTAGENT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<Optimization>MinSpace</Optimization>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableUAC>false</EnableUAC>
|
||||||
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="hooks.h" />
|
||||||
|
<ClInclude Include="logger.h" />
|
||||||
|
<ClInclude Include="SDK.h" />
|
||||||
|
<ClInclude Include="SDK_Memory.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="logger.cpp" />
|
||||||
|
<ClCompile Include="main.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Header Files">
|
||||||
|
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||||
|
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Resource Files">
|
||||||
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="logger.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="SDK.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="hooks.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="SDK_Memory.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="main.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="logger.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <locale>
|
||||||
|
#include <string>
|
||||||
|
#include "SDK_Memory.h"
|
||||||
|
|
||||||
|
namespace SDK
|
||||||
|
{
|
||||||
|
template<class T>
|
||||||
|
struct TArray
|
||||||
|
{
|
||||||
|
friend struct FString;
|
||||||
|
|
||||||
|
TArray()
|
||||||
|
{
|
||||||
|
Data = nullptr;
|
||||||
|
Count = Max = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int Num() const
|
||||||
|
{
|
||||||
|
return Count;
|
||||||
|
}
|
||||||
|
|
||||||
|
T& operator[](int i)
|
||||||
|
{
|
||||||
|
return Data[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
const T& operator[](int i) const
|
||||||
|
{
|
||||||
|
return Data[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsValidIndex(int i) const
|
||||||
|
{
|
||||||
|
return i < Num();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
T* Data;
|
||||||
|
int32_t Count;
|
||||||
|
int32_t Max;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct FString : private TArray<wchar_t>
|
||||||
|
{
|
||||||
|
FString(const wchar_t* other)
|
||||||
|
{
|
||||||
|
const size_t charLen = std::wcslen(other);
|
||||||
|
|
||||||
|
if (charLen == 0)
|
||||||
|
{
|
||||||
|
Count = 0;
|
||||||
|
Max = 0;
|
||||||
|
Data = nullptr;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Count = charLen + 1;
|
||||||
|
Max = Count;
|
||||||
|
Data = static_cast<wchar_t*>((*GMalloc)->Malloc(Count * 2));
|
||||||
|
|
||||||
|
memset(Data, 0, Count * 2);
|
||||||
|
memcpy(Data, other, charLen * 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FString(const std::wstring& other) : FString(other.c_str())
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsValid() const
|
||||||
|
{
|
||||||
|
return Data != nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
const wchar_t* c_str() const
|
||||||
|
{
|
||||||
|
return Data;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string ToString() const
|
||||||
|
{
|
||||||
|
const auto length = std::wcslen(Data);
|
||||||
|
|
||||||
|
std::string str(length, '\0');
|
||||||
|
std::use_facet<std::ctype<wchar_t>>(std::locale()).narrow(Data, Data + length, '?', &str[0]);
|
||||||
|
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct UPlayFabAPISettings
|
||||||
|
{
|
||||||
|
FString VerticalName;
|
||||||
|
FString BaseServiceHost;
|
||||||
|
FString TitleId;
|
||||||
|
FString AdvertisingIdType;
|
||||||
|
FString AdvertisingIdValue;
|
||||||
|
bool DisableAdvertising = false;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
|
#define DEFAULT_ALIGNMENT 0
|
||||||
|
|
||||||
|
namespace SDK
|
||||||
|
{
|
||||||
|
class FExec
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual ~FExec() = default;
|
||||||
|
private:
|
||||||
|
virtual bool Exec(void* world, void* cmd, void* ar) = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
class FMalloc : FExec
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual void* Malloc(SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* TryMalloc(SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* Realloc(void* Original, SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* TryRealloc(void* Original, SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void Free(void* Original) = 0;
|
||||||
|
|
||||||
|
virtual SIZE_T QuantizeSize(SIZE_T Count, uint32_t Alignment)
|
||||||
|
{
|
||||||
|
return Count;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool GetAllocationSize(void* Original, SIZE_T& SizeOut)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void Trim(bool bTrimThreadCaches)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void SetupTLSCachesOnCurrentThread()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void ClearAndDisableTLSCachesOnCurrentThread()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void InitializeStatsMetadata();
|
||||||
|
|
||||||
|
virtual bool Exec(void* InWorld, void* Cmd, void* Ar) override
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void UpdateStats() = 0;
|
||||||
|
|
||||||
|
virtual void GetAllocatorStats(void* out_Stats) = 0;
|
||||||
|
|
||||||
|
virtual void DumpAllocatorStats(class FOutputDevice& Ar) = 0;
|
||||||
|
|
||||||
|
virtual bool IsInternallyThreadSafe() const
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool ValidateHeap()
|
||||||
|
{
|
||||||
|
return(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual const TCHAR* GetDescriptiveName() = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
FMalloc** GMalloc;
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "SDK.h"
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
#include "logger.h"
|
||||||
|
|
||||||
|
#include <cstdio>
|
||||||
|
#include <Windows.h>
|
||||||
|
|
||||||
|
HANDLE h_out = nullptr, h_old_out = nullptr;
|
||||||
|
HANDLE h_err = nullptr, h_old_err = nullptr;
|
||||||
|
HANDLE h_in = nullptr, h_old_in = nullptr;
|
||||||
|
|
||||||
|
namespace logger
|
||||||
|
{
|
||||||
|
void Attach()
|
||||||
|
{
|
||||||
|
h_old_out = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
h_old_err = GetStdHandle(STD_ERROR_HANDLE);
|
||||||
|
h_old_in = GetStdHandle(STD_INPUT_HANDLE);
|
||||||
|
|
||||||
|
AllocConsole() && AttachConsole(GetCurrentProcessId());
|
||||||
|
|
||||||
|
h_out = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
h_err = GetStdHandle(STD_ERROR_HANDLE);
|
||||||
|
h_in = GetStdHandle(STD_INPUT_HANDLE);
|
||||||
|
|
||||||
|
SetConsoleMode(h_out,
|
||||||
|
ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT);
|
||||||
|
|
||||||
|
SetConsoleMode(h_in,
|
||||||
|
ENABLE_INSERT_MODE | ENABLE_EXTENDED_FLAGS |
|
||||||
|
ENABLE_PROCESSED_INPUT | ENABLE_QUICK_EDIT_MODE);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Detach()
|
||||||
|
{
|
||||||
|
if (h_out && h_err && h_in) {
|
||||||
|
FreeConsole();
|
||||||
|
|
||||||
|
if (h_old_out)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_OUTPUT_HANDLE, h_old_out);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (h_old_err)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_ERROR_HANDLE, h_old_err);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (h_old_in)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_INPUT_HANDLE, h_old_in);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Print(const char* fmt, ...)
|
||||||
|
{
|
||||||
|
if (!h_out)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
char buf[1024];
|
||||||
|
va_list va;
|
||||||
|
|
||||||
|
va_start(va, fmt);
|
||||||
|
_vsnprintf_s(buf, 1024, fmt, va);
|
||||||
|
va_end(va);
|
||||||
|
|
||||||
|
return !!WriteConsoleA(h_out, buf, static_cast<DWORD>(strlen(buf)), nullptr, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
char ReadKey()
|
||||||
|
{
|
||||||
|
if (!h_in)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto key = char{ 0 };
|
||||||
|
auto keysread = DWORD{ 0 };
|
||||||
|
|
||||||
|
ReadConsoleA(h_in, &key, 1, &keysread, nullptr);
|
||||||
|
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace logger
|
||||||
|
{
|
||||||
|
void Attach();
|
||||||
|
|
||||||
|
void Detach();
|
||||||
|
|
||||||
|
bool Print(const char* fmt, ...);
|
||||||
|
|
||||||
|
char ReadKey();
|
||||||
|
}
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#include <Windows.h>
|
||||||
|
#include <MinHook.h>
|
||||||
|
#include <cstdio>
|
||||||
|
#include "logger.h"
|
||||||
|
#include "SDK.h"
|
||||||
|
#include "SDK_Memory.h"
|
||||||
|
#include <string>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
#include <algorithm>
|
||||||
|
#include <cctype>
|
||||||
|
#include <locale>
|
||||||
|
|
||||||
|
std::wstring g_backendUrl;
|
||||||
|
|
||||||
|
// trim from start (in place)
|
||||||
|
inline void ltrim(std::wstring &s) {
|
||||||
|
s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
|
||||||
|
return !std::isspace(ch);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// trim from end (in place)
|
||||||
|
inline void rtrim(std::wstring &s) {
|
||||||
|
s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
|
||||||
|
return !std::isspace(ch);
|
||||||
|
}).base(), s.end());
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void trim(std::wstring &s) {
|
||||||
|
rtrim(s);
|
||||||
|
ltrim(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr uintptr_t OffsetGMalloc = 0x63EC4A0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function offset, find with "?sdk=".
|
||||||
|
*/
|
||||||
|
constexpr uintptr_t OffsetPlayFabApiGetUrl = 0xCEEF00;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function hooks.
|
||||||
|
*/
|
||||||
|
typedef SDK::FString(__fastcall* tPlayFabApiGetUrl)(SDK::UPlayFabAPISettings*, const SDK::FString&);
|
||||||
|
|
||||||
|
tPlayFabApiGetUrl OldPlayFabApiGetUrl;
|
||||||
|
|
||||||
|
SDK::FString __fastcall PlayFabApiGetUrlProxy(SDK::UPlayFabAPISettings* thiz, const SDK::FString& callPath) {
|
||||||
|
logger::Print("[Agent] GetURL called with callPath %s\n", callPath.ToString().c_str());
|
||||||
|
|
||||||
|
if (!g_backendUrl.empty())
|
||||||
|
{
|
||||||
|
return g_backendUrl + std::wstring(callPath.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
return std::wstring(L"https://127.0.0.1:8443") + std::wstring(callPath.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
DWORD WINAPI OnDllAttach(LPVOID base) {
|
||||||
|
logger::Print("[Agent] DLL Attached\n");
|
||||||
|
|
||||||
|
const auto hModule = GetModuleHandleW(nullptr);
|
||||||
|
const auto hModulePtr = reinterpret_cast<uintptr_t>(hModule);
|
||||||
|
|
||||||
|
// Initialize GMalloc.
|
||||||
|
SDK::GMalloc = reinterpret_cast<SDK::FMalloc**>(hModulePtr + OffsetGMalloc);
|
||||||
|
|
||||||
|
// Initialize MinHook.
|
||||||
|
if (MH_Initialize() != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to initialize MinHook\n");
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hook UPlayFabAPISettings::GetUrl.
|
||||||
|
const auto pTarget = reinterpret_cast<LPVOID>(hModulePtr + OffsetPlayFabApiGetUrl);
|
||||||
|
const auto ppOriginal = reinterpret_cast<LPVOID*>(&OldPlayFabApiGetUrl);
|
||||||
|
const auto mhStatus = MH_CreateHook(pTarget, &PlayFabApiGetUrlProxy, ppOriginal);
|
||||||
|
|
||||||
|
if (mhStatus != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to create PlayFabAPIGetUrl hook (%d)\n", mhStatus);
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MH_EnableHook(pTarget) != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to enable PlayFabAPIGetUrl hook\n");
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const wchar_t* filePath = L"backend.txt";
|
||||||
|
std::wifstream f(filePath);
|
||||||
|
if (f) {
|
||||||
|
std::wstringstream buffer;
|
||||||
|
buffer << f.rdbuf();
|
||||||
|
g_backendUrl = buffer.str();
|
||||||
|
trim(g_backendUrl);
|
||||||
|
if (g_backendUrl.rfind(L"https://", 0) != 0) {
|
||||||
|
logger::Print("[Agent] URL must start with https://\n");
|
||||||
|
g_backendUrl.clear();
|
||||||
|
} else {
|
||||||
|
logger::Print("[Agent] Loaded custom URL: %S\n", g_backendUrl.c_str());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger::Print("[Agent] Failed to open file: %S\n", filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger::Print("[Agent] DLL Initialized\n");
|
||||||
|
ExitThread(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOL WINAPI DllMain(
|
||||||
|
const _In_ HINSTANCE hinstDll,
|
||||||
|
const _In_ DWORD fdwReason,
|
||||||
|
const _In_opt_ LPVOID lpvReserved
|
||||||
|
) {
|
||||||
|
if (fdwReason == DLL_PROCESS_ATTACH) {
|
||||||
|
DisableThreadLibraryCalls(hinstDll);
|
||||||
|
|
||||||
|
// Allocate a console.
|
||||||
|
AllocConsole();
|
||||||
|
freopen_s(reinterpret_cast<FILE**>(stdout), "CONOUT$", "w", stdout);
|
||||||
|
|
||||||
|
// Attach logger.
|
||||||
|
logger::Attach();
|
||||||
|
|
||||||
|
// Spawn thread.
|
||||||
|
CreateThread(nullptr, 0, OnDllAttach, hinstDll, 0, nullptr);
|
||||||
|
} else if (fdwReason == DLL_PROCESS_DETACH) {
|
||||||
|
// Detach logger.
|
||||||
|
logger::Detach();
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"default-registry": {
|
||||||
|
"kind": "git",
|
||||||
|
"baseline": "2960d7d80e8d09c84ae8abf15c12196c2ca7d39a",
|
||||||
|
"repository": "https://github.com/microsoft/vcpkg"
|
||||||
|
},
|
||||||
|
"registries": [
|
||||||
|
{
|
||||||
|
"kind": "artifact",
|
||||||
|
"location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip",
|
||||||
|
"name": "microsoft"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"dependencies": [
|
||||||
|
"minhook"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -21,10 +21,9 @@
|
|||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<VCProjectVersion>17.0</VCProjectVersion>
|
<VCProjectVersion>17.0</VCProjectVersion>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<ProjectGuid>{8170a17f-e536-4fdb-bc01-78bf09a9a48b}</ProjectGuid>
|
<ProjectGuid>{04b1d963-2bcb-4887-9d6d-04cb3366a348}</ProjectGuid>
|
||||||
<RootNamespace>ProspectClientLoader</RootNamespace>
|
<RootNamespace>ProspectClientLoader</RootNamespace>
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
<ProjectName>Prospect.Client.Loader</ProjectName>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
@@ -71,6 +70,9 @@
|
|||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<OutDir>$(SolutionDir)\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
|||||||
@@ -2,7 +2,14 @@
|
|||||||
#include <tlhelp32.h>
|
#include <tlhelp32.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string>
|
||||||
|
|
||||||
|
std::wstring ExePath() {
|
||||||
|
TCHAR buffer[MAX_PATH] = { 0 };
|
||||||
|
GetModuleFileName( NULL, buffer, MAX_PATH );
|
||||||
|
std::wstring::size_type pos = std::wstring(buffer).find_last_of(L"\\/");
|
||||||
|
return std::wstring(buffer).substr(0, pos);
|
||||||
|
}
|
||||||
|
|
||||||
// Function to create and launch a process with parameters
|
// Function to create and launch a process with parameters
|
||||||
HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
||||||
@@ -22,7 +29,20 @@ HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
|||||||
return pi.hProcess;
|
return pi.hProcess;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
printf("Failed to start process. Error: %lu\n", GetLastError());
|
wchar_t szErrorMessage[512];
|
||||||
|
|
||||||
|
DWORD dwErrorCode = GetLastError();
|
||||||
|
FormatMessage(
|
||||||
|
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||||
|
NULL,
|
||||||
|
dwErrorCode,
|
||||||
|
0,
|
||||||
|
szErrorMessage,
|
||||||
|
sizeof(szErrorMessage),
|
||||||
|
NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
printf("Failed to start process. Error: %lu: %ws\n", dwErrorCode, szErrorMessage);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -54,80 +74,421 @@ HANDLE OpenTargetProcess(DWORD processID) {
|
|||||||
return hProcess;
|
return hProcess;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CheckTutorialActorsOffset(HANDLE hProcess, uintptr_t address) {
|
bool WriteBytes(HANDLE hProcess, uintptr_t address, BYTE* newValues, size_t size) {
|
||||||
|
SIZE_T bytesWritten;
|
||||||
|
DWORD oldProtect;
|
||||||
|
if (VirtualProtectEx(hProcess, (LPVOID)address, size, PAGE_EXECUTE_READWRITE, &oldProtect)) {
|
||||||
|
if (WriteProcessMemory(hProcess, (LPVOID)address, newValues, size, &bytesWritten)) {
|
||||||
|
printf("Memory Write Success at address 0x%p\n", (void*)address);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Failed to write memory. Error: %lu\n", GetLastError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// Restore original protection
|
||||||
|
VirtualProtectEx(hProcess, (LPVOID)address, size, oldProtect, &oldProtect);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Failed to change memory protection. Error: %lu\n", GetLastError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckForceLevelStreamingOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
BYTE buffer[2];
|
BYTE buffer[2];
|
||||||
SIZE_T bytesRead;
|
SIZE_T bytesRead;
|
||||||
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
return buffer[0] == 0x32 && buffer[1] == 0xDB;
|
return buffer[0] == 0x32 && buffer[1] == 0xDB;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
DWORD error = GetLastError();
|
DWORD error = GetLastError();
|
||||||
if (error == 299) {
|
if (error == 299) {
|
||||||
printf("Incomplete memory read. Retrying...\n");
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
Sleep(1000);
|
Sleep(1000);
|
||||||
return CheckTutorialActorsOffset(hProcess, address);
|
return CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
}
|
}
|
||||||
printf("Failed to read memory. Error: %lu\n", error);
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CheckGPStringOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x5F && buffer[1] == 0x00;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckWeakPointerCheckJumpOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0xF8 && buffer[1] == 0xFE;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckWeakPointerCheckOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[3];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x0F && buffer[1] == 0x1F && buffer[2] == 0x40;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchForceLevelStreaming(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
// Season 3 Patch force disable level streaming: sub_3DA7520 -> loc_3DA75B6
|
||||||
|
uintptr_t address = imageBase + 0x3DA75B6;
|
||||||
|
bool found = CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
// Season 2 Patch force disable level streaming: sub_3D19900 -> loc_3D19996
|
||||||
|
address = imageBase + 0x3D19996;
|
||||||
|
found = CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to patch force level streaming!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[2] = { 0xB3, 0x01 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x5541C08;
|
||||||
|
found = CheckGPStringOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
address = imageBase + 0x54E0558;
|
||||||
|
found = CheckGPStringOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find _GP string!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[6] = { 0x47, 0x00, 0x00, 0x00, 0x00, 0x00 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x16D7C24;
|
||||||
|
found = CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
// TODO
|
||||||
|
//if (!found) {
|
||||||
|
// address = imageBase + 0x54E0558;
|
||||||
|
// found = CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
//}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find Weak Pointer Check!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[28] = {
|
||||||
|
0x48, 0x8B, 0x06,
|
||||||
|
0x48, 0x8D, 0x4D, 0x7F,
|
||||||
|
0x48, 0x89, 0x45, 0x7F,
|
||||||
|
0xE8, 0xDC, 0xC7, 0xA7, 0x00,
|
||||||
|
0x48, 0x85, 0xC0,
|
||||||
|
0x0F, 0x84, 0xEE, 0x00, 0x00, 0x00,
|
||||||
|
0x90, 0x90, 0x90
|
||||||
|
};
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x16D7D34;
|
||||||
|
found = CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
// TODO
|
||||||
|
//if (!found) {
|
||||||
|
// address = imageBase + 0x54E0558;
|
||||||
|
// found = CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
//}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find Weak Pointer Check Jump!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[1] = { 0xEC };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckUpdateInventoryFunctionOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x84 && buffer[1] == 0xC0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchUpdateInventory(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
uintptr_t address = imageBase + 0x18D5A11;
|
||||||
|
bool found = CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
address = imageBase + 0x3D19B19;
|
||||||
|
found = CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to patch inventory update function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
BYTE newValues[8] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckSetupPlayerContractsOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x48 && buffer[1] == 0x8D;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckSetupPlayerContractsOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckUpdatePlayerContractsOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x3B && buffer[1] == 0xC1;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckUpdatePlayerContractsOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchLoadPlayerContracts(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
uintptr_t address = imageBase + 0x171E9EC;
|
||||||
|
bool found = CheckUpdatePlayerContractsOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to update player contracts function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[4] = { 0x90, 0x90, 0xEB, 0x21 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x1706127;
|
||||||
|
found = CheckSetupPlayerContractsOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find setup player contracts function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[39] = {
|
||||||
|
0x45, 0x33, 0xC0, 0x49, 0x8B, 0xD5, 0x48, 0x8B, 0x89, 0xD8, 0x00, 0x00, 0x00, 0xE8, 0x47,
|
||||||
|
0xE2, 0x10, 0x00, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
|
||||||
|
0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0xEB
|
||||||
|
};
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Inject(HANDLE hProcess, const wchar_t* dllPath) {
|
||||||
|
// Allocate space in the target process for the DLL path
|
||||||
|
size_t pathSize = (wcslen(dllPath) + 1) * sizeof(wchar_t);
|
||||||
|
LPVOID remotePath = VirtualAllocEx(hProcess, NULL, pathSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
|
||||||
|
if (!remotePath) {
|
||||||
|
wprintf(L"Failed to allocate memory in remote process. Error: %lu\n", GetLastError());
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write the DLL path into the target process
|
||||||
|
if (!WriteProcessMemory(hProcess, remotePath, dllPath, pathSize, NULL)) {
|
||||||
|
wprintf(L"Failed to write memory. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the address of LoadLibraryW in kernel32.dll
|
||||||
|
LPVOID loadLibraryAddr = (LPVOID)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "LoadLibraryW");
|
||||||
|
if (!loadLibraryAddr) {
|
||||||
|
wprintf(L"Failed to get LoadLibraryW address. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a remote thread to call LoadLibraryW with our DLL path
|
||||||
|
HANDLE hThread = CreateRemoteThread(
|
||||||
|
hProcess, NULL, 0,
|
||||||
|
(LPTHREAD_START_ROUTINE)loadLibraryAddr,
|
||||||
|
remotePath, 0, NULL);
|
||||||
|
|
||||||
|
if (!hThread) {
|
||||||
|
wprintf(L"Failed to create remote thread. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool Patch(const wchar_t* processName) {
|
bool Patch(const wchar_t* processName) {
|
||||||
DWORD processID;
|
DWORD processID;
|
||||||
uintptr_t imageBase, address;
|
|
||||||
BYTE newValues[2] = { 0xB3, 0x01 };
|
|
||||||
SIZE_T bytesWritten;
|
|
||||||
|
|
||||||
HANDLE hProcess = StartProcess(processName, &processID);
|
HANDLE hProcess = StartProcess(processName, &processID);
|
||||||
if (hProcess == NULL) {
|
if (hProcess == NULL) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!Inject(hProcess, L"Prospect.Agent.dll")) {
|
||||||
// Wait a bit for PE image to load
|
|
||||||
Sleep(5000);
|
|
||||||
// Find the PE Image Base Address
|
|
||||||
imageBase = GetModuleBaseAddress(processID);
|
|
||||||
if (imageBase == 0) {
|
|
||||||
printf("Failed to find PE Image Base Address.\n");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!Inject(hProcess, L"UE4SS.dll")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
uintptr_t imageBase;
|
||||||
|
// Wait a bit for PE image to load
|
||||||
|
Sleep(250);
|
||||||
|
while ((imageBase = GetModuleBaseAddress(processID)) == 0) {
|
||||||
|
printf("Failed to find PE Image Base Address. Retrying...\n");
|
||||||
|
Sleep(250);
|
||||||
|
}
|
||||||
printf("PE Image Base Address: 0x%p\n", (void*)imageBase);
|
printf("PE Image Base Address: 0x%p\n", (void*)imageBase);
|
||||||
|
|
||||||
// Season 3 Patch tutorial actors loader: sub_3DA7520 -> loc_3DA75B6
|
bool success = !PatchForceLevelStreaming(hProcess, imageBase) || !PatchUpdateInventory(hProcess, imageBase) || !PatchLoadPlayerContracts(hProcess, imageBase);
|
||||||
address = imageBase + 0x3DA75B6;
|
if (success) {
|
||||||
bool found = CheckTutorialActorsOffset(hProcess, address);
|
|
||||||
if (!found) {
|
|
||||||
// Season 2 Patch tutorial actors loader: sub_3D19900 -> loc_3D19996
|
|
||||||
address = imageBase + 0x3D19996;
|
|
||||||
found = CheckTutorialActorsOffset(hProcess, address);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!found) {
|
|
||||||
printf("Failed to find necessary memory chunk!");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
DWORD oldProtect;
|
|
||||||
if (VirtualProtectEx(hProcess, (LPVOID)address, sizeof(newValues), PAGE_EXECUTE_READWRITE, &oldProtect)) {
|
|
||||||
if (WriteProcessMemory(hProcess, (LPVOID)address, newValues, sizeof(newValues), &bytesWritten)) {
|
|
||||||
printf("Memory Write Success: Wrote 0xB3 0x01 at address 0x%p\n", (void*)address);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
printf("Failed to write memory. Error: %lu\n", GetLastError());
|
|
||||||
}
|
|
||||||
// Restore original protection
|
|
||||||
VirtualProtectEx(hProcess, (LPVOID)address, sizeof(newValues), oldProtect, &oldProtect);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
printf("Failed to change memory protection. Error: %lu\n", GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clean up
|
// Clean up
|
||||||
CloseHandle(hProcess);
|
CloseHandle(hProcess);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool WriteSteamAppIDFile() {
|
||||||
|
const char* filename = "steam_appid.txt";
|
||||||
|
FILE* fp;
|
||||||
|
|
||||||
|
if (fopen_s(&fp, filename, "r") == 0) {
|
||||||
|
// File exists, close the file
|
||||||
|
fclose(fp);
|
||||||
|
printf("File '%s' already exists.\n", filename);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// File does not exist, create and write to it
|
||||||
|
if (fopen_s(&fp, filename, "w") == 0) {
|
||||||
|
const char* content = "480";
|
||||||
|
size_t written = fwrite(content, sizeof(char), strlen(content), fp);
|
||||||
|
fclose(fp);
|
||||||
|
printf("File '%s' was created and written successfully.\n", filename);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Error creating the file '%s'.\n", filename);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
bool success = Patch(L"Prospect-Win64-Shipping.exe");
|
printf("Current working directory: %ws\n", ExePath().c_str());
|
||||||
|
|
||||||
|
bool success = WriteSteamAppIDFile();
|
||||||
|
if (!success) {
|
||||||
|
// Wait for user input to exit
|
||||||
|
printf("An error occurred when writing steam_appid.txt! Press any key to exit...\n");
|
||||||
|
getchar();
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
success = Patch(L"Prospect-Win64-Shipping.exe");
|
||||||
if (!success) {
|
if (!success) {
|
||||||
// Wait for user input to exit
|
// Wait for user input to exit
|
||||||
printf("An error occurred when patching the executable! Press any key to exit...\n");
|
printf("An error occurred when patching the executable! Press any key to exit...\n");
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Prospect.Server.Api.Config;
|
||||||
|
|
||||||
|
public class SignalRSettings
|
||||||
|
{
|
||||||
|
public string SignalRURL { get; set; }
|
||||||
|
public string SignalRAccessToken { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Prospect.Server.Api.Config;
|
||||||
|
|
||||||
|
public class VivoxConfig
|
||||||
|
{
|
||||||
|
public string Key { get; set; }
|
||||||
|
public string Issuer { get; set; }
|
||||||
|
public string Domain { get; set; }
|
||||||
|
public string Server { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
using System.Net.Mime;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Prospect.Server.Api.Hubs;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Controllers;
|
||||||
|
|
||||||
|
public class NotifyRequest
|
||||||
|
{
|
||||||
|
[JsonPropertyName("type")]
|
||||||
|
public string MessageType { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("data")]
|
||||||
|
public object MessageData { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ServerReadyMessageData
|
||||||
|
{
|
||||||
|
[JsonPropertyName("success")]
|
||||||
|
public bool Success { get; set; }
|
||||||
|
[JsonPropertyName("sessionId")]
|
||||||
|
public string SessionID { get; set; }
|
||||||
|
[JsonPropertyName("squadId")]
|
||||||
|
public string SquadID { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[Route("Notifications")]
|
||||||
|
[ApiController]
|
||||||
|
public class NotificationsController : Controller
|
||||||
|
{
|
||||||
|
private readonly IHubContext<CycleHub> _hubContext;
|
||||||
|
private readonly ILogger<NotificationsController> _logger;
|
||||||
|
|
||||||
|
public NotificationsController(ILogger<NotificationsController> logger, IHubContext<CycleHub> hubContext)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpPost("TestNotify")]
|
||||||
|
[Produces(MediaTypeNames.Application.Json)]
|
||||||
|
public async Task<IActionResult> TestNotify(NotifyRequest request)
|
||||||
|
{
|
||||||
|
// TODO: To test Notifications_DT
|
||||||
|
_logger.LogDebug("Received test notification event {MessageType}", request.MessageType);
|
||||||
|
await _hubContext.Clients.All.SendAsync(request.MessageType, request.MessageData);
|
||||||
|
|
||||||
|
return StatusCode(200);
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpPost("ServerReady")]
|
||||||
|
[Produces(MediaTypeNames.Application.Json)]
|
||||||
|
public async Task<IActionResult> ServerReady(ServerReadyMessageData request)
|
||||||
|
{
|
||||||
|
_logger.LogDebug("Received test notification event OnSquadMatchmakingSuccess");
|
||||||
|
await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", request);
|
||||||
|
|
||||||
|
return StatusCode(200);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Data;
|
namespace Prospect.Server.Api.Models.Data;
|
||||||
|
|
||||||
@@ -11,5 +12,14 @@ public class PlayerBalance
|
|||||||
public int SoftCurrency { get; set; }
|
public int SoftCurrency { get; set; }
|
||||||
|
|
||||||
[JsonPropertyName("IN")]
|
[JsonPropertyName("IN")]
|
||||||
public int InsuranceTokens { get; set; }
|
public int InsuranceCurrency { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class JobBoardsData
|
||||||
|
{
|
||||||
|
[JsonPropertyName("lastBoardRefreshTimeUtc")]
|
||||||
|
public FYTimestamp LastBoardRefreshTimeUtc { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("boards")]
|
||||||
|
public List<FYFactionContractsData> Boards { get; set; }
|
||||||
}
|
}
|
||||||
@@ -15,8 +15,8 @@ public class TitleDataContractInfo {
|
|||||||
public TitleDataContractInfoUnlockData UnlockData { get; set; }
|
public TitleDataContractInfoUnlockData UnlockData { get; set; }
|
||||||
[JsonPropertyName("IsMainContract")]
|
[JsonPropertyName("IsMainContract")]
|
||||||
public bool IsMainContract { get; set; }
|
public bool IsMainContract { get; set; }
|
||||||
[JsonPropertyName("ContractDifficulty")]
|
[JsonPropertyName("Difficulty")]
|
||||||
public EYContractDifficulty ContractDifficulty { get; set; }
|
public EYContractDifficulty Difficulty { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TitleDataContractInfoReward {
|
public class TitleDataContractInfoReward {
|
||||||
@@ -33,6 +33,24 @@ public class TitleDataContractInfoObjective {
|
|||||||
public int MaxProgress { get; set; }
|
public int MaxProgress { get; set; }
|
||||||
[JsonPropertyName("ItemToOwn")]
|
[JsonPropertyName("ItemToOwn")]
|
||||||
public string ItemToOwn { get; set; }
|
public string ItemToOwn { get; set; }
|
||||||
|
[JsonPropertyName("KillConditions")]
|
||||||
|
public TitleDataContractInfoObjectiveKillConditions? KillConditions { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TitleDataContractInfoObjectiveKillConditions
|
||||||
|
{
|
||||||
|
[JsonPropertyName("KillTarget")]
|
||||||
|
public EYKillTypeAction KillTarget { get; set; }
|
||||||
|
[JsonPropertyName("AllowedWeaponCategories")]
|
||||||
|
public EYDeviceCategory[] AllowedWeaponCategories { get; set; }
|
||||||
|
[JsonPropertyName("AllowedSpecificWeapons")]
|
||||||
|
public string[] AllowedSpecificWeapons { get; set; }
|
||||||
|
[JsonPropertyName("SpecificAIEnemyTypeToKill")]
|
||||||
|
public EYEnemyType SpecificAIEnemyTypeToKill { get; set; }
|
||||||
|
[JsonPropertyName("MapName")]
|
||||||
|
public string MapName { get; set; }
|
||||||
|
[JsonPropertyName("OnlyDuringStorm")]
|
||||||
|
public bool OnlyDuringStorm { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TitleDataContractInfoUnlockData {
|
public class TitleDataContractInfoUnlockData {
|
||||||
@@ -62,3 +80,60 @@ public enum EYContractDifficulty
|
|||||||
Hard = 3,
|
Hard = 3,
|
||||||
MAX = 4
|
MAX = 4
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public enum EYDeviceCategory
|
||||||
|
{
|
||||||
|
AssaultRifle = 0,
|
||||||
|
Pistol = 1,
|
||||||
|
SMG = 2,
|
||||||
|
SniperRifle = 3,
|
||||||
|
HeavyWeapon = 4,
|
||||||
|
Shotgun = 5,
|
||||||
|
BurstRifle = 6,
|
||||||
|
Exotic = 7,
|
||||||
|
MissileLauncher = 8,
|
||||||
|
Scanner = 9,
|
||||||
|
All = 10,
|
||||||
|
INVALID = 11,
|
||||||
|
MAX = 12
|
||||||
|
};
|
||||||
|
|
||||||
|
public enum EYKillTypeAction
|
||||||
|
{
|
||||||
|
Invalid = 0,
|
||||||
|
Players = 1,
|
||||||
|
Creatures = 2,
|
||||||
|
All = 3,
|
||||||
|
MAX = 4
|
||||||
|
};
|
||||||
|
|
||||||
|
public enum EYEnemyType
|
||||||
|
{
|
||||||
|
None = 0,
|
||||||
|
DebugAutomationTest = 1,
|
||||||
|
DirtBeast_Melee = 2,
|
||||||
|
DirtBeast_RangedShort = 3,
|
||||||
|
DirtBeast_RangedMedium = 4,
|
||||||
|
DirtBeast_RangedLong = 5,
|
||||||
|
DirtBeast_MeleeHeavy = 6,
|
||||||
|
DirtBeast_RangedHeavy = 7,
|
||||||
|
DirtBeast_FlyingHeavy = 8,
|
||||||
|
DirtBeast_Boss = 9,
|
||||||
|
Orobot_Melee = 10,
|
||||||
|
Orobot_RangedShort = 11,
|
||||||
|
Orobot_RangedMedium = 12,
|
||||||
|
Orobot_Walker = 13,
|
||||||
|
Orobot_Platform = 14,
|
||||||
|
Plunderbot_RangedShort = 15,
|
||||||
|
Plunderbot_RangedMedium = 16,
|
||||||
|
Plunderbot_RangedLong = 17,
|
||||||
|
GlowBeetle_Blast = 18,
|
||||||
|
GlowBeetle_Acid = 19,
|
||||||
|
GlowBeetle_Summon = 20,
|
||||||
|
Strider = 21,
|
||||||
|
Rattler = 22,
|
||||||
|
Weremole = 23,
|
||||||
|
Crusher = 24,
|
||||||
|
Howler = 25,
|
||||||
|
MAX = 26
|
||||||
|
};
|
||||||
@@ -1,6 +1,22 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
public class TitleDataDailyCrateInfo {
|
public class TitleDataDailyCrateInfo {
|
||||||
|
[JsonPropertyName("Name")]
|
||||||
|
public string Name { get; set; }
|
||||||
|
[JsonPropertyName("Level")]
|
||||||
|
public int Level { get; set; }
|
||||||
|
[JsonPropertyName("RewardGrants")]
|
||||||
|
public TitleDataDailyCrateInfoRewardGrants[] RewardGrants { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TitleDataDailyCrateInfoRewardGrants {
|
||||||
|
[JsonPropertyName("Pool")]
|
||||||
|
public TitleDataDailyCrateInfoPoolItem[] Pool { get; set; }
|
||||||
|
[JsonPropertyName("Amount")]
|
||||||
|
public int Amount { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TitleDataDailyCrateInfoPoolItem {
|
||||||
[JsonPropertyName("Name")]
|
[JsonPropertyName("Name")]
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
[JsonPropertyName("Weight")]
|
[JsonPropertyName("Weight")]
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ public class TitleDataMissionInfo {
|
|||||||
public UDataTable OnboardingRewards { get; set; }
|
public UDataTable OnboardingRewards { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
// {\"TalkToBadumReward\":{\"MissionRewardId\":\"TalkToBadumReward\",\"RewardEntries\":[{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"WP_E_SMG_Bullet_01\"},\"RewardAmount\":2},{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"WP_E_AR_Energy_01\"},\"RewardAmount\":1},{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"WP_E_Pistol_Bullet_01\"},\"RewardAmount\":5},{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"WP_E_SGun_Bullet_01\"},\"RewardAmount\":2},{\"RewardType\":6,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/AmmoTypes_DT.AmmoTypes_DT\\u0027\",\"RowName\":\"Light\"},\"RewardAmount\":6},{\"RewardType\":6,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/AmmoTypes_DT.AmmoTypes_DT\\u0027\",\"RowName\":\"Medium\"},\"RewardAmount\":4},{\"RewardType\":6,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/AmmoTypes_DT.AmmoTypes_DT\\u0027\",\"RowName\":\"Shotgun\"},\"RewardAmount\":2},{\"RewardType\":8,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Abilities.PRO_Abilities\\u0027\",\"RowName\":\"ShockGrenade_02\"},\"RewardAmount\":2},{\"RewardType\":8,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Abilities.PRO_Abilities\\u0027\",\"RowName\":\"Consumable_Health_01\"},\"RewardAmount\":5},{\"RewardType\":0,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_PlayerShield.PRO_PlayerShield\\u0027\",\"RowName\":\"Shield_01\"},\"RewardAmount\":5},{\"RewardType\":10,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Bags.PRO_Bags\\u0027\",\"RowName\":\"Bag_01\"},\"RewardAmount\":5},{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"TOOL_MineralScanner_01\"},\"RewardAmount\":2}]},\"FirstMatchReward\":{\"MissionRewardId\":\"FirstMatchReward\",\"RewardEntries\":[{\"RewardType\":2,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/Materials_DT.Materials_DT\\u0027\",\"RowName\":\"Insulation\"},\"RewardAmount\":4},{\"RewardType\":1,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/Currencies_DT.Currencies_DT\\u0027\",\"RowName\":\"SoftCurrency\"},\"RewardAmount\":1500},{\"RewardType\":2,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/Materials_DT.Materials_DT\\u0027\",\"RowName\":\"GenericCreatureDrop\"},\"RewardAmount\":3},{\"RewardType\":2,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/Materials_DT.Materials_DT\\u0027\",\"RowName\":\"ICAScrip\"},\"RewardAmount\":1}]}}",
|
|
||||||
|
|
||||||
public class TitleDataMissionRewardInfo {
|
public class TitleDataMissionRewardInfo {
|
||||||
[JsonPropertyName("MissionRewardId")]
|
[JsonPropertyName("MissionRewardId")]
|
||||||
public string MissionRewardId { get; set; }
|
public string MissionRewardId { get; set; }
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
||||||
},
|
},
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"applicationUrl": "https://2EA46.playfabapi.com:443",
|
"applicationUrl": "https://127.0.0.1:8443;http://127.0.0.1:8000",
|
||||||
"useSSL": true
|
"useSSL": true
|
||||||
},
|
},
|
||||||
"IIS Express": {
|
"IIS Express": {
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
||||||
},
|
},
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"applicationUrl": "https://2EA46.playfabapi.com"
|
"applicationUrl": "https://127.0.0.1:8443;http://127.0.0.1:8000",
|
||||||
|
"useSSL": true
|
||||||
},
|
},
|
||||||
"IIS Express": {
|
"IIS Express": {
|
||||||
"commandName": "IISExpress",
|
"commandName": "IISExpress",
|
||||||
|
|||||||
@@ -55,12 +55,11 @@ public class ActivateContract : ICloudScriptFunction<FYActivateContractRequest,
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive", "ContractsOneTimeCompleted"});
|
||||||
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
||||||
|
|
||||||
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
var contract = contracts[request.ContractID];
|
if (!contracts.TryGetValue(request.ContractID, out var contract)) {
|
||||||
if (contract == null) {
|
|
||||||
return new FYActivateContractResult
|
return new FYActivateContractResult
|
||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
@@ -68,14 +67,32 @@ public class ActivateContract : ICloudScriptFunction<FYActivateContractRequest,
|
|||||||
Status = 3 // EYActivateContractRequestStatus::FAILED_GETTING_STATIC_DATA
|
Status = 3 // EYActivateContractRequestStatus::FAILED_GETTING_STATIC_DATA
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
||||||
|
if (contractsCompleted.ContractsIDs.Contains(request.ContractID)) {
|
||||||
|
return new FYActivateContractResult
|
||||||
|
{
|
||||||
|
UserID = userId,
|
||||||
|
Error = "Contract is already completed",
|
||||||
|
Status = 1 // EYActivateContractRequestStatus::CONTRACT_OF_THIS_FACTION_IS_ALREADY_ACTIVE
|
||||||
|
};
|
||||||
|
}
|
||||||
// TODO: Contract unlock criteria
|
// TODO: Contract unlock criteria
|
||||||
|
|
||||||
var progress = new int[contract.Objectives.Length];
|
var progress = new int[contract.Objectives.Length];
|
||||||
|
// NOTE: Automatically set max progress for player kill objectives.
|
||||||
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
|
var objective = contract.Objectives[i];
|
||||||
|
if (objective.Type == EYContractObjectiveType.Kills && objective.KillConditions.KillTarget == EYKillTypeAction.Players) {
|
||||||
|
progress[i] = objective.MaxProgress;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
var contractData = new FYActiveContractPlayerData {
|
var contractData = new FYActiveContractPlayerData {
|
||||||
ContractID = request.ContractID,
|
ContractID = request.ContractID,
|
||||||
Progress = progress,
|
Progress = progress,
|
||||||
};
|
};
|
||||||
|
// TODO: Max number of active jobs
|
||||||
contractsActive.Contracts.Add(contractData);
|
contractsActive.Contracts.Add(contractData);
|
||||||
await _userDataService.UpdateAsync(
|
await _userDataService.UpdateAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
|
|||||||
+4
-9
@@ -32,18 +32,13 @@ public class CheckClientVersionUpToDateFunction : ICloudScriptFunction<CheckClie
|
|||||||
_logger.LogInformation("Processing client version check request for client {Version}",
|
_logger.LogInformation("Processing client version check request for client {Version}",
|
||||||
request.Version);
|
request.Version);
|
||||||
|
|
||||||
// TODO: Validate login
|
|
||||||
// if (string.IsNullOrEmpty(request.LoginNonce))
|
|
||||||
// {
|
|
||||||
// return new CheckClientVersionUpToDateResponse
|
|
||||||
// {
|
|
||||||
// IsClientUpToDate = false,
|
|
||||||
// };
|
|
||||||
// }
|
|
||||||
|
|
||||||
return new CheckClientVersionUpToDateResponse
|
return new CheckClientVersionUpToDateResponse
|
||||||
{
|
{
|
||||||
|
#if SEASON_2_RELEASE || SEASON_2_DEBUG
|
||||||
|
IsClientUpToDate = request.Version == "4.27.2-1413204+PROSPECT-Releases-R2.7.0",
|
||||||
|
#else
|
||||||
IsClientUpToDate = true,
|
IsClientUpToDate = true,
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
private readonly TitleDataService _titleDataService;
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly EYContractDifficulty[] difficulties = [EYContractDifficulty.Easy, EYContractDifficulty.Medium, EYContractDifficulty.Hard];
|
||||||
|
private readonly Random rnd = new Random();
|
||||||
|
|
||||||
public ClaimActiveContract(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
public ClaimActiveContract(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
@@ -66,11 +68,10 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var titleData = _titleDataService.Find(new List<string>{"Contracts", "Blueprints"});
|
var titleData = _titleDataService.Find(new List<string>{ "Contracts", "Blueprints", "Jobs", "LevelData" });
|
||||||
|
|
||||||
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
var contract = contracts[request.ContractID];
|
if (!contracts.TryGetValue(request.ContractID, out var contract)) {
|
||||||
if (contract == null) {
|
|
||||||
return new FYClaimCompletedActiveContractRewardsResult
|
return new FYClaimCompletedActiveContractRewardsResult
|
||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
@@ -82,16 +83,17 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
var factionKey = "FactionProgression" + contract.Faction;
|
var factionKey = "FactionProgression" + contract.Faction;
|
||||||
var userData = await _userDataService.FindAsync(
|
var userData = await _userDataService.FindAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
new List<string>{"ContractsActive", "ContractsOneTimeCompleted", "Balance", "Inventory", factionKey}
|
new List<string>{"ContractsActive", "ContractsOneTimeCompleted", "Balance", "Inventory", factionKey, "JobBoardsData" }
|
||||||
);
|
);
|
||||||
|
|
||||||
var factionProgression = JsonSerializer.Deserialize<int>(userData[factionKey].Value);
|
var factionProgression = JsonSerializer.Deserialize<int>(userData[factionKey].Value);
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
||||||
|
var jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value);
|
||||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
var targetContractIdx = contractsActive.Contracts.FindIndex(item => item.ContractID == request.ContractID);
|
var targetContractIdx = contractsActive.Contracts.FindIndex(item => item.ContractID == contract.Name);
|
||||||
if (targetContractIdx == -1) {
|
if (targetContractIdx == -1) {
|
||||||
return new FYClaimCompletedActiveContractRewardsResult
|
return new FYClaimCompletedActiveContractRewardsResult
|
||||||
{
|
{
|
||||||
@@ -106,6 +108,7 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
var targetContract = contractsActive.Contracts[targetContractIdx];
|
var targetContract = contractsActive.Contracts[targetContractIdx];
|
||||||
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
||||||
HashSet<string> deletedItemsIds = [];
|
HashSet<string> deletedItemsIds = [];
|
||||||
|
// TODO: Optimize
|
||||||
for (var i = 0; i < contract.Objectives.Length; i++) {
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
var objective = contract.Objectives[i];
|
var objective = contract.Objectives[i];
|
||||||
int remaining = objective.MaxProgress;
|
int remaining = objective.MaxProgress;
|
||||||
@@ -161,14 +164,14 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
} else if (reward.ItemID == "Aurum") {
|
} else if (reward.ItemID == "Aurum") {
|
||||||
balance.HardCurrency += reward.Amount;
|
balance.HardCurrency += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else if (reward.ItemID == "InsuranceToken") {
|
} else if (reward.ItemID == "InsuranceCurrency") {
|
||||||
balance.InsuranceTokens += reward.Amount;
|
balance.InsuranceCurrency += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance.InsuranceTokens });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||||
} else {
|
} else {
|
||||||
// TODO: Inventory limit check
|
// TODO: Inventory limit check
|
||||||
|
|
||||||
var blueprintData = blueprints[reward.ItemID];
|
var blueprintData = blueprints[reward.ItemID];
|
||||||
var remainingAmount = reward.Amount * blueprintData.AmountPerPurchase;
|
var remainingAmount = reward.Amount; // Quest rewards are given individually
|
||||||
|
|
||||||
// Populate incomplete stacks first
|
// Populate incomplete stacks first
|
||||||
foreach (var item in newInventory) {
|
foreach (var item in newInventory) {
|
||||||
@@ -211,14 +214,46 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
factionProgression += contract.ReputationIncrease;
|
factionProgression += contract.ReputationIncrease;
|
||||||
contractsActive.Contracts.RemoveAt(targetContractIdx);
|
contractsActive.Contracts.RemoveAt(targetContractIdx);
|
||||||
// Main contracts can be completed only once.
|
// Main contracts can be completed only once.
|
||||||
|
// Other contracts should be jobs.
|
||||||
|
var newContractIdOnBoard = "";
|
||||||
if (contract.IsMainContract) {
|
if (contract.IsMainContract) {
|
||||||
contractsCompleted.ContractsIDs.Add(request.ContractID);
|
contractsCompleted.ContractsIDs.Add(contract.Name);
|
||||||
|
} else {
|
||||||
|
var contractDifficulty = contract.Difficulty;
|
||||||
|
|
||||||
|
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
|
||||||
|
var levels = levelsData[contract.Faction];
|
||||||
|
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<EYContractDifficulty, string[]>>>(titleData["Jobs"]);
|
||||||
|
var level = levels.Length - Array.FindIndex(levels, (int xp) => {
|
||||||
|
return factionProgression >= xp;
|
||||||
|
});
|
||||||
|
|
||||||
|
var factionBoard = jobBoardsData.Boards.Find(c => c.FactionId == contract.Faction);
|
||||||
|
var idx = Array.FindIndex(difficulties, d => d == contractDifficulty);
|
||||||
|
var factionJobs = jobs[contract.Faction];
|
||||||
|
var jobsAvailable = Array.FindAll(factionJobs[contractDifficulty], (string jobId) => {
|
||||||
|
return level >= contracts[jobId].UnlockData.Level;
|
||||||
|
});
|
||||||
|
// If player completes a job, it means he has at least one unlocked anyway.
|
||||||
|
newContractIdOnBoard = jobsAvailable[rnd.Next(jobsAvailable.Length)];
|
||||||
|
factionBoard.Contracts[idx].ContractId = newContractIdOnBoard;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Check for next unlock in contracts instead of relying on client
|
||||||
var newContracts = new List<FYActiveContractPlayerData>();
|
var newContracts = new List<FYActiveContractPlayerData>();
|
||||||
foreach (var contractIdToUnlock in request.ContractsToUnlock) {
|
foreach (var contractIdToUnlock in request.ContractsToUnlock) {
|
||||||
|
if (contractsCompleted.ContractsIDs.Contains(contractIdToUnlock)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
var contractToUnlock = contracts[contractIdToUnlock];
|
var contractToUnlock = contracts[contractIdToUnlock];
|
||||||
var progress = new int[contractToUnlock.Objectives.Length];
|
var progress = new int[contractToUnlock.Objectives.Length];
|
||||||
|
// NOTE: Automatically set max progress for player kill objectives.
|
||||||
|
for (var i = 0; i < contractToUnlock.Objectives.Length; i++) {
|
||||||
|
var objective = contractToUnlock.Objectives[i];
|
||||||
|
if (objective.Type == EYContractObjectiveType.Kills && objective.KillConditions.KillTarget == EYKillTypeAction.Players) {
|
||||||
|
progress[i] = objective.MaxProgress;
|
||||||
|
}
|
||||||
|
}
|
||||||
var newContract = new FYActiveContractPlayerData {
|
var newContract = new FYActiveContractPlayerData {
|
||||||
ContractID = contractIdToUnlock,
|
ContractID = contractIdToUnlock,
|
||||||
Progress = progress,
|
Progress = progress,
|
||||||
@@ -235,6 +270,7 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
["Balance"] = JsonSerializer.Serialize(balance),
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
[factionKey] = JsonSerializer.Serialize(factionProgression),
|
[factionKey] = JsonSerializer.Serialize(factionProgression),
|
||||||
|
["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -242,12 +278,12 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "",
|
Error = "",
|
||||||
ClaimedContractID = request.ContractID,
|
ClaimedContractID = contract.Name,
|
||||||
ContractsActivated = newContracts,
|
ContractsActivated = newContracts,
|
||||||
ItemsUpdatedOrRemoved = itemsUpdatedOrRemoved,
|
ItemsUpdatedOrRemoved = itemsUpdatedOrRemoved,
|
||||||
ChangedCurrencies = changedCurrencies.ToArray(),
|
ChangedCurrencies = changedCurrencies.ToArray(),
|
||||||
ItemsGranted = itemsGranted,
|
ItemsGranted = itemsGranted,
|
||||||
NewContractIdOnBoard = "", // TODO: This should be a replacement contract apparently?
|
NewContractIdOnBoard = newContractIdOnBoard,
|
||||||
PlayerFactionProgressData = new FYPlayerFactionProgressData {
|
PlayerFactionProgressData = new FYPlayerFactionProgressData {
|
||||||
FactionID = contract.Faction,
|
FactionID = contract.Faction,
|
||||||
CurrentProgression = factionProgression,
|
CurrentProgression = factionProgression,
|
||||||
|
|||||||
+9
-8
@@ -43,9 +43,9 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
|
|
||||||
static readonly Random random = new();
|
static readonly Random random = new();
|
||||||
|
|
||||||
private TitleDataDailyCrateInfo[] PickItems(TitleDataDailyCrateInfo[] items, int numPicks)
|
private TitleDataDailyCrateInfoPoolItem[] PickItems(TitleDataDailyCrateInfoPoolItem[] items, int numPicks)
|
||||||
{
|
{
|
||||||
var itemList = new (TitleDataDailyCrateInfo item, float cumulativeWeight)[items.Length];
|
var itemList = new (TitleDataDailyCrateInfoPoolItem item, float cumulativeWeight)[items.Length];
|
||||||
float totalWeight = 0;
|
float totalWeight = 0;
|
||||||
|
|
||||||
for (int i = 0; i < items.Length; i++) {
|
for (int i = 0; i < items.Length; i++) {
|
||||||
@@ -54,7 +54,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
itemList[i] = (item, totalWeight);
|
itemList[i] = (item, totalWeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
var selectedItems = new TitleDataDailyCrateInfo[numPicks];
|
var selectedItems = new TitleDataDailyCrateInfoPoolItem[numPicks];
|
||||||
|
|
||||||
for (int i = 0; i < numPicks; i++) {
|
for (int i = 0; i < numPicks; i++) {
|
||||||
float pick = (float)random.NextDouble() * totalWeight;
|
float pick = (float)random.NextDouble() * totalWeight;
|
||||||
@@ -108,7 +108,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
var techTreeBonuses = JsonSerializer.Deserialize<CharacterTechTreeBonuses>(userData["CharacterTechTreeBonuses"].Value);
|
var techTreeBonuses = JsonSerializer.Deserialize<CharacterTechTreeBonuses>(userData["CharacterTechTreeBonuses"].Value);
|
||||||
|
|
||||||
var titleData = _titleDataService.Find(new List<string>{"PassiveGenerators", "DailyCrateRewardsPools", "Blueprints"});
|
var titleData = _titleDataService.Find(new List<string>{"PassiveGenerators", "DailyCrateSetups", "Blueprints"});
|
||||||
var passiveGenerators = JsonSerializer.Deserialize<Dictionary<string, TitleDataPassiveGeneratorsInfo>>(titleData["PassiveGenerators"]);
|
var passiveGenerators = JsonSerializer.Deserialize<Dictionary<string, TitleDataPassiveGeneratorsInfo>>(titleData["PassiveGenerators"]);
|
||||||
|
|
||||||
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
@@ -187,12 +187,12 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
var dailyCrateRewards = JsonSerializer.Deserialize<TitleDataDailyCrateInfo[][]>(titleData["DailyCrateRewardsPools"]);
|
var dailyCrateSetups = JsonSerializer.Deserialize<TitleDataDailyCrateInfo[]>(titleData["DailyCrateSetups"]);
|
||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
var rewardsPool = dailyCrateRewards[crateTier - 1];
|
var rewardsPool = dailyCrateSetups[crateTier - 1];
|
||||||
|
|
||||||
// TODO: Get rewardGrants from PassiveGenerators_CrateRewards_DT
|
foreach (var grant in rewardsPool.RewardGrants) {
|
||||||
var items = PickItems(rewardsPool, 5);
|
var items = PickItems(grant.Pool, grant.Amount);
|
||||||
// TODO: Stackable? GrantedItems doesn't imply granted OR updated.
|
// TODO: Stackable? GrantedItems doesn't imply granted OR updated.
|
||||||
foreach (var item in items) {
|
foreach (var item in items) {
|
||||||
var itemInfo = blueprints[item.Name];
|
var itemInfo = blueprints[item.Name];
|
||||||
@@ -213,6 +213,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
|||||||
inventory.Add(grantedItem);
|
inventory.Add(grantedItem);
|
||||||
grantedItems.Add(grantedItem);
|
grantedItems.Add(grantedItem);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
|
|||||||
@@ -0,0 +1,114 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
|
// Closed Beta Function
|
||||||
|
|
||||||
|
public class CompleteInventoryUpdateRequest
|
||||||
|
{
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserID { get; set; }
|
||||||
|
[JsonPropertyName("reason")]
|
||||||
|
public string Reason { get; set; }
|
||||||
|
[JsonPropertyName("newSet")]
|
||||||
|
public LoadoutData NewSet { get; set; }
|
||||||
|
[JsonPropertyName("itemsToAdd")]
|
||||||
|
public FYCustomItemInfo[] ItemsToAdd { get; set; }
|
||||||
|
[JsonPropertyName("itemsToUpdateAmount")]
|
||||||
|
public FYCustomItemInfo[] ItemsToUpdateAmount { get; set; }
|
||||||
|
[JsonPropertyName("itemsToRemove")]
|
||||||
|
public HashSet<string> ItemsToRemove { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CompleteInventoryUpdateResponse
|
||||||
|
{
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserId { get; set; }
|
||||||
|
[JsonPropertyName("error")]
|
||||||
|
public string Error { get; set; }
|
||||||
|
[JsonPropertyName("newSet")]
|
||||||
|
public LoadoutData NewSet { get; set; }
|
||||||
|
[JsonPropertyName("itemsToAdd")]
|
||||||
|
public FYCustomItemInfo[] ItemsToAdd { get; set; }
|
||||||
|
[JsonPropertyName("itemsToUpdateAmount")]
|
||||||
|
public FYCustomItemInfo[] ItemsToUpdateAmount { get; set; }
|
||||||
|
[JsonPropertyName("itemsToRemove")]
|
||||||
|
public HashSet<string> ItemsToRemove { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[CloudScriptFunction("CompleteInventoryUpdate")]
|
||||||
|
public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInventoryUpdateRequest, CompleteInventoryUpdateResponse>
|
||||||
|
{
|
||||||
|
private readonly ILogger<CompleteInventoryUpdateFunction> _logger;
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
|
||||||
|
public CompleteInventoryUpdateFunction(ILogger<CompleteInventoryUpdateFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<CompleteInventoryUpdateResponse> ExecuteAsync(CompleteInventoryUpdateRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory"});
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
|
// TODO: Optimize
|
||||||
|
// TODO: Check deleted items to see if other stacks/mods were updated correctly
|
||||||
|
// Process inventory update. The player may:
|
||||||
|
// 1. Split item stack - creates a new item and updates amount of existing item.
|
||||||
|
// 2. Stack existing items - deletes existing items and updates amount of existing item.
|
||||||
|
// 3. Change vanity data - updates an existing item.
|
||||||
|
// 4. Change weapon mods - updates an existing item.
|
||||||
|
// IMPORTANT: The same request is currently used to report the updated inventory in the end of match.
|
||||||
|
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||||
|
foreach (var item in inventory) {
|
||||||
|
if (!request.ItemsToRemove.Contains(item.ItemId)) {
|
||||||
|
newInventory.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var item in request.ItemsToUpdateAmount) {
|
||||||
|
var inventoryItem = newInventory.Find(i => i.ItemId == item.ItemId);
|
||||||
|
if (inventoryItem == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
inventoryItem.Amount = item.Amount;
|
||||||
|
inventoryItem.ModData = item.ModData;
|
||||||
|
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
||||||
|
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
||||||
|
inventoryItem.Durability = item.Durability;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Check updated items and validate new items
|
||||||
|
foreach (var item in request.ItemsToAdd) {
|
||||||
|
newInventory.Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>{
|
||||||
|
["LOADOUT"] = JsonSerializer.Serialize(request.NewSet),
|
||||||
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
|
});
|
||||||
|
|
||||||
|
return new CompleteInventoryUpdateResponse
|
||||||
|
{
|
||||||
|
UserId = userId,
|
||||||
|
//Error = "",
|
||||||
|
//NewSet = request.NewSet,
|
||||||
|
//ItemsToAdd = request.ItemsToAdd,
|
||||||
|
//ItemsToRemove = request.ItemsToRemove,
|
||||||
|
//ItemsToUpdateAmount = request.ItemsToUpdateAmount,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Prospect.Server.Api.Hubs;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
|
||||||
|
// Closed Beta Function
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
[CloudScriptFunction("EnterMatchmaking")]
|
||||||
|
public class EnterMatchmakingFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchAzureFunctionResult>
|
||||||
|
{
|
||||||
|
private readonly IHubContext<CycleHub> _hubContext;
|
||||||
|
|
||||||
|
public EnterMatchmakingFunction(IHubContext<CycleHub> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<FYEnterMatchAzureFunctionResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
||||||
|
{
|
||||||
|
//await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", new OnSquadMatchmakingSuccessMessage {
|
||||||
|
// Success = true,
|
||||||
|
// SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
||||||
|
// SquadID = request.SquadId,
|
||||||
|
//});
|
||||||
|
|
||||||
|
return new FYEnterMatchAzureFunctionResult
|
||||||
|
{
|
||||||
|
Success = true,
|
||||||
|
ErrorMessage = "",
|
||||||
|
SingleplayerStation = true,
|
||||||
|
Address = request.MapName,
|
||||||
|
MaintenanceMode = false,
|
||||||
|
Port = 7777,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
using Prospect.Server.Api.Hubs;
|
using Prospect.Server.Api.Hubs;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
@@ -17,15 +20,72 @@ public class OnSquadMatchmakingSuccessMessage {
|
|||||||
[CloudScriptFunction("EnterMatchmakingMatch")]
|
[CloudScriptFunction("EnterMatchmakingMatch")]
|
||||||
public class EnterMatchmakingMatchFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
public class EnterMatchmakingMatchFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
||||||
{
|
{
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly IHubContext<CycleHub> _hubContext;
|
private readonly IHubContext<CycleHub> _hubContext;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
|
||||||
public EnterMatchmakingMatchFunction(IHubContext<CycleHub> hubContext)
|
public EnterMatchmakingMatchFunction(IHubContext<CycleHub> hubContext, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_hubContext = hubContext;
|
_hubContext = hubContext;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
||||||
{
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
||||||
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
|
|
||||||
|
var userData = await _userDataService.FindAsync(
|
||||||
|
userId, userId,
|
||||||
|
new List<string>{"ContractsActive", "Inventory"}
|
||||||
|
);
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
// Compute delivery quest progress before deploy.
|
||||||
|
// This ensures that the quest progress will be shown on the planet.
|
||||||
|
// The station doesn't seem to care about delivery quests progress and calculates progress
|
||||||
|
// based on actual items in stash. And so does the "ClaimActiveContract" function.
|
||||||
|
foreach (var contractActive in contractsActive.Contracts) {
|
||||||
|
if (!contracts.TryGetValue(contractActive.ContractID, out var contract)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
|
var objective = contract.Objectives[i];
|
||||||
|
if (objective.Type != EYContractObjectiveType.OwnNumOfItem) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
int remaining = objective.MaxProgress;
|
||||||
|
foreach (var item in inventory) {
|
||||||
|
if (item.BaseItemId != objective.ItemToOwn) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
remaining -= item.Amount;
|
||||||
|
if (remaining <= 0) {
|
||||||
|
remaining = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contractActive.Progress[i] = objective.MaxProgress - remaining;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string>{
|
||||||
|
["ContractsActive"] = JsonSerializer.Serialize(contractsActive),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", new OnSquadMatchmakingSuccessMessage {
|
await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", new OnSquadMatchmakingSuccessMessage {
|
||||||
Success = true,
|
Success = true,
|
||||||
SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
||||||
|
|||||||
@@ -1,16 +1,26 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Microsoft.Extensions.Options;
|
||||||
|
using Prospect.Server.Api.Config;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
[CloudScriptFunction("GetSignalRConnection")]
|
[CloudScriptFunction("GetSignalRConnection")]
|
||||||
public class GetSignalRConnection : ICloudScriptFunction<FYGetSignalRConnection, FYGetSignalRConnectionResult>
|
public class GetSignalRConnection : ICloudScriptFunction<FYGetSignalRConnection, FYGetSignalRConnectionResult>
|
||||||
{
|
{
|
||||||
|
private readonly SignalRSettings _settings;
|
||||||
|
|
||||||
|
public GetSignalRConnection(IOptions<SignalRSettings> settings)
|
||||||
|
{
|
||||||
|
_settings = settings.Value;
|
||||||
|
}
|
||||||
|
|
||||||
public Task<FYGetSignalRConnectionResult> ExecuteAsync(FYGetSignalRConnection request)
|
public Task<FYGetSignalRConnectionResult> ExecuteAsync(FYGetSignalRConnection request)
|
||||||
{
|
{
|
||||||
|
// The game client connects to SignalR only over HTTPS
|
||||||
return Task.FromResult(new FYGetSignalRConnectionResult
|
return Task.FromResult(new FYGetSignalRConnectionResult
|
||||||
{
|
{
|
||||||
Url = "https://2ea46.playfabapi.com/signalr/?hub=pubsub",
|
Url = _settings.SignalRURL,
|
||||||
AccessToken = "TEST"
|
AccessToken = _settings.SignalRAccessToken
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+69
-70
@@ -1,4 +1,7 @@
|
|||||||
using System.Text.Json;
|
using System.Collections;
|
||||||
|
using System.Diagnostics.Contracts;
|
||||||
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
@@ -11,11 +14,16 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly string[] factions = ["Korolev", "Osiris", "ICA"]; // TODO: Order is important
|
||||||
|
private readonly EYContractDifficulty[] difficulties = [EYContractDifficulty.Easy, EYContractDifficulty.Medium, EYContractDifficulty.Hard];
|
||||||
|
private readonly Random rnd = new Random();
|
||||||
|
|
||||||
public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_userDataService = userDataService;
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
||||||
@@ -26,10 +34,63 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
return new FYGetPlayerContractsResult{};
|
return new FYGetPlayerContractsResult{};
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
|
||||||
|
|
||||||
// TODO: Get player's contract boards and refresh
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{ "ContractsActive", "JobBoardsData", "FactionProgressionKorolev", "FactionProgressionICA", "FactionProgressionOsiris" });
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
var jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value);
|
||||||
|
|
||||||
|
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
var lastBoardRefreshTimeUtc = jobBoardsData.LastBoardRefreshTimeUtc;
|
||||||
|
var boards = jobBoardsData.Boards;
|
||||||
|
// The boards are updated once in 3 hours
|
||||||
|
if (now >= lastBoardRefreshTimeUtc.Seconds + 60 * 60 * 3) {
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "Contracts", "Jobs", "LevelData" });
|
||||||
|
|
||||||
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
|
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<EYContractDifficulty, string[]>>>(titleData["Jobs"]);
|
||||||
|
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
|
||||||
|
var currentQuests = new Dictionary<string, Dictionary<EYContractDifficulty, bool>> {
|
||||||
|
["Korolev"] = new Dictionary<EYContractDifficulty, bool> { [EYContractDifficulty.Easy] = false, [EYContractDifficulty.Medium] = false, [EYContractDifficulty.Hard] = false },
|
||||||
|
["Osiris"] = new Dictionary<EYContractDifficulty, bool> { [EYContractDifficulty.Easy] = false, [EYContractDifficulty.Medium] = false, [EYContractDifficulty.Hard] = false },
|
||||||
|
["ICA"] = new Dictionary<EYContractDifficulty, bool> { [EYContractDifficulty.Easy] = false, [EYContractDifficulty.Medium] = false, [EYContractDifficulty.Hard] = false },
|
||||||
|
};
|
||||||
|
|
||||||
|
foreach (var contract in contractsActive.Contracts) {
|
||||||
|
var contractData = contracts[contract.ContractID];
|
||||||
|
if (contractData.IsMainContract) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
currentQuests[contractData.Faction][contractData.Difficulty] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < factions.Length; i++) {
|
||||||
|
var faction = factions[i];
|
||||||
|
var factionProgression = JsonSerializer.Deserialize<int>(userData[$"FactionProgression{faction}"].Value);
|
||||||
|
var levels = levelsData[faction];
|
||||||
|
var level = levels.Length - Array.FindIndex(levels, (int xp) => {
|
||||||
|
return factionProgression >= xp;
|
||||||
|
});
|
||||||
|
|
||||||
|
for (var j = 0; j < difficulties.Length; j++) {
|
||||||
|
var difficulty = difficulties[j];
|
||||||
|
if (currentQuests[faction][difficulty]) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
var factionJobs = jobs[faction];
|
||||||
|
var jobsAvailable = Array.FindAll(factionJobs[difficulty], (string jobId) => {
|
||||||
|
return level >= contracts[jobId].UnlockData.Level;
|
||||||
|
});
|
||||||
|
string jobId = jobsAvailable.Length > 0 ? jobsAvailable[rnd.Next(jobsAvailable.Length)] : factionJobs[difficulty][0];
|
||||||
|
boards[i].Contracts[j] = new FYFactionContractData { ContractId = jobId };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastBoardRefreshTimeUtc.Seconds = now;
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string> { ["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData) }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return new FYGetPlayerContractsResult
|
return new FYGetPlayerContractsResult
|
||||||
{
|
{
|
||||||
@@ -38,72 +99,10 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
ActiveContracts = contractsActive.Contracts,
|
ActiveContracts = contractsActive.Contracts,
|
||||||
FactionsContracts = new FYFactionsContractsData
|
FactionsContracts = new FYFactionsContractsData
|
||||||
{
|
{
|
||||||
Boards = new List<FYFactionContractsData>
|
Boards = boards,
|
||||||
{
|
LastBoardRefreshTimeUtc = lastBoardRefreshTimeUtc
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "ICA",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-ICA-Gather-1",
|
|
||||||
},
|
},
|
||||||
new FYFactionContractData
|
RefreshHours24UtcFromBackend = 12 // Doesn't seem to work
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-ICA-Uplink-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-ICA-Uplink-1",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Korolev",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-KOR-Mine-4",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-KOR-Mine-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-KOR-PvP-6",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Osiris",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-Osiris-Brightcaps-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-Osiris-Gather-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-Osiris-Gather-7",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
LastBoardRefreshTimeUtc = new FYTimestamp
|
|
||||||
{
|
|
||||||
Seconds = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
RefreshHours24UtcFromBackend = 12
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,9 +74,9 @@ public class RequestMissionCompleted : ICloudScriptFunction<FYRequestMissionComp
|
|||||||
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
||||||
balance.HardCurrency += reward.RewardAmount;
|
balance.HardCurrency += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else if (reward.RewardRowHandle.RowName == "InsuranceToken") {
|
} else if (reward.RewardRowHandle.RowName == "InsuranceCurrency") {
|
||||||
balance.InsuranceTokens += reward.RewardAmount;
|
balance.InsuranceCurrency += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance.InsuranceTokens });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||||
} else {
|
} else {
|
||||||
// TODO: Inventory limit check
|
// TODO: Inventory limit check
|
||||||
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
||||||
|
|||||||
+2
@@ -82,6 +82,7 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
|||||||
// 2. Stack existing items - deletes existing items and updates amount of existing item.
|
// 2. Stack existing items - deletes existing items and updates amount of existing item.
|
||||||
// 3. Change vanity data - updates an existing item.
|
// 3. Change vanity data - updates an existing item.
|
||||||
// 4. Change weapon mods - updates an existing item.
|
// 4. Change weapon mods - updates an existing item.
|
||||||
|
// IMPORTANT: The same request is currently used to report the updated inventory in the end of match.
|
||||||
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||||
foreach (var item in inventory) {
|
foreach (var item in inventory) {
|
||||||
if (!request.ItemsToRemove.Contains(item.ItemId)) {
|
if (!request.ItemsToRemove.Contains(item.ItemId)) {
|
||||||
@@ -98,6 +99,7 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
|||||||
inventoryItem.ModData = item.ModData;
|
inventoryItem.ModData = item.ModData;
|
||||||
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
||||||
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
||||||
|
inventoryItem.Durability = item.Durability;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Check updated items and validate new items
|
// TODO: Check updated items and validate new items
|
||||||
|
|||||||
@@ -117,11 +117,11 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
||||||
// TODO: Probably better to decide based on item kind instead
|
// NOTE: Ammo and consumables have reverse price mapping.
|
||||||
if (inventoryItem.Durability == -1) {
|
if (blueprintData.Kind == "Ammo" || blueprintData.Kind == "Ability") {
|
||||||
factionProgression += (int)((float)blueprintData.OverrideScrappingReputation / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
factionProgression += (int)((float)blueprintData.OverrideScrappingReputation / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||||
balance.SoftCurrency += (int)((float)blueprintData.OverrideScrappingReturns / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
balance.SoftCurrency += (int)((float)blueprintData.OverrideScrappingReturns / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||||
} else {
|
} else if (blueprintData.Kind == "Armor") {
|
||||||
factionProgression += (int)Math.Max(
|
factionProgression += (int)Math.Max(
|
||||||
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReputation,
|
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReputation,
|
||||||
blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier
|
blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||||
@@ -130,6 +130,9 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReturns,
|
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReturns,
|
||||||
blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier
|
blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
factionProgression += blueprintData.OverrideScrappingReputation * inventoryItem.Amount;
|
||||||
|
balance.SoftCurrency += blueprintData.OverrideScrappingReturns * inventoryItem.Amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
scrappedItemIds.Add(itemId);
|
scrappedItemIds.Add(itemId);
|
||||||
|
|||||||
+1
-1
@@ -135,7 +135,7 @@ public class StartPlayerQuarterUpgradeClient : ICloudScriptFunction<FYStartPlaye
|
|||||||
userId, userId,
|
userId, userId,
|
||||||
new Dictionary<string, string>{
|
new Dictionary<string, string>{
|
||||||
["Balance"] = JsonSerializer.Serialize(balance),
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
["Inventory"] = JsonSerializer.Serialize(inventory),
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
["PlayerQuartersLevel"] = JsonSerializer.Serialize(userPlayerQuarters),
|
["PlayerQuartersLevel"] = JsonSerializer.Serialize(userPlayerQuarters),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
// Custom request for dedicated server implementation
|
||||||
|
|
||||||
|
public class FYUpdatePlayerActiveContractsRequest {
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserID { get; set; }
|
||||||
|
[JsonPropertyName("contracts")]
|
||||||
|
public List<FYActiveContractPlayerData> Contracts { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class FYUpdatePlayerActiveContractsResult {
|
||||||
|
}
|
||||||
|
|
||||||
|
[CloudScriptFunction("UpdatePlayerActiveContracts")]
|
||||||
|
public class UpdatePlayerActiveContracts : ICloudScriptFunction<FYUpdatePlayerActiveContractsRequest, FYUpdatePlayerActiveContractsResult>
|
||||||
|
{
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
|
||||||
|
public UpdatePlayerActiveContracts(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
|
{
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<FYUpdatePlayerActiveContractsResult> ExecuteAsync(FYUpdatePlayerActiveContractsRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
|
||||||
|
foreach (var contract in request.Contracts) {
|
||||||
|
var foundContract = contractsActive.Contracts.Find(item => item.ContractID == contract.ContractID);
|
||||||
|
if (foundContract == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
foundContract.Progress = contract.Progress;
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string>{ ["ContractsActive"] = JsonSerializer.Serialize(contractsActive) }
|
||||||
|
);
|
||||||
|
|
||||||
|
return new FYUpdatePlayerActiveContractsResult
|
||||||
|
{};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -43,9 +43,9 @@ public class UpdateRetentionBonus : ICloudScriptFunction<FYRetentionBonusRequest
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
var currentMidnight = (int)new DateTimeOffset(DateTime.UtcNow.Date, TimeSpan.Zero).ToUnixTimeSeconds();
|
||||||
var nextClaimTime = retentionBonus.LastClaimTime.Seconds + 60 * 60 * 24 * 2;
|
var nextClaimTime = retentionBonus.LastClaimTime.Seconds + 60 * 60 * 24;
|
||||||
if (now < nextClaimTime) {
|
if (currentMidnight < nextClaimTime) {
|
||||||
return new FYRetentionBonusResult
|
return new FYRetentionBonusResult
|
||||||
{
|
{
|
||||||
UserId = userId,
|
UserId = userId,
|
||||||
@@ -58,7 +58,7 @@ public class UpdateRetentionBonus : ICloudScriptFunction<FYRetentionBonusRequest
|
|||||||
var bonusData = JsonSerializer.Deserialize<Dictionary<string, TitleDataRetentionBonusInfo>>(titleData["RetentionBonusData"]);
|
var bonusData = JsonSerializer.Deserialize<Dictionary<string, TitleDataRetentionBonusInfo>>(titleData["RetentionBonusData"]);
|
||||||
|
|
||||||
retentionBonus.DaysClaimed++;
|
retentionBonus.DaysClaimed++;
|
||||||
retentionBonus.LastClaimTime.Seconds = now;
|
retentionBonus.LastClaimTime.Seconds = currentMidnight;
|
||||||
retentionBonus.ClaimedAll = retentionBonus.DaysClaimed >= 14;
|
retentionBonus.ClaimedAll = retentionBonus.DaysClaimed >= 14;
|
||||||
|
|
||||||
// TODO: Currently only CB2 bonuses are considered
|
// TODO: Currently only CB2 bonuses are considered
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Prospect.Server.Api.Config;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
@@ -27,6 +29,13 @@ public class FYVivoxJoinTokenRequest
|
|||||||
[CloudScriptFunction("VivoxJoin")]
|
[CloudScriptFunction("VivoxJoin")]
|
||||||
public class VivoxJoin : ICloudScriptFunction<FYVivoxJoinTokenRequest, object>
|
public class VivoxJoin : ICloudScriptFunction<FYVivoxJoinTokenRequest, object>
|
||||||
{
|
{
|
||||||
|
private readonly VivoxConfig _settings;
|
||||||
|
|
||||||
|
public VivoxJoin(IOptions<VivoxConfig> settings)
|
||||||
|
{
|
||||||
|
_settings = settings.Value;
|
||||||
|
}
|
||||||
|
|
||||||
private int ReturnChannelType(string type) {
|
private int ReturnChannelType(string type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case "GLOBAL": return 2;
|
case "GLOBAL": return 2;
|
||||||
@@ -41,8 +50,7 @@ public class VivoxJoin : ICloudScriptFunction<FYVivoxJoinTokenRequest, object>
|
|||||||
public async Task<object> ExecuteAsync(FYVivoxJoinTokenRequest request)
|
public async Task<object> ExecuteAsync(FYVivoxJoinTokenRequest request)
|
||||||
{
|
{
|
||||||
var exp = (int)DateTimeOffset.UtcNow.AddDays(1).ToUnixTimeSeconds();
|
var exp = (int)DateTimeOffset.UtcNow.AddDays(1).ToUnixTimeSeconds();
|
||||||
// TODO: Replace with app configuration
|
var token = TokenGenerator.vxGenerateToken(_settings.Key, _settings.Issuer, exp, "join", request.Username, request.Channel);
|
||||||
var token = TokenGenerator.vxGenerateToken("key", "issuer", exp, "join", request.Username, request.Channel);
|
|
||||||
|
|
||||||
return new FYVivoxJoinData
|
return new FYVivoxJoinData
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Microsoft.Extensions.Options;
|
||||||
|
using Prospect.Server.Api.Config;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
|
|
||||||
@@ -84,12 +86,18 @@ public class TokenGenerator
|
|||||||
[CloudScriptFunction("VivoxLogin")]
|
[CloudScriptFunction("VivoxLogin")]
|
||||||
public class VivoxLogin : ICloudScriptFunction<FYVivoxLoginTokenRequest, FYVivoxJoinData>
|
public class VivoxLogin : ICloudScriptFunction<FYVivoxLoginTokenRequest, FYVivoxJoinData>
|
||||||
{
|
{
|
||||||
|
private readonly VivoxConfig _settings;
|
||||||
|
|
||||||
|
public VivoxLogin(IOptions<VivoxConfig> settings)
|
||||||
|
{
|
||||||
|
_settings = settings.Value;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<FYVivoxJoinData> ExecuteAsync(FYVivoxLoginTokenRequest request)
|
public async Task<FYVivoxJoinData> ExecuteAsync(FYVivoxLoginTokenRequest request)
|
||||||
{
|
{
|
||||||
// TODO: Replace with app configuration
|
var channel = $"sip:confctl-g-{_settings.Issuer}.testchannel@mtu1xp.vivox.com"; // e - echo channel, g - global, p - positional
|
||||||
var channel = "sip:confctl-g-<issuer>.testchannel@mtu1xp.vivox.com"; // e - echo channel, g - global, p - positional
|
|
||||||
var exp = (int)DateTimeOffset.UtcNow.AddSeconds(90).ToUnixTimeSeconds();
|
var exp = (int)DateTimeOffset.UtcNow.AddSeconds(90).ToUnixTimeSeconds();
|
||||||
var token = TokenGenerator.vxGenerateToken("key", "issuer", exp, "login", request.Username, channel);
|
var token = TokenGenerator.vxGenerateToken(_settings.Key, _settings.Issuer, exp, "login", request.Username, channel);
|
||||||
|
|
||||||
return new FYVivoxJoinData
|
return new FYVivoxJoinData
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,18 +1,26 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Microsoft.Extensions.Options;
|
||||||
|
using Prospect.Server.Api.Config;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
[CloudScriptFunction("VivoxSettings")]
|
[CloudScriptFunction("VivoxSettings")]
|
||||||
public class VivoxSettings : ICloudScriptFunction<FYEmptyRequest, FYVivoxSettingsData>
|
public class VivoxSettings : ICloudScriptFunction<FYEmptyRequest, FYVivoxSettingsData>
|
||||||
{
|
{
|
||||||
|
private readonly VivoxConfig _settings;
|
||||||
|
|
||||||
|
public VivoxSettings(IOptions<VivoxConfig> settings)
|
||||||
|
{
|
||||||
|
_settings = settings.Value;
|
||||||
|
}
|
||||||
|
|
||||||
public Task<FYVivoxSettingsData> ExecuteAsync(FYEmptyRequest request)
|
public Task<FYVivoxSettingsData> ExecuteAsync(FYEmptyRequest request)
|
||||||
{
|
{
|
||||||
return Task.FromResult(new FYVivoxSettingsData
|
return Task.FromResult(new FYVivoxSettingsData
|
||||||
{
|
{
|
||||||
// TODO: Replace with app configuration
|
VivoxDomain = _settings.Domain,
|
||||||
// VivoxDomain = "",
|
VivoxIssuer = _settings.Issuer,
|
||||||
// VivoxIssuer = "",
|
VivoxServer = _settings.Server
|
||||||
// VivoxServer = ""
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,3 +29,30 @@ public class FYEnterMatchAzureFunction
|
|||||||
[JsonPropertyName("loginNonce")]
|
[JsonPropertyName("loginNonce")]
|
||||||
public string LoginNonce { get; set; }
|
public string LoginNonce { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class FYEnterMatchAzureFunctionCB
|
||||||
|
{
|
||||||
|
[JsonPropertyName("optimalRegion")]
|
||||||
|
public string? OptimalRegion { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("isMatch")]
|
||||||
|
public bool IsMatch { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("bypassMaintenanceMode")]
|
||||||
|
public bool BypassMaintenanceMode { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("debugOption")]
|
||||||
|
public string? DebugOption { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("mapName")]
|
||||||
|
public string? MapName { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("squad_id")]
|
||||||
|
public string? SquadId { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("purchaseInsuranceRequest")]
|
||||||
|
public FYPurchaseInventoryInsuranceRequest PurchaseInventoryInsurances { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("loginNonce")]
|
||||||
|
public string LoginNonce { get; set; }
|
||||||
|
}
|
||||||
+27
@@ -21,3 +21,30 @@ public class FYEnterMatchmakingResult
|
|||||||
[JsonPropertyName("errorMessage")]
|
[JsonPropertyName("errorMessage")]
|
||||||
public string ErrorMessage { get; set; }
|
public string ErrorMessage { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class FYEnterMatchAzureFunctionResult
|
||||||
|
{
|
||||||
|
[JsonPropertyName("success")]
|
||||||
|
public bool Success { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("address")]
|
||||||
|
public string? Address { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("errorMessage")]
|
||||||
|
public string? ErrorMessage { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("port")]
|
||||||
|
public int Port { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("sharedIndex")]
|
||||||
|
public int ShardIndex { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("singleplayerStation")]
|
||||||
|
public bool SingleplayerStation { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("maintenanceMode")]
|
||||||
|
public bool MaintenanceMode { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("sessionTimeJoinDelay")]
|
||||||
|
public float SessionTimeJoinDelay { get; set; }
|
||||||
|
}
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,7 +1,9 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Functions;
|
using Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Database;
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.UserData;
|
namespace Prospect.Server.Api.Services.UserData;
|
||||||
@@ -171,6 +173,25 @@ public class UserDataService
|
|||||||
["GlobalVanity"] = (false, $"{{\"activeGlobalVanityIds\":[\"Season03_Spray_13\",\"Banner_MIne\",\"Emote_Chill_01\",\"\",\"\",\"\",\"\",\"\"], \"droppodId\": \"VDP_Omega02\"}}"),
|
["GlobalVanity"] = (false, $"{{\"activeGlobalVanityIds\":[\"Season03_Spray_13\",\"Banner_MIne\",\"Emote_Chill_01\",\"\",\"\",\"\",\"\",\"\"], \"droppodId\": \"VDP_Omega02\"}}"),
|
||||||
["CharacterVanity"] = (false, JsonSerializer.Serialize(defaultVanity)),
|
["CharacterVanity"] = (false, JsonSerializer.Serialize(defaultVanity)),
|
||||||
["Inventory"] = (false, "[]"),
|
["Inventory"] = (false, "[]"),
|
||||||
|
["JobBoardsData"] = (false, JsonSerializer.Serialize(
|
||||||
|
new JobBoardsData {
|
||||||
|
LastBoardRefreshTimeUtc = new CloudScript.Models.Data.FYTimestamp { Seconds = 0 },
|
||||||
|
Boards = [
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "Korolev",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
},
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "Osiris",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
},
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "ICA",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
)),
|
||||||
["VanityItems"] = (false, "[]"),
|
["VanityItems"] = (false, "[]"),
|
||||||
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
||||||
["Balance"] = (false, "{\"IN\": 0,\"AU\": 800,\"SC\": 30000}"),
|
["Balance"] = (false, "{\"IN\": 0,\"AU\": 800,\"SC\": 30000}"),
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ public class Startup
|
|||||||
services.Configure<AuthTokenSettings>(Configuration.GetSection(nameof(AuthTokenSettings)));
|
services.Configure<AuthTokenSettings>(Configuration.GetSection(nameof(AuthTokenSettings)));
|
||||||
services.Configure<DatabaseSettings>(Configuration.GetSection(nameof(DatabaseSettings)));
|
services.Configure<DatabaseSettings>(Configuration.GetSection(nameof(DatabaseSettings)));
|
||||||
services.Configure<PlayFabSettings>(Configuration.GetSection(nameof(PlayFabSettings)));
|
services.Configure<PlayFabSettings>(Configuration.GetSection(nameof(PlayFabSettings)));
|
||||||
|
services.Configure<VivoxConfig>(Configuration.GetSection(nameof(VivoxConfig)));
|
||||||
|
services.Configure<SignalRSettings>(Configuration.GetSection(nameof(SignalRSettings)));
|
||||||
|
|
||||||
services.AddSingleton<AuthTokenService>();
|
services.AddSingleton<AuthTokenService>();
|
||||||
services.AddSingleton<UserDataService>();
|
services.AddSingleton<UserDataService>();
|
||||||
@@ -65,7 +67,7 @@ public class Startup
|
|||||||
app.UseDeveloperExceptionPage();
|
app.UseDeveloperExceptionPage();
|
||||||
}
|
}
|
||||||
|
|
||||||
app.UseHttpsRedirection();
|
// app.UseHttpsRedirection();
|
||||||
app.UseSerilogRequestLogging();
|
app.UseSerilogRequestLogging();
|
||||||
app.UseMiddleware<RequestLoggerMiddleware>();
|
app.UseMiddleware<RequestLoggerMiddleware>();
|
||||||
app.UseRouting();
|
app.UseRouting();
|
||||||
|
|||||||
@@ -10,10 +10,23 @@
|
|||||||
"PublisherId": "850902E5B40508ED",
|
"PublisherId": "850902E5B40508ED",
|
||||||
"TitleId": "2EA46"
|
"TitleId": "2EA46"
|
||||||
},
|
},
|
||||||
|
"SignalRSettings": {
|
||||||
|
"SignalRURL": "https://127.0.0.1:8443/signalr/?hub=pubsub",
|
||||||
|
"SignalRAccessToken": "TEST"
|
||||||
|
},
|
||||||
|
"VivoxConfig": {
|
||||||
|
"Key": "",
|
||||||
|
"Issuer": "",
|
||||||
|
"Domain": "",
|
||||||
|
"Server": ""
|
||||||
|
},
|
||||||
"Kestrel": {
|
"Kestrel": {
|
||||||
"Endpoints": {
|
"Endpoints": {
|
||||||
"Https": {
|
"Https": {
|
||||||
"Url": "https://2EA46.playfabapi.com"
|
"Url": "https://127.0.0.1:8443"
|
||||||
|
},
|
||||||
|
"Http": {
|
||||||
|
"Url": "http://127.0.0.1:8000"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Certificates": {
|
"Certificates": {
|
||||||
|
|||||||
+53
-26
@@ -21,7 +21,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Tests", "Pr
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Generator", "Prospect.Unreal.Generator\Prospect.Unreal.Generator.csproj", "{71E3E262-49C5-4B6C-9670-D0741CEDB63B}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Generator", "Prospect.Unreal.Generator\Prospect.Unreal.Generator.csproj", "{71E3E262-49C5-4B6C-9670-D0741CEDB63B}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Client.Loader", "Prospect.Client.Loader\Prospect.Client.Loader.vcxproj", "{8170A17F-E536-4FDB-BC01-78BF09A9A48B}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Client.Loader", "Prospect.Client.Loader\Prospect.Client.Loader.vcxproj", "{04B1D963-2BCB-4887-9D6D-04CB3366A348}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Agent", "Prospect.Agent\Prospect.Agent.vcxproj", "{A9BA7D25-F239-4320-A0DC-85E8001FD669}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -183,30 +185,54 @@ Global
|
|||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x64.ActiveCfg = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x86.Build.0 = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x86.Build.0 = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x86.Build.0 = Release|Win32
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x86.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x86.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x86.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -218,7 +244,8 @@ Global
|
|||||||
{380DD490-8F01-4025-91D7-74C289AA5B75} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
{380DD490-8F01-4025-91D7-74C289AA5B75} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34} = {168B6247-2D33-4942-AB3F-C5041B3BDFEA}
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34} = {168B6247-2D33-4942-AB3F-C5041B3BDFEA}
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {12888C62-D3A2-4DD7-A9A5-1481D95865D0}
|
SolutionGuid = {12888C62-D3A2-4DD7-A9A5-1481D95865D0}
|
||||||
|
|||||||
@@ -4,8 +4,13 @@ from cryptography.x509 import NameOID, CertificateBuilder
|
|||||||
from cryptography import x509
|
from cryptography import x509
|
||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
|
import argparse
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument("--common-name", type=str, default='127.0.0.1')
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
if os.path.exists("certificate.pfx"):
|
if os.path.exists("certificate.pfx"):
|
||||||
q = input("certificate.pfx already exists. Are you sure you want to generate a new certificate? (y/n): ")
|
q = input("certificate.pfx already exists. Are you sure you want to generate a new certificate? (y/n): ")
|
||||||
if q != "y":
|
if q != "y":
|
||||||
@@ -20,7 +25,7 @@ def main():
|
|||||||
|
|
||||||
# Generate self-signed certificate
|
# Generate self-signed certificate
|
||||||
subject = issuer = x509.Name([
|
subject = issuer = x509.Name([
|
||||||
x509.NameAttribute(NameOID.COMMON_NAME, '2EA46.playfabapi.com'),
|
x509.NameAttribute(NameOID.COMMON_NAME, args.common_name),
|
||||||
])
|
])
|
||||||
|
|
||||||
cert = CertificateBuilder().subject_name(
|
cert = CertificateBuilder().subject_name(
|
||||||
|
|||||||
Reference in New Issue
Block a user