spt/modules
spt/modules
0
0
Fork 0
mirror of https://github.com/sp-tarkov/modules.git synced 2025-02-12 15:10:44 -05:00
Code

Fix FixSavageInventoryScreenPatch (!173)

Browse Source 
This fixes the logic of FixSavageInventoryScreenPatch.
NOTE:  The code below is untested and will most likely not work. It's what I theoretically believe is the right way to turn the `JObject` into a string for the server, however BSG has a `JsonWriter` in the client now that might have to be utilized? I will leave it like this until we have more info.
```c#
RequestHandler.PutJson("/raid/profile/scavsave",
				GetProfileAtEndOfRaidPatch.ProfileDescriptor.ToUnparsedData([]).JObject.ToString());
```

Co-authored-by: Lacyway <20912169+Lacyway@users.noreply.github.com>
Reviewed-on: SPT/Modules#173
Co-authored-by: Lacyway <lacyway@noreply.dev.sp-tarkov.com>
Co-committed-by: Lacyway <lacyway@noreply.dev.sp-tarkov.com>
This commit is contained in:
Lacyway 2024-11-01 13:23:31 +00:00 committed by chomp
parent c2271b0c0e
commit dd4bc93a97
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
project/SPT.SinglePlayer/Patches/ScavMode/FixSavageInventoryScreenPatch.cs
View File

@ -15,7 +15,8 @@ namespace SPT.SinglePlayer.Patches.ScavMode
/// </summary>
public class GetProfileAtEndOfRaidPatch : ModulePatch
{
public static string Profile { get; private set; }
public static GClass1962 ProfileDescriptor { get; private set; }
protected override MethodBase GetTargetMethod()
{
return AccessTools.Method(typeof(LocalGame), nameof(LocalGame.Stop));
@ -24,8 +25,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode
[PatchPrefix]
public static void PatchPrefix(LocalGame __instance)
{
//var test = new GClass1962(__instance.Profile_0, GClass1971.Instance);
//Profile = test.ToUnparsedData([]);
ProfileDescriptor = new GClass1962(__instance.Profile_0, GClass1971.Instance);
}
}
/// <summary>
@ -42,27 +42,24 @@ namespace SPT.SinglePlayer.Patches.ScavMode
[PatchPrefix]
public static void PatchPrefix(ref ISession ___iSession)
{
var profile = GetProfileAtEndOfRaidPatch.Profile.ParseJsonTo<Profile>();
if (profile.Side != EPlayerSide.Savage)
Profile profile = new(GetProfileAtEndOfRaidPatch.ProfileDescriptor);
if (profile.Side != EPlayerSide.Savage)
{
return;
}
var session = (ProfileEndpointFactoryAbstractClass)___iSession;
session.AllProfiles = new Profile[]
{
session.AllProfiles.First(x => x.Side != EPlayerSide.Savage),
session.AllProfiles =
[
session.AllProfiles.First(x => x.Side != EPlayerSide.Savage),
profile
};
];
session.ProfileOfPet.LearnAll();
// make a request to the server, so it knows of the items we might transfer
RequestHandler.PutJson("/raid/profile/scavsave", new
{
profile = session.ProfileOfPet
}
.ToJson());
// make a request to the server, so it knows of the items we might transfer
RequestHandler.PutJson("/raid/profile/scavsave",
GetProfileAtEndOfRaidPatch.ProfileDescriptor.ToUnparsedData([]).JObject.ToString());
}
}
}