mirror of
https://github.com/MSWS/TTT.git
synced 2025-12-07 06:46:59 -08:00
Compare commits
125 Commits
0.13.0-dev
...
0.17.1-dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
35191f23e1 | ||
|
|
ad29de1bc5 | ||
|
|
0a0416bff0 | ||
|
|
62c96123d1 | ||
|
|
274716267f | ||
|
|
c20842575b | ||
|
|
cf8169a10e | ||
|
|
3dcc3a7de5 | ||
|
|
65bcafca79 | ||
|
|
6cac535e94 | ||
|
|
ab3dfbda45 | ||
|
|
324a19c457 | ||
|
|
fda4c72da5 | ||
|
|
b0a1959a2e | ||
|
|
8a18b1df9c | ||
|
|
c233258efc | ||
|
|
e13497af76 | ||
|
|
e8ccd2dbf8 | ||
|
|
c0e95a2254 | ||
|
|
5a9fd9da1a | ||
|
|
fb562563de | ||
|
|
161480c1f1 | ||
|
|
cfdffbdb47 | ||
|
|
70e4127ccf | ||
|
|
5acc57d96e | ||
|
|
a10b83ec4d | ||
|
|
0a10cd22ab | ||
|
|
7838e335e4 | ||
|
|
3a472bb0bf | ||
|
|
1a7943a58e | ||
|
|
b385daf157 | ||
|
|
31a1069550 | ||
|
|
38ef183072 | ||
|
|
2c03129e86 | ||
|
|
6f169ef850 | ||
|
|
6f924a82b0 | ||
|
|
06ae0250d0 | ||
|
|
bd475edd54 | ||
|
|
092a676f97 | ||
|
|
cebf48a9e6 | ||
|
|
303b6de39c | ||
|
|
9f5e96ce33 | ||
|
|
83e90deb44 | ||
|
|
658eecef02 | ||
|
|
c90af8dfcf | ||
|
|
6cd1788992 | ||
|
|
1288ccbd7b | ||
|
|
2596289f58 | ||
|
|
59eea4bc6d | ||
|
|
d13403d7a7 | ||
|
|
d4fa621a03 | ||
|
|
cf6b42344f | ||
|
|
969c872e48 | ||
|
|
b2f19b7ac3 | ||
|
|
742e407bcf | ||
|
|
f8c8e528e2 | ||
|
|
24bd3d5f40 | ||
|
|
f1ff53893f | ||
|
|
54c89e96c0 | ||
|
|
46514a6016 | ||
|
|
73a8f6a9f5 | ||
|
|
f0c239f08e | ||
|
|
bafad884d9 | ||
|
|
1d7e2f7466 | ||
|
|
f9e3d2d324 | ||
|
|
9ce90cccaa | ||
|
|
551f6a09ef | ||
|
|
41db8f9444 | ||
|
|
361bbb0a49 | ||
|
|
228ea40cec | ||
|
|
44f7283145 | ||
|
|
1a52daad7c | ||
|
|
7d0d32998e | ||
|
|
3cda83932e | ||
|
|
7ea57d0a9b | ||
|
|
839be785f0 | ||
|
|
8f0a273f79 | ||
|
|
cb6cb442b1 | ||
|
|
cb2a5a8720 | ||
|
|
10be465d33 | ||
|
|
a0720376d4 | ||
|
|
f5cb87d92c | ||
|
|
bd6c15aca7 | ||
|
|
7e5e34c500 | ||
|
|
8a886a158c | ||
|
|
fc61682669 | ||
|
|
d6e4655674 | ||
|
|
c53a584113 | ||
|
|
c56387d6e4 | ||
|
|
1c8d1a5dd5 | ||
|
|
340dae1b16 | ||
|
|
eff58ab2f1 | ||
|
|
acababeaf5 | ||
|
|
f40b8ebef0 | ||
|
|
9a005c209a | ||
|
|
36914d01a5 | ||
|
|
62e48e6c73 | ||
|
|
82a4c47dfb | ||
|
|
31f02ec7f0 | ||
|
|
36be427f56 | ||
|
|
8709d633b1 | ||
|
|
1c63b3fbcc | ||
|
|
f1521fc499 | ||
|
|
986f30c34f | ||
|
|
be6d79dcea | ||
|
|
87d55aadd2 | ||
|
|
9efd37063b | ||
|
|
3381722e7e | ||
|
|
5565c72b5b | ||
|
|
36f9b7a600 | ||
|
|
41c7a788d3 | ||
|
|
5d37e5d1ec | ||
|
|
741f2b8586 | ||
|
|
e08cad21b3 | ||
|
|
ff4c8e76ff | ||
|
|
e8bb8564ad | ||
|
|
58cb208c1d | ||
|
|
a546a8b22e | ||
|
|
05daee24a4 | ||
|
|
84230fd231 | ||
|
|
fdfc0cc3bd | ||
|
|
7fc0f21fa4 | ||
|
|
ed7ad35b85 | ||
|
|
e6009dd75a | ||
|
|
b295fc45a2 |
15
.github/FUNDING.yml
vendored
Normal file
15
.github/FUNDING.yml
vendored
Normal file
@@ -0,0 +1,15 @@
|
||||
# These are supported funding model platforms
|
||||
|
||||
github: [msws] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
|
||||
patreon: # Replace with a single Patreon username
|
||||
open_collective: # Replace with a single Open Collective username
|
||||
ko_fi: # Replace with a single Ko-fi username
|
||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||
liberapay: # Replace with a single Liberapay username
|
||||
issuehunt: # Replace with a single IssueHunt username
|
||||
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
||||
polar: # Replace with a single Polar username
|
||||
buy_me_a_coffee: msws # Replace with a single Buy Me a Coffee username
|
||||
thanks_dev: # Replace with a single thanks.dev username
|
||||
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
||||
78
.github/workflows/release.yml
vendored
78
.github/workflows/release.yml
vendored
@@ -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:
|
||||
@@ -35,7 +33,31 @@ jobs:
|
||||
id: gitversion
|
||||
uses: gittools/actions/gitversion/execute@v4
|
||||
|
||||
# Early exit guard: if tag already exists, mark and skip all following steps
|
||||
- name: Check if tag exists
|
||||
id: tag_exists
|
||||
run: |
|
||||
set -euo pipefail
|
||||
git fetch --tags --force
|
||||
TAG="${{ steps.gitversion.outputs.fullSemVer }}"
|
||||
if git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
|
||||
echo "exists=true" >> "$GITHUB_OUTPUT"
|
||||
echo "Tag ${TAG} already exists locally."
|
||||
elif git ls-remote --tags origin "refs/tags/${TAG}" | grep -q "refs/tags/${TAG}$"; then
|
||||
echo "exists=true" >> "$GITHUB_OUTPUT"
|
||||
echo "Tag ${TAG} already exists on origin."
|
||||
else
|
||||
echo "exists=false" >> "$GITHUB_OUTPUT"
|
||||
echo "Tag ${TAG} does not exist. Continuing."
|
||||
fi
|
||||
|
||||
# Short-circuit info step for logs
|
||||
- name: Tag exists, nothing to do
|
||||
if: steps.tag_exists.outputs.exists == 'true'
|
||||
run: echo "Release already exists for tag ${{ steps.gitversion.outputs.fullSemVer }}. Exiting successfully."
|
||||
|
||||
- name: Build Locale
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
run: |
|
||||
mkdir -p build/TTT/lang
|
||||
dotnet restore Locale/Locale.csproj
|
||||
@@ -43,22 +65,26 @@ jobs:
|
||||
cp lang/*.json build/TTT/lang
|
||||
|
||||
- name: Copy Gamedata
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
run: |
|
||||
mkdir -p build/TTT/gamedata
|
||||
cp -r TTT/CS2/gamedata/* build/TTT/gamedata
|
||||
|
||||
- name: Publish Plugin
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
run: |
|
||||
dotnet restore TTT/Plugin/Plugin.csproj
|
||||
dotnet publish TTT/Plugin/Plugin.csproj --no-restore -c Release -o build/TTT
|
||||
|
||||
- name: Zip Artifacts
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
run: |
|
||||
cd build/TTT
|
||||
zip -r TTT-${{ steps.gitversion.outputs.fullSemVer }}.zip *
|
||||
|
||||
# 2. Get latest tag
|
||||
- name: Get latest tag
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
id: latest_tag
|
||||
run: |
|
||||
if git describe --tags --abbrev=0 >/dev/null 2>&1; then
|
||||
@@ -67,62 +93,60 @@ 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
|
||||
if: steps.tag_exists.outputs.exists != 'true' && steps.gitversion.outputs.fullSemVer != steps.latest_tag.outputs.tag
|
||||
run: |
|
||||
set -euo pipefail
|
||||
TAG="${{ steps.gitversion.outputs.fullSemVer }}"
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git tag ${{ steps.gitversion.outputs.fullSemVer }}
|
||||
git push origin ${{ steps.gitversion.outputs.fullSemVer }}
|
||||
if ! git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
|
||||
git tag "${TAG}"
|
||||
fi
|
||||
if git ls-remote --tags origin "refs/tags/${TAG}" | grep -q "refs/tags/${TAG}$"; then
|
||||
echo "Tag ${TAG} already on origin. Skipping push."
|
||||
else
|
||||
git push origin "${TAG}"
|
||||
fi
|
||||
|
||||
# 4. Determine previous relevant tag (lineage-aware)
|
||||
- name: Determine previous relevant tag
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
id: prev_tag
|
||||
run: |
|
||||
set -euo pipefail
|
||||
branch="${GITHUB_REF_NAME}"
|
||||
|
||||
# Use HEAD^ to skip the tag we just created. If no parent, fall back to HEAD.
|
||||
if git rev-parse --verify -q HEAD^ >/dev/null; then
|
||||
base_rev="HEAD^"
|
||||
else
|
||||
base_rev="HEAD"
|
||||
fi
|
||||
|
||||
# Match stable tags on main and prerelease tags on non-main
|
||||
if [[ "$branch" == "main" ]]; then
|
||||
pattern='[0-9]*.[0-9]*.[0-9]*'
|
||||
else
|
||||
pattern='[0-9]*.[0-9]*.[0-9]*-*'
|
||||
fi
|
||||
|
||||
# Nearest tag reachable on this lineage, not just "second most recent by date"
|
||||
prev=$(git describe --tags --abbrev=0 --match "$pattern" --tags "$base_rev" 2>/dev/null || true)
|
||||
|
||||
echo "tag=${prev:-0.0.0}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
|
||||
# 5. Generate changelog using local git (no compare API)
|
||||
- name: Generate changelog
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
prev="${{ steps.prev_tag.outputs.tag }}"
|
||||
curr="${{ steps.gitversion.outputs.fullSemVer }}"
|
||||
|
||||
# Choose what you want in the raw feed: %s = subject only, %B = full message
|
||||
GIT_LOG_FORMAT='%B'
|
||||
|
||||
if [[ "$prev" == "0.0.0" ]]; then
|
||||
# First release: whole history to this tag, first-parent to reflect main’s narrative
|
||||
git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$curr" > CHANGELOG.md
|
||||
else
|
||||
# Strict range between the previous reachable tag and the new tag on this lineage
|
||||
git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$prev..$curr" > CHANGELOG.md
|
||||
fi
|
||||
|
||||
# Fallback in case nothing was captured
|
||||
if [[ ! -s CHANGELOG.md ]]; then
|
||||
echo "No commits found between $prev and $curr on first-parent. Using full messages without first-parent filter." >&2
|
||||
if [[ "$prev" == "0.0.0" ]]; then
|
||||
@@ -134,10 +158,9 @@ jobs:
|
||||
|
||||
cat CHANGELOG.md
|
||||
|
||||
# 5b. Rewrite changelog with OpenAI
|
||||
- name: Rewrite changelog with OpenAI
|
||||
id: ai_changelog
|
||||
if: success()
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
env:
|
||||
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
|
||||
OPENAI_MODEL: ${{ env.OPENAI_MODEL }}
|
||||
@@ -146,25 +169,19 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
# Ensure we have a changelog to work with
|
||||
if [[ ! -s CHANGELOG.md ]]; then
|
||||
echo "CHANGELOG.md is empty. Skipping AI rewrite."
|
||||
echo "skipped=true" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Trim the input to a safe size for token limits
|
||||
head -c "${MAX_CHANGELOG_CHARS}" CHANGELOG.md > CHANGELOG_RAW.md
|
||||
|
||||
# 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
|
||||
|
||||
# Call the API
|
||||
# Basic retry on transient failures
|
||||
for i in 1 2 3; do
|
||||
HTTP_CODE=$(curl -sS -w "%{http_code}" -o ai_response.json \
|
||||
https://api.openai.com/v1/responses \
|
||||
@@ -181,14 +198,12 @@ jobs:
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Prefer output_text if present. Fallback to first text item. :contentReference[oaicite:1]{index=1}
|
||||
if jq -e '.output_text' ai_response.json >/dev/null; then
|
||||
jq -r '.output_text' ai_response.json > CHANGELOG.md
|
||||
else
|
||||
jq -r '.output[0].content[] | select(.type=="output_text") | .text' ai_response.json | sed '/^[[:space:]]*$/d' > CHANGELOG.md
|
||||
fi
|
||||
|
||||
# If the rewrite somehow produced an empty file, keep the raw one
|
||||
if [[ ! -s CHANGELOG.md ]]; then
|
||||
echo "AI returned empty content. Restoring raw changelog."
|
||||
mv CHANGELOG_RAW.md CHANGELOG.md
|
||||
@@ -200,8 +215,8 @@ jobs:
|
||||
echo "Rewritten changelog:"
|
||||
cat CHANGELOG.md
|
||||
|
||||
# 6. Create release using the (possibly rewritten) changelog
|
||||
- name: Create GitHub release
|
||||
if: steps.tag_exists.outputs.exists != 'true'
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ steps.gitversion.outputs.fullSemVer }}
|
||||
@@ -211,9 +226,8 @@ jobs:
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# 7. Cleanup old pre-releases
|
||||
- name: Delete old pre-releases
|
||||
if: github.ref_name != 'main'
|
||||
if: steps.tag_exists.outputs.exists != 'true' && github.ref_name != 'main'
|
||||
run: |
|
||||
gh release list --limit 100 --json name,isPrerelease \
|
||||
--jq '.[] | select(.isPrerelease) | .name' | tail -n +11 | \
|
||||
|
||||
@@ -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 2016–2024 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 |
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ survive while eliminating the traitors among them.
|
||||
- [X] Traitors
|
||||
- [X] Detectives
|
||||
- [X] Innocents
|
||||
- [ ] Shop
|
||||
- [ ] Karma
|
||||
- [X] Shop
|
||||
- [X] Karma
|
||||
- [ ] Statistics
|
||||
|
||||
## Versioning
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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>());
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
@@ -15,6 +15,12 @@
|
||||
<ProjectReference Include="..\ShopAPI\ShopAPI.csproj"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="MAULActainShared.dll">
|
||||
<HintPath>./ThirdParties/Binaries/MAULActainShared.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="RayTrace\"/>
|
||||
</ItemGroup>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.Game.Loggers;
|
||||
|
||||
@@ -12,4 +13,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));
|
||||
}
|
||||
}
|
||||
@@ -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,12 @@ 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>();
|
||||
collection.AddModBehavior<TraitorChatHandler>();
|
||||
collection.AddModBehavior<PlayerMuter>();
|
||||
|
||||
// Damage Cancelers
|
||||
collection.AddModBehavior<OutOfRoundCanceler>();
|
||||
@@ -69,6 +78,8 @@ public static class CS2ServiceCollection {
|
||||
collection.AddModBehavior<PlayerStatsTracker>();
|
||||
collection.AddModBehavior<RoundTimerListener>();
|
||||
collection.AddModBehavior<ScreenColorApplier>();
|
||||
collection.AddModBehavior<KarmaBanner>();
|
||||
collection.AddModBehavior<KarmaSyncer>();
|
||||
|
||||
// Commands
|
||||
#if DEBUG
|
||||
|
||||
@@ -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;
|
||||
|
||||
55
TTT/CS2/Command/PlayerPingShopAlias.cs
Normal file
55
TTT/CS2/Command/PlayerPingShopAlias.cs
Normal file
@@ -0,0 +1,55 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
21
TTT/CS2/Command/Test/CreditsCommand.cs
Normal file
21
TTT/CS2/Command/Test/CreditsCommand.cs
Normal 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);
|
||||
}
|
||||
}
|
||||
33
TTT/CS2/Command/Test/EmitSoundCommand.cs
Normal file
33
TTT/CS2/Command/Test/EmitSoundCommand.cs
Normal 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);
|
||||
}
|
||||
}
|
||||
@@ -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}.");
|
||||
});
|
||||
@@ -52,7 +58,8 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {
|
||||
|
||||
private IShopItem? searchItem(string query) {
|
||||
var item = shop.Items.FirstOrDefault(it
|
||||
=> it.Name.Equals(query, StringComparison.OrdinalIgnoreCase));
|
||||
=> it.Name.Replace(" ", "")
|
||||
.Equals(query, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
if (item != null) return item;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
41
TTT/CS2/Command/Test/SpecCommand.cs
Normal file
41
TTT/CS2/Command/Test/SpecCommand.cs
Normal file
@@ -0,0 +1,41 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Player;
|
||||
|
||||
namespace TTT.CS2.Command.Test;
|
||||
|
||||
public class SpecCommand(IServiceProvider provider) : ICommand {
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public Task<CommandResult>
|
||||
Execute(IOnlinePlayer? executor, ICommandInfo info) {
|
||||
var target = executor;
|
||||
|
||||
if (info.ArgCount == 2) {
|
||||
var finder = provider.GetRequiredService<IPlayerFinder>();
|
||||
var result = finder.GetPlayerByName(info.Args[1]);
|
||||
if (result == null) {
|
||||
info.ReplySync($"Player '{info.Args[1]}' not found.");
|
||||
return Task.FromResult(CommandResult.ERROR);
|
||||
}
|
||||
|
||||
target = result;
|
||||
} else if (target == null) {
|
||||
return Task.FromResult(CommandResult.PLAYER_ONLY);
|
||||
}
|
||||
|
||||
var converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
Server.NextWorldUpdate(() => {
|
||||
var player = converter.GetPlayer(target);
|
||||
player?.ChangeTeam(CsTeam.Spectator);
|
||||
info.ReplySync($"{target.Name} has been moved to Spectators.");
|
||||
});
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
}
|
||||
@@ -21,9 +21,12 @@ 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));
|
||||
subCommands.Add("spec", new SpecCommand(provider));
|
||||
}
|
||||
|
||||
public Task<CommandResult>
|
||||
|
||||
@@ -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() { }
|
||||
|
||||
115
TTT/CS2/Configs/CS2KarmaConfig.cs
Normal file
115
TTT/CS2/Configs/CS2KarmaConfig.cs
Normal file
@@ -0,0 +1,115 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
using TTT.Karma;
|
||||
|
||||
namespace TTT.CS2.Configs;
|
||||
|
||||
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", 4, 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", -5,
|
||||
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", -6, 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", -8, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(-50, 50));
|
||||
|
||||
public static readonly FakeConVar<int> CV_KARMA_PER_ROUND = new(
|
||||
"css_ttt_karma_per_round",
|
||||
"Amount of karma a player will gain at the end of each round", 2,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
|
||||
|
||||
public static readonly FakeConVar<int> CV_KARMA_PER_ROUND_WIN = new(
|
||||
"css_ttt_karma_per_round_win",
|
||||
"Amount of karma a player will gain at the end of each round if their team won",
|
||||
4, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 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),
|
||||
KarmaPerRound = CV_KARMA_PER_ROUND.Value,
|
||||
KarmaPerRoundWin = CV_KARMA_PER_ROUND_WIN.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);
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs;
|
||||
|
||||
public class CS2TaserConfig : IStorage<TaserConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_taser_price", "Price of the Taser item", 120,
|
||||
"css_ttt_shop_taser_price", "Price of the Taser item", 100,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<string> CV_WEAPON = new(
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2M4A1Config : IStorage<M4A1Config>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_m4a1_price", "Price of the M4A1 item", 90,
|
||||
"css_ttt_shop_m4a1_price", "Price of the M4A1 item", 75,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<string> CV_CLEAR_SLOTS = new(
|
||||
|
||||
@@ -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", 110,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.UserMessages;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
|
||||
namespace TTT.CS2.Extensions;
|
||||
|
||||
@@ -74,6 +75,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) {
|
||||
@@ -96,4 +108,19 @@ public static class PlayerExtensions {
|
||||
color.R | color.G << 8 | color.B << 16 | color.A << 24);
|
||||
fadeMsg.Send(player);
|
||||
}
|
||||
|
||||
public static void DealPoisonDamage(this CCSPlayerController player,
|
||||
int damage) {
|
||||
if (player.Pawn.Value == null) return;
|
||||
player.AddHealth(-damage);
|
||||
player.PlayerPawn.Value?.EmitSound("Player.DamageBody.Onlooker",
|
||||
OTHERS(player.Slot), 0.2f, 1);
|
||||
player.PlayerPawn.Value?.EmitSound("Player.DamageBody.Victim",
|
||||
SELF(player.Slot), 0.2f, 1);
|
||||
}
|
||||
|
||||
private static RecipientFilter SELF(int slot) => new(slot);
|
||||
|
||||
private static RecipientFilter OTHERS(int slot)
|
||||
=> new(ulong.MaxValue & ~(1ul << slot));
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -1,17 +1,34 @@
|
||||
using System.Reactive.Linq;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
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) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
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; } = [
|
||||
@@ -59,4 +76,13 @@ public class CS2Game(IServiceProvider provider) : RoundBasedGame(provider) {
|
||||
|
||||
return timer;
|
||||
}
|
||||
|
||||
override protected ISet<IOnlinePlayer> GetParticipants() {
|
||||
var players = Utilities.GetPlayers()
|
||||
.Where(p => p is { Team: CsTeam.Terrorist or CsTeam.CounterTerrorist });
|
||||
|
||||
return players.Select(p => converter.GetPlayer(p))
|
||||
.OfType<IOnlinePlayer>()
|
||||
.ToHashSet();
|
||||
}
|
||||
}
|
||||
17
TTT/CS2/GameHandlers/BombPlantSuppressor.cs
Normal file
17
TTT/CS2/GameHandlers/BombPlantSuppressor.cs
Normal 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;
|
||||
});
|
||||
}
|
||||
}
|
||||
65
TTT/CS2/GameHandlers/BuyMenuHandler.cs
Normal file
65
TTT/CS2/GameHandlers/BuyMenuHandler.cs
Normal file
@@ -0,0 +1,65 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core.Attributes.Registration;
|
||||
using CounterStrikeSharp.API.Modules.Commands;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Player;
|
||||
using TTT.CS2.Command;
|
||||
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_sg556", "M4A1" },
|
||||
{ "weapon_mp5sd", "M4A1" },
|
||||
{ "weapon_decoy", "healthshot" },
|
||||
{ "weapon_awp", "AWP" },
|
||||
{ "weapon_hegrenade", "Cluster" }
|
||||
};
|
||||
|
||||
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))
|
||||
return HookResult.Continue;
|
||||
|
||||
var commandManager = provider.GetRequiredService<ICommandManager>();
|
||||
var newInfo = new CS2CommandInfo(provider, player, 0, "css_shop", "buy",
|
||||
alias);
|
||||
|
||||
newInfo.CallingContext = CommandCallingContext.Chat;
|
||||
|
||||
commandManager.ProcessCommand(newInfo);
|
||||
return HookResult.Handled;
|
||||
}
|
||||
}
|
||||
@@ -36,19 +36,18 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler(HookMode.Pre)]
|
||||
public HookResult OnPlayerDeath_Pre(EventPlayerDeath ev, GameEventInfo info) {
|
||||
if (games.ActiveGame is not { State: State.IN_PROGRESS })
|
||||
return HookResult.Continue;
|
||||
var player = ev.Userid;
|
||||
if (player == null) return HookResult.Continue;
|
||||
var deathEvent = new PlayerDeathEvent(converter, ev);
|
||||
|
||||
Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
|
||||
|
||||
info.DontBroadcast = true;
|
||||
|
||||
hideAndTrackStats(ev, player);
|
||||
|
||||
if (games.ActiveGame is not { State: State.IN_PROGRESS })
|
||||
return HookResult.Continue;
|
||||
|
||||
info.DontBroadcast = true;
|
||||
spoofer.SpoofAlive(player);
|
||||
Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
@@ -62,15 +61,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);
|
||||
|
||||
@@ -15,7 +15,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 +33,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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -1,19 +1,23 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Listeners;
|
||||
|
||||
namespace TTT.CS2.Listeners;
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class LateSpawnListener(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnJoin(PlayerJoinEvent ev) {
|
||||
if (Games.ActiveGame is { State: State.IN_PROGRESS }) return;
|
||||
@@ -24,4 +28,17 @@ public class LateSpawnListener(IServiceProvider provider)
|
||||
player.Respawn();
|
||||
});
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void GameState(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState == State.FINISHED) return;
|
||||
|
||||
Server.NextWorldUpdate(() => {
|
||||
foreach (var player in Utilities.GetPlayers()
|
||||
.Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE
|
||||
&& p.Team != CsTeam.Spectator && p.Team != CsTeam.None))
|
||||
player.Respawn();
|
||||
});
|
||||
}
|
||||
}
|
||||
40
TTT/CS2/GameHandlers/MapZoneRemover.cs
Normal file
40
TTT/CS2/GameHandlers/MapZoneRemover.cs
Normal 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;
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
55
TTT/CS2/GameHandlers/PlayerMuter.cs
Normal file
55
TTT/CS2/GameHandlers/PlayerMuter.cs
Normal file
@@ -0,0 +1,55 @@
|
||||
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.Messages;
|
||||
using TTT.API.Player;
|
||||
using TTT.CS2.lang;
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class PlayerMuter(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IMsgLocalizer locale =
|
||||
provider.GetRequiredService<IMsgLocalizer>();
|
||||
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
plugin
|
||||
?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnClientVoice>(
|
||||
onVoice);
|
||||
}
|
||||
|
||||
private void onVoice(int playerSlot) {
|
||||
var player = Utilities.GetPlayerFromSlot(playerSlot);
|
||||
if (player == null) return;
|
||||
|
||||
if (player.Pawn.Value is { Health: > 0 }) return;
|
||||
|
||||
if ((player.VoiceFlags & VoiceFlags.Muted) != VoiceFlags.Muted) {
|
||||
var apiPlayer = converter.GetPlayer(player);
|
||||
messenger.Message(apiPlayer, locale[CS2Msgs.DEAD_MUTE_REMINDER]);
|
||||
}
|
||||
|
||||
player.VoiceFlags |= VoiceFlags.Muted;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnSpawn(EventPlayerSpawn ev, GameEventInfo _) {
|
||||
var player = ev.Userid;
|
||||
if (player == null) return HookResult.Continue;
|
||||
player.VoiceFlags &= ~VoiceFlags.Muted;
|
||||
return HookResult.Continue;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -39,4 +39,18 @@ public class RoundStart_GameStartHandler(IServiceProvider provider)
|
||||
game?.Start(config.RoundCfg.CountDownDuration);
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnWarmupEnd(EventWarmupEnd ev, GameEventInfo _1) {
|
||||
if (games.ActiveGame is { State: State.IN_PROGRESS or State.COUNTDOWN })
|
||||
return HookResult.Continue;
|
||||
|
||||
var count = finder.GetOnline().Count;
|
||||
if (count < config.RoundCfg.MinimumPlayers) return HookResult.Continue;
|
||||
|
||||
var game = games.CreateGame();
|
||||
game?.Start(config.RoundCfg.CountDownDuration);
|
||||
return HookResult.Continue;
|
||||
}
|
||||
}
|
||||
72
TTT/CS2/GameHandlers/TeamChangeHandler.cs
Normal file
72
TTT/CS2/GameHandlers/TeamChangeHandler.cs
Normal 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 IEventBus bus = provider.GetRequiredService<IEventBus>();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IGameManager games =
|
||||
provider.GetRequiredService<IGameManager>();
|
||||
|
||||
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;
|
||||
var team = (CsTeam)ev.Team;
|
||||
if (team is not (CsTeam.Spectator or CsTeam.None))
|
||||
return HookResult.Continue;
|
||||
var apiPlayer = converter.GetPlayer(ev.Userid);
|
||||
|
||||
var playerDeath = new PlayerDeathEvent(apiPlayer);
|
||||
bus.Dispatch(playerDeath);
|
||||
return HookResult.Continue;
|
||||
}
|
||||
}
|
||||
85
TTT/CS2/GameHandlers/TraitorChatHandler.cs
Normal file
85
TTT/CS2/GameHandlers/TraitorChatHandler.cs
Normal file
@@ -0,0 +1,85 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Commands;
|
||||
using MAULActainShared.plugin;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Messages;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.CS2.lang;
|
||||
using TTT.CS2.ThirdParties.eGO;
|
||||
using TTT.Game.Roles;
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IGameManager game =
|
||||
provider.GetRequiredService<IGameManager>();
|
||||
|
||||
private readonly IMsgLocalizer locale =
|
||||
provider.GetRequiredService<IMsgLocalizer>();
|
||||
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
private readonly IRoleAssigner roles =
|
||||
provider.GetRequiredService<IRoleAssigner>();
|
||||
|
||||
private IActain? maulService;
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
try {
|
||||
maulService ??= EgoApi.MAUL.Get();
|
||||
if (maulService != null) {
|
||||
maulService.getChatShareService().OnChatShare += OnOnChatShare;
|
||||
return;
|
||||
}
|
||||
|
||||
plugin?.AddCommandListener("say_team", onSay);
|
||||
} catch (KeyNotFoundException) {
|
||||
plugin?.AddCommandListener("say_team", onSay);
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
if (maulService != null)
|
||||
maulService.getChatShareService().OnChatShare -= OnOnChatShare;
|
||||
}
|
||||
|
||||
public void Start() { }
|
||||
|
||||
private void OnOnChatShare(CCSPlayerController? player, CommandInfo info,
|
||||
ref bool canceled) {
|
||||
if (!info.GetArg(0).Equals("say_team", StringComparison.OrdinalIgnoreCase))
|
||||
return;
|
||||
var result = onSay(player, info);
|
||||
if (result == HookResult.Handled) canceled = true;
|
||||
}
|
||||
|
||||
private HookResult onSay(CCSPlayerController? player,
|
||||
CommandInfo commandInfo) {
|
||||
if (player == null
|
||||
|| game.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED }
|
||||
|| converter.GetPlayer(player) is not IOnlinePlayer apiPlayer
|
||||
|| !roles.GetRoles(apiPlayer).Any(r => r is TraitorRole))
|
||||
return HookResult.Continue;
|
||||
|
||||
var teammates = game.ActiveGame?.Players.Where(p
|
||||
=> roles.GetRoles(p).Any(r => r is TraitorRole))
|
||||
.ToList();
|
||||
if (teammates == null) return HookResult.Continue;
|
||||
|
||||
var msg = commandInfo.ArgString;
|
||||
if (msg.StartsWith('"') && msg.EndsWith('"') && msg.Length >= 2)
|
||||
msg = msg[1..^1];
|
||||
var formatted = locale[CS2Msgs.TRAITOR_CHAT_FORMAT(apiPlayer, msg)];
|
||||
|
||||
foreach (var mate in teammates) messenger.Message(mate, formatted);
|
||||
return HookResult.Handled;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
38
TTT/CS2/Items/ClusterGrenade/ClusterGrenadeItem.cs
Normal file
38
TTT/CS2/Items/ClusterGrenade/ClusterGrenadeItem.cs
Normal file
@@ -0,0 +1,38 @@
|
||||
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.ClusterGrenade;
|
||||
|
||||
public static class ClusterGrenadeServiceCollection {
|
||||
public static void AddClusterGrenade(this IServiceCollection services) {
|
||||
services.AddModBehavior<ClusterGrenadeItem>();
|
||||
services.AddModBehavior<ClusterGrenadeListener>();
|
||||
}
|
||||
}
|
||||
|
||||
public class ClusterGrenadeItem(IServiceProvider provider)
|
||||
: RoleRestrictedItem<TraitorRole>(provider) {
|
||||
private readonly ClusterGrenadeConfig config = provider
|
||||
.GetService<IStorage<ClusterGrenadeConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new ClusterGrenadeConfig();
|
||||
|
||||
public override string Name
|
||||
=> Locale[ClusterGrenadeMsgs.SHOP_ITEM_CLUSTER_GRENADE];
|
||||
|
||||
public override string Description
|
||||
=> Locale[ClusterGrenadeMsgs.SHOP_ITEM_CLUSTER_GRENADE_DESC];
|
||||
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) {
|
||||
Inventory.GiveWeapon(player, config);
|
||||
}
|
||||
}
|
||||
65
TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs
Normal file
65
TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs
Normal file
@@ -0,0 +1,65 @@
|
||||
using System.Reactive.Concurrency;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core.Attributes.Registration;
|
||||
using CounterStrikeSharp.API.Modules.Memory;
|
||||
using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Items.ClusterGrenade;
|
||||
|
||||
public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
|
||||
private readonly ClusterGrenadeConfig config =
|
||||
provider.GetService<IStorage<ClusterGrenadeConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new ClusterGrenadeConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnHeGrenade(EventHegrenadeDetonate ev, GameEventInfo _) {
|
||||
if (ev.Userid == null) return HookResult.Continue;
|
||||
var player = converter.GetPlayer(ev.Userid) as IOnlinePlayer;
|
||||
if (player == null) return HookResult.Continue;
|
||||
if (!shop.HasItem<ClusterGrenadeItem>(player)) return HookResult.Continue;
|
||||
|
||||
shop.RemoveItem<ClusterGrenadeItem>(player);
|
||||
|
||||
for (var i = 0; i < config.GrenadeCount; i++) {
|
||||
var entity =
|
||||
Utilities.GetEntityFromIndex<CHEGrenadeProjectile>(ev.Entityid);
|
||||
|
||||
if (entity == null || entity.AbsOrigin == null) continue;
|
||||
|
||||
// Throw grenade in circular pattern
|
||||
var angle = new Vector(
|
||||
(float)(Math.Cos(2 * Math.PI / config.GrenadeCount * i)
|
||||
* config.ThrowForce),
|
||||
(float)(Math.Sin(2 * Math.PI / config.GrenadeCount * i)
|
||||
* config.ThrowForce), config.UpForce);
|
||||
|
||||
if (ev.Userid.Pawn.Value == null) continue;
|
||||
|
||||
GrenadeDataHelper.CreateGrenade(entity.AbsOrigin, QAngle.Zero, angle,
|
||||
Vector.Zero, ev.Userid.Pawn.Value.Handle, ev.Userid.Team);
|
||||
}
|
||||
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
}
|
||||
11
TTT/CS2/Items/ClusterGrenade/ClusterGrenadeMsgs.cs
Normal file
11
TTT/CS2/Items/ClusterGrenade/ClusterGrenadeMsgs.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.Items.ClusterGrenade;
|
||||
|
||||
public class ClusterGrenadeMsgs {
|
||||
public static IMsg SHOP_ITEM_CLUSTER_GRENADE
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_CLUSTER_GRENADE));
|
||||
|
||||
public static IMsg SHOP_ITEM_CLUSTER_GRENADE_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_CLUSTER_GRENADE_DESC));
|
||||
}
|
||||
152
TTT/CS2/Items/Compass/AbstractCompassItem.cs
Normal file
152
TTT/CS2/Items/Compass/AbstractCompassItem.cs
Normal file
@@ -0,0 +1,152 @@
|
||||
using System.Linq;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Timers;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.Utils;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Items.Compass;
|
||||
|
||||
/// <summary>
|
||||
/// Base compass that renders a heading toward the nearest target returned by GetTargets.
|
||||
/// Child classes decide which targets to expose and who owns the item.
|
||||
/// </summary>
|
||||
public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
|
||||
IListener, IPluginModule where TRole : class, IRole {
|
||||
protected readonly CompassConfig config;
|
||||
protected readonly IPlayerConverter<CCSPlayerController> Converter;
|
||||
protected readonly ISet<IPlayer> Owners = new HashSet<IPlayer>();
|
||||
|
||||
protected AbstractCompassItem(IServiceProvider provider) : base(provider) {
|
||||
config = provider.GetService<IStorage<CompassConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new CompassConfig();
|
||||
|
||||
Converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
}
|
||||
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
base.Start();
|
||||
plugin?.AddTimer(0.1f, Tick, TimerFlags.REPEAT);
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRoundEnd(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState == State.FINISHED) Owners.Clear();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Return world positions to point at for this player.
|
||||
/// </summary>
|
||||
protected abstract IList<Vector> GetTargets(IOnlinePlayer requester);
|
||||
|
||||
/// <summary>
|
||||
/// Whether this player currently owns/has this compass effect.
|
||||
/// </summary>
|
||||
protected abstract bool OwnsItem(IOnlinePlayer player);
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) { Owners.Add(player); }
|
||||
|
||||
public override PurchaseResult CanPurchase(IOnlinePlayer player) {
|
||||
return OwnsItem(player) ?
|
||||
PurchaseResult.ALREADY_OWNED :
|
||||
base.CanPurchase(player);
|
||||
}
|
||||
|
||||
private void Tick() {
|
||||
if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
|
||||
return;
|
||||
|
||||
foreach (var player in Owners.OfType<IOnlinePlayer>()) {
|
||||
var gamePlayer = Converter.GetPlayer(player);
|
||||
if (gamePlayer == null) continue;
|
||||
ShowCompass(gamePlayer, player);
|
||||
}
|
||||
}
|
||||
|
||||
private void ShowCompass(CCSPlayerController viewer, IOnlinePlayer online) {
|
||||
if (Games.ActiveGame?.Players == null) return;
|
||||
if (viewer.PlayerPawn.Value == null) return;
|
||||
|
||||
var src = viewer.Pawn.Value?.AbsOrigin.Clone();
|
||||
if (src == null) return;
|
||||
|
||||
var targets = GetTargets(online).ToList();
|
||||
if (targets.Count == 0) return;
|
||||
|
||||
var (nearest, distance) = GetNearestVector(src, targets);
|
||||
if (nearest == null || distance > config.MaxRange) return;
|
||||
|
||||
var normalizedYaw = AdjustGameAngle(viewer.PlayerPawn.Value.EyeAngles.Y);
|
||||
|
||||
var diff = (nearest - 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>";
|
||||
|
||||
viewer.PrintToCenterHtml($"{compass} {GetDistanceDescription(distance)}");
|
||||
}
|
||||
|
||||
private static 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 static string GetDistanceDescription(float distance) {
|
||||
return distance switch {
|
||||
> 2000 => "AWP Distance",
|
||||
> 1500 => "Scout Distance",
|
||||
> 1000 => "Rifle Distance",
|
||||
> 500 => "Pistol",
|
||||
> 250 => "Nearby",
|
||||
_ => "Knife Range"
|
||||
};
|
||||
}
|
||||
|
||||
private static (Vector?, float) GetNearestVector(in Vector src,
|
||||
IList<Vector> targets) {
|
||||
var minDistSq = float.MaxValue;
|
||||
Vector? nearest = null;
|
||||
|
||||
foreach (var v in targets) {
|
||||
var d2 = v.Clone().DistanceSquared(src);
|
||||
if (d2 >= minDistSq) continue;
|
||||
minDistSq = d2;
|
||||
nearest = v;
|
||||
}
|
||||
|
||||
return (nearest, MathF.Sqrt(minDistSq));
|
||||
}
|
||||
}
|
||||
53
TTT/CS2/Items/Compass/BodyCompassItem.cs
Normal file
53
TTT/CS2/Items/Compass/BodyCompassItem.cs
Normal file
@@ -0,0 +1,53 @@
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.CS2.API;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Items.Compass;
|
||||
|
||||
public static class BodyCompassItemExtensions {
|
||||
public static void
|
||||
AddBodyCompassServices(this IServiceCollection collection) {
|
||||
collection.AddModBehavior<BodyCompassItem>();
|
||||
}
|
||||
}
|
||||
|
||||
public class BodyCompassItem(IServiceProvider provider)
|
||||
: AbstractCompassItem<DetectiveRole>(provider) {
|
||||
private readonly IBodyTracker bodies =
|
||||
provider.GetRequiredService<IBodyTracker>();
|
||||
|
||||
public override string Name => Locale[CompassMsgs.SHOP_ITEM_COMPASS_BODY];
|
||||
|
||||
public override string Description
|
||||
=> Locale[CompassMsgs.SHOP_ITEM_COMPASS_BODY_DESC];
|
||||
|
||||
/// <summary>
|
||||
/// For innocents: point to nearest traitor.
|
||||
/// For traitors: point to nearest non-traitor (ally list in original code).
|
||||
/// Returns target world positions as vectors.
|
||||
/// </summary>
|
||||
protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
|
||||
if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
|
||||
return Array.Empty<Vector>();
|
||||
|
||||
List<Vector> vectors = [];
|
||||
|
||||
foreach (var (apiBody, body) in bodies.Bodies) {
|
||||
if (apiBody.IsIdentified) continue;
|
||||
var origin = body.AbsOrigin.Clone();
|
||||
if (origin == null) continue;
|
||||
vectors.Add(origin);
|
||||
}
|
||||
|
||||
return vectors;
|
||||
}
|
||||
|
||||
override protected bool OwnsItem(IOnlinePlayer player) {
|
||||
return Shop.HasItem<BodyCompassItem>(player);
|
||||
}
|
||||
}
|
||||
17
TTT/CS2/Items/Compass/CompassMsgs.cs
Normal file
17
TTT/CS2/Items/Compass/CompassMsgs.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.Items.Compass;
|
||||
|
||||
public class CompassMsgs {
|
||||
public static IMsg SHOP_ITEM_COMPASS_PLAYER
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_PLAYER));
|
||||
|
||||
public static IMsg SHOP_ITEM_COMPASS_PLAYER_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_PLAYER_DESC));
|
||||
|
||||
public static IMsg SHOP_ITEM_COMPASS_BODY
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_BODY));
|
||||
|
||||
public static IMsg SHOP_ITEM_COMPASS_BODY_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_BODY_DESC));
|
||||
}
|
||||
62
TTT/CS2/Items/Compass/InnoCompassItem.cs
Normal file
62
TTT/CS2/Items/Compass/InnoCompassItem.cs
Normal file
@@ -0,0 +1,62 @@
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Items.Compass;
|
||||
|
||||
public static class InnoCompassItemExtensions {
|
||||
public static void
|
||||
AddInnoCompassServices(this IServiceCollection collection) {
|
||||
collection.AddModBehavior<InnoCompassItem>();
|
||||
}
|
||||
}
|
||||
|
||||
public class InnoCompassItem(IServiceProvider provider)
|
||||
: AbstractCompassItem<TraitorRole>(provider) {
|
||||
public override string Name => Locale[CompassMsgs.SHOP_ITEM_COMPASS_PLAYER];
|
||||
|
||||
public override string Description
|
||||
=> Locale[CompassMsgs.SHOP_ITEM_COMPASS_PLAYER_DESC];
|
||||
|
||||
/// <summary>
|
||||
/// For innocents: point to nearest traitor.
|
||||
/// For traitors: point to nearest non-traitor (ally list in original code).
|
||||
/// Returns target world positions as vectors.
|
||||
/// </summary>
|
||||
protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
|
||||
if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
|
||||
return Array.Empty<Vector>();
|
||||
|
||||
var all = Games.ActiveGame.Players.OfType<IOnlinePlayer>()
|
||||
.Where(p => p.IsAlive)
|
||||
.ToList();
|
||||
|
||||
// Split by traitor role
|
||||
var traitors = all.Where(p => Roles.GetRoles(p).Any(r => r is TraitorRole))
|
||||
.ToList();
|
||||
var allies = all.Where(p => !Roles.GetRoles(p).Any(r => r is TraitorRole))
|
||||
.ToList();
|
||||
|
||||
var enemies = Roles.GetRoles(requester).Any(r => r is TraitorRole) ?
|
||||
allies :
|
||||
traitors;
|
||||
|
||||
// Convert to game controllers then to positions
|
||||
var vectors = new List<Vector>(enemies.Count);
|
||||
foreach (var enemy in enemies) {
|
||||
var controller = Converter.GetPlayer(enemy);
|
||||
var pos = controller?.Pawn.Value?.AbsOrigin.Clone();
|
||||
if (pos != null) vectors.Add(pos);
|
||||
}
|
||||
|
||||
return vectors;
|
||||
}
|
||||
|
||||
override protected bool OwnsItem(IOnlinePlayer player) {
|
||||
return Shop.HasItem<InnoCompassItem>(player);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
41
TTT/CS2/Items/OneHitKnife/OneHitKnife.cs
Normal file
41
TTT/CS2/Items/OneHitKnife/OneHitKnife.cs
Normal 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);
|
||||
}
|
||||
}
|
||||
43
TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs
Normal file
43
TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs
Normal file
@@ -0,0 +1,43 @@
|
||||
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;
|
||||
|
||||
var friendly = Roles.GetRoles(attacker)
|
||||
.Any(r => Roles.GetRoles(victim).Contains(r));
|
||||
if (friendly && !config.FriendlyFire) return;
|
||||
|
||||
shop.RemoveItem<OneHitKnife>(attacker);
|
||||
ev.HpLeft = -100;
|
||||
}
|
||||
}
|
||||
11
TTT/CS2/Items/OneHitKnife/OneHitKnifeMsgs.cs
Normal file
11
TTT/CS2/Items/OneHitKnife/OneHitKnifeMsgs.cs
Normal 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));
|
||||
}
|
||||
@@ -13,6 +13,7 @@ using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Listeners;
|
||||
@@ -21,6 +22,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()
|
||||
@@ -39,6 +42,9 @@ public class PoisonShotsListener(IServiceProvider provider)
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
// private readonly ISet<string> killedWithPoison = new HashSet<string>();
|
||||
private readonly Dictionary<string, IPlayer> killedWithPoison = new();
|
||||
|
||||
public override void Dispose() {
|
||||
base.Dispose();
|
||||
foreach (var timer in poisonTimers) timer.Dispose();
|
||||
@@ -64,9 +70,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 +83,15 @@ public class PoisonShotsListener(IServiceProvider provider)
|
||||
|
||||
foreach (var timer in poisonTimers) timer.Dispose();
|
||||
poisonTimers.Clear();
|
||||
poisonShots.Clear();
|
||||
killedWithPoison.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,13 +107,32 @@ public class PoisonShotsListener(IServiceProvider provider)
|
||||
private bool tickPoison(PoisonEffect effect) {
|
||||
if (effect.Player is not IOnlinePlayer online) return false;
|
||||
if (!online.IsAlive) return false;
|
||||
online.Health -= config.PoisonConfig.DamagePerTick;
|
||||
|
||||
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) {
|
||||
killedWithPoison[online.Id] = effect.Shooter;
|
||||
var deathEvent = new PlayerDeathEvent(online)
|
||||
.WithKiller(effect.Shooter as IOnlinePlayer)
|
||||
.WithWeapon($"[{Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS]}]");
|
||||
bus.Dispatch(deathEvent);
|
||||
}
|
||||
|
||||
effect.Ticks++;
|
||||
effect.DamageGiven += config.PoisonConfig.DamagePerTick;
|
||||
|
||||
var gamePlayer = converter.GetPlayer(online);
|
||||
gamePlayer?.ColorScreen(config.PoisonColor, 0.2f, 0.3f);
|
||||
gamePlayer?.ExecuteClientCommand("play " + config.PoisonConfig.PoisonSound);
|
||||
if (gamePlayer != null)
|
||||
gamePlayer.DealPoisonDamage(config.PoisonConfig.DamagePerTick);
|
||||
|
||||
return effect.DamageGiven < config.PoisonConfig.TotalDamage;
|
||||
}
|
||||
@@ -129,9 +157,21 @@ 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; }
|
||||
}
|
||||
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRagdollSpawn(BodyCreateEvent ev) {
|
||||
if (!killedWithPoison.TryGetValue(ev.Body.OfPlayer.Id, out var shooter))
|
||||
return;
|
||||
if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
|
||||
return;
|
||||
ev.Body.Killer = shooter as IOnlinePlayer;
|
||||
}
|
||||
}
|
||||
@@ -4,20 +4,27 @@ 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.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Listeners;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Items.PoisonSmoke;
|
||||
|
||||
public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
|
||||
public class PoisonSmokeListener(IServiceProvider provider)
|
||||
: BaseListener(provider), IPluginModule {
|
||||
private readonly PoisonSmokeConfig config =
|
||||
provider.GetService<IStorage<PoisonSmokeConfig>>()
|
||||
?.Load()
|
||||
@@ -27,25 +34,22 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IPlayerFinder finder =
|
||||
provider.GetRequiredService<IPlayerFinder>();
|
||||
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
private readonly List<IDisposable> poisonSmokes = [];
|
||||
|
||||
private readonly IRoleAssigner roleAssigner =
|
||||
provider.GetRequiredService<IRoleAssigner>();
|
||||
|
||||
private readonly IScheduler scheduler =
|
||||
provider.GetRequiredService<IScheduler>();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
private readonly ISet<string> killedWithPoison = new HashSet<string>();
|
||||
|
||||
public override void Dispose() {
|
||||
base.Dispose();
|
||||
foreach (var timer in poisonSmokes) timer.Dispose();
|
||||
|
||||
poisonSmokes.Clear();
|
||||
killedWithPoison.Clear();
|
||||
}
|
||||
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnSmokeGrenade(EventSmokegrenadeDetonate ev,
|
||||
GameEventInfo _) {
|
||||
@@ -58,19 +62,19 @@ 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);
|
||||
startPoisonEffect(projectile, player);
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
[SuppressMessage("ReSharper", "AccessToModifiedClosure")]
|
||||
private void startPoisonEffect(CSmokeGrenadeProjectile projectile) {
|
||||
private void startPoisonEffect(CSmokeGrenadeProjectile projectile,
|
||||
IOnlinePlayer thrower) {
|
||||
IDisposable? timer = null;
|
||||
|
||||
var effect = new PoisonEffect(projectile);
|
||||
var effect = new PoisonEffect(projectile, thrower);
|
||||
|
||||
timer = scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
|
||||
timer = Scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
|
||||
=> {
|
||||
Server.NextWorldUpdate(() => {
|
||||
if (tickPoisonEffect(effect) || timer == null) return;
|
||||
@@ -78,37 +82,75 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
|
||||
poisonSmokes.Remove(timer);
|
||||
});
|
||||
});
|
||||
|
||||
poisonSmokes.Add(timer);
|
||||
}
|
||||
|
||||
private bool tickPoisonEffect(PoisonEffect effect) {
|
||||
if (!effect.Projectile.IsValid) return false;
|
||||
effect.Ticks++;
|
||||
|
||||
var players = finder.GetOnline()
|
||||
.Where(player => player.IsAlive && roleAssigner.GetRoles(player)
|
||||
var players = Finder.GetOnline()
|
||||
.Where(player => player.IsAlive && Roles.GetRoles(player)
|
||||
.Any(role => role is InnocentRole or DetectiveRole));
|
||||
|
||||
var gamePlayers = players.Select(p => converter.GetPlayer(p))
|
||||
.Where(p => p != null && p.Pawn.Value != null && p.Pawn.Value.IsValid)
|
||||
.Select(p => (p!, p?.Pawn.Value?.AbsOrigin.Clone()!));
|
||||
var gamePlayers = players.Select(p => (p, converter.GetPlayer(p)))
|
||||
.Where(p => p.Item2 != null && p.Item2.Pawn.Value != null
|
||||
&& p.Item2.Pawn.Value.IsValid)
|
||||
.Select(p => (p!, p.Item2?.Pawn.Value?.AbsOrigin.Clone()!));
|
||||
|
||||
gamePlayers = gamePlayers.Where(t
|
||||
=> t.Item2.Distance(effect.Origin) <= config.SmokeRadius);
|
||||
|
||||
foreach (var player in gamePlayers.Select(p => p.Item1)) {
|
||||
foreach (var (apiPlayer, gamePlayer) in gamePlayers.Select(p => p.Item1)) {
|
||||
if (effect.DamageGiven >= config.PoisonConfig.TotalDamage) continue;
|
||||
player.AddHealth(-config.PoisonConfig.DamagePerTick);
|
||||
player.ExecuteClientCommand("play " + config.PoisonConfig.PoisonSound);
|
||||
if (gamePlayer.GetHealth() - config.PoisonConfig.DamagePerTick <= 0) {
|
||||
killedWithPoison.Add(apiPlayer.Id);
|
||||
var playerDeathEvent = new PlayerDeathEvent(apiPlayer)
|
||||
.WithKiller(effect.Attacker as IOnlinePlayer)
|
||||
.WithWeapon("[Poison Smoke]");
|
||||
Bus.Dispatch(playerDeathEvent);
|
||||
|
||||
gamePlayer.SetHealth(0);
|
||||
continue;
|
||||
}
|
||||
|
||||
var dmgEvent = new PlayerDamagedEvent(apiPlayer,
|
||||
effect.Attacker as IOnlinePlayer, config.PoisonConfig.DamagePerTick) {
|
||||
Weapon = "[Poison Smoke]"
|
||||
};
|
||||
|
||||
Bus.Dispatch(dmgEvent);
|
||||
|
||||
gamePlayer.DealPoisonDamage(config.PoisonConfig.DamagePerTick);
|
||||
effect.DamageGiven += config.PoisonConfig.DamagePerTick;
|
||||
}
|
||||
|
||||
return effect.DamageGiven < config.PoisonConfig.TotalDamage;
|
||||
}
|
||||
|
||||
private class PoisonEffect(CSmokeGrenadeProjectile projectile) {
|
||||
private class PoisonEffect(CSmokeGrenadeProjectile projectile,
|
||||
IOnlinePlayer attacker) {
|
||||
public int Ticks { get; set; }
|
||||
public int DamageGiven { get; set; }
|
||||
public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
|
||||
public CSmokeGrenadeProjectile Projectile { get; } = projectile;
|
||||
public IPlayer Attacker { get; } = attacker;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameEnd(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.FINISHED) return;
|
||||
|
||||
killedWithPoison.Clear();
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRagdollSpawn(BodyCreateEvent ev) {
|
||||
if (!killedWithPoison.Contains(ev.Body.OfPlayer.Id)) return;
|
||||
if (ev.Body.Killer == null || ev.Body.Killer.Id == ev.Body.OfPlayer.Id)
|
||||
ev.IsCanceled = true;
|
||||
}
|
||||
}
|
||||
104
TTT/CS2/Items/SilentAWP/SilentAWPItem.cs
Normal file
104
TTT/CS2/Items/SilentAWP/SilentAWPItem.cs
Normal file
@@ -0,0 +1,104 @@
|
||||
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<string, int> silentShots =
|
||||
new Dictionary<string, 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.Id] = config.CurrentAmmo ?? 0 + config.ReserveAmmo ?? 0;
|
||||
Task.Run(async () => {
|
||||
await Inventory.RemoveWeaponInSlot(player, 0);
|
||||
await 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.Id, out var shots) || shots <= 0)
|
||||
return HookResult.Continue;
|
||||
|
||||
silentShots[apiPlayer.Id] = shots - 1;
|
||||
if (silentShots[apiPlayer.Id] == 0) {
|
||||
silentShots.Remove(apiPlayer.Id);
|
||||
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;
|
||||
}
|
||||
}
|
||||
11
TTT/CS2/Items/SilentAWP/SilentAWPMsgs.cs
Normal file
11
TTT/CS2/Items/SilentAWP/SilentAWPMsgs.cs
Normal 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));
|
||||
}
|
||||
@@ -1,11 +1,19 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.Utils;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Items.Station;
|
||||
@@ -21,7 +29,9 @@ public class DamageStation(IServiceProvider provider)
|
||||
provider.GetService<IStorage<DamageStationConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new DamageStationConfig()) {
|
||||
.GetResult() ?? new DamageStationConfig()), IListener {
|
||||
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
@@ -36,12 +46,17 @@ public class DamageStation(IServiceProvider provider)
|
||||
public override string Description
|
||||
=> Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
|
||||
|
||||
// private readonly ISet<string> killedWithStation = new HashSet<string>();
|
||||
private Dictionary<string, StationInfo> killedWithStation =
|
||||
new Dictionary<string, StationInfo>();
|
||||
|
||||
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 +81,48 @@ 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;
|
||||
|
||||
if (player.Health + damageAmount <= 0) {
|
||||
killedWithStation[player.Id] = info;
|
||||
var playerDeath = new PlayerDeathEvent(player)
|
||||
.WithKiller(info.Owner as IOnlinePlayer)
|
||||
.WithWeapon($"[{Name}]");
|
||||
bus.Dispatch(playerDeath);
|
||||
}
|
||||
|
||||
player.Health += damageAmount;
|
||||
info.HealthGiven += damageAmount;
|
||||
|
||||
gamePlayer.ExecuteClientCommand("play " + _Config.UseSound);
|
||||
gamePlayer.EmitSound("Player.DamageFall", null, 0.2f);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var prop in toRemove) props.Remove(prop);
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameEnd(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.FINISHED) return;
|
||||
|
||||
killedWithStation.Clear();
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRagdollSpawn(BodyCreateEvent ev) {
|
||||
if (!killedWithStation.TryGetValue(ev.Body.OfPlayer.Id,
|
||||
out var stationInfo))
|
||||
return;
|
||||
if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
|
||||
return;
|
||||
ev.Body.Killer = stationInfo.Owner as IOnlinePlayer;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -47,14 +49,17 @@ public class HealthStation(IServiceProvider provider)
|
||||
foreach (var (player, dist) in playerDists) {
|
||||
var maxHp = player.Pawn.Value?.MaxHealth ?? 100;
|
||||
var healthScale = 1.0 - dist / _Config.MaxRange;
|
||||
var healAmount =
|
||||
var maxHealAmo =
|
||||
(int)Math.Ceiling(_Config.HealthIncrements * healthScale);
|
||||
var newHealth = Math.Min(player.GetHealth() + healAmount, maxHp);
|
||||
var newHealth = Math.Min(player.GetHealth() + maxHealAmo, maxHp);
|
||||
var healthGiven = newHealth - player.GetHealth();
|
||||
player.SetHealth(newHealth);
|
||||
info.HealthGiven += healAmount;
|
||||
info.HealthGiven += healthGiven;
|
||||
|
||||
player.ExecuteClientCommand("play " + _Config.UseSound);
|
||||
if (healthGiven > 0) player.EmitSound("HealthShot.Pickup", null, 0.1f);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var prop in toRemove) props.Remove(prop);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -11,18 +11,20 @@ using TTT.API;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.RayTrace.Class;
|
||||
|
||||
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 +119,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();
|
||||
@@ -126,12 +128,15 @@ public abstract class StationItem<T>(IServiceProvider provider,
|
||||
if (gamePlayer == null || !gamePlayer.Pawn.IsValid
|
||||
|| gamePlayer.Pawn.Value == null)
|
||||
return;
|
||||
var spawnPos = gamePlayer.Pawn.Value.AbsOrigin.Clone();
|
||||
if (spawnPos != null && gamePlayer.PlayerPawn.Value != null) {
|
||||
var forward = gamePlayer.PlayerPawn.Value.EyeAngles.ToForward();
|
||||
forward.Z = 0;
|
||||
spawnPos += forward.Normalized() * 8;
|
||||
}
|
||||
|
||||
var spawnPos = gamePlayer.GetEyePosition();
|
||||
var forward = gamePlayer.Pawn.Value.AbsRotation;
|
||||
|
||||
if (spawnPos == null) return;
|
||||
|
||||
if (forward == null) forward = new QAngle(0, 0, 0);
|
||||
|
||||
spawnPos += forward.ToForward() * 50;
|
||||
|
||||
prop.Teleport(spawnPos);
|
||||
});
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
75
TTT/CS2/Listeners/KarmaBanner.cs
Normal file
75
TTT/CS2/Listeners/KarmaBanner.cs
Normal 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;
|
||||
}
|
||||
}
|
||||
54
TTT/CS2/Listeners/KarmaSyncer.cs
Normal file
54
TTT/CS2/Listeners/KarmaSyncer.cs
Normal 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;
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using JetBrains.Annotations;
|
||||
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 +18,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 =
|
||||
@@ -28,6 +25,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.MONITOR)]
|
||||
public void OnIdentify(BodyIdentifyEvent ev) {
|
||||
var gamePlayer = converter.GetPlayer(ev.Body.OfPlayer);
|
||||
@@ -44,6 +42,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
|
||||
|
||||
// Needs to be higher so we detect the kill before the game ends
|
||||
// in the case that this is the last player
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.HIGH)]
|
||||
public void OnKill(PlayerDeathEvent ev) {
|
||||
var killer = ev.Killer == null ? null : converter.GetPlayer(ev.Killer);
|
||||
@@ -63,6 +62,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
|
||||
}
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRoundEnd(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState == State.IN_PROGRESS) {
|
||||
|
||||
@@ -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,15 @@ 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);
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Admin;
|
||||
using CounterStrikeSharp.API.Modules.Entities;
|
||||
using TTT.API.Player;
|
||||
|
||||
namespace TTT.CS2.Player;
|
||||
@@ -10,18 +8,13 @@ public class CS2PermManager(IPlayerConverter<CCSPlayerController> converter)
|
||||
: IPermissionManager {
|
||||
public bool HasFlags(IPlayer player, params string[] flags) {
|
||||
if (flags.Length == 0) return true;
|
||||
Console.WriteLine("Checking flags for player: " + player.Id);
|
||||
var gamePlayer = converter.GetPlayer(player);
|
||||
if (gamePlayer == null) return false;
|
||||
|
||||
ulong.TryParse(player.Id, out var steamId);
|
||||
return AdminManager.PlayerHasPermissions(new SteamID(steamId), flags);
|
||||
return AdminManager.PlayerHasPermissions(gamePlayer, flags);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
BIN
TTT/CS2/ThirdParties/Binaries/MAULActainShared.dll
Normal file
BIN
TTT/CS2/ThirdParties/Binaries/MAULActainShared.dll
Normal file
Binary file not shown.
9
TTT/CS2/ThirdParties/eGO/EgoApi.cs
Normal file
9
TTT/CS2/ThirdParties/eGO/EgoApi.cs
Normal file
@@ -0,0 +1,9 @@
|
||||
using CounterStrikeSharp.API.Core.Capabilities;
|
||||
using MAULActainShared.plugin;
|
||||
|
||||
namespace TTT.CS2.ThirdParties.eGO;
|
||||
|
||||
public class EgoApi {
|
||||
public static PluginCapability<IActain> MAUL { get; } =
|
||||
new("maulactain:core");
|
||||
}
|
||||
106
TTT/CS2/Utils/DamageDealingHelper.cs
Normal file
106
TTT/CS2/Utils/DamageDealingHelper.cs
Normal file
@@ -0,0 +1,106 @@
|
||||
using System.Net;
|
||||
using System.Numerics;
|
||||
using System.Runtime.InteropServices;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Memory;
|
||||
using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
|
||||
|
||||
namespace TTT.CS2.Utils;
|
||||
|
||||
public class DamageDealingHelper {
|
||||
public static void DealDamage(CCSPlayerController target,
|
||||
CCSPlayerController? attacker, int damage, string source,
|
||||
DamageTypes_t type = DamageTypes_t.DMG_BLAST_SURFACE) {
|
||||
if (target.Pawn.Value == null) return;
|
||||
|
||||
var infoSize = Schema.GetClassSize("CTakeDamageInfo");
|
||||
var infoPtr = Marshal.AllocHGlobal(infoSize);
|
||||
|
||||
for (var i = 0; i < infoSize; i++) Marshal.WriteByte(infoPtr, i, 0);
|
||||
|
||||
var damageInfo = new CTakeDamageInfo(infoPtr);
|
||||
|
||||
// var attackerInfo = new CAttackerInfo() {
|
||||
// AttackerUserId =
|
||||
// attacker != null && attacker.UserId != null ?
|
||||
// (ushort)attacker.UserId :
|
||||
// unchecked((ushort)(-1)),
|
||||
// AttackerPawn = attacker != null ? attacker.Pawn.Raw : 0,
|
||||
// NeedInit = false,
|
||||
// TeamNum =
|
||||
// attacker != null && attacker.Pawn.Value != null ?
|
||||
// attacker.Pawn.Value.TeamNum :
|
||||
// 0,
|
||||
// TeamChecked = 0,
|
||||
// IsWorld = attacker == null,
|
||||
// IsPawn = attacker != null,
|
||||
// };
|
||||
|
||||
// Marshal.StructureToPtr(attackerInfo, new IntPtr(infoPtr.ToInt64() + 0x80),
|
||||
// false);
|
||||
|
||||
Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo", "m_hInflictor",
|
||||
attacker != null ? attacker.Pawn.Raw : 0);
|
||||
Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo", "m_hAttacker",
|
||||
attacker != null ? attacker.EntityHandle.Raw : 0);
|
||||
damageInfo.Damage = damage;
|
||||
damageInfo.BitsDamageType = type;
|
||||
|
||||
if (target.Pawn.Value?.AbsOrigin != null)
|
||||
Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo",
|
||||
"m_vecDamagePosition",
|
||||
target.Pawn.Value != null ?
|
||||
target.Pawn.Value.AbsOrigin.Handle :
|
||||
Vector.Zero.Handle);
|
||||
|
||||
Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo",
|
||||
"m_vecDamageForce", Vector.Zero.Handle);
|
||||
|
||||
var damageResultSize = Schema.GetClassSize("CTakeDamageResult");
|
||||
var damageResultPtr = Marshal.AllocHGlobal(damageResultSize);
|
||||
for (var i = 0; i < damageResultSize; i++)
|
||||
Marshal.WriteByte(damageResultPtr, i, 0);
|
||||
|
||||
var damageResult = new CTakeDamageResult(damageResultPtr);
|
||||
Schema.SetSchemaValue(damageResult.Handle, "CTakeDamageResult",
|
||||
"m_pOriginatingInfo", damageInfo.Handle);
|
||||
|
||||
damageResult.HealthLost = damage;
|
||||
damageResult.DamageDealt = damage;
|
||||
damageResult.TotalledHealthLost = damage;
|
||||
damageResult.TotalledDamageDealt = damage;
|
||||
damageResult.WasDamageSuppressed = false;
|
||||
|
||||
if (target.EntityHandle.Value != null)
|
||||
VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Invoke(
|
||||
target.EntityHandle.Value, damageInfo, damageResult);
|
||||
|
||||
Marshal.FreeHGlobal(infoPtr);
|
||||
Marshal.FreeHGlobal(damageResultPtr);
|
||||
}
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Explicit)]
|
||||
public struct CAttackerInfo {
|
||||
[FieldOffset(0x0)]
|
||||
public bool NeedInit;
|
||||
|
||||
[FieldOffset(0x1)]
|
||||
public bool IsPawn;
|
||||
|
||||
[FieldOffset(0x2)]
|
||||
public bool IsWorld;
|
||||
|
||||
[FieldOffset(0x4)]
|
||||
public UInt32 AttackerPawn;
|
||||
|
||||
[FieldOffset(0x8)]
|
||||
public ushort AttackerUserId;
|
||||
|
||||
[FieldOffset(0x0C)]
|
||||
public int TeamChecked;
|
||||
|
||||
[FieldOffset(0x10)]
|
||||
public int TeamNum;
|
||||
}
|
||||
32
TTT/CS2/Utils/GrenadeDataHelper.cs
Normal file
32
TTT/CS2/Utils/GrenadeDataHelper.cs
Normal file
@@ -0,0 +1,32 @@
|
||||
using System.Runtime.InteropServices;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Memory;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using TTT.CS2.RayTrace.Class;
|
||||
using Address = TTT.CS2.Utils.Address;
|
||||
|
||||
namespace TTT.CS2.Items.ClusterGrenade;
|
||||
|
||||
public class GrenadeDataHelper {
|
||||
private static readonly CHEGrenadeProjectile_CreateDelegate
|
||||
CHEGrenadeProjectile_CreateFunc;
|
||||
|
||||
static GrenadeDataHelper() {
|
||||
var heGrenadeSignature = NativeAPI.FindSignature(Addresses.ServerPath,
|
||||
GameData.GetSignature("CHEGrenadeProjectile_CreateFunc"));
|
||||
CHEGrenadeProjectile_CreateFunc =
|
||||
Marshal
|
||||
.GetDelegateForFunctionPointer<CHEGrenadeProjectile_CreateDelegate>(
|
||||
heGrenadeSignature);
|
||||
}
|
||||
|
||||
private delegate int CHEGrenadeProjectile_CreateDelegate(IntPtr position,
|
||||
IntPtr angle, IntPtr velocity, IntPtr velocityAngle, IntPtr thrower,
|
||||
int weaponId, byte team);
|
||||
|
||||
public static int CreateGrenade(Vector position, QAngle angle,
|
||||
Vector velocity, Vector velocityAngle, IntPtr thrower, CsTeam team) {
|
||||
return CHEGrenadeProjectile_CreateFunc(position.Handle, angle.Handle,
|
||||
velocity.Handle, velocityAngle.Handle, thrower, 44, (byte)team);
|
||||
}
|
||||
}
|
||||
81
TTT/CS2/Utils/TextCompass.cs
Normal file
81
TTT/CS2/Utils/TextCompass.cs
Normal 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;
|
||||
}
|
||||
}
|
||||
@@ -26,5 +26,12 @@
|
||||
"windows": "48 89 5C 24 ? 48 89 4C 24 ? 55 57",
|
||||
"linux": "55 48 89 E5 41 57 49 89 CF 41 56 49 89 F6 41 55 4D 89 C5 41 54 49 89 D4 53 4C 89 CB"
|
||||
}
|
||||
},
|
||||
"CHEGrenadeProjectile_CreateFunc": {
|
||||
"signatures": {
|
||||
"library": "server",
|
||||
"windows": "48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 40 48 8B 6C 24 70",
|
||||
"linux": "55 4C 89 C1 48 89 E5 41 57 49 89 D7"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
@@ -9,9 +9,16 @@ public static class CS2Msgs {
|
||||
public static IMsg ROLE_SPECTATOR
|
||||
=> MsgFactory.Create(nameof(ROLE_SPECTATOR));
|
||||
|
||||
public static IMsg DEAD_MUTE_REMINDER
|
||||
=> MsgFactory.Create(nameof(DEAD_MUTE_REMINDER));
|
||||
|
||||
public static IMsg TASER_SCANNED(IPlayer scannedPlayer, IRole role) {
|
||||
var rolePrefix = GameMsgs.GetRolePrefix(role);
|
||||
return MsgFactory.Create(nameof(TASER_SCANNED),
|
||||
rolePrefix + scannedPlayer.Name, role.Name);
|
||||
}
|
||||
|
||||
public static IMsg TRAITOR_CHAT_FORMAT(IOnlinePlayer player, string msg) {
|
||||
return MsgFactory.Create(nameof(TRAITOR_CHAT_FORMAT), player.Name, msg);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,10 @@
|
||||
ROLE_SPECTATOR: "Spectator"
|
||||
ROLE_SPECTATOR: "Spectator"
|
||||
TRAITOR_CHAT_FORMAT: "{darkred}[TRAITORS] {red}{0}: {default}{1}"
|
||||
TASER_SCANNED: "%PREFIX%You scanned {0}{grey}, they are %an% {1}{grey}!"
|
||||
DNA_PREFIX: "{darkblue}D{blue}N{lightblue}A{grey} | {grey}"
|
||||
|
||||
DEAD_MUTE_REMINDER: "%PREFIX%You are dead and cannot be heard."
|
||||
|
||||
SHOP_ITEM_DNA: "DNA Scanner"
|
||||
SHOP_ITEM_DNA_DESC: "Scan bodies to reveal the person who killed them."
|
||||
SHOP_ITEM_DNA_SCANNED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, their killer was {red}{2}{grey}."
|
||||
@@ -29,4 +32,19 @@ 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: "Player Compass"
|
||||
SHOP_ITEM_COMPASS_PLAYER_DESC: "Reveals the direction that the nearest non-Traitor is in."
|
||||
|
||||
SHOP_ITEM_COMPASS_BODY: "Body Compass"
|
||||
SHOP_ITEM_COMPASS_BODY_DESC: "Reveals the direction that the nearest unidentified body is in."
|
||||
|
||||
SHOP_ITEM_SILENT_AWP: "Silent AWP"
|
||||
SHOP_ITEM_SILENT_AWP_DESC: "Receive a silenced AWP with limited ammo."
|
||||
|
||||
SHOP_ITEM_CLUSTER_GRENADE: "Cluster Grenade"
|
||||
SHOP_ITEM_CLUSTER_GRENADE_DESC: "A grenade that splits into multiple smaller grenades."
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.340"/>
|
||||
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.342"/>
|
||||
<PackageReference Include="System.Reactive" Version="6.0.1"/>
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@@ -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; } =
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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,22 +11,38 @@ public class LogsCommand(IServiceProvider provider) : ICommand {
|
||||
private readonly IGameManager games =
|
||||
provider.GetRequiredService<IGameManager>();
|
||||
|
||||
private readonly IIconManager? icons = provider.GetService<IIconManager>();
|
||||
|
||||
private readonly IMsgLocalizer localizer =
|
||||
provider.GetRequiredService<IMsgLocalizer>();
|
||||
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
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 {
|
||||
State: State.IN_PROGRESS or State.FINISHED
|
||||
}) {
|
||||
info.ReplySync("No active game to show logs for.");
|
||||
messenger.Message(executor, localizer[GameMsgs.GAME_LOGS_NONE]);
|
||||
return Task.FromResult(CommandResult.ERROR);
|
||||
}
|
||||
|
||||
if (executor is { IsAlive: true }) {
|
||||
messenger.MessageAll(localizer[GameMsgs.LOGS_VIEWED_ALIVE(executor)]);
|
||||
} else if (icons != null && executor != null) {
|
||||
icons.SetVisiblePlayers(executor, ulong.MaxValue);
|
||||
messenger.Message(executor, localizer[GameMsgs.LOGS_VIEWED_INFO]);
|
||||
}
|
||||
|
||||
games.ActiveGame.Logger.PrintLogs(executor);
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
using JetBrains.Annotations;
|
||||
using TTT.API.Events;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.lang;
|
||||
|
||||
namespace TTT.Game.Listeners;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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}");
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using System.Drawing;
|
||||
using TTT.API.Player;
|
||||
using TTT.Game.lang;
|
||||
|
||||
namespace TTT.Game.Roles;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user