From 88aedaee81f7aa32c070bb29ac0d0d28f1fe1877 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sat, 11 Jul 2026 16:41:35 +0300
Subject: [PATCH] Comp analyzer single weapon combos

---
 .../comp-analyzer/comp-analyzer-hooks.ts      |  9 +++
 .../components/DamageComboBar.module.css      |  7 +++
 .../components/DamageComboBar.tsx             | 24 ++++++-
 .../core/damage-combinations.test.ts          | 63 +++++++++++++++++++
 .../comp-analyzer/core/damage-combinations.ts | 60 +++++++++++++++---
 locales/da/analyzer.json                      |  3 +-
 locales/de/analyzer.json                      |  3 +-
 locales/en/analyzer.json                      |  3 +-
 locales/es-ES/analyzer.json                   |  3 +-
 locales/es-US/analyzer.json                   |  3 +-
 locales/fr-CA/analyzer.json                   |  3 +-
 locales/fr-EU/analyzer.json                   |  3 +-
 locales/he/analyzer.json                      |  3 +-
 locales/it/analyzer.json                      |  3 +-
 locales/ja/analyzer.json                      |  3 +-
 locales/ko/analyzer.json                      |  3 +-
 locales/nl/analyzer.json                      |  3 +-
 locales/pl/analyzer.json                      |  3 +-
 locales/pt-BR/analyzer.json                   |  3 +-
 locales/ru/analyzer.json                      |  3 +-
 locales/zh/analyzer.json                      |  3 +-
 21 files changed, 184 insertions(+), 27 deletions(-)

diff --git a/app/features/comp-analyzer/comp-analyzer-hooks.ts b/app/features/comp-analyzer/comp-analyzer-hooks.ts
index 8fe01712e..61427ab26 100644
--- a/app/features/comp-analyzer/comp-analyzer-hooks.ts
+++ b/app/features/comp-analyzer/comp-analyzer-hooks.ts
@@ -43,6 +43,15 @@ export function useSelectedWeapons() {
 	});
 }
 
