Skip to content

Commit

Permalink
Merge branch '3.10.2-dev' into better-random
Browse files Browse the repository at this point in the history
  • Loading branch information
@chompDev
chompDev authored Dec 6, 2024
2 parents c911876 + 9ef8206 commit 14dce4a
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 46 deletions.
95 changes: 58 additions & 37 deletions project/src/generators/BotEquipmentModGenerator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ export class BotEquipmentModGenerator {
const randomisationSettings = this.botHelper.getBotRandomizationDetails(request.botData.level, botEquipConfig);

// Iterate over mod pool and choose mods to attach
const sortedModKeys = this.sortModKeys(Object.keys(compatibleModsPool));
const sortedModKeys = this.sortModKeys(Object.keys(compatibleModsPool), request.parentTemplate._id);
for (const modSlot of sortedModKeys) {
// Check weapon has slot for mod to fit in
const modsParentSlot = this.getModItemSlotFromDb(modSlot, request.parentTemplate);
Expand Down Expand Up @@ -665,13 +665,15 @@ export class BotEquipmentModGenerator {
/**
* Sort mod slots into an ordering that maximises chance of a successful weapon generation
* @param unsortedSlotKeys Array of mod slot strings to sort
* @param itemTplWithKeysToSort The Tpl of the item with mod keys being sorted
* @returns Sorted array
*/
protected sortModKeys(unsortedSlotKeys: string[]): string[] {
protected sortModKeys(unsortedSlotKeys: string[], itemTplWithKeysToSort: string): string[] {
// No need to sort with only 1 item in array
if (unsortedSlotKeys.length <= 1) {
return unsortedSlotKeys;
}
const isMount = this.itemHelper.isOfBaseclass(itemTplWithKeysToSort, BaseClasses.MOUNT);

const sortedKeys: string[] = [];
const modRecieverKey = "mod_reciever";
Expand All @@ -683,50 +685,69 @@ export class BotEquipmentModGenerator {
const modHandguardKey = "mod_handguard";
const modMountKey = "mod_mount";
const modScopeKey = "mod_scope";
const modScope000Key = "mod_scope_000";

if (unsortedSlotKeys.includes(modHandguardKey)) {
sortedKeys.push(modHandguardKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modHandguardKey), 1);
}
// Mounts are a special case, they need scopes first before more mounts
if (isMount) {
if (unsortedSlotKeys.includes(modScope000Key)) {
sortedKeys.push(modScope000Key);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modScope000Key), 1);
}

if (unsortedSlotKeys.includes(modBarrelKey)) {
sortedKeys.push(modBarrelKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modBarrelKey), 1);
}
if (unsortedSlotKeys.includes(modScopeKey)) {
sortedKeys.push(modScopeKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modScopeKey), 1);
}

if (unsortedSlotKeys.includes(modMount001Key)) {
sortedKeys.push(modMount001Key);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modMount001Key), 1);
}
if (unsortedSlotKeys.includes(modMountKey)) {
sortedKeys.push(modMountKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modMountKey), 1);
}
} else {
if (unsortedSlotKeys.includes(modHandguardKey)) {
sortedKeys.push(modHandguardKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modHandguardKey), 1);
}

if (unsortedSlotKeys.includes(modRecieverKey)) {
sortedKeys.push(modRecieverKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modRecieverKey), 1);
}
if (unsortedSlotKeys.includes(modBarrelKey)) {
sortedKeys.push(modBarrelKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modBarrelKey), 1);
}

if (unsortedSlotKeys.includes(modPistolGrip)) {
sortedKeys.push(modPistolGrip);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modPistolGrip), 1);
}
if (unsortedSlotKeys.includes(modMount001Key)) {
sortedKeys.push(modMount001Key);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modMount001Key), 1);
}

if (unsortedSlotKeys.includes(modGasBlockKey)) {
sortedKeys.push(modGasBlockKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modGasBlockKey), 1);
}
if (unsortedSlotKeys.includes(modRecieverKey)) {
sortedKeys.push(modRecieverKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modRecieverKey), 1);
}

