From de8d3396b156426746041dfcedf60ef880855fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Tue, 16 Dec 2025 12:35:56 -0600 Subject: [PATCH 1/3] fix: use normalized dvpl path --- packages/scripts/src/core/vfs/abstract.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/scripts/src/core/vfs/abstract.ts b/packages/scripts/src/core/vfs/abstract.ts index 122c33f15..19aa59aa1 100644 --- a/packages/scripts/src/core/vfs/abstract.ts +++ b/packages/scripts/src/core/vfs/abstract.ts @@ -21,7 +21,7 @@ export abstract class AbstractVFS { const normalized = normalize(path); if (this.has(normalized)) return normalized; - const dvplPath = `${path}.dvpl`; + const dvplPath = `${normalized}.dvpl`; if (this.has(dvplPath)) return dvplPath; return null; From 9d4e1a66a1ae70453938fe081e4931d09d2f0402 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sat, 27 Dec 2025 15:35:16 +1300 Subject: [PATCH 2/3] Fix Turret chnage not affecting DPM --- .../components/Modules.tsx | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx index 63a4275fb..c7fc9837f 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx @@ -176,11 +176,17 @@ export function Modules() { (turret) => turret.id === unlock.id )!; - if ( - !draft.protagonist.turret.guns.some( - (gun) => gun.id === draft.protagonist.gun.id - ) - ) { + // Check if current gun exists in new turret + const gunInNewTurret = draft.protagonist.turret.guns.find( + (gun) => gun.id === draft.protagonist.gun.id + ); + + if (gunInNewTurret) { + // Gun exists - get it FROM this turret (this fixes the bug!) + draft.protagonist.gun = gunInNewTurret; + draft.protagonist.shell = gunInNewTurret.shells[0]; + } else { + // Gun doesn't exist - select top gun from new turret draft.protagonist.gun = draft.protagonist.turret.guns.at(-1)!; draft.protagonist.shell = draft.protagonist.gun.shells[0]; } @@ -422,4 +428,4 @@ export function Modules() { ); -} +} \ No newline at end of file From 18cc88586937beb964303b190fc98a6bdee0e5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Fri, 26 Dec 2025 21:13:06 -0600 Subject: [PATCH 3/3] feat: hide bug in exclaim Removed redundant comment about fixing a bug. --- .../Tankopedia/CharacteristicsSection/components/Modules.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx index c7fc9837f..55703da90 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx @@ -182,7 +182,7 @@ export function Modules() { ); if (gunInNewTurret) { - // Gun exists - get it FROM this turret (this fixes the bug!) + // Gun exists - get it FROM this turret draft.protagonist.gun = gunInNewTurret; draft.protagonist.shell = gunInNewTurret.shells[0]; } else { @@ -428,4 +428,4 @@ export function Modules() { ); -} \ No newline at end of file +}