Compare commits

...

73 Commits

Author SHA1 Message Date
MSWS
969c872e48 Force logs to be run on main thread 2025-10-13 21:12:59 -07:00
MSWS
b2f19b7ac3 feat: Enhance log viewing with messaging and visibility logic +semver:minor
```
Enhance logging and visibility management in game commands and role handling

- Update `LogsCommand.cs` to integrate messaging and localization with `IMessenger` and `IMsgLocalizer`, and conditionally adjust player visibility using `IIconManager`.
- Add new localized message in `GameMsgs.cs` for player's log viewing activity, using player's name.
- Overload `SetVisiblePlayers` in `IIconManager.cs` to increase flexibility by accepting an `IOnlinePlayer` object.
- Implement `SetVisiblePlayers` in `RoleIconsHandler.cs` to improve player visibility and role management, and integrate rules for specific roles like `DetectiveRole` and `TraitorRole`.
- Modify `en.yml` to include a log message for when a player views logs alive.
```
2025-10-13 21:11:50 -07:00
MSWS
742e407bcf Add shop list footer 2025-10-13 20:55:17 -07:00
MSWS
f8c8e528e2 Buff poison shot amo (resolves #115) 2025-10-13 20:16:21 -07:00
MSWS
24bd3d5f40 Clear recipients of awp sounds 2025-10-13 19:51:49 -07:00
MSWS
f1ff53893f Add karma grants per round 2025-10-13 19:47:15 -07:00
MSWS
54c89e96c0 fix: Respawn players when game actually starts
```
- Improve player respawn logic in RoundTimerListener for better team handling and secure timer disposal.
- Enhance initial setup and end game logic in RoundBasedGame with robust role assignment, game state checks, and localization support.
- Increase default Healthshot item price in HealthshotConfig.
```
2025-10-13 19:19:42 -07:00
MSWS
46514a6016 Change comparator 2025-10-12 19:05:13 -07:00
MSWS
73a8f6a9f5 Restrict logs command behind permission 2025-10-12 18:16:52 -07:00
MSWS
f0c239f08e build: Change DI lifetimes for TExtension and ITerrorModule
- Change dependency injection lifetime for services implementing `TExtension` from scoped to singleton in `ServiceCollectionExtensions.cs`
- Register `ITerrorModule` as a transient service in `ServiceCollectionExtensions.cs`
2025-10-12 18:08:25 -07:00
MSWS
bafad884d9 Dont modify karma if killer is the victim 2025-10-12 17:49:30 -07:00
MSWS
1d7e2f7466 Update compass more frequently 2025-10-12 17:42:15 -07:00
MSWS
f9e3d2d324 perf: Refactor KarmaStorage for thread-safety and reliability
- Replace `Dictionary<IPlayer, int>` with `ConcurrentDictionary<string, int>` in `KarmaStorage.cs` for thread-safe operations.
- Introduce caching logic with semaphore for serialized writes in `KarmaStorage.cs`.
- Add periodic data flushing mechanism to the database with improved error handling in `KarmaStorage.cs`.
- Seal `KarmaStorage` class to prevent inheritance and ensure configuration loading precedes database operations.
- Improve error handling with logging and ensure reliable database connections in `KarmaStorage.cs`.
- Enhance thread safety and performance in `FlushAsync` and `Write` methods, improving idempotency and preventing race conditions.
- Increase robustness with null checks, additional validations, and modular code separation in `KarmaStorage.cs`.
2025-10-12 17:24:19 -07:00
Isaac
9ce90cccaa Additional Shop Items, Synchronous Events (#111) 2025-10-12 14:05:14 -07:00
Isaac
551f6a09ef Update TTT/CS2/Command/PlayerPingShopAlias.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Isaac <git@msws.xyz>
2025-10-12 13:59:45 -07:00
MSWS
41db8f9444 Additional awaits 2025-10-12 13:54:56 -07:00
MSWS
361bbb0a49 Wait for async event completion 2025-10-12 13:52:17 -07:00
MSWS
228ea40cec feat: Add item sorting and player ping features +semver:minor
```
- Introduce `IItemSorter` interface across multiple components to enhance item sorting capabilities in shop commands.
- Enhance `ListCommand` with caching mechanisms, improved sorting logic, and item formatting adjustments for better performance and usability.
- Implement `PlayerPingShopAlias` for enhanced player interaction, including command listeners and shop command processing tied to player actions.
- Set default price for Silent AWP in `SilentAWPConfig` to standardize item pricing.
- Conduct significant cleanup and optimization in `PoisonShotsListener` to improve gameplay experience and reduce unnecessary debug messages.
```
2025-10-12 13:22:31 -07:00
MSWS
44f7283145 feat: Refactor PlayerDamagedEvent for enhanced accuracy
```
- Increase delay time in KarmaListenerTests to ensure proper karma update processing.
- Change `Event` class from abstract to concrete, and modify `Id` property implementation.
- Adjust CS2GameConfig timing settings for more balanced gameplay.
- Enhance PoisonShotsListener functionality with player health parameters and item removal.
- Make SimpleLogger methods virtual to improve subclass flexibility.
- Implement new logging capabilities in CS2Logger with Serilog integration.
- Enhance GiveItemCommand with new event handling for item purchases.
- Update DeagleTests for accurate simulation of weapon damage.
- Modify PlayerDamagedEvent structure for more precise damage calculations.
- Improve DamageStation logic to align with new damage handling.
- Refactor DamageCanceler for better code organization and cross-platform support.
```
2025-10-12 12:28:08 -07:00
MSWS
1a52daad7c Fix async event handler 2025-10-12 11:56:20 -07:00
MSWS
7d0d32998e feat: Refactor karma configs and add new settings
- Change database connection string constant name for consistency in `CS2KarmaConfig.cs`
- Extend description of minimum karma for clarification of its impact
- Refine descriptions of player actions related to karma for improved clarity
- Rename karma-related constants to generic terms for simplicity
- Introduce configurable warning window for low karma to prevent repeat warnings
- Add configurable karma delta values for in-game actions
- Update Load method to include new karma-related configurations
2025-10-11 20:53:49 -07:00
MSWS
3cda83932e feat: Refactor karma system for configurability
```
- Add detailed XML documentation comments to `KarmaConfig.cs` to improve code understanding and maintainability.
- Remove the default value of `MinKarma` in `KarmaConfig.cs`, making it a mandatory setting.
- Introduce new properties in `KarmaConfig.cs` for handling different karma scenarios in player interactions.
- Add a dependency on `TTT.API.Storage` in `KarmaListener.cs` for loading configurations.
- Replace hardcoded karma values in `KarmaListener.cs` with configurable options, enhancing flexibility and adaptability.
```
2025-10-11 20:50:24 -07:00
MSWS
7ea57d0a9b Reformat & Cleanup 2025-10-11 20:46:16 -07:00
MSWS
839be785f0 refactor: Refactor shop item removal to use generics
- Update `DeagleDamageListener.cs` to enhance type safety and address edge cases related to item removal and friendly fire logic.
- Improve the purchase validation logic in `Stickers.cs` using a type-specific item check.
- Refactor `Shop.cs` to use generic type parameters in item removal methods, enhancing type safety.
- Simplify `IShop.cs` by removing default implementations and focusing on type-based item checks.
- Enhance overall code clarity and maintainability with type-specific method improvements.
2025-10-11 20:42:40 -07:00
MSWS
8f0a273f79 refactor: Enhance EventBus validation and optimize role assign logic
```
- Introduce validation to `EventBus` listener methods to enforce `void` return type and enhance exception messaging for parameter constraints.
- Refactor `RoleAssignCreditor` to simplify execution path by making `OnRoleAssign` synchronous and handling asynchronous operations with `Task.Run`.
```
2025-10-11 20:23:06 -07:00
MSWS
cb6cb442b1 refactor: Refactor event dispatching to be synchronous +semver:minor
- Remove asynchronous calls and convert to synchronous dispatch in multiple files, improving performance and reducing complexity.
- Refactor `RoundBasedGame.cs` to enhance game state management, implement team victory determination, and ensure resource disposal.
- Update `IEventBus.cs` and `EventBus.cs` to change the dispatch method to synchronous operation, altering method return types.
- Modify karma-related tests and storage in `KarmaListenerTests.cs`, `KarmaStorage.cs`, and `MemoryKarmaStorage.cs` to reflect synchronization changes, ensuring correct behavior.
- Refactor `EventModifiedMessenger.cs` to improve message handling by switching to synchronous calls.
- Implement new karma penalty logic in `KarmaListener.cs` for certain actions, adjusting the handling and calculations of karma.
2025-10-11 20:01:40 -07:00
Isaac
cb2a5a8720 feat: Compass Item (resolves #80) (#108) 2025-10-09 18:55:36 -07:00
MSWS
10be465d33 Resolve merge / build issue 2025-10-09 18:17:10 -07:00
Isaac
a0720376d4 Merge branch 'dev' into feat/shop-compass
Signed-off-by: Isaac <git@msws.xyz>
2025-10-09 18:15:58 -07:00
Isaac
f5cb87d92c feat: Add Silent AWP item +semver:minor (resolves #105) (#110)
- Implement Silent AWP item functionality with
`SilentAWPServiceCollection` and `SilentAWPItem` class for `TraitorRole`
- Add Silent AWP shop item and related localized texts in `en.yml`
- Define message constants for Silent AWP in `SilentAWPMsgs.cs` for
internationalization
- Modify `GiveItemCommand.cs` to incorporate `OnPurchase` logic for item
purchases
- Manage player validity in `CS2AliveSpoofer.cs` by removing players
with null handles
- Enhance player detail replies in `IndexCommand.cs`
- Introduce messaging functionality in `BaseItem.cs` and use via
`Messenger` field
- Add Silent AWP service integration in `ShopServiceCollection.cs` and
`Traitor` config in `SilentAWPConfig.cs`
2025-10-09 18:14:57 -07:00
MSWS
bd6c15aca7 feat: Add Silent AWP item and related services +semver:minor
- Implement Silent AWP item functionality with `SilentAWPServiceCollection` and `SilentAWPItem` class for `TraitorRole`
- Add Silent AWP shop item and related localized texts in `en.yml`
- Define message constants for Silent AWP in `SilentAWPMsgs.cs` for internationalization
- Modify `GiveItemCommand.cs` to incorporate `OnPurchase` logic for item purchases
- Manage player validity in `CS2AliveSpoofer.cs` by removing players with null handles
- Enhance player detail replies in `IndexCommand.cs`
- Introduce messaging functionality in `BaseItem.cs` and use via `Messenger` field
- Add Silent AWP service integration in `ShopServiceCollection.cs` and `Traitor` config in `SilentAWPConfig.cs`
2025-10-09 18:07:05 -07:00
MSWS
7e5e34c500 Merge branch 'feat/shop-compass' of github.com:MSWS/TTT into feat/shop-compass 2025-10-09 15:04:21 -07:00
MSWS
8a886a158c Replace center with HTML specific call 2025-10-09 15:04:15 -07:00
MSWS
fc61682669 Merge branch 'dev' into feat/shop-compass 2025-10-08 21:02:54 -07:00
MSWS
d6e4655674 Update licenses 2025-10-08 21:02:40 -07:00
MSWS
c53a584113 Update licenses 2025-10-08 21:02:26 -07:00
MSWS
c56387d6e4 feat: Enhance compass configuration and logic
- Add new configuration fields in CompassConfig.cs to customize compass FOV and length
- Implement maximum range check and refactor angle calculations in CompassItem.cs
- Update distance descriptions in CompassItem.cs for thematic clarity
- Enhance code readability and maintainability in CompassItem.cs through refactoring
2025-10-08 20:53:30 -07:00
MSWS
1c8d1a5dd5 feat: Implement advanced compass and detection features +semver:minor
- Enhance `CompassItem` in `CompassItem.cs` with refined enemy detection, directional compass, and improved documentation.
- Add `TextCompass` utility class in `TextCompass.cs` featuring static method for compass line generation with direction normalization and cardinal placements.
2025-10-08 20:23:14 -07:00
MSWS
340dae1b16 Optimize role/team-based checks 2025-10-08 18:55:16 -07:00
MSWS
eff58ab2f1 Reformat & Cleanup 2025-10-07 20:54:29 -07:00
MSWS
acababeaf5 feat: Add compass itme +semver:minor (resolves #80)
```
Introduce Compass Item for Traitor Role

- Add a new configuration file `CompassConfig.cs` for the traitor-exclusive compass with default settings, including a price of 70 and a maximum range of 10,000.
- Integrate the `Compass` service into the shop by updating `ShopServiceCollection.cs` to support the new item.
- Extend `BaseItem.cs` with additional dependencies for game management, enhancing item functionality.
- Update localization in `en.yml` to include the "Player Compass" item, ensuring descriptions and structure accommodate the new addition.
- Create `CompassMsgs.cs` to manage compass-related messages with `SHOP_ITEM_COMPASS` and `SHOP_ITEM_COMPASS_DESC` for localization.
- Enhance vector handling in `VectorExtensions.cs` by adding nullability checks and support for nullable objects.
- Implement `CompassItem.cs` to support traitor-specific gameplay features like real-time radar updates and enemy tracking.
```
2025-10-07 20:46:32 -07:00
MSWS
f40b8ebef0 test: Fix BalanceClear unit tests relying on karma 2025-10-07 10:10:52 -07:00
MSWS
9a005c209a Cleanup & Reformat 2025-10-07 10:06:34 -07:00
MSWS
36914d01a5 refactor: Move BuyMenu handler into GameHandlers 2025-10-07 09:59:26 -07:00
MSWS
62e48e6c73 update(traitor): Buff hurt stations 2025-10-07 09:55:43 -07:00
MSWS
82a4c47dfb Merge branch 'main' into dev 2025-10-07 09:48:53 -07:00
MSWS
31f02ec7f0 ci: Cleanup release.yml 2025-10-07 09:48:48 -07:00
MSWS
36be427f56 Crash fixes for TeamChangeHandler 2025-10-05 17:17:53 -07:00
MSWS
8709d633b1 Fix one shot revolver improperly handling detective case 2025-10-05 00:36:33 -07:00
MSWS
1c63b3fbcc feat: Implement karma, team changes, and taser rewards
```
- Update PlayerKillListener to modify balance adjustments and simplify kill log messages.
- Add TeamChangeHandler to CS2ServiceCollection for managing team changes.
- Introduce TaseRewarder to ShopServiceCollection, enabling taser damage event handling.
- Make RoleAssignCreditor asynchronous and integrate karma-based credit adjustments.
- Update SpectatorRole assignment logic with new IRoleAssigner dependency.
- Make player parameter nullable in KarmaConfig's MaxKarma method.
- Refactor BuyListener to remove server chat notifications and streamline armor setting.
```
2025-10-04 22:53:11 -07:00
MSWS
f1521fc499 feat: Implement purchase handling and enhance karma update +semver:minor
- Update `KarmaStorage.cs` to increase karma update frequency and integrate Counter Strike features.
- Enhance `CS2ServiceCollection.cs` with new `BuyListener` behavior for handling purchase activities.
- Add `GetArmor` method in `PlayerExtensions.cs` to retrieve player armor and helmet status.
- Implement `BuyListener.cs` to manage player purchases, logging, and inventory adjustments.
2025-10-04 21:57:04 -07:00
MSWS
986f30c34f Remove all buyzones 2025-10-04 20:35:33 -07:00
MSWS
be6d79dcea test: Refactor damage events and enhance debug logging
- Simplify `PlayerDamagedEvent` instantiation by removing an unused parameter in `DeagleTests.cs` and `PlayerActionsTest.cs`.
- Update `HpLeft` calculation in `PlayerDamagedEvent.cs` to use a new formula for determining remaining health, improving damage calculation accuracy.
- Enhance debugging in `PoisonShotsListener.cs` by adding debug logs and null checks for more reliable damage event tracking.
- Refactor tests in `DeagleTests.cs` to verify unique item kill behavior after the first use.
2025-10-04 20:14:26 -07:00
MSWS
87d55aadd2 refactor: Refactor event handling and improve localization. +semver:minor
- Simplify `PlayerDamagedEvent` constructor and update health calculations for clarity and consistency.
- Add context to damage events in `DamageStation.cs` by including weapon property and streamline damage calculation logic.
- Enhance `PoisonShotsListener.cs` with localization support for weapon names, improve poison effect handling, and cleanup code for better maintainability.
2025-10-04 19:53:21 -07:00
MSWS
9efd37063b refactor: Refactor damage logic and event handling
- Refactor `OneHitKnifeListener` to set victim's health directly to zero for simplified one-hit kill logic.
- Add `PlayerDamagedEvent` in `DamageStation` to allow external interference in damage calculation and consider event modifications.
- Streamline `PlayerDamagedEvent` class by refactoring damage calculation logic and removing unnecessary properties and fields.
- Update `PoisonShotsListener` to include dependency on `IEventBus`, enhance poison effects, and dispatch relevant events such as `PlayerDamagedEvent` and `PlayerDeathEvent`.
- Remove `DamageEventTest` class, indicating a refactor or change in damage event management/testing strategy.
2025-10-04 19:04:24 -07:00
MSWS
3381722e7e feat: Enhance event handling and add player tracking features
```
- Update DamageStation.cs to enhance event handling and player interaction:
  - Integrate `IEventBus` for event dispatching.
  - Improve `onInterval` to provide health boosts, handle player deaths, and ensure sound commands are issued post-death event.
- Modify RoundBasedGame.cs to increase class extensibility:
  - Update variable access levels and rename to maintain consistency.
- Adjust OneHitKnife.cs to change service registration approach and extend functionality.
- Enhance DamageCanceler.cs with OS-specific cleanup logic and streamlined damage handling.
- Update OneHitKnifeListener.cs for improved damage calculation and to incorporate JetBrains annotations.
- Simplify station tracking and ownership in StationItem.cs and StationInfo.cs.
- Introduce EmitSoundCommand.cs to expand command module functionality.
```
2025-10-04 18:50:47 -07:00
Isaac
5565c72b5b Add Karma and One-Hit Knife Item (#103) 2025-10-04 09:53:53 -07:00
MSWS
36f9b7a600 Address unit test issues 2025-10-04 09:17:50 -07:00
MSWS
41c7a788d3 refactor: Refactor codebase for cleanup and async improvements
```
Refactor and optimize multiple components

- Remove obsolete attributes and unused dependencies in `IEventBus.cs`, `KarmaListener.cs`, `KarmaSyncer.cs`, and `ICommandManager.cs` to clean up code and improve maintainability.
- Enhance asynchronous event handling in `EventModifiedMessenger.cs` by integrating `await` for dispatch operations, improving consistency in message processing.
- Refine `CombatHandler.cs` logic with improved null-checking and better statistics handling, enhancing robustness during player events.
- Enable caching by default in `KarmaStorage.cs`, and update karmas asynchronously to boost performance.
- Simplify `Game/RoundBasedGame.cs` by removing unnecessary dependencies and improving state management and role assignment logic, enhancing game flow control.
```
2025-10-04 08:56:58 -07:00
MSWS
5d37e5d1ec feat: Add One-Hit Knife to Traitor shop +semver:minor (resolves #99)
- Add new shop item "One-Hit Knife" with description in `en.yml`
- Introduce `OneHitKnifeMsgs` class for handling localization messages related to "One-Hit Knife" item
- Implement `OneHitKnifeListener` class to handle game events for the "One-Hit Knife" item functionality
- Create `OneHitKnife` class, extending the item functionality for the `TraitorRole` with service integration
- Update `ShopServiceCollection.cs` to include "One-Hit Knife" in the item collection and shop services
- Add `OneHitKnifeConfig.cs` to define configuration settings including price and friendly fire options for the "One Hit Knife" feature
2025-10-04 08:40:19 -07:00
MSWS
741f2b8586 feat: Implement karma system enhancement features (resolves #47)
Implement enhanced Karma system functionalities and refactorings

- Update `KarmaConfig.cs` to make properties non-virtual and add immutability with "init" accessors, and introduce new configuration properties to support additional karma functionalities.
- Add `KarmaSyncer` behavior to `CS2ServiceCollection.cs` for managing Karma-related synchronization tasks.
- Enhance `SpectatorRole.cs` with an `OnAssign` method to facilitate role assignments and automatically convert players to spectators when needed.
- Filter player assignments in `RoundBasedGame.cs` to include only specific roles and refine non-traitor calculations to only consider assigned players.
- Introduce a comprehensive `KarmaSyncer` class in `Listeners/KarmaSyncer.cs` for managing Karma synchronization, including event handling for Karma updates and safe operations checks.
- Refactor `CS2KarmaConfig.cs` by simplifying structure, adding descriptive updates, and altering command usages related to Karma configurations.
- Remove `KarmaSyncer.cs` from `GameHandlers` to accommodate code restructuring and potential modality changes for player data management.
- Refactor and expand methods in `KarmaMsgs.cs` to adopt simpler expression-bodied syntax and create structured warning messages.
- Introduce dependency checks and reward temporal conditions in `PeriodicRewarder.cs` to ensure balanced issuance aligns with game progression.
- Enhance `KarmaBanner.cs` with new dependencies, tracking mechanisms, and advanced event handling for role assignments and karma-related notifications.
- Improve `KarmaListener.cs` by changing class inheritance, adding debugging capabilities, and switching to batch processing for Karma updates.
- Extend language file `en.yml` with additional warning messages targeting users with critically low Karma levels.
2025-10-04 08:27:21 -07:00
Isaac
e08cad21b3 Add remaining karma services / implementations (#102) 2025-10-04 07:09:34 -07:00
MSWS
ff4c8e76ff Reformat & Cleanup 2025-10-04 07:05:31 -07:00
MSWS
e8bb8564ad feat: Introduce Karma feature enhancements and .NET 8 update
```
- Update TTT/Plugin/Plugin.csproj to target .NET 8.0 and add Microsoft.Data.Sqlite reference
- Enhance TTT/CS2/CS2ServiceCollection.cs with new KarmaBanner mod behavior
- Add TTT/Karma/lang/KarmaMsgs.cs for Karma language messages handling
- Introduce configuration command in TTT/CS2/Configs/CS2KarmaConfig.cs for low karma actions
- Add old karma value property in TTT/Karma/Events/KarmaUpdateEvent.cs
- Implement KarmaBanner class in TTT/CS2/Listeners/KarmaBanner.cs for monitoring karma updates
- Develop new KarmaCommand class in TTT/Karma/KarmaCommand.cs for retrieving karma values
- Enhance TTT/Karma/KarmaStorage.cs with cache support and better SQL handling
- Introduce NameDisplayer OS check in TTT/CS2/GameHandlers/NameDisplayer.cs
- Add CommandUponLowKarma configuration in TTT/Karma/KarmaConfig.cs
- Register KarmaCommand in TTT/Karma/KarmaServiceCollection.cs
- Create English language file TTT/Karma/lang/en.yml for Karma messages
```
2025-10-04 07:00:08 -07:00
MSWS
58cb208c1d feat: Add Karma configuration and async event handling +semver:minor
```
Implement Karma Configuration and Improve Event Handling

- Add `IStorage<KarmaConfig>` service registration in `CS2ServiceCollection`, enhancing support for karma configurations.
- Make `KarmaUpdateEvent` dispatch asynchronous in `KarmaStorage`, and improve error checking for database connections.
- Introduce `CS2KarmaConfig`, a new configuration class with settings for managing karma, including connection strings and value limits.
- Convert karma properties and methods to virtual in `KarmaConfig`, allowing for potential overrides in derived classes.
```
2025-10-04 06:03:34 -07:00
MSWS
a546a8b22e feat: Migrate to SQLite and cleanup KarmaSyncer logic +semver:minor
- Update `Karma.csproj` to include Microsoft.Data.Sqlite and SQLite packages.
- Refactor `KarmaSyncer.cs` by removing the unused `IPlayerFinder` initialization, adding the `UsedImplicitly` attribute, and streamlining player validation logic.
- Change database backend in `KarmaStorage.cs` from MySQL to SQLite.
- Define a default value for the `DbString` property in `KarmaConfig.cs`.
- Adjust service configuration in `KarmaServiceCollection.cs` by modifying `IKarmaService` registration and introducing `KarmaListener`.
2025-10-04 05:58:49 -07:00
Isaac
05daee24a4 Shop and gameplay expansion: new items, localization, periodic rewards, command refactor (#94)
**Summary**

This PR delivers a substantial TTT update that expands the shop, refines
gameplay flow, and improves player feedback. It adds multiple new items
with CS2-specific behavior, introduces a periodic reward system,
implements configurable sounds and full localization, and cleans up
internal command and event handling.

**Scope**

* 56 commits
* 117 files changed
* +2,518 −301

**Why**

* Broaden traitor and detective toolkits to increase strategic variety.
* Make messaging consistent and translatable.
* Reduce friction in command handling and event wiring.
* Close a set of outstanding issues.

**Highlights**

New items and features

* C4 item with CS2 configuration (resolves #79).
* M4A1 item and storage support (resolves #71).
* Traitor gloves item (resolves #81).
* Camouflage item with async fix.
* Poison shots with enhanced effects and feedback (resolves #75).
* Poison smoke (resolves #74).
* Armor item (resolves #67).
* Taser item (resolves #69).
* Healthshot and role reveal (resolves #98).
* Body Paint item and service registration with default config.
* Periodic reward system for players (resolves #97).
* Credits granted for kills and identifications with tuned penalties.

Player experience

* Configurable sound support.
* Full localization for commands and messages.
* Increased HUD font size and adjusted text positioning.
* Shop prefix and HUD tweaks. Skull hidden in HUD.

Core refactors

* Command execution support on main thread. Command structure
consolidated and clarified.
* Round timer and C4 event handling refactored. Old C4 listener logic
removed.
* Event namespaces and item handling reorganized.
* Name formatting utilities updated.

Stability and fixes

* Shop events now reliably fire.
* Role assignment logging corrected.
* Credits no longer overridden by balance clearer.
* Various cleanup, reformatting, and unused line removals.

Administrative

* Licenses updated for new dependencies and content.
* Multiple merges and resyncs with main to keep branch current.

**Configuration changes**

* New item configs: C4, M4A1, Gloves, Camouflage, Poison Shots, Poison
Smoke, Armor, Taser, Healthshot, Body Paint.
* Added localization keys for new messages, commands, and out-of-ammo
lines.
* Sound configuration is now user configurable.
* Station role behavior updated to support Poison Smoke changes.

**API and plugin touchpoints**

* Storage and plugin modules extended for M4A1Config.
* PlayerKillListener added and registered.
* BodyPaint service registered and applied by default where configured.

**Testing**

* Unit and runtime checks for:

  * Shop purchase flows for each new item.
  * Command execution on main thread and permission checks.
  * Credits earn and clear at round transitions.
  * Poison effects timing, damage application, particles, and feedback.
  * HUD text size and positions across common resolutions.
  * Localization fallback behavior for missing keys.
* Manual CS2 tests for C4 behavior and item equips.
* Verified shop events fire for buy, equip, and use.
2025-10-04 05:50:51 -07:00
MSWS
84230fd231 Improve prop drag line appeareance (resolves #96) 2025-10-04 05:40:10 -07:00
MSWS
fdfc0cc3bd Update phrasing in role reveals 2025-10-04 05:31:01 -07:00
MSWS
7fc0f21fa4 fix: Poison shots carrying over rounds (resolves #101)
```
Enhance poison effect management and resource disposal

- Improve resource management in `PoisonSmokeListener.cs` by ensuring proper disposal of poison smoke timers, clearing the timer list upon disposal, and ensuring termination of damage effects according to configuration settings. Remove unnecessary debug output for cleaner logs.
- Refactor `PoisonShotsListener.cs` to reset poison shot data and improve disposal logic. Enhance poison shot usage management and streamline game mechanics related to poison damage and effects, ensuring a more efficient game experience.
```
2025-10-04 05:28:56 -07:00
MSWS
ed7ad35b85 Address concurrent modification issue 2025-10-04 05:25:55 -07:00
MSWS
e6009dd75a Price tweaks 2025-10-04 05:22:10 -07:00
MSWS
b295fc45a2 Suppress bomb planting notification 2025-10-04 05:02:38 -07:00
140 changed files with 1983 additions and 522 deletions

View File

@@ -13,10 +13,8 @@ jobs:
auto-release:
runs-on: ubuntu-latest
env:
# Tweak these if you want a different model or style
OPENAI_MODEL: gpt-4o-mini
OPENAI_TEMPERATURE: "0.2"
# Safety: cap how many characters we feed to the model
OPENAI_TEMPERATURE: "0.3"
MAX_CHANGELOG_CHARS: "50000"
steps:
@@ -67,7 +65,6 @@ jobs:
echo "tag=0.0.0" >> $GITHUB_OUTPUT
fi
# 3. Tag if new version
- name: Create and push new tag
if: steps.gitversion.outputs.fullSemVer != steps.latest_tag.outputs.tag
run: |
@@ -76,7 +73,6 @@ jobs:
git tag ${{ steps.gitversion.outputs.fullSemVer }}
git push origin ${{ steps.gitversion.outputs.fullSemVer }}
# 4. Determine previous relevant tag (lineage-aware)
- name: Determine previous relevant tag
id: prev_tag
run: |
@@ -103,7 +99,6 @@ jobs:
echo "tag=${prev:-0.0.0}" >> "$GITHUB_OUTPUT"
# 5. Generate changelog using local git (no compare API)
- name: Generate changelog
run: |
set -euo pipefail
@@ -134,7 +129,6 @@ jobs:
cat CHANGELOG.md
# 5b. Rewrite changelog with OpenAI
- name: Rewrite changelog with OpenAI
id: ai_changelog
if: success()
@@ -158,7 +152,7 @@ jobs:
# Build the JSON body. We feed system guidance and the raw changelog
# See OpenAI Responses API docs for the schema and output_text helper. :contentReference[oaicite:0]{index=0}
jq -Rs --arg sys "You are an expert release-notes writer. Given a list of changes in various formats (e.g: commits, merges, etc.), write release notes intended for reading by the public, grouping by features, features, and other pertinent groups where appropriate. Do not include a group if it is not necessary / populated. Remove internal ticket IDs and commit hashes unless essential. Merge duplicates. Use imperative, past tense voice voice. Output valid Markdown only." \
jq -Rs --arg sys "You are an expert release-notes writer. Given a list of changes in various formats (e.g: commits, merges, etc.), write release notes intended for reading by the public, grouping by features, features, and other pertinent groups where appropriate. Do not include a group if it is unnecessary. Remove internal ticket IDs and commit hashes unless essential. Merge duplicates. Use imperative, past tense voice with proper prose. Output valid Markdown only." \
--arg temp "${OPENAI_TEMPERATURE}" \
--arg model "${OPENAI_MODEL}" \
'{model:$model, temperature: ($temp|tonumber), input:[{role:"system", content:$sys},{role:"user", content:.}]}' CHANGELOG_RAW.md > request.json
@@ -200,7 +194,6 @@ jobs:
echo "Rewritten changelog:"
cat CHANGELOG.md
# 6. Create release using the (possibly rewritten) changelog
- name: Create GitHub release
uses: softprops/action-gh-release@v2
with:

View File

@@ -4,12 +4,14 @@
| CounterStrikeSharp.API | 1.0.340 | Expression | GPL-3.0-only | https://licenses.nuget.org/GPL-3.0-only | | Roflmuffin | http://docs.cssharp.dev/ |
| Dapper | 2.1.66 | Expression | Apache-2.0 | https://licenses.nuget.org/Apache-2.0 | 2019 Stack Exchange, Inc. | Sam Saffron,Marc Gravell,Nick Craver | https://github.com/DapperLib/Dapper |
| JetBrains.Annotations | 2025.2.0 | Expression | MIT | https://licenses.nuget.org/MIT | Copyright (c) 2016-2025 JetBrains s.r.o. | JetBrains | https://www.jetbrains.com/help/resharper/Code_Analysis__Code_Annotations.html |
| Microsoft.Data.Sqlite | 9.0.9 | Expression | MIT | https://licenses.nuget.org/MIT | © Microsoft Corporation. All rights reserved. | Microsoft | https://docs.microsoft.com/dotnet/standard/data/sqlite/ |
| Microsoft.Extensions.DependencyInjection.Abstractions | 9.0.7 | Expression | MIT | https://licenses.nuget.org/MIT | © Microsoft Corporation. All rights reserved. | Microsoft | https://dot.net/ |
| Microsoft.Extensions.Localization.Abstractions | 8.0.3 | Expression | MIT | https://licenses.nuget.org/MIT | © Microsoft Corporation. All rights reserved. | Microsoft | https://asp.net/ |
| Microsoft.NET.Test.Sdk | 17.14.1 | Expression | MIT | https://licenses.nuget.org/MIT | © Microsoft Corporation. All rights reserved. | Microsoft | https://github.com/microsoft/vstest |
| Microsoft.Reactive.Testing | 6.0.1 | Expression | MIT | https://licenses.nuget.org/MIT | Copyright (c) .NET Foundation and Contributors. | .NET Foundation and Contributors | https://github.com/dotnet/reactive |
| Microsoft.Testing.Extensions.CodeCoverage | 17.14.2 | Unknown | | https://aka.ms/deprecateLicenseUrl | © Microsoft Corporation. All rights reserved. | Microsoft | https://github.com/microsoft/codecoverage |
| MySqlConnector | 2.4.0 | Expression | MIT | https://licenses.nuget.org/MIT | Copyright 20162024 Bradley Grainger | Bradley Grainger | https://mysqlconnector.net/ |
| SQLite | 3.13.0 | Unknown | | | Public Domain | SQLite Development Team | |
| System.Reactive | 6.0.1 | Expression | MIT | https://licenses.nuget.org/MIT | Copyright (c) .NET Foundation and Contributors. | .NET Foundation and Contributors | https://github.com/dotnet/reactive |
| System.Text.Json | 8.0.5 | Expression | MIT | https://licenses.nuget.org/MIT | © Microsoft Corporation. All rights reserved. | Microsoft | https://dot.net/ |
| Xunit.DependencyInjection | 10.6.0 | Expression | MIT | https://licenses.nuget.org/MIT | Copyright © 2019 | Wei Peng | https://github.com/pengweiqhca/Xunit.DependencyInjection/tree/main/src/Xunit.DependencyInjection |

View File

@@ -43,7 +43,7 @@ public partial class StringLocalizer : IMsgLocalizer {
private LocalizedString getString(string name, params object[] arguments) {
// Get the localized value
string value;
try { value = localizer[name].Value; } catch (NullReferenceException e) {
try { value = localizer[name].Value; } catch (NullReferenceException) {
return new LocalizedString(name, name, true);
}

View File

@@ -12,7 +12,6 @@ public interface ICommandManager {
/// Registers a command with the manager.
/// </summary>
/// <param name="command">True if the command was successfully registered.</param>
[Obsolete("Registration is done via the ServiceProvider now.")]
bool RegisterCommand(ICommand command);
/// <summary>

View File

@@ -1,5 +1,5 @@
namespace TTT.API.Events;
public abstract class Event {
public abstract string Id { get; }
public class Event {
public virtual string Id => GetType().Name.ToLowerInvariant();
}

View File

@@ -1,10 +1,9 @@
namespace TTT.API.Events;
public interface IEventBus {
[Obsolete("Registration should be done via the ServiceProvider")]
void RegisterListener(IListener listener);
void UnregisterListener(IListener listener);
Task Dispatch(Event ev);
void Dispatch(Event ev);
}

View File

@@ -24,7 +24,7 @@ public static class ServiceCollectionExtensions {
collection.AddTransient<ICommand>(provider
=> (provider.GetRequiredService<TExtension>() as ICommand)!);
collection.AddScoped<TExtension>();
collection.AddSingleton<TExtension>();
collection.AddTransient<ITerrorModule, TExtension>(provider
=> provider.GetRequiredService<TExtension>());

View File

@@ -33,9 +33,6 @@ public interface IGame : IDisposable {
bool CheckEndConditions();
[Obsolete("This method is ambiguous, check the game state directly.")]
bool IsInProgress() { return State is State.COUNTDOWN or State.IN_PROGRESS; }
ISet<IOnlinePlayer> GetAlive() {
return Players.OfType<IOnlinePlayer>().Where(p => p.IsAlive).ToHashSet();
}

View File

@@ -9,9 +9,4 @@ public interface IGameManager : IDisposable {
}
IGame? CreateGame();
[Obsolete("This method is ambiguous, check the game state directly.")]
bool IsGameActive() {
return ActiveGame is not null && ActiveGame.IsInProgress();
}
}

View File

@@ -11,6 +11,7 @@ public interface IIconManager {
void RevealToAll(int client);
void AddVisiblePlayer(int client, int player);
void RemoveVisiblePlayer(int client, int player);
void SetVisiblePlayers(IOnlinePlayer online, ulong playersBitmask);
void ClearAllVisibility();
}

View File

@@ -1,4 +1,6 @@
using CounterStrikeSharp.API;
using Serilog;
using TTT.API.Game;
using TTT.API.Player;
using TTT.Game.Loggers;
@@ -12,4 +14,8 @@ public class CS2Logger(IServiceProvider provider) : SimpleLogger(provider) {
public override void PrintLogs(IOnlinePlayer? player) {
Server.NextWorldUpdate(() => base.PrintLogs(player));
}
public override void LogAction(IAction action) {
Server.NextWorldUpdate(() => base.LogAction(action));
}
}

View File

@@ -21,6 +21,7 @@ using TTT.CS2.lang;
using TTT.CS2.Listeners;
using TTT.CS2.Player;
using TTT.Game;
using TTT.Karma;
using TTT.Locale;
namespace TTT.CS2;
@@ -35,6 +36,7 @@ public static class CS2ServiceCollection {
collection.AddModBehavior<IAliveSpoofer, CS2AliveSpoofer>();
collection.AddModBehavior<IIconManager, RoleIconsHandler>();
collection.AddModBehavior<NameDisplayer>();
collection.AddModBehavior<PlayerPingShopAlias>();
// Configs
collection.AddModBehavior<IStorage<TTTConfig>, CS2GameConfig>();
@@ -46,6 +48,7 @@ public static class CS2ServiceCollection {
collection.AddModBehavior<IStorage<TaserConfig>, CS2TaserConfig>();
collection
.AddModBehavior<IStorage<PoisonSmokeConfig>, CS2PoisonSmokeConfig>();
collection.AddModBehavior<IStorage<KarmaConfig>, CS2KarmaConfig>();
// TTT - CS2 Specific optionals
collection.AddScoped<ITextSpawner, TextSpawner>();
@@ -57,6 +60,10 @@ public static class CS2ServiceCollection {
collection.AddModBehavior<PlayerConnectionsHandler>();
collection.AddModBehavior<PropMover>();
collection.AddModBehavior<RoundStart_GameStartHandler>();
collection.AddModBehavior<BombPlantSuppressor>();
collection.AddModBehavior<MapZoneRemover>();
collection.AddModBehavior<BuyMenuHandler>();
collection.AddModBehavior<TeamChangeHandler>();
// Damage Cancelers
collection.AddModBehavior<OutOfRoundCanceler>();
@@ -69,6 +76,8 @@ public static class CS2ServiceCollection {
collection.AddModBehavior<PlayerStatsTracker>();
collection.AddModBehavior<RoundTimerListener>();
collection.AddModBehavior<ScreenColorApplier>();
collection.AddModBehavior<KarmaBanner>();
collection.AddModBehavior<KarmaSyncer>();
// Commands
#if DEBUG

View File

@@ -4,9 +4,10 @@ using CounterStrikeSharp.API.Modules.Commands;
using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Command;
using TTT.API.Messages;
using TTT.API.Player;
using TTT.Game;
using TTT.Game.Commands;
using TTT.Game.lang;
namespace TTT.CS2.Command;
@@ -17,6 +18,9 @@ public class CS2CommandManager(IServiceProvider provider)
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IMessenger messenger = provider
.GetRequiredService<IMessenger>();
private BasePlugin? plugin;
public void Start(BasePlugin? basePlugin, bool hotReload) {
@@ -41,7 +45,9 @@ public class CS2CommandManager(IServiceProvider provider)
null :
converter.GetPlayer(executor) as IOnlinePlayer;
if (cmdMap.TryGetValue(info.GetArg(0), out var command))
messenger.Debug($"Received command: {cs2Info.Args[0]} from {wrapper?.Id}");
if (cmdMap.TryGetValue(cs2Info.Args[0], out var command))
if (command.MustBeOnMainThread) {
processCommandSync(cs2Info, wrapper);
return;

View File

@@ -0,0 +1,53 @@
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Commands;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using TTT.API;
using TTT.API.Command;
using TTT.API.Player;
namespace TTT.CS2.Command;
public class PlayerPingShopAlias(IServiceProvider provider) : IPluginModule {
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IItemSorter itemSorter =
provider.GetRequiredService<IItemSorter>();
public void Dispose() { }
public void Start() { }
public void Start(BasePlugin? plugin) {
plugin?.AddCommandListener("player_ping", onPlayerPing, HookMode.Post);
for (var i = 0; i < 10; i++) {
var index = i; // Capture variable
plugin?.AddCommand($"css_{index}", "",
(player, _) => { onButton(player, index); });
}
}
private HookResult onPlayerPing(CCSPlayerController? player,
CommandInfo commandInfo) {
if (player == null) return HookResult.Continue;
var gamePlayer = converter.GetPlayer(player) as IOnlinePlayer;
var cmdInfo =
new CS2CommandInfo(provider, gamePlayer, 0, "css_shop", "list");
cmdInfo.CallingContext = CommandCallingContext.Chat;
provider.GetRequiredService<ICommandManager>().ProcessCommand(cmdInfo);
return HookResult.Continue;
}
private void onButton(CCSPlayerController? player, int index) {
if (player == null) return;
if (converter.GetPlayer(player) is not IOnlinePlayer gamePlayer) return;
var lastUpdated = itemSorter.GetLastUpdate(gamePlayer);
if (lastUpdated == null || DateTime.Now - lastUpdated > TimeSpan.FromSeconds(20)) return;
var cmdInfo = new CS2CommandInfo(provider, gamePlayer, 0, "css_shop", "buy",
(index - 1).ToString());
cmdInfo.CallingContext = CommandCallingContext.Chat;
provider.GetRequiredService<ICommandManager>().ProcessCommand(cmdInfo);
}
}

View File

@@ -0,0 +1,21 @@
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using TTT.API.Command;
using TTT.API.Player;
namespace TTT.CS2.Command.Test;
public class CreditsCommand(IServiceProvider provider) : ICommand {
private readonly IShop shop = provider.GetRequiredService<IShop>();
public void Dispose() { }
public void Start() { }
public string Id => "credits";
public Task<CommandResult>
Execute(IOnlinePlayer? executor, ICommandInfo info) {
if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
shop.AddBalance(executor, 1000);
info.ReplySync("You have been given 1000 credits!");
return Task.FromResult(CommandResult.SUCCESS);
}
}

View File

@@ -0,0 +1,33 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Command;
using TTT.API.Player;
namespace TTT.CS2.Command.Test;
public class EmitSoundCommand(IServiceProvider provider) : ICommand {
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
public string Id => "emitsound";
public void Dispose() { }
public void Start() { }
public string[] Usage => ["[sound]"];
public Task<CommandResult>
Execute(IOnlinePlayer? executor, ICommandInfo info) {
if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
var gamePlayer = converter.GetPlayer(executor);
if (gamePlayer == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
if (info.Args.Length < 2) return Task.FromResult(CommandResult.PRINT_USAGE);
Server.NextWorldUpdate(() => {
gamePlayer.EmitSound(info.Args[1]);
info.ReplySync("Emitted sound " + info.Args[1]);
});
return Task.FromResult(CommandResult.SUCCESS);
}
}

View File

@@ -1,7 +1,9 @@
using CounterStrikeSharp.API;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using ShopAPI.Events;
using TTT.API.Command;
using TTT.API.Events;
using TTT.API.Player;
namespace TTT.CS2.Command.Test;
@@ -44,6 +46,10 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {
target = result;
}
var purchaseEv = new PlayerPurchaseItemEvent(target, item);
provider.GetRequiredService<IEventBus>().Dispatch(purchaseEv);
if (purchaseEv.IsCanceled) return;
shop.GiveItem(target, item);
info.ReplySync($"Gave item '{item.Name}' to {target.Name}.");
});

View File

@@ -1,15 +1,10 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Command;
using TTT.API.Player;
namespace TTT.CS2.Command.Test;
public class IndexCommand(IServiceProvider provider) : ICommand {
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
public class IndexCommand : ICommand {
public string Id => "index";
public void Dispose() { }
@@ -21,7 +16,8 @@ public class IndexCommand(IServiceProvider provider) : ICommand {
Server.NextWorldUpdate(() => {
foreach (var player in Utilities.GetPlayers())
info.ReplySync($"{player.PlayerName} - {player.Slot}");
info.ReplySync(
$"{player.PlayerName} - {player.Slot} {player.Index} {player.DraftIndex} {player.PawnCharacterDefIndex}");
});
return Task.FromResult(CommandResult.SUCCESS);

View File

@@ -21,9 +21,11 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
subCommands.Add("state", new StateCommand(provider));
subCommands.Add("screencolor", new ScreenColorCommand(provider));
subCommands.Add("giveitem", new GiveItemCommand(provider));
subCommands.Add("index", new IndexCommand(provider));
subCommands.Add("index", new IndexCommand());
subCommands.Add("showicons", new ShowIconsCommand(provider));
subCommands.Add("sethealth", new SetHealthCommand());
subCommands.Add("emitsound", new EmitSoundCommand(provider));
subCommands.Add("credits", new CreditsCommand(provider));
}
public Task<CommandResult>

View File

@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs;
public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
public static readonly FakeConVar<int> CV_ROUND_COUNTDOWN = new(
"css_ttt_round_countdown", "Time to wait before starting a round", 10,
"css_ttt_round_countdown", "Time to wait before starting a round", 15,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 60));
public static readonly FakeConVar<int> CV_MINIMUM_PLAYERS = new(
@@ -80,7 +80,7 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
new ItemValidator(allowMultiple: true));
public static readonly FakeConVar<int> CV_TIME_BETWEEN_ROUNDS = new(
"css_ttt_time_between_rounds", "Time to wait between rounds in seconds", 5,
"css_ttt_time_between_rounds", "Time to wait between rounds in seconds", 1,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 60));
public void Dispose() { }

View File

@@ -0,0 +1,106 @@
using TTT.API.Storage;
namespace TTT.CS2.Configs;
using System;
using System.Threading.Tasks;
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Cvars;
using CounterStrikeSharp.API.Modules.Cvars.Validators;
using TTT.API;
using Karma;
public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
public static readonly FakeConVar<string> CV_DB_STRING = new(
"css_ttt_karma_db_string", "Database connection string for Karma storage",
"Data Source=karma.db");
public static readonly FakeConVar<int> CV_MIN_KARMA = new("css_ttt_karma_min",
"Minimum possible Karma value; falling below executes the low-karma command",
0, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
public static readonly FakeConVar<int> CV_DEFAULT_KARMA = new(
"css_ttt_karma_default", "Default Karma assigned to new or reset players",
50, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
public static readonly FakeConVar<string> CV_LOW_KARMA_COMMAND = new(
"css_ttt_karma_low_command",
"Command executed when a player's karma falls below the minimum (use {0} for player slot)",
"css_ban #{0} 2880 Low Karma");
public static readonly FakeConVar<int> CV_TIMEOUT_THRESHOLD = new(
"css_ttt_karma_timeout_threshold",
"Minimum Karma before timing a player out for KarmaRoundTimeout rounds", 20,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
public static readonly FakeConVar<int> CV_ROUND_TIMEOUT = new(
"css_ttt_karma_round_timeout",
"Number of rounds a player is timed out for after falling below threshold",
4, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 100));
public static readonly FakeConVar<int> CV_WARNING_WINDOW_HOURS = new(
"css_ttt_karma_warning_window_hours",
"Time window (in hours) preventing repeat warnings for low karma", 24,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 168));
// Karma deltas
public static readonly FakeConVar<int> CV_INNO_ON_TRAITOR = new(
"css_ttt_karma_inno_on_traitor",
"Karma gained when Innocent kills a Traitor", 5, ConVarFlags.FCVAR_NONE,
new RangeValidator<int>(-50, 50));
public static readonly FakeConVar<int> CV_TRAITOR_ON_DETECTIVE = new(
"css_ttt_karma_traitor_on_detective",
"Karma gained when Traitor kills a Detective", 1, ConVarFlags.FCVAR_NONE,
new RangeValidator<int>(-50, 50));
public static readonly FakeConVar<int> CV_INNO_ON_INNO_VICTIM = new(
"css_ttt_karma_inno_on_inno_victim",
"Karma gained or lost when Innocent kills another Innocent who was a victim",
-1, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(-50, 50));
public static readonly FakeConVar<int> CV_INNO_ON_INNO = new(
"css_ttt_karma_inno_on_inno",
"Karma lost when Innocent kills another Innocent", -4,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(-50, 50));
public static readonly FakeConVar<int> CV_TRAITOR_ON_TRAITOR = new(
"css_ttt_karma_traitor_on_traitor",
"Karma lost when Traitor kills another Traitor", -5, ConVarFlags.FCVAR_NONE,
new RangeValidator<int>(-50, 50));
public static readonly FakeConVar<int> CV_INNO_ON_DETECTIVE = new(
"css_ttt_karma_inno_on_detective",
"Karma lost when Innocent kills a Detective", -6, ConVarFlags.FCVAR_NONE,
new RangeValidator<int>(-50, 50));
public void Dispose() { }
public void Start() { }
public void Start(BasePlugin? plugin) {
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
plugin.RegisterFakeConVars(this);
}
public Task<KarmaConfig?> Load() {
var cfg = new KarmaConfig {
DbString = CV_DB_STRING.Value,
MinKarma = CV_MIN_KARMA.Value,
DefaultKarma = CV_DEFAULT_KARMA.Value,
CommandUponLowKarma = CV_LOW_KARMA_COMMAND.Value,
KarmaTimeoutThreshold = CV_TIMEOUT_THRESHOLD.Value,
KarmaRoundTimeout = CV_ROUND_TIMEOUT.Value,
KarmaWarningWindow = TimeSpan.FromHours(CV_WARNING_WINDOW_HOURS.Value),
INNO_ON_TRAITOR = CV_INNO_ON_TRAITOR.Value,
TRAITOR_ON_DETECTIVE = CV_TRAITOR_ON_DETECTIVE.Value,
INNO_ON_INNO_VICTIM = CV_INNO_ON_INNO_VICTIM.Value,
INNO_ON_INNO = CV_INNO_ON_INNO.Value,
TRAITOR_ON_TRAITOR = CV_TRAITOR_ON_TRAITOR.Value,
INNO_ON_DETECTIVE = CV_INNO_ON_DETECTIVE.Value
};
return Task.FromResult<KarmaConfig?>(cfg);
}
}

View File

@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
public class CS2C4Config : IStorage<C4Config>, IPluginModule {
public static readonly FakeConVar<int> CV_PRICE = new("css_ttt_shop_c4_price",
"Price of the C4 item", 140, ConVarFlags.FCVAR_NONE,
"Price of the C4 item", 130, ConVarFlags.FCVAR_NONE,
new RangeValidator<int>(0, 10000));
public static readonly FakeConVar<string> CV_WEAPON = new(

View File

@@ -12,7 +12,7 @@ namespace TTT.CS2.Configs.ShopItems;
public class CS2OneShotDeagleConfig : IStorage<OneShotDeagleConfig>,
IPluginModule {
public static readonly FakeConVar<int> CV_PRICE = new(
"css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 120,
"css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 100,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(

View File

@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
public class CS2PoisonSmokeConfig : IStorage<PoisonSmokeConfig>, IPluginModule {
public static readonly FakeConVar<int> CV_PRICE = new(
"css_ttt_shop_poisonsmoke_price", "Price of the Poison Smoke item", 30,
"css_ttt_shop_poisonsmoke_price", "Price of the Poison Smoke item", 45,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
public static readonly FakeConVar<string> CV_WEAPON = new(

View File

@@ -74,6 +74,17 @@ public static class PlayerExtensions {
Utilities.SetStateChanged(pawn, "CCSPlayerPawn", "m_ArmorValue");
}
public static (int, bool) GetArmor(this CCSPlayerController player) {
if (!player.IsValid) return (0, false);
var pawn = player.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid) return (0, false);
var hasHelmet = false;
if (pawn.ItemServices != null)
hasHelmet = new CCSPlayer_ItemServices(pawn.ItemServices.Handle)
.HasHelmet;
return (pawn.ArmorValue, hasHelmet);
}
public static void ColorScreen(this CCSPlayerController player, Color color,
float hold = 0.1f, float fade = 0.2f, FadeFlags flags = FadeFlags.FADE_IN,
bool withPurge = true) {

View File

@@ -9,7 +9,7 @@ public static class VectorExtensions {
return MathF.Sqrt(vec.DistanceSquared(other));
}
public static float DistanceSquared(this Vector vec, Vector other) {
public static float DistanceSquared(this Vector? vec, Vector other) {
return (vec.X - other.X) * (vec.X - other.X)
+ (vec.Y - other.Y) * (vec.Y - other.Y)
+ (vec.Z - other.Z) * (vec.Z - other.Z);

View File

@@ -6,12 +6,23 @@ using TTT.API.Role;
using TTT.CS2.Roles;
using TTT.CS2.Utils;
using TTT.Game;
using TTT.Game.lang;
using TTT.Game.Events.Game;
using TTT.Game.Roles;
namespace TTT.CS2.Game;
public class CS2Game(IServiceProvider provider) : RoundBasedGame(provider) {
public override State State {
set {
var ev = new GameStateUpdateEvent(this, value);
Bus.Dispatch(ev);
if (ev.IsCanceled) return;
state = value;
}
get => state;
}
public override IActionLogger Logger { get; } = new CS2Logger(provider);
public override IList<IRole> Roles { get; } = [

View File

@@ -0,0 +1,17 @@
using CounterStrikeSharp.API.Core;
using TTT.API;
namespace TTT.CS2.GameHandlers;
public class BombPlantSuppressor : IPluginModule {
public void Dispose() { }
public void Start() { }
public void Start(BasePlugin? plugin) {
plugin?.HookUserMessage(322, um => {
um.Recipients.Clear();
return HookResult.Handled;
});
}
}

View File

@@ -0,0 +1,51 @@
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes.Registration;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Player;
using TTT.CS2.Extensions;
using TTT.Game.Roles;
namespace TTT.CS2.GameHandlers;
public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IInventoryManager inventory =
provider.GetRequiredService<IInventoryManager>();
private readonly Dictionary<string, string> shopAliases = new() {
{ "item_assaultsuit", "Armor" },
{ "item_kevlar", "Armor" },
{ "weapon_taser", "Taser" },
{ "weapon_deagle", "Revolver" },
{ "weapon_smokegrenade", "Poison Smoke" },
{ "weapon_m4a1_silencer", "M4A1" },
{ "weapon_usp_silencer", "M4A1" },
{ "weapon_mp5sd", "M4A1" },
{ "weapon_decoy", "healthshot" }
};
public void Dispose() { }
public void Start() { }
[UsedImplicitly]
[GameEventHandler(HookMode.Pre)]
public HookResult OnPurchase(EventItemPurchase ev, GameEventInfo info) {
if (ev.Userid == null) return HookResult.Continue;
if (converter.GetPlayer(ev.Userid) is not IOnlinePlayer player)
return HookResult.Continue;
if (ev.Weapon is "item_assaultsuit" or "item_kevlar") {
var user = ev.Userid;
user.SetArmor(0);
}
inventory.RemoveWeapon(player, new BaseWeapon(ev.Weapon));
if (shopAliases.TryGetValue(ev.Weapon, out var alias))
ev.Userid.ExecuteClientCommandFromServer("css_buy " + alias);
return HookResult.Handled;
}
}

View File

@@ -62,15 +62,16 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
}
var killerStats = ev.Attacker?.ActionTrackingServices?.MatchStats;
ev.Attacker.ActionTrackingServices.NumRoundKills--;
Utilities.SetStateChanged(ev.Attacker,
"CCSPlayerController_ActionTrackingServices",
"m_pActionTrackingServices");
if (killerStats == null) return;
killerStats.Kills -= 1;
killerStats.Damage -= ev.DmgHealth;
if (ev.Attacker != null) {
Utilities.SetStateChanged(ev.Attacker,
"CCSPlayerController_ActionTrackingServices",
"m_pActionTrackingServices");
if (killerStats == null) return;
killerStats.Kills -= 1;
killerStats.Damage -= ev.DmgHealth;
if (ev.Attacker.ActionTrackingServices != null)
ev.Attacker.ActionTrackingServices.NumRoundKills--;
Utilities.SetStateChanged(ev.Attacker, "CCSPlayerController",
"m_pActionTrackingServices");
ev.FireEventToClient(ev.Attacker);

View File

@@ -1,4 +1,5 @@
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Memory;
using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
using Microsoft.Extensions.DependencyInjection;
@@ -15,7 +16,11 @@ public class DamageCanceler(IServiceProvider provider) : IPluginModule {
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
public void Dispose() { }
public void Dispose() {
if (OperatingSystem.IsWindows()) return;
VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Unhook(onTakeDamage,
HookMode.Pre);
}
public void Start() { }
@@ -29,14 +34,10 @@ public class DamageCanceler(IServiceProvider provider) : IPluginModule {
var damagedEvent = new PlayerDamagedEvent(converter, hook);
bus.Dispatch(damagedEvent);
if (damagedEvent.IsCanceled) return HookResult.Handled;
if (!damagedEvent.HpModified
|| damagedEvent.Player is not IOnlinePlayer onlinePlayer)
return HookResult.Continue;
onlinePlayer.Health = damagedEvent.HpLeft;
return HookResult.Handled;
var info = hook.GetParam<CTakeDamageInfo>(1);
info.Damage = damagedEvent.DmgDealt;
return HookResult.Continue;
}
}

View File

@@ -1,47 +0,0 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes.Registration;
using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Player;
using TTT.Karma;
namespace TTT.CS2.GameHandlers;
public class KarmaSyncer(IServiceProvider provider) : IPluginModule {
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IKarmaService? karma = provider.GetService<IKarmaService>();
private readonly IPlayerFinder players =
provider.GetRequiredService<IPlayerFinder>();
public void Dispose() { }
public string Id => nameof(KarmaSyncer);
public string Version => GitVersionInformation.FullSemVer;
public void Start() { }
[GameEventHandler]
public HookResult OnRoundStart(EventRoundStart _, GameEventInfo _1) {
if (karma == null) return HookResult.Continue;
foreach (var p in Utilities.GetPlayers()) {
if (!p.IsValid || p.IsBot) continue;
var apiPlayer = converter.GetPlayer(p);
Task.Run(async () => {
var pk = await karma.Load(apiPlayer);
await Server.NextFrameAsync(() => {
p.Score = pk;
Utilities.SetStateChanged(p, "CCSPlayerController",
"m_pActionTrackingServices");
});
});
}
return HookResult.Continue;
}
}

View File

@@ -0,0 +1,40 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes.Registration;
using JetBrains.Annotations;
using TTT.API;
namespace TTT.CS2.GameHandlers;
public class MapZoneRemover : IPluginModule {
private BasePlugin? plugin;
private bool zonesRemoved;
public void Dispose() {
plugin?.RemoveListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
onMapStart);
}
public void Start() { }
public void Start(BasePlugin? pluginParent) {
if (pluginParent != null) plugin = pluginParent;
plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
onMapStart);
}
private void onMapStart(string mapName) { zonesRemoved = false; }
[UsedImplicitly]
[GameEventHandler]
public HookResult OnRoundStart(EventRoundStart _, GameEventInfo _2) {
if (zonesRemoved) return HookResult.Continue;
var buyzones =
Utilities.FindAllEntitiesByDesignerName<CBuyZone>("func_buyzone");
foreach (var zone in buyzones) zone.Remove();
zonesRemoved = true;
return HookResult.Continue;
}
}

View File

@@ -13,6 +13,7 @@ public class NameDisplayer : IPluginModule {
public void Start() { }
public void Start(BasePlugin? plugin) {
if (OperatingSystem.IsWindows()) return;
plugin?.AddTimer(0.25f, showNames, TimerFlags.REPEAT);
}

View File

@@ -187,12 +187,11 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
targetVector.Z = Math.Max(targetVector.Z, playerOrigin.Z - 48);
if (ent.AbsOrigin == null) return;
var lerpedVector = ent.AbsOrigin.Lerp(targetVector, 0.3f);
if (info.Beam != null && info.Beam.IsValid) {
info.Beam.AcceptInput("Kill");
info.Beam = createBeam(playerOrigin.With(z: playerOrigin.Z - 16),
lerpedVector);
ent.AbsOrigin);
}
playersPressingE[player] = info;
@@ -201,9 +200,9 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
private CEnvBeam? createBeam(Vector start, Vector end) {
var beam = Utilities.CreateEntityByName<CEnvBeam>("env_beam");
if (beam == null) return null;
beam.RenderMode = RenderMode_t.kRenderTransColor;
beam.Width = 0.5f;
beam.Render = Color.White;
beam.RenderMode = RenderMode_t.kRenderTransAlpha;
beam.Width = 2.0f;
beam.Render = Color.FromArgb(32, Color.White);
beam.EndPos.X = end.X;
beam.EndPos.Y = end.Y;
beam.EndPos.Z = end.Z;

View File

@@ -69,6 +69,12 @@ public class RoleIconsHandler(IServiceProvider provider)
visibilities[client] &= ~(1UL << player);
}
public void SetVisiblePlayers(IOnlinePlayer online, ulong playersBitmask) {
var gamePlayer = players.GetPlayer(online);
if (gamePlayer == null || !gamePlayer.IsValid) return;
SetVisiblePlayers(gamePlayer.Slot, playersBitmask);
}
public void ClearAllVisibility() {
Array.Clear(visibilities, 0, visibilities.Length);
}

View File

@@ -0,0 +1,72 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes.Registration;
using CounterStrikeSharp.API.Modules.Commands;
using CounterStrikeSharp.API.Modules.Utils;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Player;
using TTT.Game.Events.Player;
namespace TTT.CS2.GameHandlers;
public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
private readonly IGameManager games =
provider.GetRequiredService<IGameManager>();
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
public void Dispose() { }
public void Start() { }
public void Start(BasePlugin? plugin) {
plugin?.AddCommandListener("jointeam", onJoinTeam);
}
private HookResult onJoinTeam(CCSPlayerController? player,
CommandInfo commandInfo) {
CsTeam requestedTeam;
if (int.TryParse(commandInfo.GetArg(1), out var teamIndex))
requestedTeam = (CsTeam)teamIndex;
else
requestedTeam = commandInfo.GetArg(1).ToLower() switch {
"ct" or "counterterrorist" or "counter" => CsTeam.CounterTerrorist,
"t" or "terrorist" => CsTeam.Terrorist,
"s" or "spec" or "spectator" or "spectators" => CsTeam.Spectator,
_ => CsTeam.None
};
if (games.ActiveGame is not { State: State.IN_PROGRESS }) {
if (player != null && player.LifeState != (int)LifeState_t.LIFE_ALIVE)
Server.NextWorldUpdate(player.Respawn);
return HookResult.Continue;
}
if (requestedTeam is CsTeam.CounterTerrorist or CsTeam.Terrorist)
if (player != null && player.Team is CsTeam.Spectator or CsTeam.None)
return HookResult.Continue;
return HookResult.Handled;
}
[UsedImplicitly]
[GameEventHandler]
public HookResult OnChangeTeam(EventPlayerTeam ev, GameEventInfo _) {
if (ev.Userid == null) return HookResult.Continue;
if (ev.Userid.LifeState == (int)LifeState_t.LIFE_ALIVE)
return HookResult.Continue;
var apiPlayer = converter.GetPlayer(ev.Userid);
var playerDeath = new PlayerDeathEvent(apiPlayer);
bus.Dispatch(playerDeath);
return HookResult.Continue;
}
}

View File

@@ -5,7 +5,6 @@ using TTT.API.Extensions;
using TTT.API.Player;
using TTT.API.Storage;
using TTT.Game.Roles;
using TTT.Shop.Items.Traitor.BodyPaint;
namespace TTT.CS2.Items.BodyPaint;

View File

@@ -9,7 +9,6 @@ using TTT.CS2.API;
using TTT.CS2.Extensions;
using TTT.Game.Events.Body;
using TTT.Game.Listeners;
using TTT.Shop.Items.Traitor.BodyPaint;
namespace TTT.CS2.Items.BodyPaint;

View File

@@ -1,6 +1,6 @@
using TTT.Locale;
namespace TTT.Shop.Items.Traitor.BodyPaint;
namespace TTT.CS2.Items.BodyPaint;
public class BodyPaintMsgs {
public static IMsg SHOP_ITEM_BODY_PAINT

View File

@@ -0,0 +1,162 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Timers;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using ShopAPI.Configs;
using ShopAPI.Configs.Traitor;
using TTT.API;
using TTT.API.Extensions;
using TTT.API.Game;
using TTT.API.Player;
using TTT.API.Storage;
using TTT.CS2.Extensions;
using TTT.CS2.Utils;
using TTT.Game.Roles;
namespace TTT.CS2.Items.Compass;
public static class CompassServiceCollection {
public static void AddCompassServices(this IServiceCollection collection) {
collection.AddModBehavior<CompassItem>();
}
}
public class CompassItem(IServiceProvider provider)
: RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
private readonly CompassConfig config =
provider.GetService<IStorage<CompassConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new CompassConfig();
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
public override string Name => Locale[CompassMsgs.SHOP_ITEM_COMPASS];
public override string Description
=> Locale[CompassMsgs.SHOP_ITEM_COMPASS_DESC];
public override ShopItemConfig Config => config;
public void Start(BasePlugin? plugin) {
base.Start();
plugin?.AddTimer(0.1f, tick, TimerFlags.REPEAT);
}
public override void OnPurchase(IOnlinePlayer player) { }
public override PurchaseResult CanPurchase(IOnlinePlayer player) {
return Shop.HasItem<CompassItem>(player) ?
PurchaseResult.ALREADY_OWNED :
base.CanPurchase(player);
}
private void tick() {
if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
return;
var traitors = Games.ActiveGame.Players.OfType<IOnlinePlayer>()
.Where(p => p.IsAlive)
.Where(p => Roles.GetRoles(p).Any(r => r is TraitorRole))
.ToList();
var allies = Games.ActiveGame.Players.OfType<IOnlinePlayer>()
.Where(p => p.IsAlive)
.Where(p => !Roles.GetRoles(p).Any(r => r is TraitorRole))
.ToList();
foreach (var gamePlayer in Utilities.GetPlayers()) {
var player = converter.GetPlayer(gamePlayer);
if (player is not IOnlinePlayer online) continue;
if (!Shop.HasItem<CompassItem>(online)) continue;
showRadarTo(gamePlayer, online, traitors, allies);
}
}
private void showRadarTo(CCSPlayerController player, IOnlinePlayer online,
IList<IOnlinePlayer> traitors, List<IOnlinePlayer> allies) {
if (Games.ActiveGame?.Players == null) return;
if (player.PlayerPawn.Value == null) return;
var enemies = getEnemies(online, traitors, allies);
if (enemies.Count == 0) return;
var gameEnemies = enemies.Select(e => converter.GetPlayer(e))
.Where(e => e != null)
.Select(e => e!)
.ToList();
if (gameEnemies.Count == 0) return;
var (nearestPlayer, distance) =
getNearest(player, gameEnemies) ?? (null, 0);
if (nearestPlayer == null || distance > config.MaxRange) return;
var src = player.Pawn.Value?.AbsOrigin.Clone();
var dst = nearestPlayer.Pawn.Value?.AbsOrigin.Clone();
if (src == null || dst == null) return;
var normalizedYaw = adjustGameAngle(player.PlayerPawn.Value.EyeAngles.Y);
var diff = (dst - src).Normalized();
var targetYaw = MathF.Atan2(diff.Y, diff.X) * 180f / MathF.PI;
targetYaw = adjustGameAngle(targetYaw);
var compass = generateCompass(normalizedYaw, targetYaw);
compass = "<font color=\"#777777\">" + compass;
foreach (var c in "NESW".ToCharArray())
compass = compass.Replace(c.ToString(),
$"</font><font color=\"#FFFF00\">{c}</font><font color=\"#777777\">");
compass = compass.Replace("X",
"</font><font color=\"#FF0000\">X</font><font color=\"#777777\">");
compass += "</font>";
player.PrintToCenterHtml($"{compass} {getDistanceDescription(distance)}");
}
private float adjustGameAngle(float angle) {
return 360 - (angle + 360) % 360 + 90;
}
private string generateCompass(float pointing, float target) {
return TextCompass.GenerateCompass(config.CompassFOV, config.CompassLength,
pointing, targetDir: target);
}
private string getDistanceDescription(float distance) {
return distance switch {
> 2000 => "AWP Distance",
> 1500 => "Scout Distance",
> 1000 => "Rifle Distance",
> 500 => "Pistol",
> 250 => "Nearby",
_ => "Knife Range"
};
}
private IList<IOnlinePlayer> getEnemies(IOnlinePlayer online,
IList<IOnlinePlayer> traitors, IList<IOnlinePlayer> allies) {
return Roles.GetRoles(online).Any(r => r is TraitorRole) ?
allies :
traitors;
}
private (CCSPlayerController?, float)? getNearest(CCSPlayerController source,
List<CCSPlayerController> others) {
if (others.Count == 0) return null;
var minDist = float.MaxValue;
var minPlayer = others[0];
var src = source.Pawn.Value?.AbsOrigin.Clone();
if (src == null) return null;
foreach (var player in others) {
if (player.Pawn.Value == null) continue;
var dist = player.Pawn.Value.AbsOrigin.Clone().DistanceSquared(src);
if (dist >= minDist) continue;
minDist = dist;
minPlayer = player;
}
return (minPlayer, MathF.Sqrt(minDist));
}
}

View File

@@ -0,0 +1,11 @@
using TTT.Locale;
namespace TTT.CS2.Items.Compass;
public class CompassMsgs {
public static IMsg SHOP_ITEM_COMPASS
=> MsgFactory.Create(nameof(SHOP_ITEM_COMPASS));
public static IMsg SHOP_ITEM_COMPASS_DESC
=> MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_DESC));
}

View File

@@ -1,6 +1,6 @@
using TTT.API.Player;
using TTT.API.Role;
using TTT.Game.lang;
using TTT.Game;
using TTT.Locale;
namespace TTT.CS2.Items.DNA;

View File

@@ -31,7 +31,7 @@ public class DnaScanner(IServiceProvider provider)
public override void OnPurchase(IOnlinePlayer player) { }
public override PurchaseResult CanPurchase(IOnlinePlayer player) {
if (Shop.HasItem(player, this)) return PurchaseResult.ALREADY_OWNED;
if (Shop.HasItem<DnaScanner>(player)) return PurchaseResult.ALREADY_OWNED;
return base.CanPurchase(player);
}
}

View File

@@ -0,0 +1,41 @@
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using ShopAPI.Configs;
using ShopAPI.Configs.Traitor;
using TTT.API.Extensions;
using TTT.API.Player;
using TTT.API.Storage;
using TTT.Game.Roles;
namespace TTT.CS2.Items.OneHitKnife;
public static class OneHitKnifeServiceCollection {
public static void AddOneHitKnifeService(this IServiceCollection services) {
services.AddModBehavior<OneHitKnife>();
services.AddModBehavior<OneHitKnifeListener>();
}
}
public class OneHitKnife(IServiceProvider provider)
: RoleRestrictedItem<TraitorRole>(provider) {
private readonly OneHitKnifeConfig config = provider
.GetService<IStorage<OneHitKnifeConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new OneHitKnifeConfig();
public override string Name
=> Locale[OneHitKnifeMsgs.SHOP_ITEM_ONE_HIT_KNIFE];
public override string Description
=> Locale[OneHitKnifeMsgs.SHOP_ITEM_ONE_HIT_KNIFE_DESC];
public override ShopItemConfig Config => config;
public override void OnPurchase(IOnlinePlayer player) { }
public override PurchaseResult CanPurchase(IOnlinePlayer player) {
if (Shop.HasItem<OneHitKnife>(player)) return PurchaseResult.ALREADY_OWNED;
return base.CanPurchase(player);
}
}

View File

@@ -0,0 +1,44 @@
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using ShopAPI.Configs.Traitor;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Player;
using TTT.API.Storage;
using TTT.Game.Events.Player;
using TTT.Game.Listeners;
namespace TTT.CS2.Items.OneHitKnife;
public class OneHitKnifeListener(IServiceProvider provider)
: BaseListener(provider) {
private readonly OneHitKnifeConfig config =
provider.GetService<IStorage<OneHitKnifeConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new OneHitKnifeConfig();
private readonly IShop shop = provider.GetRequiredService<IShop>();
[UsedImplicitly]
[EventHandler]
public void OnDamage(PlayerDamagedEvent ev) {
if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
if (ev.Weapon == null || !Tag.KNIVES.Contains(ev.Weapon)) return;
var attacker = ev.Attacker;
var victim = ev.Player;
if (attacker == null) return;
if (!shop.HasItem<OneHitKnife>(attacker)) return;
if (victim is not IOnlinePlayer onlineVictim) return;
var friendly = Roles.GetRoles(attacker)
.Any(r => Roles.GetRoles(victim).Contains(r));
if (friendly && !config.FriendlyFire) return;
shop.RemoveItem<OneHitKnife>(attacker);
ev.HpLeft = 0;
}
}

View File

@@ -0,0 +1,11 @@
using TTT.Locale;
namespace TTT.CS2.Items.OneHitKnife;
public class OneHitKnifeMsgs {
public static IMsg SHOP_ITEM_ONE_HIT_KNIFE
=> MsgFactory.Create(nameof(SHOP_ITEM_ONE_HIT_KNIFE));
public static IMsg SHOP_ITEM_ONE_HIT_KNIFE_DESC
=> MsgFactory.Create(nameof(SHOP_ITEM_ONE_HIT_KNIFE_DESC));
}

View File

@@ -21,6 +21,8 @@ namespace TTT.CS2.Items.PoisonShots;
public class PoisonShotsListener(IServiceProvider provider)
: BaseListener(provider), IPluginModule {
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
private readonly PoisonShotsConfig config =
provider.GetService<IStorage<PoisonShotsConfig>>()
?.Load()
@@ -64,9 +66,10 @@ public class PoisonShotsListener(IServiceProvider provider)
if (ev.Attacker == null) return;
if (!poisonShots.TryGetValue(ev.Attacker, out var shot) || shot <= 0)
return;
if (ev.Weapon == null || !Tag.GUNS.Contains(ev.Weapon)) return;
Messenger.Message(ev.Attacker,
Locale[PoisonShotMsgs.SHOP_ITEM_POISON_HIT(ev.Player)]);
addPoisonEffect(ev.Player);
addPoisonEffect(ev.Player, ev.Attacker);
}
[UsedImplicitly]
@@ -76,13 +79,14 @@ public class PoisonShotsListener(IServiceProvider provider)
foreach (var timer in poisonTimers) timer.Dispose();
poisonTimers.Clear();
poisonShots.Clear();
}
[SuppressMessage("ReSharper", "AccessToModifiedClosure")]
private void addPoisonEffect(IPlayer player) {
private void addPoisonEffect(IPlayer player, IPlayer shooter) {
IDisposable? timer = null;
var effect = new PoisonEffect(player);
var effect = new PoisonEffect(player, shooter);
timer = scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
=> {
Server.NextWorldUpdate(() => {
@@ -98,6 +102,24 @@ public class PoisonShotsListener(IServiceProvider provider)
private bool tickPoison(PoisonEffect effect) {
if (effect.Player is not IOnlinePlayer online) return false;
if (!online.IsAlive) return false;
var dmgEvent = new PlayerDamagedEvent(online,
effect.Shooter as IOnlinePlayer, online.Health,
online.Health - config.PoisonConfig.DamagePerTick) {
Weapon = $"[{Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS]}]"
};
bus.Dispatch(dmgEvent);
if (dmgEvent.IsCanceled) return true;
if (online.Health - config.PoisonConfig.DamagePerTick <= 0) {
var deathEvent = new PlayerDeathEvent(online)
.WithKiller(effect.Shooter as IOnlinePlayer)
.WithWeapon($"[{Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS]}]");
bus.Dispatch(deathEvent);
}
online.Health -= config.PoisonConfig.DamagePerTick;
effect.Ticks++;
effect.DamageGiven += config.PoisonConfig.DamagePerTick;
@@ -129,8 +151,9 @@ public class PoisonShotsListener(IServiceProvider provider)
return 0;
}
private class PoisonEffect(IPlayer player) {
private class PoisonEffect(IPlayer player, IPlayer shooter) {
public IPlayer Player { get; } = player;
public IPlayer Shooter { get; } = shooter;
public int Ticks { get; set; }
public int DamageGiven { get; set; }
}

View File

@@ -4,11 +4,11 @@ using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes.Registration;
using CounterStrikeSharp.API.Modules.Utils;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using ShopAPI.Configs.Traitor;
using TTT.API;
using TTT.API.Messages;
using TTT.API.Player;
using TTT.API.Role;
using TTT.API.Storage;
@@ -30,9 +30,6 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
private readonly IPlayerFinder finder =
provider.GetRequiredService<IPlayerFinder>();
private readonly IMessenger messenger =
provider.GetRequiredService<IMessenger>();
private readonly List<IDisposable> poisonSmokes = [];
private readonly IRoleAssigner roleAssigner =
@@ -43,9 +40,15 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
private readonly IShop shop = provider.GetRequiredService<IShop>();
public void Dispose() { }
public void Dispose() {
foreach (var timer in poisonSmokes) timer.Dispose();
poisonSmokes.Clear();
}
public void Start() { }
[UsedImplicitly]
[GameEventHandler]
public HookResult OnSmokeGrenade(EventSmokegrenadeDetonate ev,
GameEventInfo _) {
@@ -58,7 +61,6 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
var projectile =
Utilities.GetEntityFromIndex<CSmokeGrenadeProjectile>(ev.Entityid);
messenger.DebugAnnounce(projectile?.AbsOrigin?.ToString() ?? "null");
if (projectile == null || !projectile.IsValid) return HookResult.Continue;
startPoisonEffect(projectile);
return HookResult.Continue;
@@ -78,6 +80,8 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
poisonSmokes.Remove(timer);
});
});
poisonSmokes.Add(timer);
}
private bool tickPoisonEffect(PoisonEffect effect) {

View File

@@ -0,0 +1,101 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.UserMessages;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using ShopAPI.Configs;
using ShopAPI.Configs.Traitor;
using TTT.API;
using TTT.API.Extensions;
using TTT.API.Player;
using TTT.API.Storage;
using TTT.CS2.Extensions;
using TTT.CS2.RayTrace.Class;
using TTT.Game.Roles;
using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
namespace TTT.CS2.Items.SilentAWP;
public static class SilentAWPServiceCollection {
public static void AddSilentAWPServices(this IServiceCollection services) {
services.AddModBehavior<SilentAWPItem>();
}
}
public class SilentAWPItem(IServiceProvider provider)
: RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
private readonly SilentAWPConfig config =
provider.GetService<IStorage<SilentAWPConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new SilentAWPConfig();
private readonly IPlayerConverter<CCSPlayerController> playerConverter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IDictionary<IOnlinePlayer, int> silentShots =
new Dictionary<IOnlinePlayer, int>();
public override string Name => Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP];
public override string Description
=> Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP_DESC];
public override ShopItemConfig Config => config;
public void Start(BasePlugin? plugin) {
base.Start();
plugin?.HookUserMessage(452, onWeaponSound);
}
public override void OnPurchase(IOnlinePlayer player) {
silentShots[player] = config.CurrentAmmo ?? 0 + config.ReserveAmmo ?? 0;
Inventory.GiveWeapon(player, config);
}
private HookResult onWeaponSound(UserMessage msg) {
var defIndex = msg.ReadUInt("item_def_index");
if (config.WeaponIndex != defIndex) return HookResult.Continue;
var splits = msg.DebugString.Split("\n");
if (splits.Length < 5) return HookResult.Continue;
var angleLines = msg.DebugString.Split("\n")[1..4]
.Select(s => s.Trim())
.ToList();
if (!angleLines[0].Contains('x') || !angleLines[1].Contains('y')
|| !angleLines[2].Contains('z'))
return HookResult.Continue;
var x = float.Parse(angleLines[0].Split(' ')[1]);
var y = float.Parse(angleLines[1].Split(' ')[1]);
var z = float.Parse(angleLines[2].Split(' ')[1]);
var vec = new Vector(x, y, z);
var player = findPlayerByCoord(vec);
if (player == null) return HookResult.Continue;
if (playerConverter.GetPlayer(player) is not IOnlinePlayer apiPlayer)
return HookResult.Continue;
if (!silentShots.TryGetValue(apiPlayer, out var shots) || shots <= 0)
return HookResult.Continue;
silentShots[apiPlayer] = shots - 1;
if (silentShots[apiPlayer] == 0) {
silentShots.Remove(apiPlayer);
Shop.RemoveItem<SilentAWPItem>(apiPlayer);
}
msg.Recipients.Clear();
return HookResult.Handled;
}
private CCSPlayerController? findPlayerByCoord(Vector vec) {
foreach (var pl in Utilities.GetPlayers()) {
var origin = pl.GetEyePosition();
if (origin == null) continue;
var dist = vec.DistanceSquared(origin);
if (dist < 1) return pl;
}
return null;
}
}

View File

@@ -0,0 +1,11 @@
using TTT.Locale;
namespace TTT.CS2.Items.SilentAWP;
public class SilentAWPMsgs {
public static IMsg SHOP_ITEM_SILENT_AWP
=> MsgFactory.Create(nameof(SHOP_ITEM_SILENT_AWP));
public static IMsg SHOP_ITEM_SILENT_AWP_DESC
=> MsgFactory.Create(nameof(SHOP_ITEM_SILENT_AWP_DESC));
}

View File

@@ -1,11 +1,13 @@
using CounterStrikeSharp.API.Core;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI.Configs.Traitor;
using TTT.API.Events;
using TTT.API.Extensions;
using TTT.API.Player;
using TTT.API.Role;
using TTT.API.Storage;
using TTT.CS2.Extensions;
using TTT.Game.Events.Player;
using TTT.Game.Roles;
namespace TTT.CS2.Items.Station;
@@ -22,6 +24,8 @@ public class DamageStation(IServiceProvider provider)
?.Load()
.GetAwaiter()
.GetResult() ?? new DamageStationConfig()) {
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
@@ -37,11 +41,12 @@ public class DamageStation(IServiceProvider provider)
=> Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
override protected void onInterval() {
var players = finder.GetOnline();
var players = finder.GetOnline();
var toRemove = new List<CPhysicsPropMultiplayer>();
foreach (var (prop, info) in props) {
if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
> Math.Abs(_Config.TotalHealthGiven)) {
props.Remove(prop);
toRemove.Add(prop);
continue;
}
@@ -66,11 +71,28 @@ public class DamageStation(IServiceProvider provider)
var healthScale = 1.0 - dist / _Config.MaxRange;
var damageAmount =
(int)Math.Floor(_Config.HealthIncrements * healthScale);
var dmgEvent = new PlayerDamagedEvent(player,
info.Owner as IOnlinePlayer, damageAmount) { Weapon = $"[{Name}]" };
bus.Dispatch(dmgEvent);
damageAmount = -dmgEvent.DmgDealt;
player.Health += damageAmount;
info.HealthGiven += damageAmount;
if (player.Health + damageAmount <= 0) {
var playerDeath = new PlayerDeathEvent(player)
.WithKiller(info.Owner as IOnlinePlayer)
.WithWeapon($"[{Name}]");
bus.Dispatch(playerDeath);
}
gamePlayer.ExecuteClientCommand("play " + _Config.UseSound);
}
}
foreach (var prop in toRemove) props.Remove(prop);
}
}

View File

@@ -1,4 +1,5 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI.Configs.Detective;
using TTT.API.Extensions;
@@ -26,11 +27,12 @@ public class HealthStation(IServiceProvider provider)
=> Locale[StationMsgs.SHOP_ITEM_STATION_HEALTH_DESC];
override protected void onInterval() {
var players = Utilities.GetPlayers();
var players = Utilities.GetPlayers();
var toRemove = new List<CPhysicsPropMultiplayer>();
foreach (var (prop, info) in props) {
if (_Config.TotalHealthGiven != 0
&& Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
props.Remove(prop);
toRemove.Add(prop);
continue;
}
@@ -56,5 +58,7 @@ public class HealthStation(IServiceProvider provider)
player.ExecuteClientCommand("play " + _Config.UseSound);
}
}
foreach (var prop in toRemove) props.Remove(prop);
}
}

View File

@@ -1,9 +1,12 @@
using CounterStrikeSharp.API.Core;
using TTT.API.Player;
namespace TTT.CS2.Items.Station;
public class StationInfo(CPhysicsPropMultiplayer prop, int health) {
public class StationInfo(CPhysicsPropMultiplayer prop, int health,
IPlayer owner) {
public readonly CPhysicsPropMultiplayer Prop = prop;
public int Health = health;
public int HealthGiven = 0;
public IPlayer Owner = owner;
}

View File

@@ -17,12 +17,13 @@ namespace TTT.CS2.Items.Station;
public abstract class StationItem<T>(IServiceProvider provider,
StationConfig config)
: RoleRestrictedItem<T>(provider), IPluginModule where T : IRole {
private static readonly long PROP_SIZE_SQUARED = 500;
protected readonly StationConfig _Config = config;
protected readonly IPlayerConverter<CCSPlayerController> Converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly long PROP_SIZE_SQUARED = 500;
protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
new();
@@ -117,7 +118,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
if (prop == null) return;
props[prop] = new StationInfo(prop, _Config.StationHealth);
props[prop] = new StationInfo(prop, _Config.StationHealth, player);
prop.SetModel("models/props/cs_office/microwave.vmdl");
prop.DispatchSpawn();

View File

@@ -8,8 +8,8 @@ using TTT.API.Player;
using TTT.CS2.API;
using TTT.CS2.Events;
using TTT.CS2.Extensions;
using TTT.Game;
using TTT.Game.Events.Body;
using TTT.Game.lang;
using TTT.Game.Listeners;
using TTT.Game.Roles;

View File

@@ -0,0 +1,75 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Events;
using TTT.API.Player;
using TTT.API.Storage;
using TTT.CS2.Roles;
using TTT.Game.Events.Player;
using TTT.Game.Listeners;
using TTT.Karma;
using TTT.Karma.Events;
using TTT.Karma.lang;
namespace TTT.CS2.Listeners;
public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
private readonly KarmaConfig config =
provider.GetService<IStorage<KarmaConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new KarmaConfig();
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly Dictionary<IPlayer, int> cooldownRounds = new();
private readonly IKarmaService karma =
provider.GetRequiredService<IKarmaService>();
private readonly Dictionary<IPlayer, DateTime> lastWarned = new();
[UsedImplicitly]
[EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
public void OnKarmaUpdate(KarmaUpdateEvent ev) {
if (ev.Karma < config.MinKarma) {
issueKarmaBan(ev.Player);
return;
}
if (ev.Karma >= config.KarmaTimeoutThreshold) return;
var timeSinceLastWarn = DateTime.UtcNow
- lastWarned.GetValueOrDefault(ev.Player, DateTime.MinValue);
if (timeSinceLastWarn <= config.KarmaWarningWindow) return;
issueKarmaWarning(ev.Player);
}
[UsedImplicitly]
[EventHandler(Priority = Priority.HIGH)]
public void OnRoleAssign(PlayerRoleAssignEvent ev) {
if (!cooldownRounds.TryGetValue(ev.Player, out var rounds) || rounds <= 0)
return;
Messenger.Message(ev.Player, Locale[KarmaMsgs.KARMA_WARNING(rounds)]);
cooldownRounds[ev.Player]--;
if (cooldownRounds[ev.Player] <= 0) cooldownRounds.Remove(ev.Player);
ev.Role = new SpectatorRole(Provider);
}
private void issueKarmaBan(IPlayer player) {
Server.NextWorldUpdate(() => {
var userId = converter.GetPlayer(player);
if (userId == null) return;
Server.ExecuteCommand(string.Format(config.CommandUponLowKarma,
userId.UserId));
Task.Run(async () => await karma.Write(player, config.DefaultKarma));
});
}
private void issueKarmaWarning(IPlayer player) {
cooldownRounds[player] = config.KarmaRoundTimeout;
lastWarned[player] = DateTime.UtcNow;
}
}

View File

@@ -0,0 +1,54 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes.Registration;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Events;
using TTT.API.Player;
using TTT.Game.Listeners;
using TTT.Karma;
using TTT.Karma.Events;
namespace TTT.CS2.Listeners;
public class KarmaSyncer(IServiceProvider provider)
: BaseListener(provider), IPluginModule {
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IKarmaService? karma = provider.GetService<IKarmaService>();
[UsedImplicitly]
[EventHandler]
public void OnKarmaUpdate(KarmaUpdateEvent ev) {
if (karma == null) return;
Server.NextWorldUpdate(() => {
var player = converter.GetPlayer(ev.Player);
if (player == null) return;
player.Score = ev.Karma;
Utilities.SetStateChanged(player, "CCSPlayerController", "m_iScore");
});
}
[UsedImplicitly]
[GameEventHandler]
public HookResult OnJoin(EventPlayerConnectFull ev, GameEventInfo _) {
if (ev.Userid == null || karma == null) return HookResult.Continue;
var player = converter.GetPlayer(ev.Userid);
var user = ev.Userid;
Task.Run(async () => {
var karmaValue = await karma.Load(player);
await Server.NextWorldUpdateAsync(() => {
if (!user.IsValid) return;
user.Score = karmaValue;
Utilities.SetStateChanged(user, "CCSPlayerController", "m_iScore");
});
});
return HookResult.Continue;
}
}

View File

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Messages;
using TTT.API.Player;
using TTT.Game.Events.Body;
using TTT.Game.Events.Game;
@@ -18,9 +17,6 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
private readonly IPlayerFinder finder =
provider.GetRequiredService<IPlayerFinder>();
private readonly IMessenger messenger =
provider.GetRequiredService<IMessenger>();
private readonly ISet<int> revealedDeaths = new HashSet<int>();
private readonly IDictionary<int, (int, int)> roundKillsAndAssists =

View File

@@ -45,7 +45,9 @@ public class RoundTimerListener(IServiceProvider provider)
.TotalSeconds);
Server.ExecuteCommand("mp_ignore_round_win_conditions 1");
foreach (var player in Utilities.GetPlayers()
.Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE))
.Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE && p is {
Team: CsTeam.CounterTerrorist or CsTeam.Terrorist
}))
player.Respawn();
foreach (var player in Utilities.GetPlayers())
@@ -55,6 +57,16 @@ public class RoundTimerListener(IServiceProvider provider)
return;
}
if (ev.NewState == State.IN_PROGRESS) {
Server.NextWorldUpdate(() => {
foreach (var player in Utilities.GetPlayers()
.Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE && p is {
Team: CsTeam.CounterTerrorist or CsTeam.Terrorist
}))
player.Respawn();
});
}
if (ev.NewState == State.FINISHED) endTimer?.Dispose();
if (ev.NewState != State.IN_PROGRESS) return;
var duration = config.RoundCfg.RoundDuration(ev.Game.Players.Count);

View File

@@ -53,7 +53,7 @@ public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
}
private void onTick() {
_fakeAlivePlayers.RemoveWhere(p => !p.IsValid);
_fakeAlivePlayers.RemoveWhere(p => !p.IsValid || p.Handle == IntPtr.Zero);
foreach (var player in _fakeAlivePlayers) {
player.PawnIsAlive = true;
Utilities.SetStateChanged(player, "CCSPlayerController",

View File

@@ -1,4 +1,3 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Admin;
using CounterStrikeSharp.API.Modules.Entities;
@@ -20,8 +19,6 @@ public class CS2PermManager(IPlayerConverter<CCSPlayerController> converter)
public bool InGroups(IPlayer player, params string[] groups) {
if (groups.Length == 0) return true;
Server.PrintToChatAll("Checking groups for player: " + player.Id);
Console.WriteLine("Checking groups for player: " + player.Id);
var gamePlayer = converter.GetPlayer(player);
var adminData = AdminManager.GetPlayerAdminData(gamePlayer);

View File

@@ -13,6 +13,9 @@ public class SpectatorRole(IServiceProvider provider) : IRole {
private readonly IPlayerConverter<CCSPlayerController> playerConverter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IRoleAssigner roles =
provider.GetRequiredService<IRoleAssigner>();
public string Id => "basegame.role.spectator";
public string Name
@@ -22,6 +25,14 @@ public class SpectatorRole(IServiceProvider provider) : IRole {
public IOnlinePlayer? FindPlayerToAssign(ISet<IOnlinePlayer> players) {
return players.FirstOrDefault(p
=> playerConverter.GetPlayer(p) is { Team: CsTeam.Spectator });
=> roles.GetRoles(p).Count == 0
&& playerConverter.GetPlayer(p) is { Team: CsTeam.Spectator });
}
public void OnAssign(IOnlinePlayer player) {
var csPlayer = playerConverter.GetPlayer(player);
if (csPlayer is null) return;
csPlayer.CommitSuicide(false, true);
csPlayer.ChangeTeam(CsTeam.Spectator);
}
}

View File

@@ -0,0 +1,81 @@
namespace TTT.CS2.Utils;
public static class TextCompass {
/// <summary>
/// Builds a compass line with at most one character for each of N, E, S, W.
/// 0° = North, 90° = East, angles increase clockwise.
/// </summary>
/// <param name="fov">Field of view in degrees [0..360].</param>
/// <param name="width">Output width in characters.</param>
/// <param name="direction">Facing direction in degrees.</param>
/// <param name="filler">Filler character for empty slots.</param>
/// <param name="targetDir"></param>
public static string GenerateCompass(float fov, int width, float direction,
char filler = '·', float? targetDir = null) {
if (width <= 0) return string.Empty;
fov = Math.Clamp(fov, 0.001f, 360f);
direction = Normalize(direction);
var buf = new char[width];
for (var i = 0; i < width; i++) buf[i] = filler;
var start = direction - fov / 2f; // left edge of view
var degPerChar = fov / width;
PlaceIfVisible('N', 0f);
PlaceIfVisible('E', 90f);
PlaceIfVisible('S', 180f);
PlaceIfVisible('W', 270f);
if (targetDir.HasValue) PlaceIfVisible('X', targetDir.Value);
return new string(buf);
void PlaceIfVisible(char c, float cardinalAngle) {
var delta = ForwardDelta(start, cardinalAngle); // [0..360)
if (delta < 0f || delta >= fov) return; // outside view
// Map degrees to nearest character cell
var idx = (int)MathF.Round(delta / degPerChar);
if (idx < 0) idx = 0;
if (idx >= width) idx = width - 1;
// Nudge left/right to avoid collisions when possible
if (buf[idx] == filler) {
buf[idx] = c;
return;
}
var maxRadius = Math.Max(idx, width - 1 - idx);
for (var r = 1; r <= maxRadius; r++) {
var left = idx - r;
if (left >= 0 && buf[left] == filler) {
buf[left] = c;
return;
}
var right = idx + r;
if (right < width && buf[right] == filler) {
buf[right] = c;
return;
}
}
// If no space, overwrite the original cell as a last resort
buf[idx] = c;
}
}
private static float Normalize(float angle) {
angle %= 360f;
return angle < 0 ? angle + 360f : angle;
}
// Delta moving forward from start to target, wrapped to [0..360)
private static float ForwardDelta(float start, float target) {
var s = Normalize(start);
var t = Normalize(target);
var d = t - s;
return d < 0 ? d + 360f : d;
}
}

View File

@@ -1,6 +1,6 @@
using TTT.API.Player;
using TTT.API.Role;
using TTT.Game.lang;
using TTT.Game;
using TTT.Locale;
namespace TTT.CS2.lang;

View File

@@ -1,4 +1,4 @@
ROLE_SPECTATOR: "Spectator"
ROLE_SPECTATOR: "Spectator"
TASER_SCANNED: "%PREFIX%You scanned {0}{grey}, they are %an% {1}{grey}!"
DNA_PREFIX: "{darkblue}D{blue}N{lightblue}A{grey} | {grey}"
@@ -29,4 +29,13 @@ SHOP_ITEM_POISON_SMOKE: "Poison Smoke"
SHOP_ITEM_POISON_SMOKE_DESC: "Throw a grenade that releases poisonous gas."
SHOP_ITEM_ARMOR: "Armor with Helmet"
SHOP_ITEM_ARMOR_DESC: "Wear armor that reduces incoming damage."
SHOP_ITEM_ARMOR_DESC: "Wear armor that reduces incoming damage."
SHOP_ITEM_ONE_HIT_KNIFE: "One-Hit Knife"
SHOP_ITEM_ONE_HIT_KNIFE_DESC: "Your next knife hit will be a guaranteed kill."
SHOP_ITEM_COMPASS: "Player Compass"
SHOP_ITEM_COMPASS_DESC: "Reveals the direction that the nearest non-Traitor is in."
SHOP_ITEM_SILENT_AWP: "Silent AWP"
SHOP_ITEM_SILENT_AWP_DESC: "Receive a silenced AWP with limited ammo."

View File

@@ -15,7 +15,9 @@ public class IdentifyBodyAction(IRoleAssigner roles, BodyIdentifyEvent ev)
#endregion
public IPlayer Player { get; } = ev.Identifier;
public IPlayer Player { get; } =
ev.Identifier ?? throw new InvalidOperationException();
public IPlayer? Other { get; } = ev.Body.OfPlayer;
public IRole? PlayerRole { get; } =

View File

@@ -2,7 +2,6 @@ using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Command;
using TTT.API.Player;
using TTT.Game.lang;
using TTT.Locale;
namespace TTT.Game.Commands;

View File

@@ -1,7 +1,9 @@
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Command;
using TTT.API.Game;
using TTT.API.Messages;
using TTT.API.Player;
using TTT.Locale;
namespace TTT.Game.Commands;
@@ -9,13 +11,22 @@ public class LogsCommand(IServiceProvider provider) : ICommand {
private readonly IGameManager games =
provider.GetRequiredService<IGameManager>();
private readonly IMessenger messenger =
provider.GetRequiredService<IMessenger>();
private readonly IMsgLocalizer localizer =
provider.GetRequiredService<IMsgLocalizer>();
private readonly IIconManager? icons = provider.GetService<IIconManager>();
public void Dispose() { }
public string[] RequiredFlags => ["@ttt/admin"];
public bool MustBeOnMainThread => true;
public string Id => "logs";
public void Start() { }
// TODO: Restrict and verbalize usage
public Task<CommandResult>
Execute(IOnlinePlayer? executor, ICommandInfo info) {
if (games.ActiveGame is not {
@@ -25,6 +36,13 @@ public class LogsCommand(IServiceProvider provider) : ICommand {
return Task.FromResult(CommandResult.ERROR);
}
if (executor is { IsAlive: true })
messenger.MessageAll(localizer[GameMsgs.LOGS_VIEWED_ALIVE(executor)]);
else if (icons != null && executor != null) {
if (int.TryParse(executor.Id, out var slot))
icons.SetVisiblePlayers(slot, ulong.MaxValue);
}
games.ActiveGame.Logger.PrintLogs(executor);
return Task.FromResult(CommandResult.SUCCESS);
}

View File

@@ -4,7 +4,6 @@ using TTT.API;
using TTT.API.Command;
using TTT.API.Events;
using TTT.API.Player;
using TTT.Game.lang;
using TTT.Locale;
namespace TTT.Game.Commands;

View File

@@ -9,7 +9,6 @@ public class EventBus(IServiceProvider provider) : IEventBus, ITerrorModule {
private readonly Dictionary<Type, List<(object listener, MethodInfo method)>>
handlers = new();
[Obsolete("Registering listeners is deprecated, use DI instead.")]
public void RegisterListener(IListener listener) {
var dirtyTypes = new HashSet<Type>();
appendListener(listener, dirtyTypes);
@@ -28,29 +27,24 @@ public class EventBus(IServiceProvider provider) : IEventBus, ITerrorModule {
}
}
public Task Dispatch(Event ev) {
public void Dispatch(Event ev) {
var type = ev.GetType();
handlers.TryGetValue(type, out var list);
if (list == null || list.Count == 0) return Task.CompletedTask;
if (list == null || list.Count == 0) return;
ICancelableEvent? cancelable = null;
if (ev is ICancelableEvent) cancelable = (ICancelableEvent)ev;
List<Task> tasks = [];
foreach (var (listener, method) in list) {
if (cancelable is { IsCanceled: true } && method
.GetCustomAttribute<EventHandlerAttribute>()
?.IgnoreCanceled == true)
continue;
var result = method.Invoke(listener, [ev]);
if (result is Task task) tasks.Add(task);
method.Invoke(listener, [ev]);
}
return Task.WhenAll(tasks);
}
public void Dispose() { handlers.Clear(); }
@@ -86,6 +80,11 @@ public class EventBus(IServiceProvider provider) : IEventBus, ITerrorModule {
var attr = method.GetCustomAttribute<EventHandlerAttribute>();
if (attr == null) return;
if (method.ReturnType != typeof(void))
throw new InvalidOperationException(
$"Method {method.Name} in {listener.GetType().Name} "
+ "must have void return type.");
var parameters = method.GetParameters();
if (parameters.Length != 1
|| !typeof(Event).IsAssignableFrom(parameters[0].ParameterType))

View File

@@ -6,8 +6,10 @@ using TTT.API.Player;
namespace TTT.Game.Events.Player;
public class PlayerDamagedEvent(IOnlinePlayer player, IOnlinePlayer? attacker,
int dmgDealt, int hpLeft) : PlayerEvent(player), ICancelableEvent {
private int _hpLeft = hpLeft;
int originalHp, int hpLeft) : PlayerEvent(player), ICancelableEvent {
public PlayerDamagedEvent(IOnlinePlayer player, IOnlinePlayer? attacker,
int damageDealt) : this(player, attacker, player.Health - damageDealt,
player.Health) { }
public PlayerDamagedEvent(IPlayerConverter<CCSPlayerController> converter,
EventPlayerHurt ev) : this(
@@ -15,21 +17,13 @@ public class PlayerDamagedEvent(IOnlinePlayer player, IOnlinePlayer? attacker,
?? throw new InvalidOperationException(),
ev.Attacker == null ?
null :
converter.GetPlayer(ev.Attacker) as IOnlinePlayer, ev.DmgHealth,
ev.Health) {
converter.GetPlayer(ev.Attacker) as IOnlinePlayer,
ev.Health + ev.DmgHealth, ev.Health) {
ArmorDamage = ev.DmgArmor;
ArmorRemaining = ev.Armor;
Weapon = ev.Weapon;
}
public PlayerDamagedEvent(IPlayerConverter<CCSPlayerController> converter,
EventPlayerFalldamage ev) : this(
converter.GetPlayer(ev.Userid!) as IOnlinePlayer
?? throw new InvalidOperationException(), null, (int)ev.Damage,
ev.Userid!.Health) {
ArmorRemaining = ev.Userid.PawnArmor;
}
public PlayerDamagedEvent(IPlayerConverter<CCSPlayerController> converter,
DynamicHook hook) : this(null!, null, 0, 0) {
var playerPawn = hook.GetParam<CCSPlayerPawn>(0);
@@ -48,37 +42,19 @@ public class PlayerDamagedEvent(IOnlinePlayer player, IOnlinePlayer? attacker,
Attacker = attacker == null || !attacker.IsValid ?
null :
converter.GetPlayer(attacker) as IOnlinePlayer;
DmgDealt = (int)info.Damage;
_hpLeft = player.Health - DmgDealt;
OriginalHp = player.Pawn.Value!.Health;
HpLeft = (int)(OriginalHp - info.Damage);
}
public bool HpModified { get; private set; }
public override string Id => "basegame.event.player.damaged";
public IOnlinePlayer? Attacker { get; private set; } = attacker;
public int ArmorDamage { get; private set; }
public int ArmorRemaining { get; set; }
public int DmgDealt { get; } = dmgDealt;
public int DmgDealt => OriginalHp - HpLeft;
public int HpLeft {
get => _hpLeft;
set {
if (value == _hpLeft) return;
switch (value) {
case < 0:
throw new ArgumentOutOfRangeException(nameof(value),
"HpLeft must be greater than 0.");
case 0:
throw new ArgumentException(
"Cannot override HP if player is already dead; cancel the event instead.");
default:
HpModified = _hpLeft != value;
_hpLeft = value;
break;
}
}
}
public int HpLeft { get; set; } = hpLeft;
public int OriginalHp { get; } = originalHp;
public string? Weapon { get; init; }
public bool IsCanceled { get; set; }

View File

@@ -18,7 +18,7 @@ public class PlayerActionsLogger(IServiceProvider provider)
[UsedImplicitly]
[EventHandler]
[EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
public void OnPlayerDamage(PlayerDamagedEvent ev) {
if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
Games.ActiveGame.Logger.LogAction(new DamagedAction(Provider, ev));

View File

@@ -1,8 +1,6 @@
using JetBrains.Annotations;
using TTT.API.Events;
using TTT.API.Role;
using TTT.Game.Events.Player;
using TTT.Game.Roles;
namespace TTT.Game.Listeners;
@@ -19,38 +17,4 @@ public class PlayerCausesEndListener(IServiceProvider provider)
public void OnLeave(PlayerLeaveEvent ev) {
Games.ActiveGame?.CheckEndConditions();
}
private bool getWinningTeam(out IRole? winningTeam) {
var game = Games.ActiveGame;
winningTeam = null;
if (game is null) return false;
var traitorRole =
game.Roles.First(r => r.GetType().IsAssignableTo(typeof(TraitorRole)));
var innocentRole =
game.Roles.First(r => r.GetType().IsAssignableTo(typeof(InnocentRole)));
var detectiveRole = game.Roles.First(r
=> r.GetType().IsAssignableTo(typeof(DetectiveRole)));
var traitorsAlive = game.GetAlive(typeof(TraitorRole)).Count;
var nonTraitorsAlive = game.GetAlive().Count - traitorsAlive;
var detectivesAlive = game.GetAlive(typeof(DetectiveRole)).Count;
switch (traitorsAlive) {
case 0 when nonTraitorsAlive == 0:
winningTeam = null;
return true;
case > 0 when nonTraitorsAlive == 0:
winningTeam = traitorRole;
return true;
case 0 when nonTraitorsAlive > 0:
winningTeam = nonTraitorsAlive == detectivesAlive ?
detectiveRole :
innocentRole;
return true;
default:
winningTeam = null;
return false;
}
}
}

View File

@@ -1,7 +1,6 @@
using JetBrains.Annotations;
using TTT.API.Events;
using TTT.Game.Events.Player;
using TTT.Game.lang;
namespace TTT.Game.Listeners;

View File

@@ -3,7 +3,6 @@ using JetBrains.Annotations;
using TTT.API.Events;
using TTT.API.Game;
using TTT.Game.Events.Game;
using TTT.Game.lang;
using TTT.Game.Roles;
namespace TTT.Game.Listeners;

View File

@@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
using TTT.API.Game;
using TTT.API.Messages;
using TTT.API.Player;
using TTT.Game.lang;
using TTT.Locale;
namespace TTT.Game.Loggers;
@@ -22,7 +21,7 @@ public class SimpleLogger(IServiceProvider provider) : IActionLogger {
private DateTime? epoch;
public void LogAction(IAction action) {
public virtual void LogAction(IAction action) {
#if DEBUG
msg.Value.Debug(
$"Logging action: {action.GetType().Name} at {scheduler.Now}");

View File

@@ -4,7 +4,6 @@ using TTT.API.Messages;
using TTT.API.Player;
using TTT.API.Role;
using TTT.API.Storage;
using TTT.Game.lang;
using TTT.Locale;
namespace TTT.Game.Roles;

View File

@@ -1,6 +1,5 @@
using System.Drawing;
using TTT.API.Player;
using TTT.Game.lang;
namespace TTT.Game.Roles;

View File

@@ -1,7 +1,6 @@
using System.Drawing;
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Player;
using TTT.Game.lang;
using TTT.Locale;
namespace TTT.Game.Roles;

View File

@@ -49,7 +49,7 @@ public class RoleAssigner(IServiceProvider provider) : IRoleAssigner {
assignedRoles[player].Add(ev.Role);
ev.Role.OnAssign(player);
onlineMessenger?.BackgroundMsgAll(
onlineMessenger?.Debug(
$"{player.Name} was assigned the role of {role.Name}.");
return true;
}

View File

@@ -1,6 +1,5 @@
using System.Drawing;
using TTT.API.Player;
using TTT.Game.lang;
namespace TTT.Game.Roles;

View File

@@ -8,7 +8,6 @@ using TTT.API.Player;
using TTT.API.Role;
using TTT.API.Storage;
using TTT.Game.Events.Game;
using TTT.Game.lang;
using TTT.Game.Loggers;
using TTT.Game.Roles;
using TTT.Locale;
@@ -22,15 +21,12 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
.GetAwaiter()
.GetResult() ?? new TTTConfig();
private readonly IInventoryManager inventory =
provider.GetRequiredService<IInventoryManager>();
protected readonly IMsgLocalizer Locale =
provider.GetRequiredService<IMsgLocalizer>();
private readonly List<IPlayer> players = [];
private State state = State.WAITING;
protected State state = State.WAITING;
public virtual IList<IRole> Roles { get; } = [
new InnocentRole(provider), new TraitorRole(provider),
@@ -49,10 +45,10 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
public IRoleAssigner RoleAssigner { get; init; } = provider
.GetRequiredService<IRoleAssigner>();
public State State {
public virtual State State {
set {
var ev = new GameStateUpdateEvent(this, value);
bus.Dispatch(ev);
Bus.Dispatch(ev);
if (ev.IsCanceled) return;
state = value;
}
@@ -174,19 +170,22 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
StartedAt = DateTime.Now;
RoleAssigner.AssignRoles(online, Roles);
players.AddRange(online);
players.AddRange(online.Where(p
=> RoleAssigner.GetRoles(p)
.Any(r => r is TraitorRole or DetectiveRole or InnocentRole)));
State = State.IN_PROGRESS;
var traitors = ((IGame)this).GetAlive(typeof(TraitorRole)).Count;
var nonTraitors = online.Count - traitors;
var nonTraitors = players.Count - traitors;
Messenger?.MessageAll(Locale[
GameMsgs.GAME_STATE_STARTED(traitors, nonTraitors)]);
}
#region classDeps
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
protected readonly IEventBus Bus = provider.GetRequiredService<IEventBus>();
protected readonly IScheduler Scheduler =
provider.GetRequiredService<IScheduler>();

View File

@@ -4,7 +4,7 @@ using TTT.API.Role;
using TTT.Game.Roles;
using TTT.Locale;
namespace TTT.Game.lang;
namespace TTT.Game;
public static class GameMsgs {
public static IMsg PREFIX => MsgFactory.Create(nameof(PREFIX));
@@ -108,4 +108,7 @@ public static class GameMsgs {
}
#endregion
public static IMsg LOGS_VIEWED_ALIVE(IPlayer player)
=> MsgFactory.Create(nameof(LOGS_VIEWED_ALIVE), player.Name);
}

View File

@@ -4,8 +4,8 @@ ROLE_DETECTIVE: "{blue}Detective"
ROLE_TRAITOR: "{red}Traitor"
ROLE_ASSIGNED: "%PREFIX%You are %an% {0}{grey}!"
ROLE_REVEAL_DEATH: "%PREFIX%Your killer was %an% {0}{grey}!"
ROLE_REVEAL_TRAITORS_HEADER: "%PREFIX%Your Traitor Buddies are:"
ROLE_REVEAL_TRAITORS_NONE: "%PREFIX%You have no Traitor Buddies."
ROLE_REVEAL_TRAITORS_HEADER: "%PREFIX%Your {red}Traitor {grey}teammates are:"
ROLE_REVEAL_TRAITORS_NONE: "%PREFIX%You have no {red}Traitor {grey}teammates."
GENERIC_UNKNOWN: "%PREFIX%{red}Unknown Command: {darkred}{0}"
GENERIC_NO_PERMISSION: "%PREFIX%{red}You do not have permission to use this command."
GENERIC_NO_PERMISSION_NODE: "%PREFIX%{red}You are missing the {darkred}{0}{red} permission."
@@ -21,4 +21,5 @@ GAME_STATE_ENDED_OTHER: "%PREFIX%{blue}GAME! {default}{0}{grey}."
NOT_ENOUGH_PLAYERS: "%PREFIX%{red}Game was canceled due to having fewer than {yellow}{0}{red} player%s%."
BODY_IDENTIFIED: "%PREFIX%{default}{0}{grey} identified the body of {blue}{1}{grey}, they were %an% {2}{grey}!"
GAME_LOGS_HEADER: "---------- Game Logs ----------"
GAME_LOGS_FOOTER: "-------------------------------"
GAME_LOGS_FOOTER: "-------------------------------"
LOGS_VIEWED_ALIVE: "%PREFIX%{red}{0}{grey} viewed the logs while alive."

View File

@@ -7,6 +7,7 @@ namespace TTT.Karma.Events;
public class KarmaUpdateEvent(IPlayer player, int oldKarma, int newKarma)
: PlayerEvent(player), ICancelableEvent {
public override string Id => "karma.update";
public int OldKarma { get; set; } = oldKarma;
public int Karma { get; set; } = newKarma;
public bool IsCanceled { get; set; }
}

View File

@@ -13,7 +13,9 @@
<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.66"/>
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9"/>
<PackageReference Include="MySqlConnector" Version="2.4.0"/>
<PackageReference Include="SQLite" Version="3.13.0"/>
</ItemGroup>
</Project>

30
TTT/Karma/KarmaCommand.cs Normal file
View File

@@ -0,0 +1,30 @@
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Command;
using TTT.API.Player;
using TTT.Karma.lang;
using TTT.Locale;
namespace TTT.Karma;
public class KarmaCommand(IServiceProvider provider) : ICommand {
private readonly IKarmaService karma =
provider.GetRequiredService<IKarmaService>();
private readonly IMsgLocalizer locale =
provider.GetRequiredService<IMsgLocalizer>();
public void Dispose() { }
public void Start() { }
public string Id => "karma";
public async Task<CommandResult> Execute(IOnlinePlayer? executor,
ICommandInfo info) {
if (executor == null) return CommandResult.PLAYER_ONLY;
var value = await karma.Load(executor);
info.ReplySync(locale[KarmaMsgs.KARMA_COMMAND(value)]);
return CommandResult.SUCCESS;
}
}

View File

@@ -3,9 +3,60 @@ using TTT.API.Player;
namespace TTT.Karma;
public record KarmaConfig {
public string DbString { get; init; }
public string DbString { get; init; } = "Data Source=karma.db";
public int MinKarma => 0;
public int DefaultKarma => 50;
public int MaxKarma(IPlayer player) { return 100; }
/// <summary>
/// The minimum amount of karma a player can have.
/// If a player's karma falls below this value, the CommandUponLowKarma
/// will be executed.
/// </summary>
public int MinKarma { get; init; }
/// <summary>
/// The default amount of karma a player starts with.
/// Once a player falls below MinKarma, their karma will
/// also be reset to this value.
/// </summary>
public int DefaultKarma { get; init; } = 50;
/// <summary>
/// The command to execute when a player's karma falls below MinKarma.
/// The first argument will be the player's slot.
/// </summary>
public string CommandUponLowKarma { get; init; } = "karmaban {0} Bad Player!";
/// <summary>
/// The minimum threshold that a player's karma must reach
/// before timing them out for KarmaRoundTimeout rounds;
/// </summary>
public int KarmaTimeoutThreshold { get; init; } = 20;
/// <summary>
/// The number of rounds a player will be timed out for
/// if their karma falls below KarmaTimeoutThreshold.
/// </summary>
public int KarmaRoundTimeout { get; init; } = 4;
/// <summary>
/// The time window in which a player will receive a warning
/// if their karma falls below KarmaWarningThreshold.
/// If the player has already received a warning within this time window,
/// no warning will be sent.
/// </summary>
public TimeSpan KarmaWarningWindow { get; init; } = TimeSpan.FromDays(1);
public int MaxKarma(IPlayer? player) { return 100; }
/// <summary>
/// Amount of karma a player will gain at the end of each round.
/// </summary>
public int KarmaPerRound { get; init; } = 3;
public int KarmaPerRoundWin { get; init; } = 5;
public int INNO_ON_TRAITOR { get; init; } = 5;
public int TRAITOR_ON_DETECTIVE { get; init; } = 1;
public int INNO_ON_INNO_VICTIM { get; init; } = -1;
public int INNO_ON_INNO { get; init; } = -4;
public int TRAITOR_ON_TRAITOR { get; init; } = -5;
public int INNO_ON_DETECTIVE { get; init; } = -6;
}

View File

@@ -2,21 +2,17 @@ using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Player;
using TTT.API.Role;
using TTT.API.Storage;
using TTT.Game.Events.Game;
using TTT.Game.Events.Player;
using TTT.Game.Listeners;
using TTT.Game.Roles;
namespace TTT.Karma;
public class KarmaListener(IServiceProvider provider) : IListener {
private static readonly int INNO_ON_TRAITOR = 2;
private static readonly int TRAITOR_ON_DETECTIVE = 1;
private static readonly int INNO_ON_INNO_VICTIM = -1;
private static readonly int INNO_ON_INNO = -4;
private static readonly int TRAITOR_ON_TRAITOR = -5;
private static readonly int INNO_ON_DETECTIVE = -6;
public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
private readonly Dictionary<string, int> badKills = new();
private readonly IGameManager games =
@@ -25,10 +21,16 @@ public class KarmaListener(IServiceProvider provider) : IListener {
private readonly IKarmaService karma =
provider.GetRequiredService<IKarmaService>();
private readonly Dictionary<IPlayer, int> queuedKarmaUpdates = new();
private readonly IRoleAssigner roles =
provider.GetRequiredService<IRoleAssigner>();
public void Dispose() { }
private readonly KarmaConfig config =
provider.GetService<IStorage<KarmaConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new KarmaConfig();
[EventHandler]
[UsedImplicitly]
@@ -36,14 +38,14 @@ public class KarmaListener(IServiceProvider provider) : IListener {
[EventHandler]
[UsedImplicitly]
public Task OnKill(PlayerDeathEvent ev) {
if (games.ActiveGame is not { State: State.IN_PROGRESS })
return Task.CompletedTask;
public void OnKill(PlayerDeathEvent ev) {
if (games.ActiveGame is not { State: State.IN_PROGRESS }) return;
var victim = ev.Victim;
var killer = ev.Killer;
if (killer == null) return Task.CompletedTask;
if (killer == null) return;
if (victim.Id == killer.Id) return;
var victimRole = roles.GetRoles(victim).First();
var killerRole = roles.GetRoles(killer).First();
@@ -58,30 +60,58 @@ public class KarmaListener(IServiceProvider provider) : IListener {
attackerKarmaMultiplier = badKills[killer.Id];
}
if (victimRole is InnocentRole) {
if (killerRole is TraitorRole) return Task.CompletedTask;
victimKarmaDelta = INNO_ON_INNO_VICTIM;
killerKarmaDelta = INNO_ON_INNO;
switch (victimRole) {
case InnocentRole when killerRole is TraitorRole:
return;
case InnocentRole:
victimKarmaDelta = config.INNO_ON_INNO_VICTIM;
killerKarmaDelta = config.INNO_ON_INNO;
break;
case TraitorRole:
killerKarmaDelta = killerRole is TraitorRole ?
config.TRAITOR_ON_TRAITOR :
config.INNO_ON_TRAITOR;
break;
case DetectiveRole:
killerKarmaDelta = killerRole is TraitorRole ?
config.TRAITOR_ON_DETECTIVE :
config.INNO_ON_DETECTIVE;
if (killerRole is DetectiveRole)
victimKarmaDelta = config.INNO_ON_INNO_VICTIM;
break;
}
if (victimRole is TraitorRole)
killerKarmaDelta = killerRole is TraitorRole ?
TRAITOR_ON_TRAITOR :
INNO_ON_TRAITOR;
if (victimRole is DetectiveRole)
killerKarmaDelta = killerRole is TraitorRole ?
TRAITOR_ON_DETECTIVE :
INNO_ON_DETECTIVE;
killerKarmaDelta *= attackerKarmaMultiplier;
return Task.Run(async () => {
var newKillerKarma = await karma.Load(killer) + killerKarmaDelta;
var newVictimKarma = await karma.Load(victim) + victimKarmaDelta;
queuedKarmaUpdates[killer] = queuedKarmaUpdates.GetValueOrDefault(killer, 0)
+ killerKarmaDelta;
queuedKarmaUpdates[victim] = queuedKarmaUpdates.GetValueOrDefault(victim, 0)
+ victimKarmaDelta;
}
await karma.Write(killer, newKillerKarma);
await karma.Write(victim, newVictimKarma);
});
[UsedImplicitly]
[EventHandler]
public void OnRoundEnd(GameStateUpdateEvent ev) {
if (ev.NewState != State.FINISHED) return;
var winner = ev.Game.WinningRole;
foreach (var player in ev.Game.Players) {
if (Roles.GetRoles(player).Any(r => r.GetType() == winner?.GetType()))
queuedKarmaUpdates[player] =
queuedKarmaUpdates.GetValueOrDefault(player, 0)
+ config.KarmaPerRoundWin;
else
queuedKarmaUpdates[player] =
queuedKarmaUpdates.GetValueOrDefault(player, 0)
+ config.KarmaPerRound;
}
foreach (var (player, karmaDelta) in queuedKarmaUpdates)
Task.Run(async () => {
var newKarma = await karma.Load(player) + karmaDelta;
await karma.Write(player, newKarma);
});
queuedKarmaUpdates.Clear();
}
}

View File

@@ -1,9 +1,12 @@
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Extensions;
namespace TTT.Karma;
public static class KarmaServiceCollection {
public static void AddKarmaService(this IServiceCollection collection) {
collection.AddScoped<IKarmaService, KarmaStorage>();
collection.AddModBehavior<IKarmaService, KarmaStorage>();
collection.AddModBehavior<KarmaListener>();
collection.AddModBehavior<KarmaCommand>();
}
}

View File

@@ -1,9 +1,11 @@
using System.Data;
using System.Collections.Concurrent;
using System.Data;
using System.Reactive.Concurrency;
using System.Reactive.Linq;
using System.Reactive.Threading.Tasks;
using Dapper;
using Microsoft.Data.Sqlite;
using Microsoft.Extensions.DependencyInjection;
using MySqlConnector;
using TTT.API.Events;
using TTT.API.Player;
using TTT.API.Storage;
@@ -11,71 +13,157 @@ using TTT.Karma.Events;
namespace TTT.Karma;
public class KarmaStorage(IServiceProvider provider) : IKarmaService {
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
public sealed class KarmaStorage(IServiceProvider provider) : IKarmaService {
private readonly IEventBus _bus = provider.GetRequiredService<IEventBus>();
private readonly KarmaConfig config =
provider.GetService<IStorage<KarmaConfig>>()?.Load().Result
?? new KarmaConfig();
private readonly IScheduler _scheduler =
provider.GetRequiredService<IScheduler>();
private readonly IDictionary<IPlayer, int> karmaCache =
new Dictionary<IPlayer, int>();
private readonly IStorage<KarmaConfig>? _configStorage =
provider.GetService<IStorage<KarmaConfig>>();
private IDbConnection? connection;
// Cache keyed by stable player id to avoid relying on IPlayer equality
private readonly ConcurrentDictionary<string, int> _karmaCache = new();
public void Start() {
connection = new MySqlConnection(config.DbString);
var scheduler = provider.GetRequiredService<IScheduler>();
private KarmaConfig _config = new();
private IDbConnection? _connection;
private IDisposable? _flushSubscription;
private readonly SemaphoreSlim _flushGate = new(1, 1);
Observable.Interval(TimeSpan.FromMinutes(5), scheduler)
.Subscribe(_ => updateKarmas());
}
// Toggle immediate writes. If false, every Write triggers a flush
private const bool EnableCache = true;
public Task<int> Load(IPlayer key) {
if (connection is not { State: ConnectionState.Open })
throw new InvalidOperationException(
"Storage connection is not initialized.");
return connection.QuerySingleOrDefaultAsync<int>(
$"SELECT IFNULL(Karma, {config.DefaultKarma}) FROM PlayerKarma WHERE PlayerId = @PlayerId",
new { PlayerId = key.Id });
}
public void Dispose() { }
public string Id => nameof(KarmaStorage);
public string Version => GitVersionInformation.FullSemVer;
public async Task Write(IPlayer key, int newData) {
if (newData < config.MinKarma || newData > config.MaxKarma(key))
throw new ArgumentOutOfRangeException(nameof(newData),
$"Karma must be between {config.MinKarma} and {config.MaxKarma(key)} for player {key.Id}.");
if (!karmaCache.TryGetValue(key, out var oldKarma)) {
oldKarma = await Load(key);
karmaCache[key] = oldKarma;
public void Start() {
// Load configuration first
if (_configStorage is not null) {
// Synchronously wait here since IKarmaService.Start is sync
_config = _configStorage.Load().GetAwaiter().GetResult()
?? new KarmaConfig();
}
if (oldKarma == newData) return;
// Open a dedicated connection used only by this service
_connection = new SqliteConnection(_config.DbString);
_connection.Open();
var karmaUpdateEvent = new KarmaUpdateEvent(key, oldKarma, newData);
bus.Dispatch(karmaUpdateEvent);
if (karmaUpdateEvent.IsCanceled) return;
// Ensure schema before any reads or writes
_connection.Execute(@"CREATE TABLE IF NOT EXISTS PlayerKarma (
PlayerId TEXT PRIMARY KEY,
Karma INTEGER NOT NULL
)");
karmaCache[key] = newData;
// Periodic flush with proper error handling and serialization
_flushSubscription = Observable
.Interval(TimeSpan.FromSeconds(30), _scheduler)
.SelectMany(_ => FlushAsync().ToObservable())
.Subscribe(_ => { }, // no-op on success
ex => {
// Replace with your logger if available
System.Diagnostics.Trace.TraceError($"Karma flush failed: {ex}");
});
}
private async Task updateKarmas() {
if (connection is not { State: ConnectionState.Open })
public async Task<int> Load(IPlayer player) {
if (player is null) throw new ArgumentNullException(nameof(player));
var key = player.Id;
if (EnableCache && _karmaCache.TryGetValue(key, out var cached))
return cached;
var conn = EnsureConnection();
// Parameterize the default value to keep SQL static
var sql = @"
SELECT COALESCE(
(SELECT Karma FROM PlayerKarma WHERE PlayerId = @PlayerId),
@DefaultKarma
)";
var karma = await conn.QuerySingleAsync<int>(sql,
new { PlayerId = key, DefaultKarma = _config.DefaultKarma });
if (EnableCache) _karmaCache[key] = karma;
return karma;
}
public async Task Write(IPlayer player, int newValue) {
if (player is null) throw new ArgumentNullException(nameof(player));
var key = player.Id;
var max = _config.MaxKarma(player);
if (newValue > max)
throw new ArgumentOutOfRangeException(nameof(newValue),
$"Karma must be less than {max} for player {key}.");
int oldValue;
if (!_karmaCache.TryGetValue(key, out oldValue)) {
oldValue = await Load(player);
}
if (oldValue == newValue) return;
var evt = new KarmaUpdateEvent(player, oldValue, newValue);
try { _bus.Dispatch(evt); } catch {
// Replace with your logger if available
System.Diagnostics.Trace.TraceError(
"Exception during KarmaUpdateEvent dispatch.");
throw;
}
if (evt.IsCanceled) return;
_karmaCache[key] = newValue;
if (!EnableCache) await FlushAsync();
}
private async Task FlushAsync() {
var conn = EnsureConnection();
// Fast path if there is nothing to flush
if (_karmaCache.IsEmpty) return;
await _flushGate.WaitAsync().ConfigureAwait(false);
try {
// Snapshot to avoid long lock on dictionary and to provide a stable view
var snapshot = _karmaCache.ToArray();
if (snapshot.Length == 0) return;
using var tx = conn.BeginTransaction();
const string upsert = @"
INSERT INTO PlayerKarma (PlayerId, Karma)
VALUES (@PlayerId, @Karma)
ON CONFLICT(PlayerId) DO UPDATE SET Karma = excluded.Karma
";
foreach (var (playerId, karma) in snapshot) {
await conn.ExecuteAsync(upsert,
new { PlayerId = playerId, Karma = karma }, tx);
}
tx.Commit();
} finally { _flushGate.Release(); }
}
private IDbConnection EnsureConnection() {
if (_connection is not { State: ConnectionState.Open })
throw new InvalidOperationException(
"Storage connection is not initialized.");
return _connection;
}
var tasks = new List<Task>();
foreach (var (player, karma) in karmaCache)
tasks.Add(connection.ExecuteAsync(
"INSERT INTO PlayerKarma (PlayerId, Karma) VALUES (@PlayerId, @Karma) "
+ "ON DUPLICATE KEY UPDATE Karma = @Karma",
new { PlayerId = player.Id, Karma = karma }));
await Task.WhenAll(tasks);
public void Dispose() {
try {
_flushSubscription?.Dispose();
// Best effort final flush
if (_connection is { State: ConnectionState.Open }) {
FlushAsync().GetAwaiter().GetResult();
}
} catch (Exception ex) {
System.Diagnostics.Trace.TraceError($"Dispose flush failed: {ex}");
} finally {
_connection?.Dispose();
_flushGate.Dispose();
}
}
}

View File

@@ -0,0 +1,13 @@
using TTT.Locale;
namespace TTT.Karma.lang;
public class KarmaMsgs {
public static IMsg KARMA_COMMAND(int karma) {
return MsgFactory.Create(nameof(KARMA_COMMAND), karma);
}
public static IMsg KARMA_WARNING(int rounds) {
return MsgFactory.Create(nameof(KARMA_WARNING), rounds);
}
}

2
TTT/Karma/lang/en.yml Normal file
View File

@@ -0,0 +1,2 @@
KARMA_COMMAND: "%PREFIX%You have {yellow}{0}{grey} karma."
KARMA_WARNING: "%PREFIX%You have {red}very low{grey} karma, and have been forced to sit out for {yellow}{0} {grey}round%s%. Please make sure you read our rules!"

View File

@@ -14,6 +14,16 @@
<ProjectReference Include="..\Shop\Shop.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9"/>
</ItemGroup>
<PropertyGroup>
<!-- Ensure all NuGet deps are copied to the publish folder -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<PublishTrimmed>false</PublishTrimmed>
</PropertyGroup>
<PropertyGroup>
<PublishBaseDirectory>$(MSBuildThisFileDirectory)/../../build</PublishBaseDirectory>
<PublishDir>$(PublishBaseDirectory)/TTT</PublishDir>

View File

@@ -16,6 +16,8 @@ public class BuyCommand(IServiceProvider provider) : ICommand {
private readonly IShop shop = provider.GetRequiredService<IShop>();
private readonly IItemSorter? sorter = provider.GetService<IItemSorter>();
public void Dispose() { }
public string Id => "buy";
public void Start() { }
@@ -41,7 +43,7 @@ public class BuyCommand(IServiceProvider provider) : ICommand {
}
var query = string.Join(" ", info.Args.Skip(1));
var item = searchItem(query);
var item = searchItem(executor, query);
if (item == null) {
info.ReplySync(locale[ShopMsgs.SHOP_ITEM_NOT_FOUND(query)]);
@@ -54,7 +56,13 @@ public class BuyCommand(IServiceProvider provider) : ICommand {
CommandResult.ERROR);
}
private IShopItem? searchItem(string query) {
private IShopItem? searchItem(IOnlinePlayer? player, string query) {
if (sorter != null && int.TryParse(query, out var id)) {
var items = sorter.GetSortedItems(player);
if (id >= 0 && id < items.Count) return items[id];
return null;
}
var item = shop.Items.FirstOrDefault(it
=> it.Name.Equals(query, StringComparison.OrdinalIgnoreCase));

View File

@@ -1,16 +1,31 @@
using CounterStrikeSharp.API.Modules.Utils;
using System.Runtime.CompilerServices;
using CounterStrikeSharp.API.Modules.Utils;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using TTT.API.Command;
using TTT.API.Game;
using TTT.API.Player;
using TTT.API.Role;
using TTT.Locale;
namespace TTT.Shop.Commands;
public class ListCommand(IServiceProvider provider) : ICommand {
public class ListCommand(IServiceProvider provider) : ICommand, IItemSorter {
private readonly IGameManager games = provider
.GetRequiredService<IGameManager>();
private readonly IDictionary<IOnlinePlayer, List<IShopItem>> cache =
new Dictionary<IOnlinePlayer, List<IShopItem>>();
private readonly IDictionary<IOnlinePlayer, DateTime> lastUpdate =
new Dictionary<IOnlinePlayer, DateTime>();
private readonly IRoleAssigner roles = provider
.GetRequiredService<IRoleAssigner>();
private readonly IMsgLocalizer locale = provider
.GetRequiredService<IMsgLocalizer>();
private readonly IShop shop = provider.GetRequiredService<IShop>();
public void Dispose() { }
@@ -21,19 +36,44 @@ public class ListCommand(IServiceProvider provider) : ICommand {
public async Task<CommandResult> Execute(IOnlinePlayer? executor,
ICommandInfo info) {
var items = new List<IShopItem>(shop.Items).Where(item
=> executor == null
|| games.ActiveGame is not { State: State.IN_PROGRESS }
|| item.CanPurchase(executor) != PurchaseResult.WRONG_ROLE)
.ToList();
var items = calculateSortedItems(executor);
if (executor != null) cache[executor] = items;
items = new List<IShopItem>(items);
items.Reverse();
var balance = executor == null ? int.MaxValue : await shop.Load(executor);
foreach (var (index, item) in items.Select((value, i) => (i, value))) {
var canPurchase = executor == null
|| item.CanPurchase(executor) == PurchaseResult.SUCCESS;
canPurchase = canPurchase && item.Config.Price <= balance;
info.ReplySync(formatItem(item, items.Count - index, canPurchase));
}
if (games.ActiveGame is not { State: State.IN_PROGRESS }
|| executor == null)
return CommandResult.SUCCESS;
var role = roles.GetRoles(executor).FirstOrDefault();
if (role == null) return CommandResult.SUCCESS;
info.ReplySync(locale[ShopMsgs.SHOP_LIST_FOOTER(role, balance)]);
return CommandResult.SUCCESS;
}
private List<IShopItem> calculateSortedItems(IOnlinePlayer? player) {
var items = new List<IShopItem>(shop.Items).Where(item
=> player == null
|| games.ActiveGame is not { State: State.IN_PROGRESS }
|| item.CanPurchase(player) != PurchaseResult.WRONG_ROLE)
.ToList();
items.Sort((a, b) => {
var aPrice = a.Config.Price;
var bPrice = b.Config.Price;
var aCanBuy = executor != null
&& a.CanPurchase(executor) == PurchaseResult.SUCCESS;
var bCanBuy = executor != null
&& b.CanPurchase(executor) == PurchaseResult.SUCCESS;
var aCanBuy = player != null
&& a.CanPurchase(player) == PurchaseResult.SUCCESS;
var bCanBuy = player != null
&& b.CanPurchase(player) == PurchaseResult.SUCCESS;
if (aCanBuy && !bCanBuy) return -1;
if (!aCanBuy && bCanBuy) return 1;
@@ -41,29 +81,40 @@ public class ListCommand(IServiceProvider provider) : ICommand {
return string.Compare(a.Name, b.Name, StringComparison.Ordinal);
});
var balance = info.CallingPlayer == null ?
int.MaxValue :
await shop.Load(info.CallingPlayer);
foreach (var item in items)
info.ReplySync(formatItem(item,
item.Config.Price <= balance
&& item.CanPurchase(info.CallingPlayer ?? executor!)
== PurchaseResult.SUCCESS));
return CommandResult.SUCCESS;
if (player != null) lastUpdate[player] = DateTime.Now;
return items;
}
private string formatPrefix(IShopItem item, bool canBuy = true) {
private string formatPrefix(IShopItem item, int index, bool canBuy) {
if (!canBuy)
return
$" {ChatColors.Grey}- [{ChatColors.DarkRed}{item.Config.Price}{ChatColors.Grey}] {ChatColors.Red}{item.Name}";
if (index > 9) {
return
$" {ChatColors.Default}- [{ChatColors.Yellow}{item.Config.Price}{ChatColors.Default}] {ChatColors.Green}{item.Name}";
}
return
$" {ChatColors.Default}- [{ChatColors.Yellow}{item.Config.Price}{ChatColors.Default}] {ChatColors.Green}{item.Name}";
$" {ChatColors.Blue}/{index} {ChatColors.Default}| [{ChatColors.Yellow}{item.Config.Price}{ChatColors.Default}] {ChatColors.Green}{item.Name}";
}
private string formatItem(IShopItem item, bool canBuy) {
private string formatItem(IShopItem item, int index, bool canBuy) {
return
$" {formatPrefix(item, canBuy)} {ChatColors.Grey} | {item.Description}";
$" {formatPrefix(item, index, canBuy)} {ChatColors.Grey} | {item.Description}";
}
public List<IShopItem> GetSortedItems(IOnlinePlayer? player,
bool refresh = false) {
if (player == null) return calculateSortedItems(null);
if (refresh || !cache.ContainsKey(player))
cache[player] = calculateSortedItems(player);
return cache[player];
}
public DateTime? GetLastUpdate(IOnlinePlayer? player) {
if (player == null) return null;
lastUpdate.TryGetValue(player, out var time);
return time;
}
}

View File

@@ -1,34 +1,45 @@
using CounterStrikeSharp.API.Modules.Utils;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using TTT.API.Command;
using TTT.API.Player;
using TTT.Game.lang;
using TTT.Game;
using TTT.Locale;
namespace TTT.Shop.Commands;
public class ShopCommand(IServiceProvider provider) : ICommand {
public class ShopCommand(IServiceProvider provider) : ICommand, IItemSorter {
private readonly IMsgLocalizer locale = provider
.GetRequiredService<IMsgLocalizer>();
private readonly Dictionary<string, ICommand> subcommands = new() {
["list"] = new ListCommand(provider),
["buy"] = new BuyCommand(provider),
["balance"] = new BalanceCommand(provider),
["bal"] = new BalanceCommand(provider)
};
private readonly ListCommand listCmd = new(provider);
private Dictionary<string, ICommand>? subcommands;
public void Dispose() { }
public string Id => "shop";
public string[] Usage => ["list", "buy [item]", "balance"];
public void Start() { }
public void Start() {
subcommands = new Dictionary<string, ICommand> {
["list"] = listCmd,
["buy"] = new BuyCommand(provider),
["balance"] = new BalanceCommand(provider),
["bal"] = new BalanceCommand(provider)
};
}
public bool MustBeOnMainThread => true;
public Task<CommandResult>
Execute(IOnlinePlayer? executor, ICommandInfo info) {
HashSet<string> sent = [];
if (subcommands == null) {
info.ReplySync(
$"{locale[GameMsgs.PREFIX]}{ChatColors.Red}No subcommands available.");
return Task.FromResult(CommandResult.ERROR);
}
if (info.ArgCount == 1) {
foreach (var (_, cmd) in subcommands) {
if (!sent.Add(cmd.Id)) continue;
@@ -52,4 +63,13 @@ public class ShopCommand(IServiceProvider provider) : ICommand {
return command.Execute(executor, info.Skip());
return Task.FromResult(CommandResult.ERROR);
}
public List<IShopItem> GetSortedItems(IOnlinePlayer? player,
bool refresh = false) {
return listCmd.GetSortedItems(player, refresh);
}
public DateTime? GetLastUpdate(IOnlinePlayer? player) {
return listCmd.GetLastUpdate(player);
}
}

View File

@@ -18,13 +18,11 @@ public static class StickerExtensions {
public class Stickers(IServiceProvider provider)
: RoleRestrictedItem<DetectiveRole>(provider) {
private readonly StickerConfig config = provider
.GetService<IStorage<StickerConfig>>()
private readonly StickersConfig config = provider
.GetService<IStorage<StickersConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new StickerConfig();
private readonly IIconManager? icons = provider.GetService<IIconManager>();
.GetResult() ?? new StickersConfig();
public override string Name => Locale[StickerMsgs.SHOP_ITEM_STICKERS];
@@ -36,7 +34,7 @@ public class Stickers(IServiceProvider provider)
public override void OnPurchase(IOnlinePlayer player) { }
public override PurchaseResult CanPurchase(IOnlinePlayer player) {
if (Shop.HasItem(player, this)) return PurchaseResult.ALREADY_OWNED;
if (Shop.HasItem<Stickers>(player)) return PurchaseResult.ALREADY_OWNED;
return base.CanPurchase(player);
}
}

View File

@@ -8,6 +8,7 @@ using TTT.API.Player;
using TTT.API.Storage;
using TTT.Game.Events.Player;
using TTT.Game.Listeners;
using TTT.Game.Roles;
namespace TTT.Shop.Items;
@@ -44,8 +45,10 @@ public class DeagleDamageListener(IServiceProvider provider)
var attackerRole = Roles.GetRoles(attacker);
var victimRole = Roles.GetRoles(victim);
shop.RemoveItem(attacker, deagleItem);
if (attackerRole.Intersect(victimRole).Any()) {
shop.RemoveItem<OneShotDeagleItem>(attacker);
var attackerIsTraitor = attackerRole.Any(r => r is TraitorRole);
var victimIsTraitor = victimRole.Any(r => r is TraitorRole);
if (attackerIsTraitor == victimIsTraitor) {
if (config.KillShooterOnFF) attacker.Health = 0;
Messenger.Message(attacker, Locale[DeagleMsgs.SHOP_ITEM_DEAGLE_HIT_FF]);
if (!config.DoesFriendlyFire) {

Some files were not shown because too many files have changed in this diff Show More