+export function useSingleWeaponCombos() {
+	return useSearchParamStateEncoder<boolean>({
+		defaultValue: false,
+		name: "singleCombos",
+		revive: (value) => value === "true",
+		encode: (val) => String(val),
+	});
+}
+
 export function useTargetSubDefenseAp() {
 	return useSearchParamStateEncoder<number>({
 		defaultValue: 0,
diff --git a/app/features/comp-analyzer/components/DamageComboBar.module.css b/app/features/comp-analyzer/components/DamageComboBar.module.css
index b09991340..279ce9a69 100644
--- a/app/features/comp-analyzer/components/DamageComboBar.module.css
+++ b/app/features/comp-analyzer/components/DamageComboBar.module.css
@@ -167,6 +167,13 @@
 	color: var(--color-text-high);
 }
 
+.singleWeaponToggleRow {
+	display: flex;
+	padding-block-end: var(--s-3);
+	border-block-end: 1px solid var(--color-border);
+	margin-block-end: var(--s-1);
+}
+
 .filterControlsRow {
 	display: flex;
 	gap: var(--s-2);
diff --git a/app/features/comp-analyzer/components/DamageComboBar.tsx b/app/features/comp-analyzer/components/DamageComboBar.tsx
index bd2ea540b..4afd51853 100644
--- a/app/features/comp-analyzer/components/DamageComboBar.tsx
+++ b/app/features/comp-analyzer/components/DamageComboBar.tsx
@@ -1,5 +1,6 @@
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { SendouSwitch } from "~/components/elements/Switch";
 import { Image, WeaponImage } from "~/components/Image";
 import { MAX_AP } from "~/features/build-analyzer/analyzer-constants";
 import { mainWeaponParams } from "~/features/build-analyzer/core/utils";
@@ -14,7 +15,11 @@ import {
 	subWeaponImageUrl,
 } from "~/utils/urls";
 import { LETHAL_DAMAGE } from "../comp-analyzer-constants";
-import { useTargetResAp, useTargetSubDefenseAp } from "../comp-analyzer-hooks";
+import {
+	useSingleWeaponCombos,
+	useTargetResAp,
+	useTargetSubDefenseAp,
+} from "../comp-analyzer-hooks";
 import type { DamageCombo, DamageSegment } from "../comp-analyzer-types";
 import {
 	calculateDamageCombos,
@@ -268,6 +273,10 @@ export function DamageComboList({ weaponIds }: DamageComboListProps) {
 		initialTargetSubDefenseAp,
 	);
 	const [isCollapsed, setIsCollapsed] = useState(false);
+	const [singleWeaponCombos, setSingleWeaponCombos] = useSingleWeaponCombos();
+
+	const singleWeaponOnly = weaponIds.length === 1;
+	const includeSingleWeaponCombos = singleWeaponOnly || singleWeaponCombos;
 
 	const allDamageKeys = getAllDamageKeys(weaponIds, targetSubDefenseAp);
 	const allDamageKeyStrings = new Set(allDamageKeys.map(filterKeyToString));
@@ -279,9 +288,11 @@ export function DamageComboList({ weaponIds }: DamageComboListProps) {
 		weaponIds,
 		validExcludedKeys,
 		targetSubDefenseAp,
+		undefined,
+		includeSingleWeaponCombos,
 	);
 
-	if (weaponIds.length < 2) {
+	if (weaponIds.length < 1) {
 		return null;
 	}
 
@@ -357,6 +368,15 @@ export function DamageComboList({ weaponIds }: DamageComboListProps) {
 						/>
 						<span className={styles.resSliderValue}>{targetResAp} AP</span>
 					</div>
+					<div className={styles.singleWeaponToggleRow}>
+						<SendouSwitch
+							isSelected={includeSingleWeaponCombos}
+							onChange={setSingleWeaponCombos}
+							isDisabled={singleWeaponOnly}
+						>
+							{t("analyzer:comp.singleWeaponCombos")}
+						</SendouSwitch>
+					</div>
 					<div className={styles.filterControlsRow}>
 						<button
 							type="button"
diff --git a/app/features/comp-analyzer/core/damage-combinations.test.ts b/app/features/comp-analyzer/core/damage-combinations.test.ts
index d8cfbdf16..ed1c0a634 100644
--- a/app/features/comp-analyzer/core/damage-combinations.test.ts
+++ b/app/features/comp-analyzer/core/damage-combinations.test.ts
@@ -403,6 +403,69 @@ describe("calculateDamageCombos - deduplication", () => {
 	});
 });
 
+describe("calculateDamageCombos - single weapon combos", () => {
+	test("returns no combos for a single weapon when disabled", () => {
+		const combos = calculateDamageCombos([SPLATTERSHOT_ID]);
+
+		expect(combos).toEqual([]);
+	});
+
+	test("generates combos from a single weapon when enabled", () => {
+		const combos = calculateDamageCombos(
+			[SPLATTERSHOT_ID],
+			[],
+			0,
+			undefined,
+			true,
+		);
+
+		expect(combos.length).toBeGreaterThan(0);
+
+		for (const combo of combos) {
+			const uniqueSlots = new Set(combo.segments.map((s) => s.weaponSlot));
+			expect(uniqueSlots.size).toBe(1);
+			expect(combo.totalDamage).toBeGreaterThanOrEqual(COMBO_DAMAGE_THRESHOLD);
+		}
+	});
+
+	test("lets a single weapon pair its main and sub damage when enabled", () => {
+		const combos = calculateDamageCombos(
+			[SPLATTERSHOT_ID],
+			[],
+			0,
+			undefined,
+			true,
+		);
+
+		const hasMainSubCombo = combos.some((combo) => {
+			const hasMain = combo.segments.some(
+				(s) => !s.isSubWeapon && !s.isSpecialWeapon,
+			);
+			const hasSub = combo.segments.some((s) => s.isSubWeapon);
+			return hasMain && hasSub;
+		});
+		expect(hasMainSubCombo).toBe(true);
+	});
+
+	test("keeps single-weapon combos alongside cross-weapon ones when enabled", () => {
+		const withoutSingle = calculateDamageCombos(
+			[SPLATTERSHOT_ID, SPLAT_ROLLER_ID],
+			[],
+			0,
+			1000,
+		);
+		const withSingle = calculateDamageCombos(
+			[SPLATTERSHOT_ID, SPLAT_ROLLER_ID],
+			[],
+			0,
+			1000,
+			true,
+		);
+
+		expect(withSingle.length).toBeGreaterThanOrEqual(withoutSingle.length);
+	});
+});
+
 describe("virtual damage combos", () => {
 	test("Explosher has COMBO damage type combining DIRECT and DISTANCE", () => {
 		const sources = extractDamageSources([EXPLOSHER_ID]);
diff --git a/app/features/comp-analyzer/core/damage-combinations.ts b/app/features/comp-analyzer/core/damage-combinations.ts
index 6c607540c..8caebc6ed 100644
--- a/app/features/comp-analyzer/core/damage-combinations.ts
+++ b/app/features/comp-analyzer/core/damage-combinations.ts
@@ -147,8 +147,10 @@ export function calculateDamageCombos(
 	excludedKeys: ExcludedDamageKey[] = [],
 	targetSubDefenseAp = 0,
 	maxCombosDisplayed = MAX_COMBOS_DISPLAYED,
+	includeSingleWeaponCombos = false,
 ): DamageCombo[] {
-	if (weaponIds.length < 2) {
+	const minWeaponSlots = includeSingleWeaponCombos ? 1 : 2;
+	if (weaponIds.length < minWeaponSlots) {
 		return [];
 	}
 
@@ -158,7 +160,11 @@ export function calculateDamageCombos(
 
 	const sources = extractDamageSources(weaponIds, targetSubDefenseAp);
 	const damageOptions = flattenToOptions(sources, excludedSet);
-	const combos = generateCombinations(damageOptions);
+	const combos = generateCombinations(
+		damageOptions,
+		minWeaponSlots,
+		includeSingleWeaponCombos,
+	);
 	const filtered = filterAndSortCombos(combos, maxCombosDisplayed);
 
 	return filtered;
@@ -201,10 +207,29 @@ interface PartialCombo {
 	hitCount: number;
 	usedSlots: Set<number>;
 	typeCountMap: Map<DamageType, number>;
-	slotDamageType: Map<number, DamageType>;
+	slotDamageType: Map<string, DamageType>;
 }
 
-function generateCombinations(options: DamageOption[]): DamageCombo[] {
+/**
+ * Groups a weapon slot's damage into a single "channel" that may only ever
+ * contribute one damage type per combo. In single-weapon mode each weapon type
+ * (main/sub/special) is its own channel so a single weapon can pair e.g. its
+ * main damage with its sub; otherwise a whole slot is one channel.
+ */
+function slotDamageChannel(
+	option: DamageOption,
+	includeSingleWeaponCombos: boolean,
+): string {
+	return includeSingleWeaponCombos
+		? `${option.weaponSlot}-${option.weaponType}`
+		: String(option.weaponSlot);
+}
+
+function generateCombinations(
+	options: DamageOption[],
+	minWeaponSlots: number,
+	includeSingleWeaponCombos: boolean,
+): DamageCombo[] {
 	const results: DamageCombo[] = [];
 
 	const initialState: PartialCombo = {
@@ -216,7 +241,14 @@ function generateCombinations(options: DamageOption[]): DamageCombo[] {
 		slotDamageType: new Map(),
 	};
 
-	backtrack(options, 0, initialState, results);
+	backtrack(
+		options,
+		0,
+		initialState,
+		results,
+		minWeaponSlots,
+		includeSingleWeaponCombos,
+	);
 
 	return results;
 }
@@ -226,9 +258,11 @@ function backtrack(
 	startIndex: number,
 	current: PartialCombo,
 	results: DamageCombo[],
+	minWeaponSlots: number,
+	includeSingleWeaponCombos: boolean,
 ): void {
 	if (
-		current.usedSlots.size >= 2 &&
+		current.usedSlots.size >= minWeaponSlots &&
 		current.totalDamage >= COMBO_DAMAGE_THRESHOLD
 	) {
 		results.push({
@@ -260,7 +294,8 @@ function backtrack(
 			continue;
 		}
 
-		const existingTypeForSlot = current.slotDamageType.get(option.weaponSlot);
+		const slotChannel = slotDamageChannel(option, includeSingleWeaponCombos);
+		const existingTypeForSlot = current.slotDamageType.get(slotChannel);
 		if (existingTypeForSlot && existingTypeForSlot !== option.damageType) {
 			continue;
 		}
@@ -287,7 +322,7 @@ function backtrack(
 			newTypeCountMap.set(option.damageType, currentTypeCount + count);
 
 			const newSlotDamageType = new Map(current.slotDamageType);
-			newSlotDamageType.set(option.weaponSlot, option.damageType);
+			newSlotDamageType.set(slotChannel, option.damageType);
 
 			const newState: PartialCombo = {
 				segments: [...current.segments, segment],
@@ -298,7 +333,14 @@ function backtrack(
 				slotDamageType: newSlotDamageType,
 			};
 
-			backtrack(options, i + 1, newState, results);
+			backtrack(
+				options,
+				i + 1,
+				newState,
+				results,
+				minWeaponSlots,
+				includeSingleWeaponCombos,
+			);
 		}
 	}
 }
diff --git a/locales/da/analyzer.json b/locales/da/analyzer.json
index d85a684c1..e0a69eb5e 100644
--- a/locales/da/analyzer.json
+++ b/locales/da/analyzer.json
@@ -208,5 +208,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/de/analyzer.json b/locales/de/analyzer.json
index a331e3225..39d965c0c 100644
--- a/locales/de/analyzer.json
+++ b/locales/de/analyzer.json
@@ -208,5 +208,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/en/analyzer.json b/locales/en/analyzer.json
index 45feeeaf7..0ae192512 100644
--- a/locales/en/analyzer.json
+++ b/locales/en/analyzer.json
@@ -208,5 +208,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "Team Shield",
 	"comp.specialCategory.TEAM_BUFF": "Team Buff",
 	"comp.removeAll": "Remove all",
-	"comp.addAll": "Add all"
+	"comp.addAll": "Add all",
+	"comp.singleWeaponCombos": "Single weapon combos"
 }
diff --git a/locales/es-ES/analyzer.json b/locales/es-ES/analyzer.json
index fc9b525b7..917127ee1 100644
--- a/locales/es-ES/analyzer.json
+++ b/locales/es-ES/analyzer.json
@@ -211,5 +211,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "Escudo de equipo",
 	"comp.specialCategory.TEAM_BUFF": "Mejora de equipo",
 	"comp.removeAll": "Eliminar todos",
-	"comp.addAll": "Añadir todos"
+	"comp.addAll": "Añadir todos",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/es-US/analyzer.json b/locales/es-US/analyzer.json
index f2921506d..b7e65f778 100644
--- a/locales/es-US/analyzer.json
+++ b/locales/es-US/analyzer.json
@@ -211,5 +211,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/fr-CA/analyzer.json b/locales/fr-CA/analyzer.json
index fd26c6650..d0547d587 100644
--- a/locales/fr-CA/analyzer.json
+++ b/locales/fr-CA/analyzer.json
@@ -211,5 +211,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/fr-EU/analyzer.json b/locales/fr-EU/analyzer.json
index 0c153f232..82bf2a8be 100644
--- a/locales/fr-EU/analyzer.json
+++ b/locales/fr-EU/analyzer.json
@@ -211,5 +211,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/he/analyzer.json b/locales/he/analyzer.json
index 2c1da30a5..10c6a070a 100644
--- a/locales/he/analyzer.json
+++ b/locales/he/analyzer.json
@@ -211,5 +211,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "מגן הקבוצה",
 	"comp.specialCategory.TEAM_BUFF": "חיזוק הקבוצה",
 	"comp.removeAll": "הסר הכל",
-	"comp.addAll": "הוסף הכל"
+	"comp.addAll": "הוסף הכל",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/it/analyzer.json b/locales/it/analyzer.json
index 29d5ccc38..82accc109 100644
--- a/locales/it/analyzer.json
+++ b/locales/it/analyzer.json
@@ -211,5 +211,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/ja/analyzer.json b/locales/ja/analyzer.json
index 8579c729e..68793efbb 100644
--- a/locales/ja/analyzer.json
+++ b/locales/ja/analyzer.json
@@ -202,5 +202,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/ko/analyzer.json b/locales/ko/analyzer.json
index 534accada..c21d687a5 100644
--- a/locales/ko/analyzer.json
+++ b/locales/ko/analyzer.json
@@ -202,5 +202,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/nl/analyzer.json b/locales/nl/analyzer.json
index abeed3ded..5b7a31c95 100644
--- a/locales/nl/analyzer.json
+++ b/locales/nl/analyzer.json
@@ -208,5 +208,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/pl/analyzer.json b/locales/pl/analyzer.json
index 36fd52c79..584d3ef3c 100644
--- a/locales/pl/analyzer.json
+++ b/locales/pl/analyzer.json
@@ -214,5 +214,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/pt-BR/analyzer.json b/locales/pt-BR/analyzer.json
index 75a02d3d7..98fa2655d 100644
--- a/locales/pt-BR/analyzer.json
+++ b/locales/pt-BR/analyzer.json
@@ -211,5 +211,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/ru/analyzer.json b/locales/ru/analyzer.json
index f70182351..13fe32f5f 100644
--- a/locales/ru/analyzer.json
+++ b/locales/ru/analyzer.json
@@ -214,5 +214,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "",
 	"comp.specialCategory.TEAM_BUFF": "",
 	"comp.removeAll": "",
-	"comp.addAll": ""
+	"comp.addAll": "",
+	"comp.singleWeaponCombos": ""
 }
diff --git a/locales/zh/analyzer.json b/locales/zh/analyzer.json
index 56f7bb2d2..12b321e45 100644
--- a/locales/zh/analyzer.json
+++ b/locales/zh/analyzer.json
@@ -205,5 +205,6 @@
 	"comp.specialCategory.TEAM_SHIELD": "团队防护罩",
 	"comp.specialCategory.TEAM_BUFF": "团队增益",
 	"comp.removeAll": "移除所有",
-	"comp.addAll": "添加所有"
+	"comp.addAll": "添加所有",
+	"comp.singleWeaponCombos": ""
 }