Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server into 310-dev

# Conflicts:
#	project/assets/database/globals.json
This commit is contained in:
Dev 2024-07-07 14:13:35 +01:00
commit 57100544c9
50 changed files with 74 additions and 65 deletions

View File

@ -168,6 +168,13 @@
"season": "None",
"startTimestamp": 1341615600000,
"endTimestamp": "",
"yearly": false
},
"6672ec2a2b6f3b71be794cc5": {
"name": "Key to salvation",
"season": "None",
"startTimestamp": 1341615600000,
"endTimestamp": "",
"yearly": false
}
},

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:debb7497a8b90210e9298472e0e2d0fc2d563f35234b6e86c0e44baf652fd5a0
size 16799708
oid sha256:0dd8747570b053845755c626321f51f0b58d116c35f2b31b9f76832e4deb74c6
size 16805431

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f7d74986d3d6b0ab711a5252845f0bb971681a58643069baa694e7ccfb83341
oid sha256:c64df6e2f64a529d2bd85dc898cab963736661ddf5de370e1d2d24e769d719ce
size 10978

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c28b9c1cf63f5fbce962c7a816f5887ea3e57a877b0423d2c4ffe9c0711dcdf
oid sha256:c3288696b13632d08e8309b3a73bd4cb319db564aeb24d7cb268226a8fa20e6b
size 205851

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3944a8cccdfba72942b0cee645b37c020816af73b44a7b3b3990aadb3feb436
oid sha256:5375aadea26c04e1b18fe0144fc6dd8a154fcd7ba1bca0e1f3b517508cc167a9
size 647044

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85b4a083df6a04697562152c4e2a78e91152da96b3306d8fbcb01bd38f6e869a
size 1827923
oid sha256:e33c0b5158097da58bfb872dd9b8917233925a352507058bfdcbee9cc2a54566
size 1827795

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ea8b96cb3d535a570da7ee3c3d62fbcd1eff75b8a460039d728be58a35e2600
oid sha256:26c724f814b0bbe349652078231a8583ed1aec209285c46e68a983da7943e83e
size 10227

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8118c137f5654b2edb346dc6e4a1c7ca1c7833ab15cdad99fb1866d093c17a96
oid sha256:6f2ec7c11f114f1ac5e3aef47efb20d7a8c20b6efe2d39d1735488a6418f5685
size 37890

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77bcfb236d1a50ef134e2a9a2494dea498e7febd04eae6ebb5de1564afb5bde0
size 279031
oid sha256:b5a479aed700b1a9bebe8dc9c4d3ed33a84890601e655d73f07d844b10aa6306
size 279030

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a728717837bb0fee60dd0e2e1e0237b7769551b46b6ef8ddab4f105b5b70a727
size 32882791
oid sha256:23233f0ee4936b7102767c6f952bd50b6ba16f9e247b297a8d25ee72db4e1567
size 32885020

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad0cc9c6392172dab0fa29fe827ce809fbf35d32891614e1258e4ee8ad70a675
oid sha256:1c82ab9ff213a5329db72d80fa098dc195d8dc256cfd183f6b875ce510310446
size 11019

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ffcf7af86ce0c36a0a24a2688b1e0fc01b0ea05cae4aa2231b8272d4009f8fc1
oid sha256:436129d5a3c7f78fdc3f1a12392dd4671861c75857515edba5a33c6c14666658
size 335916

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42a7f99d78815d2f144fb2eaf2a679c76687846a0cbff4b8e921c347274ddf3c
oid sha256:520f93b216fa92825b23b9bd86950819bed039d71232ca6885d36661ee5df036
size 565897

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ea5e0344f23047acced8ebb134b4bec630d99b99b4dc21c6f4994258c64f526
size 17404620
oid sha256:48ce462cf2983a6d556a009457d64ed8d02aa1645aac27dd17872a948b2ce51c
size 17409487

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc87a2ec094e67a32f0de63842e25b41f2a8b74a40ebf378a61fedd4e7e78c03
oid sha256:6715538cc1afecfcd5d221e5ba6379b33663af2390617e040a3d00ce1aeb8f72
size 10130

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dac8ba5666c0eef6c10b227d58503c9f4b68d7383a274223eee72df0c62f6cd0
oid sha256:363a730534364678c849cdad582f9a57501f98d4b889c1680c0c18b1773d04e2
size 113318

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:efe33fe3eabff1b4c6384ee5155d172b3b01900fab044629332282503ceab4d6
oid sha256:1e4156b97d8e13cb58febe4b55c8958aef84f174d5a01f741c2576c1381409fe
size 405326

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:412c779fa3e87856a632b4b30ccaa5397eaeac5a164f9c71c3bf9b923b48e476
size 71172915
oid sha256:d74e798bde6238e45ee08cef6f55388c628a1f0528fbcd4502912e71cfe4c7ad
size 71211480

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61e3eab7c119dd39d73a06d91717cea5f8803325894a3c580b7cf9849098a103
oid sha256:e09edb9c31dda920bc7ee5a39deaa4a8c2d77464c98d9ca495944b74fba82583
size 10972

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d53764939c8b0c1f8a11ecd6d541a9f06d0ec9944c45e9a8158dcbcadea838a6
oid sha256:1a70f082b1196882f66686a8edee9f7e36c0359de8def1d692fb590e1533bd7a
size 295667

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:735afbcc94efa6a693bc2e91fac6973d88c922f5bc6a3c8ef58c8825e3dc9c09
oid sha256:9aabf7308b563e703a35cc17e936c2794ae1ba22ec69f28ed8f0d9571c0a8e15
size 596718

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5fdfe0f9f71c6a3e298a036604863670056a5475b6b8a2466f96f345627b71c
size 44648400
oid sha256:8e62f1e0fd773036f133294cdc1722808a8114691b3cb3c9acf6794e28c88cd0
size 44663606

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2b14e7186a7dfea1b1b96c8020e37afc0ed679480903aedc5671c866c63b321
oid sha256:d709a2cede06f65de438b70621599357a0f4682c5d66c8168fc25f125264ac6b
size 11003

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dbe812801766520c02164b66513b698688fa01a1fbfab53eb6b95ba11ea493a3
oid sha256:c5387fde50222e82e6edb192551386135b6d724112ac2a9f0449eee33394e82e
size 473607

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b551c5287769603d348e97d16dfcef17c690dcef4edfc1bbf04e3be207fe54f8
oid sha256:717309330be95c8566240c551675b03999cf1d047bb4369ef5ad9115adf0211a
size 500837

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:69683c78a59eb8cf8c2afdc944d96f152859ba0490fe4215b264160fae5c5eae
size 7496329
oid sha256:7dbd9819d4af90bdad6e7a2a2a04fecf8bb752b601ed68fbbc2edd2e103bad04
size 7491289

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b4bcd5b6f5cd6301a8488fdd94534ebbe235f0b24eb99375ed82a15f20de3a2
oid sha256:85533ae2da8cda82614dee91299838739bcdca54274ecc95f875260fffdc66fe
size 11000

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dcb4ec704f36cd8933986f7df169bc6ace35634acf37f1f3cc1e132a70e0b607
oid sha256:0a2ff7bce0caba1fa290a07f982ed22ae89cfced17800ac009604dabcbbbb89b
size 236629

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3df2617c86dec09f4b4e4ea8b1e8c8326baa10c5601039e852c27cdd3ed5f81
oid sha256:0e39888d2e48e2032f4ae8a79263da2c43d8a73f13fb412a7f87347ca6c77b9a
size 589275

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32689bc6381547ed8fdcd62a756ef8b97b5f2cd6ea82a92aca0ca33821fc0fbb
size 8206849
oid sha256:df85f7ec80ebf6f6b17d3501aa37d255761e74dab2b59614afc64f2c7c873392
size 8203162

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e3331d809e05fe5bbbb5c7f6f0651e14cec01eb4e04bc7dbcd6a720198d0b16
oid sha256:84892f767f1f98dd47d2eabe604479a2e8d6023bad2fa18138d896aa1a2689a9
size 10997

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:638f15f8b3a54d0a46dbe1294e08a1e7dc8547001e4af98c9a77571e2cea1dd5
oid sha256:7080f3f91f83f8c37925e7f6af533d615e9668aee5bd31a845c6f3f8f8fa2402
size 236443

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e21833c66207f69b4c3eff5ef877a5c92b690fe08959884920a87b0ce018191a
oid sha256:5176e17e781897118db072a9bf59fb7e27d50164c90043b6d022d3b35f258e86
size 588250

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f9dd1660d2eef0914e375ca9c415d87a8f016282e3599bdd8b84a46aff9351f
size 25239699
oid sha256:bc80db0dac7cfb788023bea0224645e2e46491cb30cc0b5092e3b9a0cf54ff5c
size 25257405

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b1e3a6be88093f8262c9d50077fe806ae80f18efe5e924948c6d5a6fec43a82
oid sha256:3319e916d333742b77ffdb7109973bb3bad1ee0a5e4e2f973cf232388f70bdfa
size 10959

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:428ab5b3b96b61e01f84621ca9b0215f26dc74af8fcd7aaf20a79487a872bd60
oid sha256:254b9917c06c42c9eb8ce2d8f1451e4e53426de099125d9aed92171674e6c53e
size 320779

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a436af2cbc134669f4fe9f7636c80775cef3de24838c83250efc12ee0e254862
oid sha256:c8fbe58a31b142d7543356a814ad9856fd02fa3f221eb542e25fd6734437a981
size 577571

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8562a662ae53bb71a3c7fe644c575c9096a805cc39d339a8d3b71ca5bfb3b59
size 55878955
oid sha256:7c6d28134037422430eb392144925fa28832b5740648a19a926506f52010c87f
size 55851927

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc155c4bc479ef9c6124e9a72e96aa63043c83601704f81761abb3fcd0e3e8a6
oid sha256:188aa4b217aecafc189a70b142aa0ed5b9e8513cfb49c2ac3f131b7e79bce43e
size 11042

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b72f832f47318ca90f5d9d9f6d9a81925ccde655c3872e8059d7498450b6f277
oid sha256:b05cbd4d2dd2d4e3df7a33e7e2388e3233df849830c2fb4e684ad40eb48027ea
size 609648

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e60e50f396823f97a835876e69408d6c83dde17317d87f4ead4660c91219c60d
oid sha256:86e5f80c62439452112898d63d6c0ac9301251f7de5759ebd6333277ec049073
size 546403

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61a3f6a9616d3e8ae311c460cbf874b05201938c4c2c95220ad0542a03b79a0e
size 14627113
oid sha256:274a62f4eb3be97e427f75779a8909fcf337a2f4e27e646ab01596425492ab6a
size 14632141

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d936c2ef6472bd3c785226d07985ad4be6650dccb3a82914072f1f27c35fd2bb
oid sha256:af1b32413e8c8ff18fc11a85fad43d95077c49463a6f69831b8fda08b8aeea7a
size 10930

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ebee0ce92e136cb01b120cf489d84f94d2ee79d85ce0b774de110f5a4712585f
oid sha256:ba1fc36f6535c5c875ba9521d6c3f8207947f6232ddd2b4ed4068b80f9debebb
size 119963

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f45eadca4bdf4991accd40de2993ab774b989edfe06961dce9ab42c42b6f23cc
oid sha256:b7cf21064ca17e4279c9e79791e6aacbfe9d167df55386bde97c28fbe425da29
size 574746

