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

Merge branch '3.8.1-DEV' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.9.0-DEV

Browse Source
This commit is contained in:
Dev 2024-04-23 10:03:48 +01:00
commit a4bb5a2f60
14 changed files with 98 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/run-lint.yaml
View File

@ -15,7 +15,7 @@ jobs:
- name: Clone
run: |
rm -rf /workspace/SPT-AKI/Build/server
git clone https://dev.sp-tarkov.com/SPT-AKI/Server.git --branch master /workspace/SPT-AKI/Build/server
git clone https://dev.sp-tarkov.com/${GITHUB_REPOSITORY}.git --branch master /workspace/SPT-AKI/Build/server
cd /workspace/SPT-AKI/Build/server
git checkout ${GITHUB_SHA}

2
.gitea/workflows/run-style.yaml
View File

@ -15,7 +15,7 @@ jobs:
- name: Clone
run: |
rm -rf /workspace/SPT-AKI/Build/server
git clone https://dev.sp-tarkov.com/SPT-AKI/Server.git --branch master /workspace/SPT-AKI/Build/server
git clone https://dev.sp-tarkov.com/${GITHUB_REPOSITORY}.git --branch master /workspace/SPT-AKI/Build/server
cd /workspace/SPT-AKI/Build/server
git checkout ${GITHUB_SHA}

2
.gitea/workflows/run-test.yaml
View File

@ -15,7 +15,7 @@ jobs:
- name: Clone
run: |
rm -rf /workspace/SPT-AKI/Build/server
git clone https://dev.sp-tarkov.com/SPT-AKI/Server.git --branch master /workspace/SPT-AKI/Build/server
git clone https://dev.sp-tarkov.com/${GITHUB_REPOSITORY}.git --branch master /workspace/SPT-AKI/Build/server
cd /workspace/SPT-AKI/Build/server
git checkout ${GITHUB_SHA}

2
project/package.json
View File

