From fe2d21fa2a69e1ae32280622b847c95d0b60e463 Mon Sep 17 00:00:00 2001
From: agustin-lowpoly <agustin@lowpoly.gg>
Date: Sat, 27 Jun 2026 12:02:03 -0300
Subject: [PATCH] Fix thin damageable trigger brush aiming

---
 src/runtime/weapons.ts                        | 12 ++++-
 .../weaponDamageableBrushTargets.test.mjs     | 54 +++++++++++++++----
 2 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/src/runtime/weapons.ts b/src/runtime/weapons.ts
index bc13f33..261d074 100644
--- a/src/runtime/weapons.ts
+++ b/src/runtime/weapons.ts
@@ -1038,8 +1038,7 @@ export function createQuakeWeaponsController({
   function quakeAimTrace(ray: QuakeViewRay): QuakeUseTrace | null {
     const collisionWorld = getCollisionWorld();
     let best: { score: number; trace: QuakeUseTrace } | null = null;
-    for (const shootable of getShootables()) {
-      if (shootable.dead) continue;
+    for (const shootable of aimAssistTargets()) {
       const target = shootableAimPoint(shootable);
       const targetDirection = normalizeVec3([
         target[0] - ray.origin[0],
@@ -1060,6 +1059,15 @@ export function createQuakeWeaponsController({
     return best?.trace ?? null;
   }
 
+  function* aimAssistTargets(): Iterable<QuakeWeaponShootableTarget> {
+    for (const shootable of getShootables()) {
+      if (!shootable.dead) yield shootable;
+    }
+    for (const target of getDamageableBrushTargets?.() ?? []) {
+      if (!target.dead && isWeaponTraceDamageableBrushTarget(target.entity)) yield target;
+    }
+  }
+
   function fireWeaponProfile(profile: QuakeRuntimeWeaponFireProfile, now: number): boolean {
     if (profile.kind === "hitscan-pellets") return fireShotgunPellets(profile);
     if (profile.kind === "projectile") {
diff --git a/test/gameplay/weaponDamageableBrushTargets.test.mjs b/test/gameplay/weaponDamageableBrushTargets.test.mjs
index eb09c0b..e466e23 100644
--- a/test/gameplay/weaponDamageableBrushTargets.test.mjs
+++ b/test/gameplay/weaponDamageableBrushTargets.test.mjs
@@ -84,6 +84,35 @@ test("projectiles can damage health trigger brush targets over earlier world tra
   assert.deepEqual(damagedBrushes, [{ amount: 1, entityIndex: 138 }]);
 });
 
+test("health trigger brush targets can use weapon source aim correction", () => {
+  const controller = createWeaponsController({
+    damageableBrushTargets: [
+      damageableBrushTarget({
+        bounds: {
+          min: [1, -0.1, -0.02],
+          max: [2, 0.1, 0.02],
+        },
+        classname: "trigger_multiple",
+        health: 1,
+        index: 270,
+      }),
+    ],
+    entities: [
+      quakeEntity({
+        classname: "trigger_multiple",
+        health: 1,
+        index: 270,
+      }),
+    ],
+    traceUse: () => null,
+  });
+
+  const trace = controller.weaponTraceAtCrosshair();
+
+  assert.equal(trace?.classname, "trigger_multiple");
+  assert.equal(trace?.entityIndex, 270);
+});
+
 test("non-button damageable brush targets do not bypass world trace", () => {
   const controller = createWeaponsController({
     damageableBrushTargets: [
@@ -108,7 +137,17 @@ test("non-button damageable brush targets do not bypass world trace", () => {
   assert.equal(trace?.entityIndex, undefined);
 });
 
-function createWeaponsController({ damageBrushEntity = () => false, damageableBrushTargets, entities }) {
+function createWeaponsController({
+  damageBrushEntity = () => false,
+  damageableBrushTargets,
+  entities,
+  traceUse = () => ({
+    classname: "worldspawn",
+    end: [0.1, 0, 0],
+    fraction: 0.01,
+    planeNormal: [-1, 0, 0],
+  }),
+}) {
   const entityByIndex = new Map(entities.map((entity) => [entity.index, entity]));
   return weapons.createQuakeWeaponsController({
     scene: { camera: { state: { rotX: 90, rotY: 180 } } },
@@ -120,14 +159,7 @@ function createWeaponsController({ damageBrushEntity = () => false, damageableBr
     damageShootable: () => false,
     getActiveWeapon: () => "nailgun",
     getAmmo: () => 100,
-    getCollisionWorld: () => ({
-      traceUse: () => ({
-        classname: "worldspawn",
-        end: [0.1, 0, 0],
-        fraction: 0.01,
-        planeNormal: [-1, 0, 0],
-      }),
-    }),
+    getCollisionWorld: () => ({ traceUse }),
     getDamageableBrushTargets: () => damageableBrushTargets,
     getEntities: () => entityByIndex,
     getPlayerEyeHeight: () => 0.92,
@@ -143,12 +175,12 @@ function createWeaponsController({ damageBrushEntity = () => false, damageableBr
   });
 }
 
-function damageableBrushTarget({ classname, health, index }) {
+function damageableBrushTarget({ bounds, classname, health, index }) {
   return {
     dead: false,
     entity: quakeEntity({ classname, health, index }),
     origin: [0, 0, 0],
-    bounds: {
+    bounds: bounds ?? {
       min: [-100, -100, -100],
       max: [100, 100, 100],
     },