Compare commits

...

10 Commits

Author SHA1 Message Date
Isaac
042c48c0a6 Fix logic of round conflicts (#188) 2025-11-10 15:34:58 -08:00
MSWS
c2ada273a8 Merge branch 'dev' of github.com:MSWS/TTT into dev 2025-11-10 15:32:40 -08:00
MSWS
deb2e1cab2 fix: Round confliction logic +semver:patch 2025-11-10 15:32:36 -08:00
MSWS
dfe86b0242 fix: Round confliction logic 2025-11-10 15:02:40 -08:00
Isaac
c40c89b624 Fix Vanilla Round Inversion (#187) 2025-11-10 14:48:30 -08:00
Isaac
1df2722ce7 Force rebuild for new major 2.0.0 (#186) 2025-11-10 14:39:02 -08:00
Isaac
9079fe6c41 BREAKING CHANGES: New Special Rounds and Updates +semver:major (#185)
## Shop
- Added the ability for multiple special rounds to occur at once
- Added Rich and Low Grav Rounds
- Overhauled the Poison Gun
  - Only pistol shots count towards poison bullet usage
  - Poison bullets will be silent when shot
- Item descriptions will now be printed upon purchase

## Fixes
- Reduced the volume of the Special Round cue
- Increased the strictness of Karma
- Miscellaneous bug fixes
2025-11-10 14:15:29 -08:00
Isaac
2b04486e65 feat: Add tripwire defuse reward (#179) 2025-11-08 22:33:44 -08:00
Isaac
3b97c77065 +semver:patch (#178) 2025-11-08 22:13:00 -08:00
Isaac
83715fff1f Station Stacking and Round Start Sound Cue
- Added special round start sound cue
- Multiple Damage / Hurt Stations will now stack their effects
2025-11-08 22:04:01 -08:00

View File

@@ -86,8 +86,7 @@ public class SpecialRoundStarter(IServiceProvider provider)
var rounds = Provider.GetServices<ITerrorModule>()
.OfType<AbstractSpecialRound>()
.Where(r => r.Config.Weight > 0 && !exclude.Contains(r))
.Where(r
=> !exclude.Any(er => er.ConflictsWith(r) && !r.ConflictsWith(er)))
.Where(r => !exclude.Any(er => er.ConflictsWith(r) || r.ConflictsWith(er)))
.ToList();
if (rounds.Count == 0) return null;
var totalWeight = rounds.Sum(r => r.Config.Weight);