[matt-edmondson]

Fixes #94

What changed

Collateral ("Kill two players with one bullet") fired whenever the same attacker got a second kill in one server tick, with any weapon. Two cases were wrongly awarded:

• one shotgun shell killing two enemies who were standing close together
• a molotov finishing one enemy on the same tick that a rifle killed another

Fixes:

• RoundTracker.RegisterKill takes the weapon key as a new optional last parameter. KillsWithThisBullet now counts only same-tick kills with the same weapon.
• CombatHandlers.CreditKill resolves the weapon before calling RegisterKill (it used to resolve it just after) and passes its key in.
• Collateral uses GunNotShotgun, matching Point blank and One tap.

Spray transfer's KillsWithThisBullet < 2 check only becomes more precise with this change.

Tests

• TrackerTests.KillsOnTheSameTickWithDifferentWeaponsAreNotOneBullet: molotov then AK on one tick gives 1, and a second AK kill on that tick gives 2.
• SkillShotTests.SituationalKills: an AK with KillsWithThisBullet = 2 still earns Collateral, and a Nova does not.
• Both fail with the tick/weapon comparison and catalog filter reverted, and pass with them. Full suite: 742 passed, 7 skipped.

Note: main doesn't build at the moment, so CI here will fail until those fixes land:

• The Site fails with KTSU0006 (main doesn't build since #81: Core's new Microsoft.Extensions.Logging.Abstractions 11.0.0 reference fails the Site with KTSU0006 #82, fixed by Drop Core's stray Logging.Abstractions 11 reference so the Site builds again [patch] #85). I ran the tests with Drop Core's stray Logging.Abstractions 11 reference so the Site builds again [patch] #85's package change applied locally only.
• The plugin's Debug and Release builds fail with CS0618 (Plugin fails a Debug build with 6 × CS0618 since CounterStrikeSharp 1.0.379 made ConVar obsolete #83, fixed by Read the game-mode and teammate cvars through the typed ConVar<T> API [patch] #86). With CS0618 suppressed, the plugin builds cleanly with this change.

Open PR #79 also edits multi-kill tracking. It may need a small rebase in RoundTracker depending on which PR merges first.

---

Generated by Claude Code

[matt-edmondson]

CI is red, but the cause is already on main, not this PR. The build stops before any tests run, with the same two KTSU0006 errors as on main (#82):

• CounterStrikeProgression.Site/MetricsEndpoints.cs(22,38): transitive Microsoft.Extensions.DependencyInjection.Abstractions used directly
• CounterStrikeProgression.Site/Live/LiveState.cs(28,97): transitive Microsoft.Extensions.Logging.Abstractions used directly

This PR doesn't touch the Site. #85 fixes the build, and with its package change applied locally this branch's full suite passes (742 passed, 7 skipped).

The plugin build also fails on main with CS0618 (ConVar obsolete, #83), which #86 fixes. With CS0618 suppressed, the plugin builds cleanly with this PR's CombatHandlers change. CI should go green on this PR once #85 and #86 merge.

---

Generated by Claude Code