if (unsortedSlotKeys.includes(modStockKey)) {
sortedKeys.push(modStockKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modStockKey), 1);
}
if (unsortedSlotKeys.includes(modPistolGrip)) {
sortedKeys.push(modPistolGrip);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modPistolGrip), 1);
}

if (unsortedSlotKeys.includes(modMountKey)) {
sortedKeys.push(modMountKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modMountKey), 1);
}
if (unsortedSlotKeys.includes(modGasBlockKey)) {
sortedKeys.push(modGasBlockKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modGasBlockKey), 1);
}

if (unsortedSlotKeys.includes(modScopeKey)) {
sortedKeys.push(modScopeKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modScopeKey), 1);
if (unsortedSlotKeys.includes(modStockKey)) {
sortedKeys.push(modStockKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modStockKey), 1);
}

if (unsortedSlotKeys.includes(modMountKey)) {
sortedKeys.push(modMountKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modMountKey), 1);
}

if (unsortedSlotKeys.includes(modScopeKey)) {
sortedKeys.push(modScopeKey);
unsortedSlotKeys.splice(unsortedSlotKeys.indexOf(modScopeKey), 1);
}
}

sortedKeys.push(...unsortedSlotKeys);
Expand Down
23 changes: 14 additions & 9 deletions project/src/services/BotWeaponModLimitService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,28 @@ export class BotWeaponModLimitService {
return true;
}

// mods parent is scope and mod is scope, allow it (adds those mini-sights to the tops of sights)
// Mods parent is scope and mod is scope, allow it (adds those mini-sights to the tops of sights)
const modIsScope = this.itemHelper.isOfBaseclasses(modTemplate._id, modLimits.scopeBaseTypes);
if (this.itemHelper.isOfBaseclasses(modsParent._id, modLimits.scopeBaseTypes) && modIsScope) {
return false;
}

// If mod is a scope, return if limit reached
// If mod is a scope , Exit early
if (modIsScope) {
return this.weaponModLimitReached(modTemplate._id, modLimits.scope, modLimits.scopeMax, botRole);
}

// Mod is a mount that can hold only scopes and limit is reached (dont want to add empty mounts if limit is reached)
// Don't allow multple mounts on a weapon (except when mount is on another mount)
// Fail when:
// Over or at scope limit on weapon
// Item being added is a mount but the parent item is NOT a mount (Allows red dot sub-mounts on mounts)
// Mount has one slot and its for a mod_scope
if (
modLimits.scope.count >= modLimits.scopeMax &&
modTemplate._props.Slots?.length === 1 &&
this.itemHelper.isOfBaseclass(modTemplate._id, BaseClasses.MOUNT) &&
modTemplate._props.Slots.some((x) => x._name === "mod_scope") &&
modTemplate._props.Slots.length === 1 &&
modLimits.scope.count >= modLimits.scopeMax
!this.itemHelper.isOfBaseclass(modsParent._id, BaseClasses.MOUNT) &&
modTemplate._props.Slots.some((slot) => slot._name === "mod_scope")
) {
return true;
}
Expand All @@ -134,10 +139,10 @@ export class BotWeaponModLimitService {

// Mod is a mount that can hold only flashlights ad limit is reached (dont want to add empty mounts if limit is reached)
if (
modLimits.scope.count >= modLimits.scopeMax &&
modTemplate._props.Slots?.length === 1 &&
this.itemHelper.isOfBaseclass(modTemplate._id, BaseClasses.MOUNT) &&
modTemplate._props.Slots.some((x) => x._name === "mod_flashlight") &&
modTemplate._props.Slots.length === 1 &&
modLimits.scope.count >= modLimits.scopeMax
modTemplate._props.Slots.some((slot) => slot._name === "mod_flashlight")
) {
return true;
}
Expand Down

0 comments on commit 14dce4a

Please sign in to comment.