View File

@ -27560,7 +27560,7 @@
"LastTimePlayedAsSavage": 0,
"Level": 1,
"LowerNickname": "__REPLACEME__",
"MemberCategory": 1024,
"MemberCategory": 1026,
"isMigratedSkills": false,
"SelectedMemberCategory": 1024,
"NeedWipeOptions": [],
@ -31900,7 +31900,7 @@
"LastTimePlayedAsSavage": 0,
"Level": 1,
"LowerNickname": "__REPLACEME__",
"MemberCategory": 1024,
"MemberCategory": 1026,
"isMigratedSkills": false,
"SelectedMemberCategory": 1024,
"NeedWipeOptions": [],

View File

@ -167,10 +167,10 @@ export class ProfileCallbacks
url: string,
info: IGetProfileSettingsRequest,
sessionId: string,
): IGetBodyResponseData<string>
): IGetBodyResponseData<boolean>
{
this.profileController.setChosenProfileIcon(sessionId, info);
return this.httpResponse.emptyResponse();
return this.httpResponse.getBody(this.profileController.setChosenProfileIcon(sessionId, info));
}
/**

View File

@ -489,14 +489,15 @@ export class ProfileController
/**
* Handle client/profile/settings
*/
public setChosenProfileIcon(sessionId: string, request: IGetProfileSettingsRequest): void
public setChosenProfileIcon(sessionId: string, request: IGetProfileSettingsRequest): boolean
{
const profileToUpdate = this.profileHelper.getPmcProfile(sessionId);
if (!profileToUpdate)
{
return;
return false;
}
profileToUpdate.Info.SelectedMemberCategory = request.memberCategory;
return true;
}
}

View File

@ -483,6 +483,7 @@ export interface Slot
export interface SlotProps
{
filters: SlotFilter[]
MaxStackCount?: number
}
export interface SlotFilter
@ -505,7 +506,7 @@ export interface StackSlot
_max_count: number
_props: StackSlotProps
_proto: string
upd: any
upd?: any
}
export interface StackSlotProps

View File

@ -126,7 +126,7 @@ export class ProfileStaticRouter extends StaticRouter
info: any,
sessionID: string,
output: string,
): Promise<IGetBodyResponseData<string>> =>
): Promise<IGetBodyResponseData<boolean>> =>
{
return this.profileCallbacks.getProfileSettings(url, info, sessionID);
},