Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Yury
|
44a7554616 |
@@ -11,9 +11,10 @@ Also known as "The Cycle: Frontier".
|
||||
- [2. Unpack `Prospect.Server.Api`](#2-unpack-prospectserverapi)
|
||||
- [3. Patch the `hosts` file](#3-patch-the-hosts-file)
|
||||
- [4. Generate and import SSL certificate](#4-generate-and-import-ssl-certificate)
|
||||
- [5. Extract `LoaderPack` to the game](#5-extract-loaderpack-to-the-game)
|
||||
- [6. Run the server](#6-run-the-server)
|
||||
- [7. Run the game](#7-run-the-game)
|
||||
- [5. Add `steam_appid` to the game](#5-add-steam_appid-to-the-game)
|
||||
- [6. Create a game shortcut with specified arguments](#6-create-a-game-shortcut-with-specified-arguments)
|
||||
- [7. Run the server](#7-run-the-server)
|
||||
- [8. Run the game](#8-run-the-game)
|
||||
- [Troubleshooting and FAQ](#troubleshooting-and-faq)
|
||||
- [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)
|
||||
@@ -29,7 +30,10 @@ Also known as "The Cycle: Frontier".
|
||||
* [x] EULA acceptance
|
||||
* [x] Tutorial
|
||||
* [x] Single-player station (Season 2 and Season 3):
|
||||
* [x] Onboarding
|
||||
* [ ] Onboarding
|
||||
* [x] Talk to Badum
|
||||
* [x] Equip items
|
||||
* [ ] Deploy to Fortuna
|
||||
* [ ] Matchmaking and deployment
|
||||
* [x] Solo
|
||||
* [ ] Squad
|
||||
@@ -38,15 +42,16 @@ Also known as "The Cycle: Frontier".
|
||||
* [x] Inventory and loadout
|
||||
* [ ] Loadout presets (Season 3)
|
||||
* [x] Quests
|
||||
* [ ] Job boards
|
||||
* [x] Faction progression
|
||||
* [ ] Season pass
|
||||
* [ ] Aurum Shops
|
||||
* [ ] Shops
|
||||
* [ ] Daily shop
|
||||
* [ ] Weekly shop
|
||||
* [ ] Shop rotation
|
||||
* [x] Daily login
|
||||
* [x] Character appearance and emotes
|
||||
* [x] Item Shops
|
||||
* [x] Shops
|
||||
* [x] Crafting station
|
||||
* [x] Quarters
|
||||
* [x] Player balance
|
||||
@@ -58,16 +63,14 @@ Also known as "The Cycle: Frontier".
|
||||
* [ ] Game mechanics
|
||||
* [x] Can deploy through terminal
|
||||
* [x] Can deploy with loadout
|
||||
* [x] Can evac
|
||||
* [ ] Can evac
|
||||
* [ ] Can do quests
|
||||
* [x] Delivery quests
|
||||
* [ ] Kill quests
|
||||
* [x] Can gain/lose loot
|
||||
* [x] Can use Alien Forge.
|
||||
* [x] Map content
|
||||
* [ ] Can gain/lose loot
|
||||
* [ ] Can use Alien Forge.
|
||||
* [ ] Map content
|
||||
* [x] Bright Sands
|
||||
* [x] Crescent Falls
|
||||
* [x] Tharis Island
|
||||
* [ ] Crescent Falls
|
||||
* [ ] Tharis Island
|
||||
|
||||
## Running locally
|
||||
|
||||
@@ -87,29 +90,29 @@ 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. [`Prospect.Server.Api` and `LoaderPack`](https://github.com/deiteris/Prospect/releases) from the Releases section:
|
||||
1. [Latest `Prospect.Server.Api`](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:
|
||||
|
||||
- The latest version from [Steam](https://steamcommunity.com/app/868270).
|
||||
|
||||
- Season 2 client version `4623363103423775682` from SteamDB. See [download instructions below](#11-how-to-download-season-2-client-from-steamdb-using-steam-console).
|
||||
- Season 2 client. See [download instructions below](#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
|
||||
- Any other version, even Season 1 works.
|
||||
|
||||
### 1.1 How to download Season 2 client from SteamDB using Steam console
|
||||
|
||||
> [!WARNING]
|
||||
> This will overwrite the existing client if you try to download a different manifest!
|
||||
|
||||
1. With Steam running, press `Win+R` and enter `steam://nav/console`. A Steam console will open.
|
||||
1. With Steam running, click <steam://nav/console> to open Steam console. Alternatively, you can press `Win+R` and enter `steam://nav/console`.
|
||||
|
||||
1. Open [The Cycle: Frontier SteamDB manifests](https://steamdb.info/depot/868271/manifests/).
|
||||
|
||||
1. Make sure you have **Copy format** set to **Steam console**.
|
||||
|
||||
1. Press `CTRL+F` and enter `4623363103423775682` to find the manifest for Season 2 version 2.7.2 client.
|
||||
|
||||
1. Click the  icon to copy the download command.
|
||||
@@ -156,24 +159,38 @@ to successfully communicate with the local server. Do the following:
|
||||
|
||||
1. Click **Finish**. A **Security Warning** popup may appear, make sure it specifies `2EA46.playfabapi.com` certification authority and click **Yes**.
|
||||
|
||||
### 5. Extract `LoaderPack` to the game
|
||||
### 5. Add `steam_appid` to the game
|
||||
|
||||
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
||||
|
||||
1. Open the `LoaderPack` archive.
|
||||
1. Right-click in the folder > **New** > **Text Document**, and name it `steam_appid`.
|
||||
|
||||
1. Drag and drop the contents of the `LoaderPack` archive to the game.
|
||||
1. Open `steam_appid` and enter `480`.
|
||||
|
||||
1. Create a shortcut for the `Prospect.Client.Loader` that you will use later to launch the game.
|
||||
1. Save and close the file.
|
||||
|
||||
### 6. Run the server
|
||||
### 6. Create a game shortcut with specified arguments
|
||||
|
||||
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
||||
|
||||
1. Right-click `Prospect-Win64-Shipping.exe` > **Create Shortcut**.
|
||||
|
||||
1. Right-click the created shortcut > **Properties**.
|
||||
|
||||
1. In the **Target** field, add the following parameters after the quote ` -log -steam_auth PF_TITLEID=2EA46`. Note the space after the quote.
|
||||
|
||||
1. Move the shortcut to desktop.
|
||||
|
||||
### 7. 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.
|
||||
|
||||
> [!IMPORTANT]
|
||||
> 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.
|
||||
|
||||
### 7. Run the game
|
||||
### 8. 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.
|
||||
|
||||
|
||||
@@ -1,135 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<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>17.0</VCProjectVersion>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<ProjectGuid>{04b1d963-2bcb-4887-9d6d-04cb3366a348}</ProjectGuid>
|
||||
<RootNamespace>ProspectClientLoader</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</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|Win32'">
|
||||
<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|Win32'">
|
||||
<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)'=='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" />
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="main.cpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
@@ -1,22 +0,0 @@
|
||||
<?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>
|
||||
<ClCompile Include="main.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -1,479 +0,0 @@
|
||||
#include <windows.h>
|
||||
#include <tlhelp32.h>
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
// Function to create and launch a process with parameters
|
||||
HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
||||
STARTUPINFO si = { 0 };
|
||||
PROCESS_INFORMATION pi = { 0 };
|
||||
si.cb = sizeof(si);
|
||||
|
||||
// Command-line arguments to pass to the process
|
||||
wchar_t commandLine[MAX_PATH] = L""; // Buffer for full command
|
||||
_snwprintf_s(commandLine, sizeof(commandLine) / sizeof(wchar_t), L"\"%s\" -log -steam_auth PF_TITLEID=2EA46", exePath);
|
||||
|
||||
if (CreateProcess(NULL, commandLine, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi)) {
|
||||
*processID = pi.dwProcessId;
|
||||
printf("Successfully started process: %ls (PID: %lu)\n", exePath, *processID);
|
||||
ResumeThread(pi.hThread);
|
||||
CloseHandle(pi.hThread);
|
||||
return pi.hProcess;
|
||||
}
|
||||
else {
|
||||
printf("Failed to start process. Error: %lu\n", GetLastError());
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
// Function to get the base address of the main module (PE Image)
|
||||
uintptr_t GetModuleBaseAddress(DWORD processID) {
|
||||
uintptr_t baseAddress = 0;
|
||||
HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, processID);
|
||||
if (hSnapshot != INVALID_HANDLE_VALUE) {
|
||||
MODULEENTRY32 moduleEntry;
|
||||
moduleEntry.dwSize = sizeof(MODULEENTRY32);
|
||||
if (Module32First(hSnapshot, &moduleEntry)) {
|
||||
baseAddress = (uintptr_t)moduleEntry.modBaseAddr;
|
||||
}
|
||||
CloseHandle(hSnapshot);
|
||||
}
|
||||
else {
|
||||
printf("Failed to take process snapshot. Error: %lu\n", GetLastError());
|
||||
}
|
||||
return baseAddress;
|
||||
}
|
||||
|
||||
// Function to get a handle to the target process
|
||||
HANDLE OpenTargetProcess(DWORD processID) {
|
||||
HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, processID);
|
||||
if (hProcess == NULL) {
|
||||
printf("Failed to open process. Error: %lu\n", GetLastError());
|
||||
}
|
||||
return hProcess;
|
||||
}
|
||||
|
||||
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];
|
||||
SIZE_T bytesRead;
|
||||
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||
return buffer[0] == 0x32 && buffer[1] == 0xDB;
|
||||
}
|
||||
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 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!");
|
||||
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!");
|
||||
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!");
|
||||
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!");
|
||||
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 = L"UE4SS.dll";
|
||||
// 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) {
|
||||
DWORD processID;
|
||||
uintptr_t imageBase;
|
||||
|
||||
HANDLE hProcess = StartProcess(processName, &processID);
|
||||
if (hProcess == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 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;
|
||||
}
|
||||
printf("PE Image Base Address: 0x%p\n", (void*)imageBase);
|
||||
|
||||
bool success = !PatchForceLevelStreaming(hProcess, imageBase) || !PatchUpdateInventory(hProcess, imageBase) || !PatchLoadPlayerContracts(hProcess, imageBase);
|
||||
if (success) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!Inject(hProcess)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Clean up
|
||||
CloseHandle(hProcess);
|
||||
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() {
|
||||
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) {
|
||||
// Wait for user input to exit
|
||||
printf("An error occurred when patching the executable! Press any key to exit...\n");
|
||||
getchar();
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -6,7 +6,6 @@ using Microsoft.Extensions.Options;
|
||||
using Prospect.Server.Api.Config;
|
||||
using Prospect.Server.Api.Models.Client;
|
||||
using Prospect.Server.Api.Models.Client.Data;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.Auth.User;
|
||||
@@ -297,7 +296,7 @@ public class ClientController : Controller
|
||||
Data = new FGetUserInventoryResult
|
||||
{
|
||||
Inventory = items,
|
||||
VirtualCurrency = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value),
|
||||
VirtualCurrency = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value),
|
||||
VirtualCurrencyRechargeTimes = new Dictionary<string, FVirtualCurrencyRechargeTime>()
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Client.Data;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
|
||||
namespace Prospect.Server.Api.Models.Client;
|
||||
|
||||
@@ -18,7 +17,7 @@ public class FGetUserInventoryResult
|
||||
/// </summary>
|
||||
[JsonPropertyName("VirtualCurrency")]
|
||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||
public PlayerBalance? VirtualCurrency { get; set; }
|
||||
public Dictionary<string, int>? VirtualCurrency { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// [optional] Array of virtual currency balance(s) belonging to the user.
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
|
||||
namespace Prospect.Server.Api.Models.Data;
|
||||
|
||||
public class PlayerBalance
|
||||
{
|
||||
[JsonPropertyName("AU")]
|
||||
public int HardCurrency { get; set; }
|
||||
|
||||
[JsonPropertyName("SC")]
|
||||
public int SoftCurrency { get; set; }
|
||||
|
||||
[JsonPropertyName("IN")]
|
||||
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,6 @@ public class TitleDataContractInfo {
|
||||
public TitleDataContractInfoUnlockData UnlockData { get; set; }
|
||||
[JsonPropertyName("IsMainContract")]
|
||||
public bool IsMainContract { get; set; }
|
||||
[JsonPropertyName("ContractDifficulty")]
|
||||
public EYContractDifficulty ContractDifficulty { get; set; }
|
||||
}
|
||||
|
||||
public class TitleDataContractInfoReward {
|
||||
@@ -28,7 +26,7 @@ public class TitleDataContractInfoReward {
|
||||
|
||||
public class TitleDataContractInfoObjective {
|
||||
[JsonPropertyName("Type")]
|
||||
public EYContractObjectiveType Type { get; set; }
|
||||
public int Type { get; set; }
|
||||
[JsonPropertyName("MaxProgress")]
|
||||
public int MaxProgress { get; set; }
|
||||
[JsonPropertyName("ItemToOwn")]
|
||||
@@ -39,26 +37,5 @@ public class TitleDataContractInfoUnlockData {
|
||||
[JsonPropertyName("Level")]
|
||||
public int Level { get; set; }
|
||||
[JsonPropertyName("Contracts")]
|
||||
public HashSet<string> Contracts { get; set; }
|
||||
public string[] Contracts { get; set; }
|
||||
}
|
||||
|
||||
public enum EYContractObjectiveType {
|
||||
Invalid = 0,
|
||||
Kills = 1,
|
||||
OwnNumOfItem = 2,
|
||||
DeadDrop = 3,
|
||||
VisitArea = 4,
|
||||
LootContainer = 5,
|
||||
FactionLevel = 6,
|
||||
CompletedMission = 7,
|
||||
MAX = 8
|
||||
}
|
||||
|
||||
public enum EYContractDifficulty
|
||||
{
|
||||
Invalid = 0,
|
||||
Easy = 1,
|
||||
Medium = 2,
|
||||
Hard = 3,
|
||||
MAX = 4
|
||||
};
|
||||
|
||||
@@ -28,11 +28,11 @@ public class TitleDataBlueprintInfo {
|
||||
[JsonPropertyName("ScrappingFactionProgressionIncrement")]
|
||||
public int ScrappingFactionProgressionIncrement { get; set; }
|
||||
[JsonPropertyName("UnlockData")]
|
||||
public TitleDataItemUnlockData UnlockData { get; set; }
|
||||
public object UnlockData { get; set; }
|
||||
[JsonPropertyName("ModID")]
|
||||
public int? ModID { get; set; }
|
||||
[JsonPropertyName("AlienForgeCatalystToUpgradedItemMap")]
|
||||
public TitleDataItemAlienForgeCatalystToUpgradedItemMap AlienForgeCatalystToUpgradedItemMap { get; set; }
|
||||
public object? AlienForgeCatalystToUpgradedItemMap { get; set; }
|
||||
[JsonPropertyName("Rarity")]
|
||||
public int Rarity { get; set; }
|
||||
[JsonPropertyName("Kind")]
|
||||
@@ -61,22 +61,6 @@ public class TitleDataItemRecipeCostType {
|
||||
public int Amount { get; set; }
|
||||
}
|
||||
|
||||
public class TitleDataItemUnlockData {
|
||||
[JsonPropertyName("FactionUnlockLevel")]
|
||||
public int FactionUnlockLevel { get; set; }
|
||||
[JsonPropertyName("ContractLockPurchase")]
|
||||
public string ContractLockPurchase { get; set; }
|
||||
[JsonPropertyName("ContractLockCrafting")]
|
||||
public string ContractLockCrafting { get; set; }
|
||||
}
|
||||
|
||||
public class TitleDataItemAlienForgeCatalystToUpgradedItemMap {
|
||||
[JsonPropertyName("Catalyst")]
|
||||
public string Catalyst { get; set; }
|
||||
[JsonPropertyName("NextItem")]
|
||||
public string NextItem { get; set; }
|
||||
}
|
||||
|
||||
/*
|
||||
enum class EYItemType : uint8_t
|
||||
{
|
||||
|
||||
@@ -4,23 +4,6 @@
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>true</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<Configurations>Debug;Release;Season 3 Release;Season 2 Release;Season 2 Debug;Season 3 Debug</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Season 3 Debug|AnyCPU'">
|
||||
<Optimize>False</Optimize>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Season 3 Release|AnyCPU'">
|
||||
<Optimize>True</Optimize>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Season 2 Release|AnyCPU'">
|
||||
<Optimize>True</Optimize>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<Optimize>True</Optimize>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
@@ -59,7 +59,8 @@ public class ActivateContract : ICloudScriptFunction<FYActivateContractRequest,
|
||||
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
||||
|
||||
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||
if (!contracts.TryGetValue(request.ContractID, out var contract)) {
|
||||
var contract = contracts[request.ContractID];
|
||||
if (contract == null) {
|
||||
return new FYActivateContractResult
|
||||
{
|
||||
UserID = userId,
|
||||
@@ -70,14 +71,6 @@ public class ActivateContract : ICloudScriptFunction<FYActivateContractRequest,
|
||||
// TODO: Contract unlock criteria
|
||||
|
||||
var progress = new int[contract.Objectives.Length];
|
||||
// TODO: Automatically set max progress of kill and visit objectives. To remove once kill and visit objectives are reported by the client.
|
||||
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||
var objective = contract.Objectives[i];
|
||||
if (objective.Type != EYContractObjectiveType.OwnNumOfItem) {
|
||||
progress[i] = objective.MaxProgress;
|
||||
}
|
||||
}
|
||||
|
||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||
var contractData = new FYActiveContractPlayerData {
|
||||
ContractID = request.ContractID,
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
@@ -50,8 +49,6 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||
private readonly UserDataService _userDataService;
|
||||
private readonly TitleDataService _titleDataService;
|
||||
private readonly string[] difficulties = ["Easy", "Medium", "Hard"];
|
||||
private readonly Random rnd = new Random();
|
||||
|
||||
public ClaimActiveContract(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||
{
|
||||
@@ -68,10 +65,11 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||
}
|
||||
var userId = context.User.FindAuthUserId();
|
||||
var titleData = _titleDataService.Find(new List<string>{ "Contracts", "Blueprints", "Jobs", "LevelData" });
|
||||
var titleData = _titleDataService.Find(new List<string>{"Contracts", "Blueprints"});
|
||||
|
||||
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||
if (!contracts.TryGetValue(request.ContractID, out var contract)) {
|
||||
var contract = contracts[request.ContractID];
|
||||
if (contract == null) {
|
||||
return new FYClaimCompletedActiveContractRewardsResult
|
||||
{
|
||||
UserID = userId,
|
||||
@@ -83,17 +81,16 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
var factionKey = "FactionProgression" + contract.Faction;
|
||||
var userData = await _userDataService.FindAsync(
|
||||
userId, userId,
|
||||
new List<string>{"ContractsActive", "ContractsOneTimeCompleted", "Balance", "Inventory", factionKey, "JobBoardsData" }
|
||||
new List<string>{"ContractsActive", "ContractsOneTimeCompleted", "Balance", "Inventory", factionKey}
|
||||
);
|
||||
|
||||
var factionProgression = JsonSerializer.Deserialize<int>(userData[factionKey].Value);
|
||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].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<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
|
||||
var targetContractIdx = contractsActive.Contracts.FindIndex(item => item.ContractID == contract.Name);
|
||||
var targetContractIdx = contractsActive.Contracts.FindIndex(item => item.ContractID == request.ContractID);
|
||||
if (targetContractIdx == -1) {
|
||||
return new FYClaimCompletedActiveContractRewardsResult
|
||||
{
|
||||
@@ -105,17 +102,14 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
|
||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||
|
||||
var targetContract = contractsActive.Contracts[targetContractIdx];
|
||||
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
||||
HashSet<string> deletedItemsIds = [];
|
||||
// TODO: Optimize
|
||||
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||
var objective = contract.Objectives[i];
|
||||
// TODO: Proper progress verification of all objectives
|
||||
foreach (var objective in contract.Objectives) {
|
||||
int remaining = objective.MaxProgress;
|
||||
if (objective.Type == EYContractObjectiveType.OwnNumOfItem) {
|
||||
// NOTE: The backend may perform item ownership validation
|
||||
// since it has the information about the player's items.
|
||||
foreach (var item in inventory) {
|
||||
if (objective.Type == 2) {
|
||||
for (var i = 0; i < inventory.Count; i++) {
|
||||
var item = inventory[i];
|
||||
if (item.BaseItemId != objective.ItemToOwn) {
|
||||
continue;
|
||||
}
|
||||
@@ -131,11 +125,6 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// NOTE: A game server must write the correct progress
|
||||
// for other types of objectives.
|
||||
// The objectives are mapped by array index.
|
||||
remaining -= targetContract.Progress[i];
|
||||
}
|
||||
if (remaining > 0) {
|
||||
return new FYClaimCompletedActiveContractRewardsResult
|
||||
@@ -159,17 +148,15 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
List<FYCurrencyItem> changedCurrencies = [];
|
||||
foreach (var reward in contract.Rewards) {
|
||||
if (reward.ItemID == "SoftCurrency") {
|
||||
balance.SoftCurrency += reward.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||
balance["SC"] += reward.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
||||
} else if (reward.ItemID == "Aurum") {
|
||||
balance.HardCurrency += reward.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||
} else if (reward.ItemID == "InsuranceCurrency") {
|
||||
balance.InsuranceCurrency += reward.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||
balance["AU"] += reward.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
||||
} else if (reward.ItemID == "InsuranceToken") {
|
||||
balance["IN"] += reward.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance["IN"] });
|
||||
} else {
|
||||
// TODO: Inventory limit check
|
||||
|
||||
var blueprintData = blueprints[reward.ItemID];
|
||||
var remainingAmount = reward.Amount * blueprintData.AmountPerPurchase;
|
||||
|
||||
@@ -214,44 +201,14 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
factionProgression += contract.ReputationIncrease;
|
||||
contractsActive.Contracts.RemoveAt(targetContractIdx);
|
||||
// Main contracts can be completed only once.
|
||||
// Other contracts should be jobs.
|
||||
var newContractIdOnBoard = "";
|
||||
if (contract.IsMainContract) {
|
||||
contractsCompleted.ContractsIDs.Add(contract.Name);
|
||||
} else {
|
||||
var parts = contract.Name.Split('-');
|
||||
var difficulty = parts[1];
|
||||
|
||||
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
|
||||
var levels = levelsData[contract.Faction];
|
||||
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, 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 == difficulty);
|
||||
var factionJobs = jobs[contract.Faction];
|
||||
var jobsAvailable = Array.FindAll(factionJobs[difficulty], (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;
|
||||
contractsCompleted.ContractsIDs.Add(request.ContractID);
|
||||
}
|
||||
|
||||
// TODO: Check for next unlock in contracts instead of relying on client
|
||||
var newContracts = new List<FYActiveContractPlayerData>();
|
||||
foreach (var contractIdToUnlock in request.ContractsToUnlock) {
|
||||
var contractToUnlock = contracts[contractIdToUnlock];
|
||||
var progress = new int[contractToUnlock.Objectives.Length];
|
||||
// TODO: Automatically set max progress of kill and visit objectives. To remove once kill and visit objectives are reported by the client.
|
||||
for (var i = 0; i < contractToUnlock.Objectives.Length; i++) {
|
||||
var objective = contractToUnlock.Objectives[i];
|
||||
if (objective.Type != EYContractObjectiveType.OwnNumOfItem) {
|
||||
progress[i] = objective.MaxProgress;
|
||||
}
|
||||
}
|
||||
var newContract = new FYActiveContractPlayerData {
|
||||
ContractID = contractIdToUnlock,
|
||||
Progress = progress,
|
||||
@@ -268,7 +225,6 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
["Balance"] = JsonSerializer.Serialize(balance),
|
||||
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||
[factionKey] = JsonSerializer.Serialize(factionProgression),
|
||||
["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData),
|
||||
}
|
||||
);
|
||||
|
||||
@@ -276,12 +232,12 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
||||
{
|
||||
UserID = userId,
|
||||
Error = "",
|
||||
ClaimedContractID = contract.Name,
|
||||
ClaimedContractID = request.ContractID,
|
||||
ContractsActivated = newContracts,
|
||||
ItemsUpdatedOrRemoved = itemsUpdatedOrRemoved,
|
||||
ChangedCurrencies = changedCurrencies.ToArray(),
|
||||
ItemsGranted = itemsGranted,
|
||||
NewContractIdOnBoard = newContractIdOnBoard,
|
||||
NewContractIdOnBoard = "", // TODO: This should be a replacement contract apparently?
|
||||
PlayerFactionProgressData = new FYPlayerFactionProgressData {
|
||||
FactionID = contract.Faction,
|
||||
CurrentProgression = factionProgression,
|
||||
|
||||
+6
-8
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
@@ -104,7 +103,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
||||
};
|
||||
}
|
||||
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
var techTreeBonuses = JsonSerializer.Deserialize<CharacterTechTreeBonuses>(userData["CharacterTechTreeBonuses"].Value);
|
||||
|
||||
@@ -137,8 +136,8 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
||||
};
|
||||
}
|
||||
|
||||
balance.SoftCurrency += claimableAmount;
|
||||
changedCurrencies = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency }];
|
||||
balance["SC"] += claimableAmount;
|
||||
changedCurrencies = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] }];
|
||||
break;
|
||||
}
|
||||
case "playerquarters_gen_aurum": {
|
||||
@@ -163,8 +162,8 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
||||
};
|
||||
}
|
||||
|
||||
balance.HardCurrency += claimableAmount;
|
||||
changedCurrencies = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency }];
|
||||
balance["AU"] += claimableAmount;
|
||||
changedCurrencies = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] }];
|
||||
break;
|
||||
}
|
||||
case "playerquarters_gen_crate": {
|
||||
@@ -191,8 +190,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
|
||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||
var rewardsPool = dailyCrateRewards[crateTier - 1];
|
||||
|
||||
// TODO: Get rewardGrants from PassiveGenerators_CrateRewards_DT
|
||||
var items = PickItems(rewardsPool, 5);
|
||||
var items = PickItems(rewardsPool, 5); // TODO: Not sure how many items were granted
|
||||
// TODO: Stackable? GrantedItems doesn't imply granted OR updated.
|
||||
foreach (var item in items) {
|
||||
var itemInfo = blueprints[item.Name];
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
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,10 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using System.Text.Json.Serialization;
|
||||
using Microsoft.AspNetCore.SignalR;
|
||||
using Prospect.Server.Api.Hubs;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
|
||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||
|
||||
@@ -20,72 +17,15 @@ public class OnSquadMatchmakingSuccessMessage {
|
||||
[CloudScriptFunction("EnterMatchmakingMatch")]
|
||||
public class EnterMatchmakingMatchFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
||||
{
|
||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||
private readonly IHubContext<CycleHub> _hubContext;
|
||||
private readonly UserDataService _userDataService;
|
||||
private readonly TitleDataService _titleDataService;
|
||||
|
||||
public EnterMatchmakingMatchFunction(IHubContext<CycleHub> hubContext, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||
public EnterMatchmakingMatchFunction(IHubContext<CycleHub> hubContext)
|
||||
{
|
||||
_httpContextAccessor = httpContextAccessor;
|
||||
_hubContext = hubContext;
|
||||
_userDataService = userDataService;
|
||||
_titleDataService = titleDataService;
|
||||
}
|
||||
|
||||
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 {
|
||||
Success = true,
|
||||
SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
@@ -139,7 +138,7 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
||||
}
|
||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance"});
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
|
||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(blueprintsData["Blueprints"]);
|
||||
if (!blueprints.ContainsKey(request.BaseItemID)) {
|
||||
@@ -166,15 +165,16 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
||||
if (ingredient.Currency == "SoftCurrency") {
|
||||
var buyCost = request.PurchaseAmount * ingredient.Amount;
|
||||
remaining -= buyCost;
|
||||
balance.SoftCurrency -= buyCost;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||
balance["SC"] -= buyCost;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
||||
} else if (ingredient.Currency == "Aurum") {
|
||||
var buyCost = request.PurchaseAmount * ingredient.Amount;
|
||||
remaining -= buyCost;
|
||||
balance.HardCurrency -= buyCost;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||
balance["AU"] -= buyCost;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
||||
} else {
|
||||
foreach (var item in inventory) {
|
||||
for (var i = 0; i < inventory.Count; i++) {
|
||||
var item = inventory[i];
|
||||
if (item.BaseItemId != ingredient.Currency) {
|
||||
continue;
|
||||
}
|
||||
@@ -209,7 +209,6 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Inventory limit check
|
||||
// TODO: Refactor into a helper function
|
||||
var remainingAmount = request.PurchaseAmount * blueprintData.AmountPerPurchase;
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
using Prospect.Server.Api.Utils;
|
||||
@@ -66,20 +65,20 @@ public class RepairItem : ICloudScriptFunction<FYRepairItemRequest, FYRepairItem
|
||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||
var blueprintData = blueprints[item.BaseItemId];
|
||||
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
|
||||
var repairCost = blueprintData.RepairCostBase + (int)Math.Ceiling((1 - (float)item.Durability / blueprintData.DurabilityMax) * blueprintData.RepairCostMaxDurability);
|
||||
var repairCost = MapValue.Map(item.Durability, blueprintData.DurabilityMax, 0, blueprintData.RepairCostBase, blueprintData.RepairCostMaxDurability);
|
||||
if (item.Durability == 0) {
|
||||
repairCost += blueprintData.RepairCostModifierBroken;
|
||||
}
|
||||
if (balance.SoftCurrency < repairCost) {
|
||||
if (balance["SC"] < repairCost) {
|
||||
return new FYRepairItemResult
|
||||
{
|
||||
UserID = userId,
|
||||
Error = "Insufficient balance",
|
||||
};
|
||||
}
|
||||
balance.SoftCurrency -= repairCost;
|
||||
balance["SC"] -= repairCost;
|
||||
item.Durability = blueprintData.DurabilityMax;
|
||||
|
||||
await _userDataService.UpdateAsync(
|
||||
@@ -96,7 +95,7 @@ public class RepairItem : ICloudScriptFunction<FYRepairItemRequest, FYRepairItem
|
||||
Error = "",
|
||||
ChangedItems = [item],
|
||||
ChangedCurrencies = [
|
||||
new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency },
|
||||
new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] },
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
+69
-70
@@ -1,7 +1,4 @@
|
||||
using System.Collections;
|
||||
using System.Diagnostics.Contracts;
|
||||
using System.Text.Json;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using System.Text.Json;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
@@ -14,16 +11,11 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
||||
{
|
||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||
private readonly UserDataService _userDataService;
|
||||
private readonly TitleDataService _titleDataService;
|
||||
private readonly string[] factions = ["Korolev", "Osiris", "ICA"]; // TODO: Order is important
|
||||
private readonly string[] difficulties = ["Easy", "Medium", "Hard"];
|
||||
private readonly Random rnd = new Random();
|
||||
|
||||
public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||
public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||
{
|
||||
_httpContextAccessor = httpContextAccessor;
|
||||
_userDataService = userDataService;
|
||||
_titleDataService = titleDataService;
|
||||
}
|
||||
|
||||
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
||||
@@ -34,65 +26,10 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
||||
return new FYGetPlayerContractsResult{};
|
||||
}
|
||||
var userId = context.User.FindAuthUserId();
|
||||
|
||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{ "ContractsActive", "JobBoardsData", "FactionProgressionKorolev", "FactionProgressionICA", "FactionProgressionOsiris" });
|
||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
||||
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<string, string[]>>>(titleData["Jobs"]);
|
||||
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
|
||||
var currentQuests = new Dictionary<string, Dictionary<string, bool>> {
|
||||
["Korolev"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||
["Osiris"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||
["ICA"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||
};
|
||||
|
||||
foreach (var contract in contractsActive.Contracts) {
|
||||
var parts = contract.ContractID.Split('-');
|
||||
if (parts[0] != "NEW") {
|
||||
continue;
|
||||
}
|
||||
var difficulty = parts[1];
|
||||
var faction = parts[2] == "KOR" ? "Korolev" : parts[2];
|
||||
currentQuests[faction][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) }
|
||||
);
|
||||
}
|
||||
// TODO: Get player's contract boards and refresh
|
||||
|
||||
return new FYGetPlayerContractsResult
|
||||
{
|
||||
@@ -101,10 +38,72 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
||||
ActiveContracts = contractsActive.Contracts,
|
||||
FactionsContracts = new FYFactionsContractsData
|
||||
{
|
||||
Boards = boards,
|
||||
LastBoardRefreshTimeUtc = lastBoardRefreshTimeUtc
|
||||
Boards = new List<FYFactionContractsData>
|
||||
{
|
||||
new FYFactionContractsData
|
||||
{
|
||||
FactionId = "ICA",
|
||||
Contracts = new List<FYFactionContractData>
|
||||
{
|
||||
new FYFactionContractData
|
||||
{
|
||||
ContractId = "NEW-Easy-ICA-Gather-1",
|
||||
},
|
||||
RefreshHours24UtcFromBackend = 12 // Doesn't seem to work
|
||||
new FYFactionContractData
|
||||
{
|
||||
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
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
|
||||
@@ -55,7 +54,7 @@ public class RequestMissionCompleted : ICloudScriptFunction<FYRequestMissionComp
|
||||
var rewards = JsonSerializer.Deserialize<Dictionary<string, TitleDataMissionRewardInfo>>(titleData["OnboardingRewardMissions"]);
|
||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||
var missions = JsonSerializer.Deserialize<Dictionary<string, TitleDataMissionInfo>>(titleData["OnboardingMissions"]);
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
|
||||
var currentMission = missions[onboardingMission.CurrentMissionID];
|
||||
var missionRewardId = currentMission.OnboardingRewards.RowName;
|
||||
@@ -69,16 +68,15 @@ public class RequestMissionCompleted : ICloudScriptFunction<FYRequestMissionComp
|
||||
var missionRewards = rewards[missionRewardId].RewardEntries;
|
||||
foreach (var reward in missionRewards) {
|
||||
if (reward.RewardRowHandle.RowName == "SoftCurrency") {
|
||||
balance.SoftCurrency += reward.RewardAmount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||
balance["SC"] += reward.RewardAmount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
||||
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
||||
balance.HardCurrency += reward.RewardAmount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||
} else if (reward.RewardRowHandle.RowName == "InsuranceCurrency") {
|
||||
balance.InsuranceCurrency += reward.RewardAmount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||
balance["AU"] += reward.RewardAmount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
||||
} else if (reward.RewardRowHandle.RowName == "InsuranceToken") {
|
||||
balance["IN"] += reward.RewardAmount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance["IN"] });
|
||||
} else {
|
||||
// TODO: Inventory limit check
|
||||
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
||||
var remainingAmount = reward.RewardAmount * blueprintData.AmountPerPurchase;
|
||||
while (remainingAmount > 0) {
|
||||
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript;
|
||||
|
||||
public class RequestUpdateAvailableFreeLoadoutRequest
|
||||
{
|
||||
}
|
||||
|
||||
public class RequestUpdateAvailableFreeLoadoutResponse
|
||||
{
|
||||
[JsonPropertyName("userId")]
|
||||
public string UserId { get; set; }
|
||||
[JsonPropertyName("error")]
|
||||
public string Error { get; set; }
|
||||
[JsonPropertyName("newRandomSeed")]
|
||||
public int NewRandomSeed { get; set; }
|
||||
}
|
||||
|
||||
[CloudScriptFunction("RequestUpdateAvailableFreeLoadout")]
|
||||
public class RequestUpdateAvailableFreeLoadoutFunction : ICloudScriptFunction<RequestUpdateAvailableFreeLoadoutRequest, RequestUpdateAvailableFreeLoadoutResponse>
|
||||
{
|
||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||
private readonly ILogger<RequestUpdateAvailableFreeLoadoutFunction> _logger;
|
||||
|
||||
public RequestUpdateAvailableFreeLoadoutFunction(ILogger<RequestUpdateAvailableFreeLoadoutFunction> logger, IHttpContextAccessor httpContextAccessor)
|
||||
{
|
||||
_logger = logger;
|
||||
_httpContextAccessor = httpContextAccessor;
|
||||
}
|
||||
|
||||
public async Task<RequestUpdateAvailableFreeLoadoutResponse> ExecuteAsync(RequestUpdateAvailableFreeLoadoutRequest request)
|
||||
{
|
||||
var context = _httpContextAccessor.HttpContext;
|
||||
if (context == null)
|
||||
{
|
||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||
}
|
||||
var userId = context.User.FindAuthUserId();
|
||||
|
||||
return new RequestUpdateAvailableFreeLoadoutResponse
|
||||
{
|
||||
UserId = userId,
|
||||
Error = "",
|
||||
NewRandomSeed = 0,
|
||||
};
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -9,9 +9,9 @@ public class RequestUpdateSeasonWipeDataRequest
|
||||
public class RequestUpdateSeasonWipeDataResponse
|
||||
{
|
||||
[JsonPropertyName("userId")]
|
||||
public string UserId { get; set; }
|
||||
public string UserId;
|
||||
[JsonPropertyName("error")]
|
||||
public string Error { get; set; }
|
||||
public string Error;
|
||||
}
|
||||
|
||||
[CloudScriptFunction("RequestUpdateSeasonWipeData")]
|
||||
|
||||
+1
-8
@@ -76,13 +76,6 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
||||
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)) {
|
||||
@@ -90,6 +83,7 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Check deleted items to see if other stacks/mods were updated correctly
|
||||
foreach (var item in request.ItemsToUpdateAmount) {
|
||||
var inventoryItem = newInventory.Find(i => i.ItemId == item.ItemId);
|
||||
if (inventoryItem == null) {
|
||||
@@ -99,7 +93,6 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
||||
inventoryItem.ModData = item.ModData;
|
||||
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
||||
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
||||
inventoryItem.Durability = item.Durability;
|
||||
}
|
||||
|
||||
// TODO: Check updated items and validate new items
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
@@ -34,7 +33,7 @@ public class SellItemsClientResponse
|
||||
[JsonPropertyName("scrappedItemIds")]
|
||||
public HashSet<string> ScrappedItemIDs { get; set; }
|
||||
[JsonPropertyName("changedItems")]
|
||||
public List<FYCustomItemInfo> ChangedItems { get; set; }
|
||||
public FYCustomItemInfo[] ChangedItems { get; set; }
|
||||
[JsonPropertyName("changedCurrencies")]
|
||||
public FYCurrencyItem[] ChangedCurrencies { get; set; }
|
||||
[JsonPropertyName("playerFactionProgressionData")]
|
||||
@@ -72,67 +71,40 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||
}
|
||||
var userId = context.User.FindAuthUserId();
|
||||
var progressionFactionKey = $"FactionProgression{request.FactionID}";
|
||||
var progressionFactionKey = "FactionProgression" + request.FactionID;
|
||||
|
||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance", progressionFactionKey});
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balanceData = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var factionProgression = JsonSerializer.Deserialize<int>(userData[progressionFactionKey].Value);
|
||||
|
||||
var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
|
||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(blueprintsData["Blueprints"]);
|
||||
|
||||
// TODO: Optimize
|
||||
// TODO: Check deleted items to see if other stacks/mods were updated correctly
|
||||
// Process inventory update before selling since a player may split item stack.
|
||||
// This will result in creating a new item and updating amount of existing item.
|
||||
// NOTE: Stacking items back doesn't seem to work, at least in single-player station. Bug?
|
||||
// var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||
// foreach (var item in inventory) {
|
||||
// if (!request.InventoryUpdateData.ItemsToRemove.Contains(item.ItemId)) {
|
||||
// newInventory.Add(item);
|
||||
// }
|
||||
// }
|
||||
|
||||
var changedItems = new List<FYCustomItemInfo>();
|
||||
foreach (var item in request.InventoryUpdateData.ItemsToUpdateAmount) {
|
||||
var inventoryItem = inventory.Find(i => i.ItemId == item.ItemId);
|
||||
if (inventoryItem == null) {
|
||||
continue;
|
||||
}
|
||||
inventoryItem.Amount = item.Amount;
|
||||
// NOTE: Vanity and mod data cannot be managed in sell menu
|
||||
changedItems.Add(item);
|
||||
}
|
||||
|
||||
foreach (var item in request.InventoryUpdateData.ItemsToAdd) {
|
||||
inventory.Add(item);
|
||||
}
|
||||
|
||||
// Then process selling. The game client provides item IDs for newly added items.
|
||||
var playerBalance = balanceData["SC"];
|
||||
HashSet<string> scrappedItemIds = [];
|
||||
foreach (var itemId in request.IDs) {
|
||||
var inventoryItem = inventory.Find(i => i.ItemId == itemId);
|
||||
if (inventoryItem == null) {
|
||||
var inventoryItemIdx = inventory.FindIndex(i => i.ItemId == itemId);
|
||||
if (inventoryItemIdx == -1) {
|
||||
continue;
|
||||
}
|
||||
var inventoryItem = inventory[inventoryItemIdx];
|
||||
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
||||
// NOTE: Ammo and consumables have reverse price mapping.
|
||||
if (blueprintData.Kind == "Ammo" || blueprintData.Kind == "Ability") {
|
||||
factionProgression += (int)((float)blueprintData.OverrideScrappingReputation / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||
balance.SoftCurrency += (int)((float)blueprintData.OverrideScrappingReturns / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||
} else if (blueprintData.Kind == "Armor") {
|
||||
factionProgression += (int)Math.Max(
|
||||
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReputation,
|
||||
blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||
);
|
||||
balance.SoftCurrency += (int)Math.Max(
|
||||
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReturns,
|
||||
blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||
);
|
||||
} else {
|
||||
// TODO: Probably better to decide based on item kind instead
|
||||
if (inventoryItem.Durability == -1) {
|
||||
factionProgression += blueprintData.OverrideScrappingReputation * inventoryItem.Amount;
|
||||
balance.SoftCurrency += blueprintData.OverrideScrappingReturns * inventoryItem.Amount;
|
||||
playerBalance += blueprintData.OverrideScrappingReturns * inventoryItem.Amount;
|
||||
} else {
|
||||
// Items that have durability are not stackable so it's always 1 item
|
||||
factionProgression += MapValue.Map(
|
||||
inventoryItem.Durability,
|
||||
blueprintData.DurabilityMax, 0,
|
||||
blueprintData.OverrideScrappingReputation, (int)(blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier)
|
||||
);
|
||||
playerBalance += MapValue.Map(
|
||||
inventoryItem.Durability,
|
||||
blueprintData.DurabilityMax, 0,
|
||||
blueprintData.OverrideScrappingReturns, (int)(blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier)
|
||||
);
|
||||
}
|
||||
|
||||
scrappedItemIds.Add(itemId);
|
||||
@@ -146,11 +118,13 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
||||
}
|
||||
}
|
||||
|
||||
balanceData["SC"] = playerBalance;
|
||||
|
||||
await _userDataService.UpdateAsync(
|
||||
userId, userId,
|
||||
new Dictionary<string, string>{
|
||||
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||
["Balance"] = JsonSerializer.Serialize(balance),
|
||||
["Balance"] = JsonSerializer.Serialize(balanceData),
|
||||
[progressionFactionKey] = JsonSerializer.Serialize(factionProgression),
|
||||
}
|
||||
);
|
||||
@@ -161,14 +135,14 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
||||
Error = "",
|
||||
ChangedCurrencies = [new FYCurrencyItem {
|
||||
CurrencyName = "SoftCurrency",
|
||||
Amount = balance.SoftCurrency,
|
||||
Amount = playerBalance,
|
||||
}],
|
||||
PlayerFactionProgressionData = new FYPlayerFactionProgressData {
|
||||
FactionID = request.FactionID,
|
||||
CurrentProgression = factionProgression,
|
||||
},
|
||||
ScrappedItemIDs = scrappedItemIds,
|
||||
ChangedItems = changedItems,
|
||||
ChangedItems = [], // TODO: Changed items from InventoryUpdateData
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
+4
-12
@@ -47,18 +47,10 @@ public class SetCharacterVanityArchetype : ICloudScriptFunction<FYSetActiveChara
|
||||
var genderSuffix = request.ArcheTypeId.EndsWith("G02") ? "M" : "F";
|
||||
returnVanity.ArchetypeID = request.ArcheTypeId;
|
||||
returnVanity.HeadItem.ID = request.ArcheTypeId + "_Head01";
|
||||
#if SEASON_2_RELEASE || SEASON_2_DEBUG
|
||||
returnVanity.BootsItem.ID = $"StarterOutfit01_Boots_{genderSuffix}";
|
||||
returnVanity.ChestItem.ID = $"StarterOutfit01_Chest_{genderSuffix}";
|
||||
returnVanity.GloveItem.ID = $"StarterOutfit01_Gloves_{genderSuffix}";
|
||||
#elif SEASON_3_RELEASE || SEASON_3_DEBUG
|
||||
returnVanity.BootsItem.ID = "StarterOutfit01_Boots";
|
||||
returnVanity.ChestItem.ID = "StarterOutfit01_Chest";
|
||||
returnVanity.GloveItem.ID = "StarterOutfit01_Gloves";
|
||||
#else
|
||||
#error Unsupported build type
|
||||
#endif
|
||||
returnVanity.BaseSuitItem.ID = $"StarterOutfit01{genderSuffix}_BaseSuit";
|
||||
returnVanity.BootsItem.ID = "StarterOutfit01_Boots_" + genderSuffix;
|
||||
returnVanity.ChestItem.ID = "StarterOutfit01_Chest_" + genderSuffix;
|
||||
returnVanity.GloveItem.ID = "StarterOutfit01_Gloves_" + genderSuffix;
|
||||
returnVanity.BaseSuitItem.ID = "StarterOutfit01" + genderSuffix + "_BaseSuit";
|
||||
returnVanity.BodyType = request.ArcheTypeId.EndsWith("G02") ? 1 : 2;
|
||||
await _userDataService.UpdateAsync(
|
||||
userId, userId,
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
using Prospect.Server.Api.Utils;
|
||||
|
||||
@@ -60,7 +61,7 @@ public class SkipItemCraftingClient : ICloudScriptFunction<FYSkipItemCraftingCli
|
||||
new List<string>{"CraftingTimer__2022_05_12", "Balance", "Inventory"}
|
||||
);
|
||||
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
var craftingTimer = JsonSerializer.Deserialize<FYItemCurrentlyBeingCrafted>(userData["CraftingTimer__2022_05_12"].Value);
|
||||
|
||||
@@ -77,24 +78,24 @@ public class SkipItemCraftingClient : ICloudScriptFunction<FYSkipItemCraftingCli
|
||||
FYCurrencyItem[] changedCurrency;
|
||||
if (request.UseOptionalCosts) {
|
||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, shopCraftingData.SkipOptionalCraftingMaxCost, 1);
|
||||
if (balance.SoftCurrency < remaining) {
|
||||
if (balance["SC"] < remaining) {
|
||||
return new FYSkipItemCraftingClientResult {
|
||||
UserID = userId,
|
||||
Error = "Insufficient balance",
|
||||
};
|
||||
}
|
||||
balance.SoftCurrency -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency }];
|
||||
balance["SC"] -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] }];
|
||||
} else {
|
||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, shopCraftingData.SkipCraftingMaxCost, 1);
|
||||
if (balance.HardCurrency < remaining) {
|
||||
if (balance["AU"] < remaining) {
|
||||
return new FYSkipItemCraftingClientResult {
|
||||
UserID = userId,
|
||||
Error = "Insufficient balance",
|
||||
};
|
||||
}
|
||||
balance.HardCurrency -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency }];
|
||||
balance["AU"] -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] }];
|
||||
}
|
||||
|
||||
List<FYCustomItemInfo> itemsGrantedOrUpdated = [];
|
||||
|
||||
+7
-8
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
@@ -70,7 +69,7 @@ public class SkipPlayerQuarterUpgradeClient : ICloudScriptFunction<FYSkipPlayerQ
|
||||
}
|
||||
|
||||
var titleData = _titleDataService.Find(new List<string>{"PlayerQuarters"});
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var playerQuartersData = JsonSerializer.Deserialize<TitleDataPlayerQuartersInfo[]>(titleData["PlayerQuarters"]);
|
||||
var nextQuartersLevel = playerQuartersData[userPlayerQuarters.Level - 1]; // Quarters level starts from 1
|
||||
|
||||
@@ -80,24 +79,24 @@ public class SkipPlayerQuarterUpgradeClient : ICloudScriptFunction<FYSkipPlayerQ
|
||||
FYCurrencyItem[] changedCurrency;
|
||||
if (request.UseOptionalCosts) {
|
||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nextQuartersLevel.OptionalRushCosts, 1);
|
||||
if (balance.SoftCurrency < remaining) {
|
||||
if (balance["SC"] < remaining) {
|
||||
return new FYSkipPlayerQuarterUpgradeClientResult {
|
||||
UserID = userId,
|
||||
Error = "Insufficient balance",
|
||||
};
|
||||
}
|
||||
balance.SoftCurrency -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency }];
|
||||
balance["SC"] -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] }];
|
||||
} else {
|
||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nextQuartersLevel.InitialRushCosts, 1);
|
||||
if (balance.HardCurrency < remaining) {
|
||||
if (balance["AU"] < remaining) {
|
||||
return new FYSkipPlayerQuarterUpgradeClientResult {
|
||||
UserID = userId,
|
||||
Error = "Insufficient balance",
|
||||
};
|
||||
}
|
||||
balance.HardCurrency -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency }];
|
||||
balance["AU"] -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] }];
|
||||
}
|
||||
|
||||
var upgradeStartedTime = new FYTimestamp {
|
||||
|
||||
+7
-8
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
using Prospect.Server.Api.Utils;
|
||||
@@ -57,7 +56,7 @@ public class SkipTechTreeNodeUpgradeClient : ICloudScriptFunction<FYSkipTechTree
|
||||
new List<string>{"TechTreeNodeData", "Balance", "CharacterTechTreeBonuses"}
|
||||
);
|
||||
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var userTechTree = JsonSerializer.Deserialize<UserTechTreeNodeData>(userData["TechTreeNodeData"].Value);
|
||||
|
||||
var currentNode = userTechTree.NodeInProgress;
|
||||
@@ -82,24 +81,24 @@ public class SkipTechTreeNodeUpgradeClient : ICloudScriptFunction<FYSkipTechTree
|
||||
FYCurrencyItem[] changedCurrency;
|
||||
if (request.UseOptionalCosts) {
|
||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nodeLevelInfo.OptionalRushCosts, 1);
|
||||
if (balance.SoftCurrency < remaining) {
|
||||
if (balance["SC"] < remaining) {
|
||||
return new FYSkipTechTreeNodeUpgradeClientResult {
|
||||
UserID = userId,
|
||||
Error = "Insufficient balance",
|
||||
};
|
||||
}
|
||||
balance.SoftCurrency -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency }];
|
||||
balance["SC"] -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] }];
|
||||
} else {
|
||||
var remaining = MapValue.Map(now, craftStartTime, craftEndTime, nodeLevelInfo.InitialRushCosts, 1);
|
||||
if (balance.HardCurrency < remaining) {
|
||||
if (balance["AU"] < remaining) {
|
||||
return new FYSkipTechTreeNodeUpgradeClientResult {
|
||||
UserID = userId,
|
||||
Error = "Insufficient balance",
|
||||
};
|
||||
}
|
||||
balance.HardCurrency -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency }];
|
||||
balance["AU"] -= remaining;
|
||||
changedCurrency = [new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] }];
|
||||
}
|
||||
|
||||
userTechTree.TotalUpgrades++;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
@@ -71,9 +70,8 @@ public class StartItemCraftingClient : ICloudScriptFunction<FYStartItemCraftingC
|
||||
}
|
||||
|
||||
// TODO: Contract unlock criteria
|
||||
// TODO: Inventory limit check
|
||||
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
|
||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||
@@ -90,14 +88,15 @@ public class StartItemCraftingClient : ICloudScriptFunction<FYStartItemCraftingC
|
||||
int remaining = ingredient.Amount;
|
||||
if (ingredient.Currency == "SoftCurrency") {
|
||||
remaining -= ingredient.Amount;
|
||||
balance.SoftCurrency -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||
balance["SC"] -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
||||
} else if (ingredient.Currency == "Aurum") {
|
||||
remaining -= ingredient.Amount;
|
||||
balance.HardCurrency -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||
balance["AU"] -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
||||
} else {
|
||||
foreach (var item in inventory) {
|
||||
for (var i = 0; i < inventory.Count; i++) {
|
||||
var item = inventory[i];
|
||||
if (item.BaseItemId != ingredient.Currency) {
|
||||
continue;
|
||||
}
|
||||
|
||||
+7
-7
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
@@ -67,7 +66,7 @@ public class StartPlayerQuarterUpgradeClient : ICloudScriptFunction<FYStartPlaye
|
||||
}
|
||||
|
||||
var titleData = _titleDataService.Find(new List<string>{"PlayerQuarters"});
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
var playerQuartersData = JsonSerializer.Deserialize<TitleDataPlayerQuartersInfo[]>(titleData["PlayerQuarters"]);
|
||||
// Current level contains the information about next level
|
||||
@@ -83,14 +82,15 @@ public class StartPlayerQuarterUpgradeClient : ICloudScriptFunction<FYStartPlaye
|
||||
int remaining = ingredient.Amount;
|
||||
if (ingredient.Currency == "SoftCurrency") {
|
||||
remaining -= ingredient.Amount;
|
||||
balance.SoftCurrency -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||
balance["SC"] -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
||||
} else if (ingredient.Currency == "Aurum") {
|
||||
remaining -= ingredient.Amount;
|
||||
balance.HardCurrency -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||
balance["AU"] -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
||||
} else {
|
||||
foreach (var item in inventory) {
|
||||
for (var i = 0; i < inventory.Count; i++) {
|
||||
var item = inventory[i];
|
||||
if (item.BaseItemId != ingredient.Currency) {
|
||||
continue;
|
||||
}
|
||||
|
||||
+7
-7
@@ -1,6 +1,5 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Models.Data;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
@@ -68,7 +67,7 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
|
||||
};
|
||||
}
|
||||
|
||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||
var balance = JsonSerializer.Deserialize<Dictionary<string, int>>(userData["Balance"].Value);
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
|
||||
var titleData = _titleDataService.Find(new List<string>{"TechTreeNodes"});
|
||||
@@ -90,14 +89,15 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
|
||||
int remaining = ingredient.Amount;
|
||||
if (ingredient.Currency == "SoftCurrency") {
|
||||
remaining -= ingredient.Amount;
|
||||
balance.SoftCurrency -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||
balance["SC"] -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance["SC"] });
|
||||
} else if (ingredient.Currency == "Aurum") {
|
||||
remaining -= ingredient.Amount;
|
||||
balance.HardCurrency -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||
balance["AU"] -= ingredient.Amount;
|
||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance["AU"] });
|
||||
} else {
|
||||
foreach (var item in inventory) {
|
||||
for (var i = 0; i < inventory.Count; i++) {
|
||||
var item = inventory[i];
|
||||
if (item.BaseItemId != ingredient.Currency) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -29,30 +29,3 @@ public class FYEnterMatchAzureFunction
|
||||
[JsonPropertyName("loginNonce")]
|
||||
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,30 +21,3 @@ public class FYEnterMatchmakingResult
|
||||
[JsonPropertyName("errorMessage")]
|
||||
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,9 +1,6 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
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.Models.Data;
|
||||
using Prospect.Server.Api.Services.Database;
|
||||
|
||||
namespace Prospect.Server.Api.Services.UserData;
|
||||
@@ -73,53 +70,35 @@ public class UserDataService
|
||||
};
|
||||
}
|
||||
|
||||
var defaultVanity = new FYCharacterVanity {
|
||||
UserID = playFabId,
|
||||
ArchetypeID = "E01_G02",
|
||||
SlotIndex = 0,
|
||||
BaseSuitItem = new FYVanityMaterialItem {
|
||||
ID = "StarterOutfit01M_BaseSuit",
|
||||
MaterialIndex = 0,
|
||||
},
|
||||
HeadItem = new FYVanityMaterialItem {
|
||||
ID = "E01_G02_Head01",
|
||||
MaterialIndex = 0,
|
||||
},
|
||||
MeleeWeaponItem = new FYVanityMaterialItem {
|
||||
ID = "Melee_Omega",
|
||||
MaterialIndex = 0,
|
||||
},
|
||||
BodyType = 1,
|
||||
};
|
||||
#if SEASON_2_RELEASE || SEASON_2_DEBUG
|
||||
defaultVanity.BootsItem = new FYVanityMaterialItem {
|
||||
ID = "StarterOutfit01_Boots_M",
|
||||
MaterialIndex = 0,
|
||||
};
|
||||
defaultVanity.ChestItem = new FYVanityMaterialItem {
|
||||
ID = "StarterOutfit01_Chest_M",
|
||||
MaterialIndex = 0,
|
||||
};
|
||||
defaultVanity.GloveItem = new FYVanityMaterialItem {
|
||||
ID = "StarterOutfit01_Gloves_M",
|
||||
MaterialIndex = 0,
|
||||
};
|
||||
#elif SEASON_3_RELEASE || SEASON_3_DEBUG
|
||||
defaultVanity.BootsItem = new FYVanityMaterialItem {
|
||||
ID = "StarterOutfit01_Boots",
|
||||
MaterialIndex = 0,
|
||||
};
|
||||
defaultVanity.ChestItem = new FYVanityMaterialItem {
|
||||
ID = "StarterOutfit01_Chest",
|
||||
MaterialIndex = 0,
|
||||
};
|
||||
defaultVanity.GloveItem = new FYVanityMaterialItem {
|
||||
ID = "StarterOutfit01_Gloves",
|
||||
MaterialIndex = 0,
|
||||
};
|
||||
#else
|
||||
#error Unsupported build type
|
||||
#endif
|
||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||
|
||||
// TODO: For testing purposes
|
||||
List<FYCustomItemInfo> inventory = new List<FYCustomItemInfo>();
|
||||
foreach (var dict in blueprints)
|
||||
{
|
||||
var blueprint = dict.Value;
|
||||
if (blueprint.Kind != "Material")
|
||||
{
|
||||
continue;
|
||||
}
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
inventory.Add(new FYCustomItemInfo {
|
||||
Amount = 10000,
|
||||
BaseItemId = blueprint.Name,
|
||||
Durability = blueprint.DurabilityMax,
|
||||
ItemId = Guid.NewGuid().ToString(),
|
||||
Insurance = "",
|
||||
InsuranceOwnerPlayfabId = "",
|
||||
ModData = new FYModItems { M = [] },
|
||||
Origin = new FYItemOriginBackend { G = "", P = "", T = "" },
|
||||
InsuredAttachmentId = "",
|
||||
PrimaryVanityId = 0,
|
||||
SecondaryVanityId = 0,
|
||||
RolledPerks = [],
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Proper objects.
|
||||
var defaultData = new Dictionary<string, (bool isPublic, string value)>
|
||||
@@ -171,27 +150,10 @@ public class UserDataService
|
||||
// Used to optimize bonuses calculation and further validations without getting the user data and computing bonuses in runtime.
|
||||
["CharacterTechTreeBonuses"] = (false, "{\"aurumCap\":0,\"aurumRate\":0,\"kmarksCap\":0,\"kmarksRate\":0,\"crateTier\":0,\"stashSize\":0,\"safePocketSize\":0,\"upgradeSpeed\":1.0}"),
|
||||
["GlobalVanity"] = (false, $"{{\"activeGlobalVanityIds\":[\"Season03_Spray_13\",\"Banner_MIne\",\"Emote_Chill_01\",\"\",\"\",\"\",\"\",\"\"], \"droppodId\": \"VDP_Omega02\"}}"),
|
||||
["CharacterVanity"] = (false, JsonSerializer.Serialize(defaultVanity)),
|
||||
["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 { }]
|
||||
}
|
||||
]
|
||||
}
|
||||
)),
|
||||
// NOTE: Default CharacterVanity is based on Season 2 IDs.
|
||||
["CharacterVanity"] = (false, $"{{\"userId\":\"{playFabId}\",\"head_item\":{{\"id\":\"E01_G02_Head01\",\"materialIndex\":0}},\"boots_item\":{{\"id\":\"StarterOutfit01_Boots_M\",\"materialIndex\":0}},\"chest_item\":{{\"id\":\"StarterOutfit01_Chest_M\",\"materialIndex\":0}},\"glove_item\":{{\"id\":\"StarterOutfit01_Gloves_M\",\"materialIndex\":0}},\"base_suit_item\":{{\"id\":\"StarterOutfit01M_BaseSuit\",\"materialIndex\":0}},\"melee_weapon_item\":{{\"id\":\"Melee_Omega\",\"materialIndex\":0}},\"body_type\":1,\"archetype_id\":\"E01_G02\",\"slot_index\":0}}"),
|
||||
// ["Inventory"] = (false, "[]"),
|
||||
["Inventory"] = (false, JsonSerializer.Serialize(inventory)),
|
||||
["VanityItems"] = (false, "[]"),
|
||||
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
||||
["Balance"] = (false, "{\"IN\": 0,\"AU\": 800,\"SC\": 30000}"),
|
||||
@@ -233,6 +195,9 @@ public class UserDataService
|
||||
}
|
||||
|
||||
var other = currentUserId != requestUserId;
|
||||
if (other) {
|
||||
Console.WriteLine("aboba");
|
||||
}
|
||||
var result = new Dictionary<string, FUserDataRecord>();
|
||||
|
||||
if (keys != null && keys.Count > 0)
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<Configurations>Debug;Release;Season 3 Release;Season 2 Release;Season 2 Debug;Season 3 Debug</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>true</ImplicitUsings>
|
||||
<Configurations>Debug;Release;Season 3 Release;Season 2 Release;Season 2 Debug;Season 3 Debug</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<LangVersion>9.0</LangVersion>
|
||||
<IsRoslynComponent>true</IsRoslynComponent>
|
||||
<Configurations>Debug;Release;Season 3 Release;Season 2 Release;Season 2 Debug;Season 3 Debug</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
<Nullable>enable</Nullable>
|
||||
|
||||
<IsPackable>false</IsPackable>
|
||||
|
||||
<Configurations>Debug;Release;Season 3 Release;Season 2 Release;Season 2 Debug;Season 3 Debug</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Configurations>Debug;Release;Season 3 Release;Season 2 Release;Season 2 Debug;Season 3 Debug</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
||||
+1
-132
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.12.35514.174
|
||||
VisualStudioVersion = 17.12.35514.174 d17.12
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Server.Api", "Prospect.Server.Api\Prospect.Server.Api.csproj", "{A539B020-8BEC-497F-9176-DC2665D927A1}"
|
||||
EndProject
|
||||
@@ -21,22 +21,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Tests", "Pr
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Generator", "Prospect.Unreal.Generator\Prospect.Unreal.Generator.csproj", "{71E3E262-49C5-4B6C-9670-D0741CEDB63B}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Client.Loader", "Prospect.Client.Loader\Prospect.Client.Loader.vcxproj", "{04B1D963-2BCB-4887-9D6D-04CB3366A348}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
Season 2 Debug|x64 = Season 2 Debug|x64
|
||||
Season 2 Debug|x86 = Season 2 Debug|x86
|
||||
Season 2 Release|x64 = Season 2 Release|x64
|
||||
Season 2 Release|x86 = Season 2 Release|x86
|
||||
Season 3 Debug|x64 = Season 3 Debug|x64
|
||||
Season 3 Debug|x86 = Season 3 Debug|x86
|
||||
Season 3 Release|x64 = Season 3 Release|x64
|
||||
Season 3 Release|x86 = Season 3 Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
@@ -47,22 +37,6 @@ Global
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x64.Build.0 = Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Release|x86.Build.0 = Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||
{A539B020-8BEC-497F-9176-DC2665D927A1}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
@@ -71,22 +45,6 @@ Global
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x64.Build.0 = Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Release|x86.Build.0 = Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||
{E65720EB-7ED5-4D81-BE06-1DFFD57C1C47}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
@@ -95,22 +53,6 @@ Global
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x64.Build.0 = Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Release|x86.Build.0 = Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||
{DE064B5C-5E9A-44FB-8DB0-5E61DD8ED4F6}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
@@ -119,22 +61,6 @@ Global
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x64.Build.0 = Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Release|x86.Build.0 = Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
@@ -143,22 +69,6 @@ Global
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x64.Build.0 = Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Release|x86.Build.0 = Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
@@ -167,46 +77,6 @@ Global
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x64.Build.0 = Release|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x64.ActiveCfg = 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.Build.0 = Season 3 Release|Any CPU
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x64.Build.0 = Debug|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x86.Build.0 = Debug|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x64.ActiveCfg = Release|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x64.Build.0 = Release|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x86.ActiveCfg = Release|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x86.Build.0 = Release|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x64.Build.0 = Debug|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x86.ActiveCfg = Debug|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x86.Build.0 = Debug|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x64.ActiveCfg = Release|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x64.Build.0 = Release|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x86.ActiveCfg = Release|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x86.Build.0 = Release|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x64.Build.0 = Debug|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x86.ActiveCfg = Debug|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x86.Build.0 = Debug|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x64.ActiveCfg = Release|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x64.Build.0 = Release|x64
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x86.ActiveCfg = Release|Win32
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x86.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -218,7 +88,6 @@ Global
|
||||
{380DD490-8F01-4025-91D7-74C289AA5B75} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34} = {168B6247-2D33-4942-AB3F-C5041B3BDFEA}
|
||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
||||
{04B1D963-2BCB-4887-9D6D-04CB3366A348} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {12888C62-D3A2-4DD7-A9A5-1481D95865D0}
|
||||
|
||||
Reference in New Issue
Block a user