470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements to PMC gear variety + comment changes

Browse Source
This commit is contained in:
Dev 2023-07-26 16:41:54 +01:00
parent 76dce7a548
commit ef03d546ce
4 changed files with 14007 additions and 13849 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27773
project/assets/database/bots/types/bear.json
View File

File diff suppressed because it is too large Load Diff

77
project/assets/database/bots/types/usec.json
View File

@ -3717,9 +3717,8 @@
"6113cc78d3a39d50044c065a" "6113cc78d3a39d50044c065a"
], ],
"mod_reciever": [ "mod_reciever": [
"55d355e64bdc2d962f8b4569",
"5c07a8770db8340023300450",
"5c0e2f26d174af02a9625114", "5c0e2f26d174af02a9625114",
"55d355e64bdc2d962f8b4569",
"59bfe68886f7746004266202" "59bfe68886f7746004266202"
], ],
"mod_stock": [ "mod_stock": [
@ -3755,7 +3754,8 @@
"mod_barrel": [ "mod_barrel": [
"55d4491a4bdc2d882f8b456e", "55d4491a4bdc2d882f8b456e",
"560835c74bdc2dc8488b456f", "560835c74bdc2dc8488b456f",
"560836484bdc2d20478b456e" "560836484bdc2d20478b456e",
"5608379a4bdc2d26448b4569"
], ],
"mod_handguard": [ "mod_handguard": [
"55d45d3f4bdc2d972f8b456c", "55d45d3f4bdc2d972f8b456c",
@ -3934,7 +3934,8 @@
"55d3632e4bdc2d972f8b4569", "55d3632e4bdc2d972f8b4569",
"5d440b93a4b9364276578d4b", "5d440b93a4b9364276578d4b",
"5c0e2f94d174af029f650d56", "5c0e2f94d174af029f650d56",
"5d440b9fa4b93601354d480c" "5d440b9fa4b93601354d480c",
"55d35ee94bdc2d61338b4568"
], ],
"mod_handguard": [ "mod_handguard": [
"6034e3e20ddce744014cb878", "6034e3e20ddce744014cb878",
@ -4210,6 +4211,15 @@
"560838c94bdc2d77798b4569" "560838c94bdc2d77798b4569"
] ]
}, },
"5608379a4bdc2d26448b4569": {
"mod_mount": [
"609b9e31506cf869cf3eaf41",
"5dfe14f30b92095fd441edaf"
],
"mod_muzzle": [
"5c0111ab0db834001966914d"
]
},
"56083a334bdc2dc8488b4571": { "56083a334bdc2dc8488b4571": {
"mod_scope": [ "mod_scope": [
"57ae0171245977343c27bfcf" "57ae0171245977343c27bfcf"
@ -6298,7 +6308,9 @@
"5a787fdfc5856700142fdd9a" "5a787fdfc5856700142fdd9a"
], ],
"mod_handguard": [ "mod_handguard": [
"5a788089c5856700142fdd9c" "5a788089c5856700142fdd9c",
"5a788068c5856700137e4c8f",
"5a788031c585673f2b5c1c79"
], ],
"mod_magazine": [ "mod_magazine": [
"5a78830bc5856700137e4c90", "5a78830bc5856700137e4c90",
@ -6361,6 +6373,35 @@
"609b9e31506cf869cf3eaf41" "609b9e31506cf869cf3eaf41"
] ]
}, },
"5a788031c585673f2b5c1c79": {
"mod_foregrip": [
"5c7fc87d2e221644f31c0298",
"588226e62459776e3e094af7"
],
"mod_tactical_000": [
"5a800961159bd4315e3a1657"
],
"mod_tactical_001": [
"5a800961159bd4315e3a1657"
]
},
"5a788068c5856700137e4c8f": {
"mod_foregrip": [
"57cffb66245977632f391a99",
"57cffcd624597763133760c5",
"57cffcdd24597763f5110006",
"57cffce524597763b31685d8",
"5b7be4895acfc400170e2dd5"
],
"mod_mount_000": [
"5b7be47f5acfc400170e2dd2",
"6269220d70b6c02e665f2635"
],
"mod_mount_001": [
"5b7be47f5acfc400170e2dd2",
"6269220d70b6c02e665f2635"
]
},
"5a78830bc5856700137e4c90": { "5a78830bc5856700137e4c90": {
"cartridges": [ "cartridges": [
"560d5e524bdc2d25448b4571", "560d5e524bdc2d25448b4571",
@ -8622,6 +8663,9 @@
], ],
"mod_handguard": [ "mod_handguard": [
"55d459824bdc2d892f8b4573", "55d459824bdc2d892f8b4573",
"5c78f2492e221600114c9f04",
"5d122e7bd7ad1a07102d6d7f",
"619b5db699fb192e7430664f",
"5d123102d7ad1a004e475fe5" "5d123102d7ad1a004e475fe5"
], ],
"mod_scope": [ "mod_scope": [
@ -8650,7 +8694,8 @@
"5cc9bcaed7f00c011c04e179" "5cc9bcaed7f00c011c04e179"
], ],
"mod_reciever": [ "mod_reciever": [
"5c0e2f26d174af02a9625114" "5c0e2f26d174af02a9625114",
"59bfe68886f7746004266202"
], ],
"mod_stock": [ "mod_stock": [
"5a33ca0fc4a282000d72292f", "5a33ca0fc4a282000d72292f",
@ -10152,11 +10197,13 @@
"5c0e2f26d174af02a9625114", "5c0e2f26d174af02a9625114",
"55d355e64bdc2d962f8b4569", "55d355e64bdc2d962f8b4569",
"5c07a8770db8340023300450", "5c07a8770db8340023300450",
"59bfe68886f7746004266202" "59bfe68886f7746004266202",
"5d4405aaa4b9361e6a4e6bd3"
], ],
"mod_stock": [ "mod_stock": [
"5649be884bdc2d79388b4577", "5649be884bdc2d79388b4577",
"5c793fb92e221644f31bfb64" "5c793fb92e221644f31bfb64",
"602e3f1254072b51b239f713"
], ],
"patron_in_weapon": [ "patron_in_weapon": [
"59e6920f86f77411d82aa167", "59e6920f86f77411d82aa167",
@ -11660,7 +11707,9 @@
"602e63fb6335467b0c5ac94d": { "602e63fb6335467b0c5ac94d": {
"mod_barrel": [ "mod_barrel": [
"603372b4da11d6478d5a07ff", "603372b4da11d6478d5a07ff",
"603372f153a60014f970616d" "603372f153a60014f970616d",
"603372d154072b51b239f9e1",
"603373004e02ce1eaa358814"
], ],
"mod_handguard": [ "mod_handguard": [
"6034e3cb0ddce744014cb870" "6034e3cb0ddce744014cb870"
@ -11680,11 +11729,21 @@
"5a32a064c4a28200741e22de" "5a32a064c4a28200741e22de"
] ]
}, },
"603372d154072b51b239f9e1": {
"mod_muzzle": [
"5fbbc3324e8a554c40648348"
]
},
"603372f153a60014f970616d": { "603372f153a60014f970616d": {
"mod_muzzle": [ "mod_muzzle": [
"5c6165902e22160010261b28" "5c6165902e22160010261b28"
] ]
}, },
"603373004e02ce1eaa358814": {
"mod_muzzle": [
"5a9fb739a2750c003215717f"
]
},
"60339954d62c9b14ed777c06": { "60339954d62c9b14ed777c06": {
"mod_charge": [ "mod_charge": [
"6033749e88382f4fab3fd2c5" "6033749e88382f4fab3fd2c5"

4
project/src/controllers/DialogueController.ts
View File

@ -192,7 +192,7 @@ export class DialogueController
return profile.dialogues[request.dialogId]; return profile.dialogues[request.dialogId];
} }
/** /**
* Get the users involved in a mail between two entities * Get the users involved in a mail between two entities
* @param fullProfile Player profile * @param fullProfile Player profile
* @param dialogUsers The participants of the mail * @param dialogUsers The participants of the mail
* @returns IUserDialogInfo array * @returns IUserDialogInfo array
@ -204,7 +204,7 @@ export class DialogueController
{ {
result.push(...dialogUsers); result.push(...dialogUsers);
// Plyer doesnt exist, add them in before returning // Player doesnt exist, add them in before returning
if (!result.find(x => x._id === fullProfile.info.id)) if (!result.find(x => x._id === fullProfile.info.id))
{ {
const pmcProfile = fullProfile.characters.pmc; const pmcProfile = fullProfile.characters.pmc;

2
project/src/generators/BotEquipmentModGenerator.ts
View File

@ -553,7 +553,7 @@ export class BotEquipmentModGenerator
{ {
if (parentSlot._required) if (parentSlot._required)
{ {
this.logger.warning(`Required slot unable to be filled, ${modSlot} on ${parentTemplate._name} ${parentTemplate._id} for weapon ${weapon[0]._tpl}`); this.logger.warning(`Required slot unable to be filled, ${modSlot} on ${parentTemplate._name} ${parentTemplate._id} for weapon: ${weapon[0]._tpl}`);
} }
return null; return null;