@ -27,7 +27,7 @@
"run:build": "gulp run:build",
"run:debug": "gulp run:debug",
"run:profiler": "gulp run:profiler",
"gen:types": "tsc -p tsconfig.typedef.json",
"gen:types": "tsc -p tsconfig.typedef.json --resolveJsonModule",
"gen:docs": "typedoc --options ./typedoc.json --entryPointStrategy expand ./src"
},
"dependencies": {

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

@ -1106,12 +1106,12 @@ export class BotEquipmentModGenerator
}
/**
* Log errors if mod is not compatible with slot
* @param modToAdd template of mod to check
* @param slotAddedToTemplate slot the item will be placed in
* @param modSlot slot the mod will fill
* @param parentTemplate template of the mods being added
* @param botRole
* Check if mod exists in db + is for a required slot
* @param modToAdd Db template of mod to check
* @param slotAddedToTemplate Slot object the item will be placed as child into
* @param modSlot Slot the mod will fill
* @param parentTemplate Db template of the mods being added
* @param botRole Bots wildspawntype (assault/pmcBot etc)
* @returns true if valid
*/
protected isModValidForSlot(
@ -1122,31 +1122,31 @@ export class BotEquipmentModGenerator
botRole: string,
): boolean
{
const modBeingAddedTemplate = modToAdd[1];
const modBeingAddedDbTemplate = modToAdd[1];
// Mod lacks template item
if (!modBeingAddedTemplate)
// Mod lacks db template object
if (!modBeingAddedDbTemplate)
{
this.logger.error(
this.localisationService.getText("bot-no_item_template_found_when_adding_mod", {
modId: modBeingAddedTemplate._id,
modId: modBeingAddedDbTemplate?._id ?? "UNKNOWN",
modSlot: modSlot,
}),
);
this.logger.debug(`Item -> ${parentTemplate._id}; Slot -> ${modSlot}`);
this.logger.debug(`Item -> ${parentTemplate?._id}; Slot -> ${modSlot}`);
return false;
}
// Mod isn't a valid item
// Mod has invalid db item
if (!modToAdd[0])
{
// Slot must be filled, show warning
// Parent slot must be filled but db object is invalid, show warning and return false
if (slotAddedToTemplate._required)
{
this.logger.warning(
this.localisationService.getText("bot-unable_to_add_mod_item_invalid", {
itemName: modBeingAddedTemplate._name,
itemName: modBeingAddedDbTemplate?._name ?? "UNKNOWN",
modSlot: modSlot,
parentItemName: parentTemplate._name,
botRole: botRole,
@ -1157,6 +1157,7 @@ export class BotEquipmentModGenerator
return false;
}
// Mod was found in db
return true;
}

13
project/src/generators/PMCLootGenerator.ts
View File

@ -270,13 +270,14 @@ export class PMCLootGenerator
protected gcd(a: number, b: number): number
{
while (b !== 0)
let x = a;
let y = b;
while (y !== 0)
{
const temp = b;
b = a % b;
a = temp;
const temp = y;
y = x % y;
x = temp;
}
return a;
return x;
}
}

14
project/src/helpers/AssortHelper.ts
View File

@ -37,6 +37,8 @@ export class AssortHelper
flea = false,
): ITraderAssort
{
let strippedTraderAssorts = traderAssorts;
// Trader assort does not always contain loyal_level_items
if (!traderAssorts.loyal_level_items)
{
@ -59,11 +61,11 @@ export class AssortHelper
const questStatusInProfile = this.questHelper.getQuestStatus(pmcProfile, unlockValues.questId);
if (!unlockValues.status.includes(questStatusInProfile))
{
traderAssorts = this.removeItemFromAssort(traderAssorts, assortId, flea);
strippedTraderAssorts = this.removeItemFromAssort(traderAssorts, assortId, flea);
}
}
return traderAssorts;
return strippedTraderAssorts;
}
/**
@ -108,12 +110,14 @@ export class AssortHelper
*/
public stripLockedLoyaltyAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort
{
let strippedAssort = assort;
// Trader assort does not always contain loyal_level_items
if (!assort.loyal_level_items)
{
this.logger.warning(this.localisationService.getText("assort-missing_loyalty_level_object", traderId));
return assort;
return strippedAssort;
}
// Remove items restricted by loyalty levels above those reached by the player
@ -121,11 +125,11 @@ export class AssortHelper
{
if (assort.loyal_level_items[itemId] > pmcProfile.TradersInfo[traderId].loyaltyLevel)
{
assort = this.removeItemFromAssort(assort, itemId);
strippedAssort = this.removeItemFromAssort(assort, itemId);
}
}
return assort;
return strippedAssort;
}
/**

16
project/src/helpers/ItemHelper.ts
View File

@ -1198,6 +1198,7 @@ export class ItemHelper
const cartridgeTpl = this.drawAmmoTpl(
chosenCaliber,
staticAmmoDist,
weapon?._props.defAmmo,
weapon?._props?.Chambers[0]?._props?.filters[0]?.Filter,
);
this.fillMagazineWithCartridge(magazine, magTemplate, cartridgeTpl, minSizePercent);
@ -1306,12 +1307,14 @@ export class ItemHelper
* Chose a randomly weighted cartridge that fits
* @param caliber Desired caliber
* @param staticAmmoDist Cartridges and thier weights
* @param fallbackCartridgeTpl If a cartridge cannot be found in the above staticAmmoDist param, use this instead
* @param cartridgeWhitelist OPTIONAL whitelist for cartridges
* @returns Tpl of cartridge
*/
protected drawAmmoTpl(
caliber: string,
staticAmmoDist: Record<string, IStaticAmmoDetails[]>,
fallbackCartridgeTpl: string,
cartridgeWhitelist: string[] = null,
): string
{
@ -1319,14 +1322,20 @@ export class ItemHelper
const ammos = staticAmmoDist[caliber];
if (!ammos)
{
this.logger.error(`Missing caliber data for: ${caliber}`);
this.logger.error(
`Unable to pick a cartridge for caliber: ${caliber} as staticAmmoDist has no data. using fallback value of ${fallbackCartridgeTpl}`,
);
return fallbackCartridgeTpl;
}
if (!Array.isArray(ammos))
{
this.logger.error(
`Unable to pick a cartridge for caliber ${caliber}, chosen staticAmmoDist data is not an array: ${ammos}`,
`Unable to pick a cartridge for caliber: ${caliber}, the chosen staticAmmoDist data is not an array. Using fallback value of ${fallbackCartridgeTpl}`,
);
return fallbackCartridgeTpl;
}
for (const icd of ammos)
@ -1463,7 +1472,6 @@ export class ItemHelper
const modItemDbDetails = this.getItem(modItemToAdd._tpl)[1];
// Include conflicting items of newly added mod in pool to be used for next mod choice
// biome-ignore lint/complexity/noForEach: <explanation>
modItemDbDetails._props.ConflictingItems.forEach(incompatibleModTpls.add, incompatibleModTpls);
}
@ -1472,7 +1480,7 @@ export class ItemHelper
/**
* Get a compatible tpl from the array provided where it is not found in the provided incompatible mod tpls parameter
* @param possibleTpls Tpls to randomply choose from
* @param possibleTpls Tpls to randomly choose from
* @param incompatibleModTpls Incompatible tpls to not allow
* @returns Chosen tpl or null
*/

22
project/src/helpers/QuestHelper.ts
View File

@ -692,12 +692,12 @@ export class QuestHelper
*/
public getQuestWithOnlyLevelRequirementStartCondition(quest: IQuest): IQuest
{
quest = this.jsonUtil.clone(quest);
quest.conditions.AvailableForStart = quest.conditions.AvailableForStart.filter((q) =>
const updatedQuest = this.jsonUtil.clone(quest);
updatedQuest.conditions.AvailableForStart = updatedQuest.conditions.AvailableForStart.filter((q) =>
q.conditionType === "Level"
);
return quest;
return updatedQuest;
}
/**
@ -714,14 +714,22 @@ export class QuestHelper
output: IItemEventRouterResponse = null,
): void
{
let updatedOutput = output;
// Prepare response to send back to client
if (!output)
if (!updatedOutput)
{
output = this.eventOutputHolder.getOutput(sessionID);
updatedOutput = this.eventOutputHolder.getOutput(sessionID);
}
this.updateQuestState(pmcData, QuestStatus.Fail, failRequest.qid);
const questRewards = this.applyQuestReward(pmcData, failRequest.qid, QuestStatus.Fail, sessionID, output);
const questRewards = this.applyQuestReward(
pmcData,
failRequest.qid,
QuestStatus.Fail,
sessionID,
updatedOutput,
);
// Create a dialog message for completing the quest.
const quest = this.getQuestFromDb(failRequest.qid, pmcData);
@ -747,7 +755,7 @@ export class QuestHelper
}
}
output.profileChanges[sessionID].quests.push(...this.failedUnlocked(failRequest.qid, sessionID));
updatedOutput.profileChanges[sessionID].quests.push(...this.failedUnlocked(failRequest.qid, sessionID));
}
/**

2
project/src/helpers/TradeHelper.ts
View File

@ -72,7 +72,7 @@ export class TradeHelper
): void
{
let offerItems: Item[] = [];
let buyCallback: { (buyCount: number); };
let buyCallback: (buyCount: number) => void;
if (buyRequestData.tid.toLocaleLowerCase() === "ragfair")
{
buyCallback = (buyCount: number) =>

31
project/src/services/FenceService.ts
View File

@ -387,8 +387,8 @@ export class FenceService
/**
* Choose an item at random and remove it + mods from assorts
* @param assort Items to remove from
* @param rootItems Assort root items to pick from to remove
* @param assort Trader assort to remove item from
* @param rootItems Pool of root items to pick from to remove
*/
protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void
{
@ -399,14 +399,25 @@ export class FenceService
// Get a random count of the chosen item to remove
const itemCountToRemove = this.randomUtil.getInt(1, stackSize);
if (itemCountToRemove > 1 && itemCountToRemove < rootItemToAdjust.upd.StackObjectsCount)
{ // More than 1 + less then full stack
// Reduce stack size but keep stack
rootItemToAdjust.upd.StackObjectsCount -= itemCountToRemove;
}
else
const isEntireStackToBeRemoved = itemCountToRemove === stackSize;
// Partial stack reduction
if (!isEntireStackToBeRemoved)
{
// Remove up item + any mods
if (!rootItemToAdjust.upd)
{
this.logger.warning(`Fence Item: ${rootItemToAdjust._tpl} lacks a upd object, adding`);
rootItemToAdjust.upd = {};
}
// Reduce stack to at smallest, 1
rootItemToAdjust.upd.StackObjectsCount -= Math.max(1, itemCountToRemove);
return;
}
// Remove item + child mods (if any)
const itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems(assort.items, rootItemToAdjust._id);
for (const itemToDelete of itemWithChildren)
{
@ -414,10 +425,10 @@ export class FenceService
assort.items.splice(assort.items.indexOf(itemToDelete), 1);
}
// Need to remove item from all areas of trader assort
delete assort.barter_scheme[rootItemToAdjust._id];
delete assort.loyal_level_items[rootItemToAdjust._id];
}
}
/**
* Get an integer rounded count of items to replace based on percentrage from traderConfig value

2
project/src/utils/DatabaseImporter.ts
View File

@ -134,7 +134,7 @@ export class DatabaseImporter implements OnLoad
try
{
const finalPath = filePathAndName.replace(this.filepath, "").replace(".json", "");
let tempObject;
let tempObject: any;
for (const prop of finalPath.split("/"))
{
if (!tempObject)

3
project/tests/controllers/InsuranceController.test.ts
View File

@ -1020,7 +1020,8 @@ describe("InsuranceController", () =>
const attachments = parentAttachmentsMap.entries().next().value;
// Set the dynamicPrice of the first attachment to null.
vi.spyOn(insuranceController.ragfairPriceService, "getDynamicItemPrice").mockReturnValue(666).mockReturnValueOnce(null);
vi.spyOn(insuranceController.ragfairPriceService, "getDynamicItemPrice").mockReturnValue(666)
.mockReturnValueOnce(null);
// Execute the method.
const sortedAttachments = insuranceController.sortAttachmentsByPrice(attachments);