From 509cdff8b6f7488a41d5f6f501db84275154a193 Mon Sep 17 00:00:00 2001 From: Valens Date: Thu, 16 Feb 2023 13:21:06 -0500 Subject: [PATCH] Fix marked room loot for AKI 3.5.1 --- src/loot.ts | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/loot.ts b/src/loot.ts index 74ac57e..25eac9b 100644 --- a/src/loot.ts +++ b/src/loot.ts @@ -55,9 +55,9 @@ export class Loot { // Customs Marked Room Loot. let spawnPoints = this.tables.getTables().locations.bigmap.looseLoot.spawnpoints; - const customsMarked1 = spawnPoints.find(x=>x.template.Id==="Loot 135 (10)1137996"); - const customsMarked2 = spawnPoints.find(x=>x.template.Id==="Loot 135 (9)1132486"); - const customsMarked3 = spawnPoints.find(x=>x.template.Id==="Loot 135 (8)1141962"); + const customsMarked1 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135 (10)")); + const customsMarked2 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135 (9)")); + const customsMarked3 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135 (8)")); // Pushing containers into the customs marked room loot pool. customsMarked1.itemDistribution.push(...this.containers()); @@ -67,15 +67,15 @@ export class Loot // Reserve Marked Room Loot. spawnPoints = this.tables.getTables().locations.rezervbase.looseLoot.spawnpoints; const rsrvRBBK1 = spawnPoints.find(x=>x.template.Id==="Loot 135 (10)51646628"); - const rsrvRBBK2 = spawnPoints.find(x=>x.template.Id==="Loot 135 (8)51666758"); - const rsrvRBBK3 = spawnPoints.find(x=>x.template.Id==="Loot 135 (9)51636512"); + const rsrvRBBK2 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135 (8)")); + const rsrvRBBK3 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135 (9)")); - const rsrvRBPKPM1 = spawnPoints.find(x=>x.template.Id==="cult_Loot 135 (11)51654030"); - const rsrvRBPKPM2 = spawnPoints.find(x=>x.template.Id==="cult_Loot 135 (12)51653462"); + const rsrvRBPKPM1 = spawnPoints.find(x=>x.template.Id.startsWith("cult_Loot 135 (11)")); + const rsrvRBPKPM2 = spawnPoints.find(x=>x.template.Id.startsWith("cult_Loot 135 (12)")); const rsrvRBVO1 = spawnPoints.find(x=>x.template.Id==="Loot 135 (10)51658080"); - const rsrvRBVO2 = spawnPoints.find(x=>x.template.Id==="Loot 135 (11)51652762"); - const rsrvRBVO3 = spawnPoints.find(x=>x.template.Id==="Loot 135 (12)51652706"); + const rsrvRBVO2 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135 (11)")); + const rsrvRBVO3 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135 (12)")); // Pushing containers into the reserve base marked room loot pool. rsrvRBBK1.itemDistribution.push(...this.containers()); @@ -91,23 +91,23 @@ export class Loot // Streets Marked Room Loot. spawnPoints = this.tables.getTables().locations.tarkovstreets.looseLoot.spawnpoints; - const streets = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare3328366"); - const streets1 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (1)3332226"); - const streets2 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (2)3322128"); - const streets3 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (3)3810498"); - const streets4 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (4)3951260"); - const streets5 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (5)3325368"); + const streets = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare5491814"); + const streets1 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (1)")); + const streets2 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (2)")); + const streets3 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (3)")); + const streets4 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (4)")); + const streets5 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (5)")); const streets6 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (6)3814146"); const streets6a = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (6)3955044"); - const streets7 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (7)3811846"); - const streets8 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (8)3803698"); - const streets9 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (9)3826302"); + const streets7 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (7)")); + const streets8 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (8)")); + const streets9 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (9)")); const streets10 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (10)5484984"); - const streets11 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (11)3332946"); - const streets12 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (12)3804226"); - const streets13 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (13)3967988"); - const streets14 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (14)3809678"); - const streets15 = spawnPoints.find(x=>x.template.Id==="Loot 135_Leo_Rare (15)3947696"); + const streets11 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (11)")); + const streets12 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (12)")); + const streets13 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (13)")); + const streets14 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (14)")); + const streets15 = spawnPoints.find(x=>x.template.Id.startsWith("Loot 135_Leo_Rare (15)")); // Pushing containers into the streets marked room loot pool. streets.itemDistribution.push(...this.containers());