From 0995e0c0141828ddb55c099608186b15d2454193 Mon Sep 17 00:00:00 2001 From: Chomp Date: Sun, 19 Jan 2025 11:56:24 +0000 Subject: [PATCH] Fixed 30round FDE mag conflict --- project/src/models/enums/ItemTpl.ts | 6 ++++-- project/src/models/enums/Weapons.ts | 3 ++- project/src/tools/ItemTplGenerator/itemOverrides.ts | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/project/src/models/enums/ItemTpl.ts b/project/src/models/enums/ItemTpl.ts index d329361d..5145388f 100644 --- a/project/src/models/enums/ItemTpl.ts +++ b/project/src/models/enums/ItemTpl.ts @@ -1,5 +1,6 @@ // This is an auto generated file, do not modify. Re-generate with `npm run gen:items` -export enum ItemTpl { +export enum ItemTpl +{ AMMOBOX_127X33_COPPER_20RND = "676009ddb623f3b8ba079419", AMMOBOX_127X33_FMJ_20RND = "676009ed8f1fee08740f9479", AMMOBOX_127X33_JHP_20RND = "676009fe8f1fee08740f947c", @@ -2813,7 +2814,8 @@ export enum ItemTpl { MAGAZINE_556X45_HK_STEEL_30RND = "5c05413a0db834001c390617", MAGAZINE_556X45_MAG5100_100RND = "5c6592372e221600133e47d7", MAGAZINE_556X45_MAG560_60RND = "544a37c44bdc2d25388b4567", - MAGAZINE_556X45_MK16_30RND = "61840d85568c120fdd2962a5", + MAGAZINE_556X45_MK16_30RND = "61840bedd92c473c77021635", + MAGAZINE_556X45_MK16_FDE_30RND = "61840d85568c120fdd2962a5", MAGAZINE_556X45_PMAG_D60_60RND = "59c1383d86f774290a37e0ca", MAGAZINE_556X45_PM_GEN2_30RND = "5c6d450c2e221600114c997d", MAGAZINE_556X45_STANAG_30RND = "55d4887d4bdc2d962f8b4570", diff --git a/project/src/models/enums/Weapons.ts b/project/src/models/enums/Weapons.ts index b4e57187..b9dbaa5f 100644 --- a/project/src/models/enums/Weapons.ts +++ b/project/src/models/enums/Weapons.ts @@ -1,5 +1,6 @@ // This is an auto generated file, do not modify. Re-generate with `npm run gen:items` -export enum Weapons { +export enum Weapons +{ ASSAULTCARBINE_762X39_OP_SKS = "587e02ff24597743df3deaeb", ASSAULTCARBINE_762X39_SKS = "574d967124597745970e7c94", ASSAULTCARBINE_762X51_VPO_101_VEPR_HUNTER = "5c501a4d2e221602b412b540", diff --git a/project/src/tools/ItemTplGenerator/itemOverrides.ts b/project/src/tools/ItemTplGenerator/itemOverrides.ts index f6be9f3a..d4895ebe 100644 --- a/project/src/tools/ItemTplGenerator/itemOverrides.ts +++ b/project/src/tools/ItemTplGenerator/itemOverrides.ts @@ -74,6 +74,7 @@ export default { "5cbdaf89ae9215000e5b9c94": "6L23 Plum", "5e21a3c67e40bd02257a008a": "GEN M3 Banana", "6241c2c2117ad530666a5108": "GEN M3 AIRSOFT", + "61840d85568c120fdd2962a5": "MK16 FDE", // Lootable Containers "5914944186f774189e5e76c2": "Jacket 204Key",