mirror of
https://github.com/MSWS/TTT.git
synced 2025-12-06 06:22:44 -08:00
Compare commits
310 Commits
0.13.0-dev
...
1.1.1-dev.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
29e28038b8 | ||
|
|
b253d8ee12 | ||
|
|
02575b51e2 | ||
|
|
d8d365b497 | ||
|
|
1ac38dc0ad | ||
|
|
62e57ffa97 | ||
|
|
81e6b2e695 | ||
|
|
2ce0457346 | ||
|
|
ed90c54e53 | ||
|
|
06d2d71f76 | ||
|
|
c6ba041a6b | ||
|
|
f283d7407e | ||
|
|
51ff4df545 | ||
|
|
e0ee4bf325 | ||
|
|
4a4c7e0782 | ||
|
|
d4f67ced0c | ||
|
|
33ca0c8385 | ||
|
|
ff2e97a3ce | ||
|
|
a56cdc1285 | ||
|
|
ceda5cba64 | ||
|
|
7c203bcd91 | ||
|
|
f91fc54897 | ||
|
|
7ca4a6bef4 | ||
|
|
d589a222c8 | ||
|
|
a3fdb590fd | ||
|
|
987df197bc | ||
|
|
acb3be9132 | ||
|
|
bbcc998559 | ||
|
|
56781c6ae8 | ||
|
|
0ca983943d | ||
|
|
8cd8e14e18 | ||
|
|
57ef5e3e24 | ||
|
|
9c99d316aa | ||
|
|
e679c5193b | ||
|
|
6ece0450bb | ||
|
|
daa24a0e87 | ||
|
|
1c8785b388 | ||
|
|
a80c36e3c5 | ||
|
|
ba6b6c448f | ||
|
|
d30e916319 | ||
|
|
9f275fa189 | ||
|
|
40bdcac4b0 | ||
|
|
6b3ae03ab3 | ||
|
|
9e8e1d1fb0 | ||
|
|
fba875f098 | ||
|
|
38fa801c15 | ||
|
|
b21fed3ff8 | ||
|
|
0e02d66350 | ||
|
|
7f6ac62348 | ||
|
|
f44e57215f | ||
|
|
ce48f5a5ac | ||
|
|
4f258e55dd | ||
|
|
b0ba6baac9 | ||
|
|
4d052f31c6 | ||
|
|
7c5e7c3f68 | ||
|
|
23e08134c8 | ||
|
|
16d9335292 | ||
|
|
840e04fd71 | ||
|
|
70c416bbe6 | ||
|
|
b85a3a415d | ||
|
|
2351ec55ec | ||
|
|
4af1be95f4 | ||
|
|
fdb22c1090 | ||
|
|
ddc309927f | ||
|
|
7b657b1595 | ||
|
|
05eed34ffd | ||
|
|
707a967445 | ||
|
|
d6c6562d32 | ||
|
|
64e9332fa6 | ||
|
|
536f0eafb5 | ||
|
|
3e513cb611 | ||
|
|
cba8470f09 | ||
|
|
275404582f | ||
|
|
76dc717a8b | ||
|
|
ff8d4dfc7e | ||
|
|
f63acf24c4 | ||
|
|
678b9b0de6 | ||
|
|
18144f5827 | ||
|
|
e590ae2b7a | ||
|
|
6bc0f57bed | ||
|
|
83a1d0e3e3 | ||
|
|
4d0fdfa25e | ||
|
|
9f673f9d8b | ||
|
|
3ad4339073 | ||
|
|
890ba71fdf | ||
|
|
c6fea1a21e | ||
|
|
db9ad9303f | ||
|
|
9224e823c0 | ||
|
|
4ab16d71db | ||
|
|
627c048183 | ||
|
|
66d1106d4c | ||
|
|
39c7a4762d | ||
|
|
f2352ede1f | ||
|
|
f675a87ffd | ||
|
|
7f455d5354 | ||
|
|
d1972fc556 | ||
|
|
f2dbc72aee | ||
|
|
77a2289367 | ||
|
|
456ae22b12 | ||
|
|
2616b231dc | ||
|
|
3cb86aa2f8 | ||
|
|
4c72f3dfff | ||
|
|
bc45f3fb74 | ||
|
|
2bcf436677 | ||
|
|
9dfb45583b | ||
|
|
3fa1558011 | ||
|
|
6c7bc22395 | ||
|
|
c95fba0fc5 | ||
|
|
40c7a6d471 | ||
|
|
b79519f6b4 | ||
|
|
bea87d20f3 | ||
|
|
5bbc621d86 | ||
|
|
5ed244f84c | ||
|
|
31d2354e6f | ||
|
|
44d9644694 | ||
|
|
f6d1b95a38 | ||
|
|
cf1d040b44 | ||
|
|
5393920f95 | ||
|
|
8158206101 | ||
|
|
06f8f083df | ||
|
|
5c18a046b8 | ||
|
|
063813baca | ||
|
|
a10ce25846 | ||
|
|
89077c8361 | ||
|
|
fd3ffc6d59 | ||
|
|
f9e2734390 | ||
|
|
251d8efeaf | ||
|
|
e83fbdd3fe | ||
|
|
99742efc5b | ||
|
|
c802f468ed | ||
|
|
43becefb0a | ||
|
|
f8f2617b09 | ||
|
|
3eb59dec13 | ||
|
|
792a737102 | ||
|
|
85dd4edb08 | ||
|
|
2f78a62385 | ||
|
|
247f7de49b | ||
|
|
c523a9f015 | ||
|
|
8363265e39 | ||
|
|
f3363da9bb | ||
|
|
ec2355eb6d | ||
|
|
fd14728a27 | ||
|
|
556657d249 | ||
|
|
26c5d0e367 | ||
|
|
536662a500 | ||
|
|
64889de2fa | ||
|
|
7a6676e6ac | ||
|
|
49227e6d37 | ||
|
|
0748114c9a | ||
|
|
346984f394 | ||
|
|
6316f39819 | ||
|
|
2d572e19b0 | ||
|
|
e4938502f4 | ||
|
|
e59b2538ee | ||
|
|
7454e5e3f3 | ||
|
|
bdef55428c | ||
|
|
4ce453dccd | ||
|
|
31f1403b9b | ||
|
|
d12cfa5eab | ||
|
|
9022416053 | ||
|
|
9f45b919e1 | ||
|
|
7d75b867f9 | ||
|
|
35b15c4578 | ||
|
|
9b99adca3f | ||
|
|
3802610b1c | ||
|
|
171250382e | ||
|
|
6524772d4f | ||
|
|
bd8125b7a0 | ||
|
|
9c693059ea | ||
|
|
695d34c10c | ||
|
|
05aeb53a3c | ||
|
|
9d3ecbe7fb | ||
|
|
85dac3622a | ||
|
|
9e4c29e3f7 | ||
|
|
c545a10d6f | ||
|
|
453ba14126 | ||
|
|
91750a1067 | ||
|
|
dd6b8c00fe | ||
|
|
d9ad08aa27 | ||
|
|
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 | ||
|
|
385f87ad12 | ||
|
|
6aedbeb3fb | ||
|
|
2d078e4dfa | ||
|
|
ff3dd9563e | ||
|
|
8126dfea21 | ||
|
|
e158bbbd77 |
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']
|
||||
4
.github/workflows/dotnet.yml
vendored
4
.github/workflows/dotnet.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
- name: Publish Test Project
|
||||
run: dotnet publish TTT/Test/Test.csproj --no-restore --no-build -o build_output -c Debug
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
- uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: build_output
|
||||
path: build_output
|
||||
@@ -59,7 +59,7 @@ jobs:
|
||||
dotnet-version: '8.0.x'
|
||||
|
||||
- name: Download Build Output
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v6
|
||||
with:
|
||||
name: build_output
|
||||
path: build_output
|
||||
|
||||
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,9 +14,11 @@ survive while eliminating the traitors among them.
|
||||
- [X] Traitors
|
||||
- [X] Detectives
|
||||
- [X] Innocents
|
||||
- [ ] Shop
|
||||
- [ ] Karma
|
||||
- [ ] Statistics
|
||||
- [X] Shop
|
||||
- [X] Karma
|
||||
- [X] Statistics
|
||||
- [X] Map Integrations
|
||||
- [X] Special Rounds
|
||||
|
||||
## Versioning
|
||||
|
||||
|
||||
26
SpecialRoundAPI/SpecialRoundAPI/AbstractSpecialRound.cs
Normal file
26
SpecialRoundAPI/SpecialRoundAPI/AbstractSpecialRound.cs
Normal file
@@ -0,0 +1,26 @@
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using SpecialRoundAPI.Configs;
|
||||
using TTT.API;
|
||||
using TTT.API.Events;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Listeners;
|
||||
using TTT.Locale;
|
||||
|
||||
namespace SpecialRoundAPI;
|
||||
|
||||
public abstract class AbstractSpecialRound(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
protected readonly ISpecialRoundTracker Tracker =
|
||||
provider.GetRequiredService<ISpecialRoundTracker>();
|
||||
|
||||
public abstract string Name { get; }
|
||||
public abstract IMsg Description { get; }
|
||||
public abstract SpecialRoundConfig Config { get; }
|
||||
|
||||
public abstract void ApplyRoundEffects();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public abstract void OnGameState(GameStateUpdateEvent ev);
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
namespace SpecialRoundAPI.Configs;
|
||||
|
||||
public record BhopRoundConfig : SpecialRoundConfig {
|
||||
public override float Weight { get; init; } = 0.2f;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
namespace SpecialRoundAPI.Configs;
|
||||
|
||||
public record SilentRoundConfig : SpecialRoundConfig {
|
||||
public override float Weight { get; init; } = 0.1f;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
namespace SpecialRoundAPI.Configs;
|
||||
|
||||
public abstract record SpecialRoundConfig {
|
||||
public abstract float Weight { get; init; }
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
namespace SpecialRoundAPI.Configs;
|
||||
|
||||
public record SpeedRoundConfig : SpecialRoundConfig {
|
||||
public override float Weight { get; init; } = 0.6f;
|
||||
|
||||
public TimeSpan InitialSeconds { get; init; } = TimeSpan.FromSeconds(40);
|
||||
public TimeSpan SecondsPerKill { get; init; } = TimeSpan.FromSeconds(10);
|
||||
public TimeSpan MaxTimeEver { get; init; } = TimeSpan.FromSeconds(90);
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
namespace SpecialRoundAPI.Configs;
|
||||
|
||||
public record SuppressedRoundConfig : SpecialRoundConfig {
|
||||
public override float Weight { get; init; } = 0.3f;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
namespace SpecialRoundAPI.Configs;
|
||||
|
||||
public record VanillaRoundConfig : SpecialRoundConfig {
|
||||
public override float Weight { get; init; } = 0.2f;
|
||||
}
|
||||
13
SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundStarter.cs
Normal file
13
SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundStarter.cs
Normal file
@@ -0,0 +1,13 @@
|
||||
namespace SpecialRoundAPI;
|
||||
|
||||
public interface ISpecialRoundStarter {
|
||||
/// <summary>
|
||||
/// Attempts to start the given special round.
|
||||
/// Will bypass most checks, but may still return null if starting the round
|
||||
/// is not possible.
|
||||
/// </summary>
|
||||
/// <param name="round"></param>
|
||||
/// <returns></returns>
|
||||
public AbstractSpecialRound?
|
||||
TryStartSpecialRound(AbstractSpecialRound? round);
|
||||
}
|
||||
6
SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundTracker.cs
Normal file
6
SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundTracker.cs
Normal file
@@ -0,0 +1,6 @@
|
||||
namespace SpecialRoundAPI;
|
||||
|
||||
public interface ISpecialRoundTracker {
|
||||
public AbstractSpecialRound? CurrentRound { get; set; }
|
||||
public int RoundsSinceLastSpecial { get; set; }
|
||||
}
|
||||
15
SpecialRoundAPI/SpecialRoundAPI/SpecialRoundAPI.csproj
Normal file
15
SpecialRoundAPI/SpecialRoundAPI/SpecialRoundAPI.csproj
Normal file
@@ -0,0 +1,15 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Locale\Locale.csproj"/>
|
||||
<ProjectReference Include="..\..\TTT\API\API.csproj"/>
|
||||
<ProjectReference Include="..\..\TTT\Game\Game.csproj"/>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
24
TTT.sln
24
TTT.sln
@@ -23,6 +23,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Karma", "TTT\Karma\Karma.cs
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShopAPI", "TTT\ShopAPI\ShopAPI.csproj", "{16F720B5-9D45-47BF-8C80-4F91005E36D1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RTD", "TTT\RTD\RTD.csproj", "{8A426E84-45DA-4558-A218-E042F1AC60B2}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats", "TTT\Stats\Stats.csproj", "{256473A2-6ACD-440C-83FA-6056147656C7}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRound", "TTT\SpecialRound\SpecialRound.csproj", "{5092069A-3CFA-41C8-B685-341040AB435C}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRoundAPI", "SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj", "{360FEF16-54DA-42EE-995A-3D31C699287D}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@@ -72,6 +80,22 @@ Global
|
||||
{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8A426E84-45DA-4558-A218-E042F1AC60B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8A426E84-45DA-4558-A218-E042F1AC60B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8A426E84-45DA-4558-A218-E042F1AC60B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8A426E84-45DA-4558-A218-E042F1AC60B2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{256473A2-6ACD-440C-83FA-6056147656C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{256473A2-6ACD-440C-83FA-6056147656C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{256473A2-6ACD-440C-83FA-6056147656C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{256473A2-6ACD-440C-83FA-6056147656C7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5092069A-3CFA-41C8-B685-341040AB435C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5092069A-3CFA-41C8-B685-341040AB435C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5092069A-3CFA-41C8-B685-341040AB435C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5092069A-3CFA-41C8-B685-341040AB435C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{360FEF16-54DA-42EE-995A-3D31C699287D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{360FEF16-54DA-42EE-995A-3D31C699287D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{360FEF16-54DA-42EE-995A-3D31C699287D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{360FEF16-54DA-42EE-995A-3D31C699287D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
EndGlobalSection
|
||||
|
||||
@@ -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>());
|
||||
|
||||
@@ -11,6 +11,7 @@ public interface IAction {
|
||||
string Id { get; }
|
||||
string Verb { get; }
|
||||
string Details { get; }
|
||||
string Prefix => "";
|
||||
|
||||
public string Format() {
|
||||
var pRole = PlayerRole != null ?
|
||||
@@ -20,7 +21,7 @@ public interface IAction {
|
||||
$" [{OtherRole.Name.First(char.IsAsciiLetter)}]" :
|
||||
"";
|
||||
return Other is not null ?
|
||||
$"{Player}{pRole} {Verb} {Other}{oRole} {Details}" :
|
||||
$"{Player}{pRole} {Verb} {Details}";
|
||||
$"{Prefix}{Player}{pRole} {Verb} {Other}{oRole} {Details}" :
|
||||
$"{Prefix}{Player}{pRole} {Verb} {Details}";
|
||||
}
|
||||
}
|
||||
@@ -18,4 +18,6 @@ public interface IActionLogger {
|
||||
|
||||
void PrintLogs();
|
||||
void PrintLogs(IOnlinePlayer? player);
|
||||
|
||||
string[] MakeLogs();
|
||||
}
|
||||
@@ -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,8 @@ 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 RevealToAll(IOnlinePlayer online);
|
||||
|
||||
void ClearAllVisibility();
|
||||
}
|
||||
3
TTT/API/Player/IMuted.cs
Normal file
3
TTT/API/Player/IMuted.cs
Normal file
@@ -0,0 +1,3 @@
|
||||
namespace TTT.API.Player;
|
||||
|
||||
public interface IMuted : ISet<string> { }
|
||||
@@ -7,7 +7,7 @@ public interface IPlayer : IEquatable<IPlayer> {
|
||||
/// </summary>
|
||||
string Id { get; }
|
||||
|
||||
string Name { get; }
|
||||
string Name { get; set; }
|
||||
|
||||
bool IEquatable<IPlayer>.Equals(IPlayer? other) {
|
||||
if (other is null) return false;
|
||||
|
||||
19
TTT/CS2/Actions/TaserAction.cs
Normal file
19
TTT/CS2/Actions/TaserAction.cs
Normal file
@@ -0,0 +1,19 @@
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
|
||||
namespace TTT.CS2.Actions;
|
||||
|
||||
public class TaserAction(IRoleAssigner roles, IPlayer victim,
|
||||
IPlayer identifier) : IAction {
|
||||
public IPlayer Player { get; } = identifier;
|
||||
public IPlayer? Other { get; } = victim;
|
||||
|
||||
public IRole? PlayerRole { get; } =
|
||||
roles.GetRoles(identifier).FirstOrDefault();
|
||||
|
||||
public IRole? OtherRole { get; } = roles.GetRoles(victim).FirstOrDefault();
|
||||
public string Id { get; } = "cs2.action.tased";
|
||||
public string Verb { get; } = "tased";
|
||||
public string Details { get; } = "";
|
||||
}
|
||||
@@ -9,12 +9,19 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj"/>
|
||||
<ProjectReference Include="..\API\API.csproj"/>
|
||||
<ProjectReference Include="..\Game\Game.csproj"/>
|
||||
<ProjectReference Include="..\Karma\Karma.csproj"/>
|
||||
<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));
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs;
|
||||
using ShopAPI.Configs.Detective;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Extensions;
|
||||
@@ -21,6 +23,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;
|
||||
@@ -34,6 +37,8 @@ public static class CS2ServiceCollection {
|
||||
collection.AddModBehavior<ICommandManager, CS2CommandManager>();
|
||||
collection.AddModBehavior<IAliveSpoofer, CS2AliveSpoofer>();
|
||||
collection.AddModBehavior<IIconManager, RoleIconsHandler>();
|
||||
collection.AddModBehavior<NameDisplayer>();
|
||||
collection.AddModBehavior<PlayerPingShopAlias>();
|
||||
|
||||
// Configs
|
||||
collection.AddModBehavior<IStorage<TTTConfig>, CS2GameConfig>();
|
||||
@@ -45,6 +50,22 @@ public static class CS2ServiceCollection {
|
||||
collection.AddModBehavior<IStorage<TaserConfig>, CS2TaserConfig>();
|
||||
collection
|
||||
.AddModBehavior<IStorage<PoisonSmokeConfig>, CS2PoisonSmokeConfig>();
|
||||
collection.AddModBehavior<IStorage<KarmaConfig>, CS2KarmaConfig>();
|
||||
collection.AddModBehavior<IStorage<CamoConfig>, CS2CamoConfig>();
|
||||
collection.AddModBehavior<IStorage<StickersConfig>, CS2StickersConfig>();
|
||||
collection.AddModBehavior<IStorage<BodyPaintConfig>, CS2BodyPaintConfig>();
|
||||
collection
|
||||
.AddModBehavior<IStorage<DnaScannerConfig>, CS2DnaScannerConfig>();
|
||||
collection
|
||||
.AddModBehavior<IStorage<HealthStationConfig>, CS2HealthStationConfig>();
|
||||
collection
|
||||
.AddModBehavior<IStorage<ClusterGrenadeConfig>, CS2ClusterGrenadeConfig>();
|
||||
collection.AddModBehavior<IStorage<GlovesConfig>, CS2GlovesConfig>();
|
||||
collection
|
||||
.AddModBehavior<IStorage<OneHitKnifeConfig>, CS2OneHitKnifeConfig>();
|
||||
collection.AddModBehavior<IStorage<SilentAWPConfig>, CS2SilentAWPConfig>();
|
||||
collection
|
||||
.AddModBehavior<IStorage<HealthshotConfig>, CS2HealthshotConfig>();
|
||||
|
||||
// TTT - CS2 Specific optionals
|
||||
collection.AddScoped<ITextSpawner, TextSpawner>();
|
||||
@@ -55,25 +76,35 @@ public static class CS2ServiceCollection {
|
||||
collection.AddModBehavior<DamageCanceler>();
|
||||
collection.AddModBehavior<PlayerConnectionsHandler>();
|
||||
collection.AddModBehavior<PropMover>();
|
||||
// collection.AddModBehavior<RoundEnd_GameEndHandler>();
|
||||
collection.AddModBehavior<RoundStart_GameStartHandler>();
|
||||
collection.AddModBehavior<BombPlantSuppressor>();
|
||||
collection.AddModBehavior<MapZoneRemover>();
|
||||
collection.AddModBehavior<BuyMenuHandler>();
|
||||
collection.AddModBehavior<TeamChangeHandler>();
|
||||
collection.AddModBehavior<TraitorChatHandler>();
|
||||
collection.AddModBehavior<PlayerMuter>();
|
||||
collection.AddModBehavior<MapChangeCausesEndListener>();
|
||||
collection.AddModBehavior<NameUpdater>();
|
||||
// collection.AddModBehavior<EntityTargetHandlers>();
|
||||
|
||||
// Damage Cancelers
|
||||
collection.AddModBehavior<OutOfRoundCanceler>();
|
||||
collection.AddModBehavior<TaserListenCanceler>();
|
||||
|
||||
// Listeners
|
||||
collection.AddModBehavior<AfkTimerListener>();
|
||||
collection.AddModBehavior<BodyPickupListener>();
|
||||
collection.AddModBehavior<IBodyTracker, BodyTracker>();
|
||||
collection.AddModBehavior<LateSpawnListener>();
|
||||
collection.AddModBehavior<PlayerStatsTracker>();
|
||||
collection.AddModBehavior<RoundTimerListener>();
|
||||
collection.AddModBehavior<ScreenColorApplier>();
|
||||
collection.AddModBehavior<KarmaBanner>();
|
||||
collection.AddModBehavior<KarmaSyncer>();
|
||||
collection.AddModBehavior<MapHookListener>();
|
||||
|
||||
// Commands
|
||||
#if DEBUG
|
||||
collection.AddModBehavior<TestCommand>();
|
||||
#endif
|
||||
|
||||
collection.AddScoped<IGameManager, CS2GameManager>();
|
||||
collection.AddScoped<IInventoryManager, CS2InventoryManager>();
|
||||
|
||||
@@ -4,6 +4,7 @@ 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.Commands;
|
||||
using TTT.Game.lang;
|
||||
@@ -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 apiPlayer) return;
|
||||
|
||||
var lastUpdated = itemSorter.GetLastUpdate(apiPlayer);
|
||||
if (lastUpdated == null
|
||||
|| DateTime.Now - lastUpdated > TimeSpan.FromSeconds(20))
|
||||
return;
|
||||
var cmdInfo = new CS2CommandInfo(provider, apiPlayer, 0, "css_shop", "buy",
|
||||
(index - 1).ToString()) { CallingContext = CommandCallingContext.Chat };
|
||||
provider.GetRequiredService<ICommandManager>().ProcessCommand(cmdInfo);
|
||||
itemSorter.InvalidateOrder(apiPlayer);
|
||||
}
|
||||
}
|
||||
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);
|
||||
|
||||
62
TTT/CS2/Command/Test/ReloadModuleCommand.cs
Normal file
62
TTT/CS2/Command/Test/ReloadModuleCommand.cs
Normal file
@@ -0,0 +1,62 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Player;
|
||||
|
||||
namespace TTT.CS2.Command.Test;
|
||||
|
||||
public class ReloadModuleCommand(IServiceProvider provider)
|
||||
: ICommand, IPluginModule {
|
||||
private BasePlugin? plugin;
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public string Id => "reload";
|
||||
|
||||
public string[] Usage => ["<module>"];
|
||||
|
||||
public Task<CommandResult>
|
||||
Execute(IOnlinePlayer? executor, ICommandInfo info) {
|
||||
if (info.ArgCount != 2) return Task.FromResult(CommandResult.INVALID_ARGS);
|
||||
|
||||
var moduleName = info.Args[1];
|
||||
var modules = provider.GetServices<ITerrorModule>();
|
||||
|
||||
var module = modules.FirstOrDefault(m
|
||||
=> m.Id.Equals(moduleName, StringComparison.OrdinalIgnoreCase));
|
||||
if (module == null) {
|
||||
info.ReplySync($"Module '{moduleName}' not found.");
|
||||
return Task.FromResult(CommandResult.INVALID_ARGS);
|
||||
}
|
||||
|
||||
info.ReplySync($"Reloading module '{moduleName}'...");
|
||||
module.Dispose();
|
||||
|
||||
info.ReplySync($"Starting module '{moduleName}'...");
|
||||
module.Start();
|
||||
info.ReplySync($"Module '{moduleName}' reloaded successfully.");
|
||||
|
||||
if (plugin == null) {
|
||||
info.ReplySync("Plugin context not found; skipping hotload steps.");
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
if (module is not IPluginModule pluginModule)
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
|
||||
Server.NextWorldUpdate(() => {
|
||||
info.ReplySync($"Hotloading plugin module '{moduleName}'...");
|
||||
pluginModule.Start(plugin, true);
|
||||
info.ReplySync($"Plugin module '{moduleName}' hotloaded successfully.");
|
||||
});
|
||||
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
if (plugin == null) return;
|
||||
this.plugin = plugin;
|
||||
}
|
||||
}
|
||||
29
TTT/CS2/Command/Test/SetTargetCommand.cs
Normal file
29
TTT/CS2/Command/Test/SetTargetCommand.cs
Normal file
@@ -0,0 +1,29 @@
|
||||
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 SetTargetCommand(IServiceProvider provider) : ICommand {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public string Id => "settarget";
|
||||
|
||||
public Task<CommandResult>
|
||||
Execute(IOnlinePlayer? executor, ICommandInfo info) {
|
||||
if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
|
||||
|
||||
Server.NextWorldUpdate(() => {
|
||||
var gamePlayer = converter.GetPlayer(executor);
|
||||
if (gamePlayer == null) return;
|
||||
gamePlayer.Pawn.Value?.AcceptInput("AddContext", null, null, "TRAITOR:1");
|
||||
});
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
}
|
||||
43
TTT/CS2/Command/Test/SpecCommand.cs
Normal file
43
TTT/CS2/Command/Test/SpecCommand.cs
Normal file
@@ -0,0 +1,43 @@
|
||||
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 string Id => "spec";
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
44
TTT/CS2/Command/Test/SpecialRoundCommand.cs
Normal file
44
TTT/CS2/Command/Test/SpecialRoundCommand.cs
Normal file
@@ -0,0 +1,44 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using SpecialRoundAPI;
|
||||
using TTT.API;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Player;
|
||||
|
||||
namespace TTT.CS2.Command.Test;
|
||||
|
||||
public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
|
||||
private readonly ISpecialRoundStarter tracker =
|
||||
provider.GetRequiredService<ISpecialRoundStarter>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public string Id => "specialround";
|
||||
|
||||
public Task<CommandResult>
|
||||
Execute(IOnlinePlayer? executor, ICommandInfo info) {
|
||||
if (info.ArgCount == 1) {
|
||||
tracker.TryStartSpecialRound(null);
|
||||
info.ReplySync("Started a random special round.");
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
var rounds = provider.GetServices<ITerrorModule>()
|
||||
.OfType<AbstractSpecialRound>()
|
||||
.ToDictionary(r => r.Name.ToLower(), r => r);
|
||||
|
||||
var roundName = info.Args[1].ToLower();
|
||||
if (!rounds.TryGetValue(roundName, out var round)) {
|
||||
info.ReplySync($"No special round found with name '{roundName}'.");
|
||||
foreach (var name in rounds.Keys) info.ReplySync($"- {name}");
|
||||
return Task.FromResult(CommandResult.INVALID_ARGS);
|
||||
}
|
||||
|
||||
Server.NextWorldUpdate(() => {
|
||||
tracker.TryStartSpecialRound(round);
|
||||
info.ReplySync($"Started special round '{roundName}'.");
|
||||
});
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
}
|
||||
@@ -21,15 +21,24 @@ 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));
|
||||
subCommands.Add("reload", new ReloadModuleCommand(provider));
|
||||
subCommands.Add("specialround", new SpecialRoundCommand(provider));
|
||||
subCommands.Add("settarget", new SetTargetCommand(provider));
|
||||
}
|
||||
|
||||
public Task<CommandResult>
|
||||
Execute(IOnlinePlayer? executor, ICommandInfo info) {
|
||||
if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
|
||||
|
||||
if (executor.Id != "76561198333588297")
|
||||
return Task.FromResult(CommandResult.NO_PERMISSION);
|
||||
|
||||
if (info.ArgCount == 1) {
|
||||
foreach (var c in subCommands.Values)
|
||||
info.ReplySync(
|
||||
|
||||
@@ -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(
|
||||
@@ -24,7 +24,7 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
|
||||
|
||||
public static readonly FakeConVar<int> CV_ROUND_DURATION_PER_PLAYER = new(
|
||||
"css_ttt_round_duration_per_player",
|
||||
"Additional round duration per player in seconds", 30,
|
||||
"Additional round duration per player in seconds", 15,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 60));
|
||||
|
||||
public static readonly FakeConVar<int> CV_ROUND_DURATION_MAX = new(
|
||||
@@ -63,24 +63,22 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
|
||||
|
||||
public static readonly FakeConVar<string> CV_TRAITOR_WEAPONS = new(
|
||||
"css_ttt_roleweapons_traitor",
|
||||
"Weapons available to traitors at start of round",
|
||||
"weapon_knife,weapon_glock", ConVarFlags.FCVAR_NONE,
|
||||
new ItemValidator(allowMultiple: true));
|
||||
"Weapons available to traitors at start of round", "",
|
||||
ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
|
||||
|
||||
public static readonly FakeConVar<string> CV_DETECTIVE_WEAPONS = new(
|
||||
"css_ttt_roleweapons_detective",
|
||||
"Weapons available to detectives at start of round",
|
||||
"weapon_knife,weapon_taser,weapon_m4a1,weapon_revolver",
|
||||
ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
|
||||
"weapon_taser,weapon_m4a1_silencer,weapon_revolver", ConVarFlags.FCVAR_NONE,
|
||||
new ItemValidator(allowMultiple: true));
|
||||
|
||||
public static readonly FakeConVar<string> CV_INNOCENT_WEAPONS = new(
|
||||
"css_ttt_roleweapons_innocent",
|
||||
"Weapons available to innocents at start of round",
|
||||
"weapon_knife,weapon_glock", ConVarFlags.FCVAR_NONE,
|
||||
new ItemValidator(allowMultiple: true));
|
||||
"Weapons available to innocents at start of round", "",
|
||||
ConVarFlags.FCVAR_NONE, 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", 1,
|
||||
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",
|
||||
1, 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);
|
||||
}
|
||||
}
|
||||
@@ -10,15 +10,15 @@ namespace TTT.CS2.Configs;
|
||||
|
||||
public class CS2ShopConfig : IStorage<ShopConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_STARTING_INNOCENT_CREDITS = new(
|
||||
"css_ttt_shop_start_innocent", "Starting credits for Innocents", 100,
|
||||
"css_ttt_shop_start_innocent", "Starting credits for Innocents", 60,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_STARTING_TRAITOR_CREDITS = new(
|
||||
"css_ttt_shop_start_traitor", "Starting credits for Traitors", 120,
|
||||
"css_ttt_shop_start_traitor", "Starting credits for Traitors", 100,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_STARTING_DETECTIVE_CREDITS = new(
|
||||
"css_ttt_shop_start_detective", "Starting credits for Detectives", 150,
|
||||
"css_ttt_shop_start_detective", "Starting credits for Detectives", 120,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_INNO_V_INNO = new(
|
||||
|
||||
52
TTT/CS2/Configs/ShopItems/CS2BodyPaintConfig.cs
Normal file
52
TTT/CS2/Configs/ShopItems/CS2BodyPaintConfig.cs
Normal file
@@ -0,0 +1,52 @@
|
||||
using System.Drawing;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2BodyPaintConfig : IStorage<BodyPaintConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_bodypaint_price", "Price of the Body Paint item", 30,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_MAX_USES = new(
|
||||
"css_ttt_shop_bodypaint_max_uses",
|
||||
"Maximum number of times the Body Paint can be applied per item", 4,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 100));
|
||||
|
||||
public static readonly FakeConVar<string> CV_COLOR = new(
|
||||
"css_ttt_shop_bodypaint_color",
|
||||
"Color to apply to the player's body (HTML hex or known color name)",
|
||||
"GreenYellow");
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<BodyPaintConfig?> Load() {
|
||||
Color parsedColor;
|
||||
try { parsedColor = ColorTranslator.FromHtml(CV_COLOR.Value); } catch {
|
||||
try { parsedColor = Color.FromName(CV_COLOR.Value); } catch {
|
||||
parsedColor = Color.GreenYellow;
|
||||
}
|
||||
}
|
||||
|
||||
var cfg = new BodyPaintConfig {
|
||||
Price = CV_PRICE.Value,
|
||||
MaxUses = CV_MAX_USES.Value,
|
||||
ColorToApply = parsedColor
|
||||
};
|
||||
|
||||
return Task.FromResult<BodyPaintConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
@@ -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(
|
||||
|
||||
37
TTT/CS2/Configs/ShopItems/CS2CamoConfig.cs
Normal file
37
TTT/CS2/Configs/ShopItems/CS2CamoConfig.cs
Normal file
@@ -0,0 +1,37 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2CamoConfig : IStorage<CamoConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_camo_price", "Price of the Camo item", 75,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<float> CV_CAMO_VISIBILITY = new(
|
||||
"css_ttt_shop_camo_visibility",
|
||||
"Player visibility multiplier while camouflaged (0 = invisible, 1 = fully visible)",
|
||||
0.5f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<CamoConfig?> Load() {
|
||||
var cfg = new CamoConfig {
|
||||
Price = CV_PRICE.Value, CamoVisibility = CV_CAMO_VISIBILITY.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<CamoConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
56
TTT/CS2/Configs/ShopItems/CS2ClusterGrenadeConfig.cs
Normal file
56
TTT/CS2/Configs/ShopItems/CS2ClusterGrenadeConfig.cs
Normal file
@@ -0,0 +1,56 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2ClusterGrenadeConfig : IStorage<ClusterGrenadeConfig>,
|
||||
IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_clustergrenade_price",
|
||||
"Price of the Cluster Grenade item (Traitor)", 100, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_GRENADE_COUNT = new(
|
||||
"css_ttt_shop_clustergrenade_count",
|
||||
"Number of grenades released upon explosion", 8, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(1, 50));
|
||||
|
||||
public static readonly FakeConVar<string> CV_WEAPON_ID = new(
|
||||
"css_ttt_shop_clustergrenade_weapon",
|
||||
"Weapon entity ID used for the Cluster Grenade", "weapon_hegrenade");
|
||||
|
||||
public static readonly FakeConVar<float> CV_UP_FORCE = new(
|
||||
"css_ttt_shop_clustergrenade_up_force",
|
||||
"Upward force applied to cluster fragments", 200f, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<float>(0f, 1000f));
|
||||
|
||||
public static readonly FakeConVar<float> CV_THROW_FORCE = new(
|
||||
"css_ttt_shop_clustergrenade_throw_force",
|
||||
"Forward throw force applied to cluster fragments", 250f,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1000f));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<ClusterGrenadeConfig?> Load() {
|
||||
var cfg = new ClusterGrenadeConfig {
|
||||
Price = CV_PRICE.Value,
|
||||
GrenadeCount = CV_GRENADE_COUNT.Value,
|
||||
UpForce = CV_UP_FORCE.Value,
|
||||
ThrowForce = CV_THROW_FORCE.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<ClusterGrenadeConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
44
TTT/CS2/Configs/ShopItems/CS2DnaScannerConfig.cs
Normal file
44
TTT/CS2/Configs/ShopItems/CS2DnaScannerConfig.cs
Normal file
@@ -0,0 +1,44 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs.Detective;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2DnaScannerConfig : IStorage<DnaScannerConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_dna_price", "Price of the DNA Scanner item (Detective)", 110,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_MAX_SAMPLES = new(
|
||||
"css_ttt_shop_dna_max_samples",
|
||||
"Maximum number of DNA samples that can be stored at once", 0,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 100));
|
||||
|
||||
public static readonly FakeConVar<int> CV_DECAY_TIME_SECONDS = new(
|
||||
"css_ttt_shop_dna_decay_time",
|
||||
"Time (in seconds) before a DNA sample decays", 120, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(10, 3600));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<DnaScannerConfig?> Load() {
|
||||
var cfg = new DnaScannerConfig {
|
||||
Price = CV_PRICE.Value,
|
||||
MaxSamples = CV_MAX_SAMPLES.Value,
|
||||
DecayTime = TimeSpan.FromSeconds(CV_DECAY_TIME_SECONDS.Value)
|
||||
};
|
||||
|
||||
return Task.FromResult<DnaScannerConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
37
TTT/CS2/Configs/ShopItems/CS2GlovesConfig.cs
Normal file
37
TTT/CS2/Configs/ShopItems/CS2GlovesConfig.cs
Normal file
@@ -0,0 +1,37 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2GlovesConfig : IStorage<GlovesConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_gloves_price", "Price of the Gloves item (Traitor)", 40,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_MAX_USES = new(
|
||||
"css_ttt_shop_gloves_max_uses",
|
||||
"Maximum number of times the Gloves can be used before breaking", 5,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 100));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<GlovesConfig?> Load() {
|
||||
var cfg = new GlovesConfig {
|
||||
Price = CV_PRICE.Value, MaxUses = CV_MAX_USES.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<GlovesConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
69
TTT/CS2/Configs/ShopItems/CS2HealthStationConfig.cs
Normal file
69
TTT/CS2/Configs/ShopItems/CS2HealthStationConfig.cs
Normal file
@@ -0,0 +1,69 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs.Detective;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2HealthStationConfig : IStorage<HealthStationConfig>,
|
||||
IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_healthstation_price",
|
||||
"Price of the Health Station item (Detective)", 50, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<string> CV_USE_SOUND = new(
|
||||
"css_ttt_shop_healthstation_use_sound",
|
||||
"Sound played when using the Health Station", "sounds/buttons/blip1");
|
||||
|
||||
public static readonly FakeConVar<int> CV_HEALTH_INCREMENTS = new(
|
||||
"css_ttt_shop_healthstation_increments",
|
||||
"Number of health increments applied per use", 10, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(1, 100));
|
||||
|
||||
public static readonly FakeConVar<int> CV_HEALTH_INTERVAL = new(
|
||||
"css_ttt_shop_healthstation_interval",
|
||||
"Interval (in seconds) between health increments", 1,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 60));
|
||||
|
||||
public static readonly FakeConVar<int> CV_STATION_HEALTH = new(
|
||||
"css_ttt_shop_healthstation_station_health",
|
||||
"Maximum health of the station object itself", 200, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(50, 1000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_TOTAL_HEALTH_GIVEN = new(
|
||||
"css_ttt_shop_healthstation_total_health_given",
|
||||
"Total health the station can provide before depleting (0 = infinite)", 0,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<float> CV_MAX_RANGE = new(
|
||||
"css_ttt_shop_healthstation_max_range",
|
||||
"Maximum range (in units) from which players can use the station", 256f,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(50f, 2048f));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<HealthStationConfig?> Load() {
|
||||
var cfg = new HealthStationConfig {
|
||||
Price = CV_PRICE.Value,
|
||||
UseSound = CV_USE_SOUND.Value,
|
||||
HealthIncrements = CV_HEALTH_INCREMENTS.Value,
|
||||
HealthInterval = TimeSpan.FromSeconds(CV_HEALTH_INTERVAL.Value),
|
||||
StationHealth = CV_STATION_HEALTH.Value,
|
||||
TotalHealthGiven = CV_TOTAL_HEALTH_GIVEN.Value,
|
||||
MaxRange = CV_MAX_RANGE.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<HealthStationConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
43
TTT/CS2/Configs/ShopItems/CS2HealthshotConfig.cs
Normal file
43
TTT/CS2/Configs/ShopItems/CS2HealthshotConfig.cs
Normal file
@@ -0,0 +1,43 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2HealthshotConfig : IStorage<HealthshotConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_healthshot_price", "Price of the Healthshot item", 40,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_MAX_PURCHASES = new(
|
||||
"css_ttt_shop_healthshot_max_purchases",
|
||||
"Maximum number of times a player can purchase the Healthshot per round", 2,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 100));
|
||||
|
||||
public static readonly FakeConVar<string> CV_WEAPON = new(
|
||||
"css_ttt_shop_healthshot_weapon", "Weapon entity name for the Healthshot",
|
||||
"weapon_healthshot");
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<HealthshotConfig?> Load() {
|
||||
var cfg = new HealthshotConfig {
|
||||
Price = CV_PRICE.Value,
|
||||
MaxPurchases = CV_MAX_PURCHASES.Value,
|
||||
Weapon = CV_WEAPON.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<HealthshotConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
@@ -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", 50,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<string> CV_CLEAR_SLOTS = new(
|
||||
|
||||
37
TTT/CS2/Configs/ShopItems/CS2OneHitKnifeConfig.cs
Normal file
37
TTT/CS2/Configs/ShopItems/CS2OneHitKnifeConfig.cs
Normal file
@@ -0,0 +1,37 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2OneHitKnifeConfig : IStorage<OneHitKnifeConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_onehitknife_price",
|
||||
"Price of the One-Hit Knife item (Traitor)", 80, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(
|
||||
"css_ttt_shop_onehitknife_friendly_fire",
|
||||
"Whether the One-Hit Knife can damage teammates");
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<OneHitKnifeConfig?> Load() {
|
||||
var cfg = new OneHitKnifeConfig {
|
||||
Price = CV_PRICE.Value, FriendlyFire = CV_FRIENDLY_FIRE.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<OneHitKnifeConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
@@ -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", 130,
|
||||
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(
|
||||
|
||||
54
TTT/CS2/Configs/ShopItems/CS2SilentAWPConfig.cs
Normal file
54
TTT/CS2/Configs/ShopItems/CS2SilentAWPConfig.cs
Normal file
@@ -0,0 +1,54 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2SilentAWPConfig : IStorage<SilentAWPConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_silentawp_price", "Price of the Silent AWP item (Traitor)",
|
||||
80, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_WEAPON_INDEX = new(
|
||||
"css_ttt_shop_silentawp_index", "Weapon slot index for the Silent AWP", 9,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 64));
|
||||
|
||||
public static readonly FakeConVar<string> CV_WEAPON_ID = new(
|
||||
"css_ttt_shop_silentawp_weapon", "Weapon entity ID for the Silent AWP",
|
||||
"weapon_awp");
|
||||
|
||||
public static readonly FakeConVar<int> CV_RESERVE_AMMO = new(
|
||||
"css_ttt_shop_silentawp_reserve_ammo",
|
||||
"Reserve ammo count for the Silent AWP", 0, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(0, 100));
|
||||
|
||||
public static readonly FakeConVar<int> CV_CURRENT_AMMO = new(
|
||||
"css_ttt_shop_silentawp_current_ammo",
|
||||
"Current ammo loaded in the Silent AWP", 1, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(0, 10));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<SilentAWPConfig?> Load() {
|
||||
var cfg = new SilentAWPConfig {
|
||||
Price = CV_PRICE.Value,
|
||||
WeaponIndex = CV_WEAPON_INDEX.Value,
|
||||
WeaponId = CV_WEAPON_ID.Value,
|
||||
ReserveAmmo = CV_RESERVE_AMMO.Value,
|
||||
CurrentAmmo = CV_CURRENT_AMMO.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<SilentAWPConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
30
TTT/CS2/Configs/ShopItems/CS2StickersConfig.cs
Normal file
30
TTT/CS2/Configs/ShopItems/CS2StickersConfig.cs
Normal file
@@ -0,0 +1,30 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Cvars;
|
||||
using CounterStrikeSharp.API.Modules.Cvars.Validators;
|
||||
using ShopAPI.Configs.Detective;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2StickersConfig : IStorage<StickersConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_stickers_price", "Price of the Stickers item (Detective)", 45,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
|
||||
plugin.RegisterFakeConVars(this);
|
||||
}
|
||||
|
||||
public Task<StickersConfig?> Load() {
|
||||
var cfg = new StickersConfig { Price = CV_PRICE.Value };
|
||||
|
||||
return Task.FromResult<StickersConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Validators;
|
||||
|
||||
namespace TTT.CS2.Configs;
|
||||
namespace TTT.CS2.Configs.ShopItems;
|
||||
|
||||
public class CS2TaserConfig : IStorage<TaserConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = 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,22 @@ 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) {
|
||||
return new RecipientFilter(slot);
|
||||
}
|
||||
|
||||
private static RecipientFilter OTHERS(int slot) {
|
||||
return new RecipientFilter(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,35 @@
|
||||
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.Events.Game;
|
||||
using TTT.Game.lang;
|
||||
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 +77,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;
|
||||
});
|
||||
}
|
||||
}
|
||||
73
TTT/CS2/GameHandlers/BuyMenuHandler.cs
Normal file
73
TTT/CS2/GameHandlers/BuyMenuHandler.cs
Normal file
@@ -0,0 +1,73 @@
|
||||
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_awp", "AWP" },
|
||||
{ "weapon_hegrenade", "Cluster" },
|
||||
{ "weapon_decoy", "Teleport Decoy" }
|
||||
};
|
||||
|
||||
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));
|
||||
switch (ev.Weapon) {
|
||||
case "weapon_m4a1_silencer":
|
||||
inventory.RemoveWeaponInSlot(player, 0);
|
||||
break;
|
||||
case "weapon_revolver":
|
||||
inventory.RemoveWeaponInSlot(player, 1);
|
||||
break;
|
||||
}
|
||||
|
||||
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,30 @@ 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;
|
||||
|
||||
if (ev.Attacker != null) ev.FireEventToClient(ev.Attacker);
|
||||
info.DontBroadcast = true;
|
||||
spoofer.SpoofAlive(player);
|
||||
Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler(HookMode.Pre)]
|
||||
public HookResult OnPlayerDamage(EventPlayerHurt ev, GameEventInfo info) {
|
||||
var player = ev.Userid;
|
||||
if (player == null) return HookResult.Continue;
|
||||
|
||||
hideAndTrackStats(ev);
|
||||
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
@@ -62,14 +73,22 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
|
||||
}
|
||||
|
||||
var killerStats = ev.Attacker?.ActionTrackingServices?.MatchStats;
|
||||
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;
|
||||
killerStats.UtilityDamage = 0;
|
||||
if (ev.Attacker.ActionTrackingServices != null)
|
||||
ev.Attacker.ActionTrackingServices.NumRoundKills--;
|
||||
Utilities.SetStateChanged(ev.Attacker, "CSPerRoundStats_t", "m_iDamage");
|
||||
Utilities.SetStateChanged(ev.Attacker, "CSPerRoundStats_t",
|
||||
"m_iUtilityDamage");
|
||||
Utilities.SetStateChanged(ev.Attacker, "CCSPlayerController",
|
||||
"m_pActionTrackingServices");
|
||||
ev.FireEventToClient(ev.Attacker);
|
||||
}
|
||||
|
||||
var assisterStats = ev.Assister?.ActionTrackingServices?.MatchStats;
|
||||
@@ -81,6 +100,16 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
|
||||
"m_pActionTrackingServices");
|
||||
}
|
||||
|
||||
private void hideAndTrackStats(EventPlayerHurt ev) {
|
||||
var attackerStats = ev.Attacker?.ActionTrackingServices?.MatchStats;
|
||||
|
||||
if (attackerStats == null) return;
|
||||
if (ev.Attacker == null) return;
|
||||
attackerStats.Damage -= ev.DmgHealth;
|
||||
Utilities.SetStateChanged(ev.Attacker, "CCSPlayerController",
|
||||
"m_pActionTrackingServices");
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnPlayerHurt(EventPlayerHurt ev, GameEventInfo _) {
|
||||
|
||||
@@ -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() { }
|
||||
|
||||
@@ -26,17 +30,17 @@ public class DamageCanceler(IServiceProvider provider) : IPluginModule {
|
||||
}
|
||||
|
||||
private HookResult onTakeDamage(DynamicHook hook) {
|
||||
var playerPawn = hook.GetParam<CCSPlayerPawn>(0);
|
||||
var player = playerPawn.Controller.Value?.As<CCSPlayerController>();
|
||||
if (player == null || !player.IsValid) return HookResult.Continue;
|
||||
|
||||
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,4 +1,5 @@
|
||||
using TTT.API.Events;
|
||||
using JetBrains.Annotations;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.CS2.Utils;
|
||||
using TTT.Game.Events.Player;
|
||||
@@ -8,10 +9,11 @@ namespace TTT.CS2.GameHandlers.DamageCancelers;
|
||||
|
||||
public class OutOfRoundCanceler(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnHurt(PlayerDamagedEvent ev) {
|
||||
if (RoundUtil.IsWarmup()) return;
|
||||
if (Games.ActiveGame is not { State: State.IN_PROGRESS })
|
||||
if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
|
||||
ev.IsCanceled = true;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
using TTT.API.Events;
|
||||
using JetBrains.Annotations;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.CS2.Actions;
|
||||
using TTT.CS2.lang;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Listeners;
|
||||
@@ -8,6 +10,7 @@ namespace TTT.CS2.GameHandlers.DamageCancelers;
|
||||
|
||||
public class TaserListenCanceler(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnHurt(PlayerDamagedEvent ev) {
|
||||
if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
|
||||
@@ -23,5 +26,6 @@ public class TaserListenCanceler(IServiceProvider provider)
|
||||
|
||||
Messenger.Message(attacker,
|
||||
Locale[CS2Msgs.TASER_SCANNED(victim, Roles.GetRoles(victim).First())]);
|
||||
Games.ActiveGame.Logger.LogAction(new TaserAction(Roles, victim, attacker));
|
||||
}
|
||||
}
|
||||
@@ -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,24 @@
|
||||
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.CS2.Extensions;
|
||||
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 +29,17 @@ public class LateSpawnListener(IServiceProvider provider)
|
||||
player.Respawn();
|
||||
});
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void GameState(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState is State.FINISHED or State.WAITING) return;
|
||||
|
||||
Server.NextWorldUpdate(() => {
|
||||
foreach (var player in Utilities.GetPlayers()
|
||||
.Where(p => p.GetHealth() <= 0 && p.Team != CsTeam.Spectator
|
||||
&& p.Team != CsTeam.None))
|
||||
player.Respawn();
|
||||
});
|
||||
}
|
||||
}
|
||||
26
TTT/CS2/GameHandlers/MapChangeCausesEndListener.cs
Normal file
26
TTT/CS2/GameHandlers/MapChangeCausesEndListener.cs
Normal file
@@ -0,0 +1,26 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Game;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class MapChangeCausesEndListener(IServiceProvider provider)
|
||||
: IPluginModule {
|
||||
private readonly IGameManager games =
|
||||
provider.GetRequiredService<IGameManager>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
|
||||
onMapChange);
|
||||
}
|
||||
|
||||
private void onMapChange(string mapName) {
|
||||
games.ActiveGame?.EndGame(new EndReason("Map Change"));
|
||||
Server.PrintToConsole("Detected map change, ending active game.");
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
35
TTT/CS2/GameHandlers/NameDisplayer.cs
Normal file
35
TTT/CS2/GameHandlers/NameDisplayer.cs
Normal file
@@ -0,0 +1,35 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Timers;
|
||||
using TTT.API;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.RayTrace.Class;
|
||||
using TTT.CS2.RayTrace.Enum;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class NameDisplayer : IPluginModule {
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
if (OperatingSystem.IsWindows()) return;
|
||||
plugin?.AddTimer(0.25f, showNames, TimerFlags.REPEAT);
|
||||
}
|
||||
|
||||
private void showNames() {
|
||||
foreach (var player in Utilities.GetPlayers()) {
|
||||
if (player.GetHealth() <= 0) continue;
|
||||
|
||||
var target = player.GetGameTraceByEyePosition(TraceMask.MaskSolid,
|
||||
Contents.NoDraw, player);
|
||||
|
||||
if (target == null) continue;
|
||||
|
||||
if (!target.Value.HitPlayer(out var hit)) continue;
|
||||
if (hit == null) continue;
|
||||
|
||||
player.PrintToCenterAlert($"{hit.PlayerName}");
|
||||
}
|
||||
}
|
||||
}
|
||||
22
TTT/CS2/GameHandlers/NameUpdater.cs
Normal file
22
TTT/CS2/GameHandlers/NameUpdater.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Player;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Listeners;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class NameUpdater(IServiceProvider provider) : BaseListener(provider) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameInit(GameInitEvent ev) {
|
||||
foreach (var player in Utilities.GetPlayers())
|
||||
converter.GetPlayer(player).Name = player.PlayerName;
|
||||
}
|
||||
}
|
||||
71
TTT/CS2/GameHandlers/PlayerMuter.cs
Normal file
71
TTT/CS2/GameHandlers/PlayerMuter.cs
Normal file
@@ -0,0 +1,71 @@
|
||||
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.Game;
|
||||
using TTT.API.Messages;
|
||||
using TTT.API.Player;
|
||||
using TTT.CS2.lang;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class PlayerMuter(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>();
|
||||
|
||||
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 (game.ActiveGame is not { State: State.IN_PROGRESS }) 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;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameEvent(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.FINISHED) return;
|
||||
|
||||
foreach (var p in Utilities.GetPlayers()) p.VoiceFlags &= ~VoiceFlags.Muted;
|
||||
}
|
||||
}
|
||||
@@ -51,7 +51,9 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!pressed.HasFlag(PlayerButtons.Use)) return;
|
||||
if (!pressed.HasFlag(PlayerButtons.Use)
|
||||
&& !pressed.HasFlag(PlayerButtons.Inspect))
|
||||
return;
|
||||
|
||||
onStartUse(player);
|
||||
}
|
||||
@@ -90,9 +92,13 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
|
||||
if (!released.HasFlag(PlayerButtons.Use)) return;
|
||||
playersPressingE.Remove(player);
|
||||
if (!heldItem.Ragdoll.IsValid) return;
|
||||
heldItem.Ragdoll.AcceptInput("EnableMotion");
|
||||
if (heldItem.Beam != null && heldItem.Beam.IsValid)
|
||||
heldItem.Beam.AcceptInput("Kill");
|
||||
// Check if any other players are still holding this ragdoll
|
||||
foreach (var (_, info) in playersPressingE)
|
||||
if (info.Ragdoll == heldItem.Ragdoll)
|
||||
return;
|
||||
heldItem.Ragdoll.AcceptInput("EnableMotion");
|
||||
}
|
||||
|
||||
private void refreshHeld() {
|
||||
@@ -187,12 +193,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 +206,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;
|
||||
|
||||
@@ -6,7 +6,6 @@ using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.CS2.Extensions;
|
||||
@@ -69,6 +68,18 @@ 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 RevealToAll(IOnlinePlayer online) {
|
||||
var gamePlayer = players.GetPlayer(online);
|
||||
if (gamePlayer == null || !gamePlayer.IsValid) return;
|
||||
RevealToAll(gamePlayer.Slot);
|
||||
}
|
||||
|
||||
public void ClearAllVisibility() {
|
||||
Array.Clear(visibilities, 0, visibilities.Length);
|
||||
}
|
||||
@@ -92,8 +103,7 @@ public class RoleIconsHandler(IServiceProvider provider)
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(IgnoreCanceled = true)]
|
||||
public void OnRoundStart(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.FINISHED) return;
|
||||
public void OnRoundStart(GameInitEvent ev) {
|
||||
for (var i = 0; i < icons.Length; i++) removeIcon(i);
|
||||
ClearAllVisibility();
|
||||
traitorsThisRound.Clear();
|
||||
|
||||
@@ -12,16 +12,18 @@ namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class RoundStart_GameStartHandler(IServiceProvider provider)
|
||||
: IPluginModule {
|
||||
private readonly TTTConfig config =
|
||||
provider.GetService<IStorage<TTTConfig>>()?.Load().GetAwaiter().GetResult()
|
||||
?? new TTTConfig();
|
||||
|
||||
private readonly IPlayerFinder finder =
|
||||
provider.GetRequiredService<IPlayerFinder>();
|
||||
|
||||
private readonly IGameManager games =
|
||||
provider.GetRequiredService<IGameManager>();
|
||||
|
||||
private TTTConfig config
|
||||
=> provider.GetService<IStorage<TTTConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new TTTConfig();
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public void Start() { }
|
||||
@@ -39,4 +41,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;
|
||||
}
|
||||
}
|
||||
87
TTT/CS2/GameHandlers/TeamChangeHandler.cs
Normal file
87
TTT/CS2/GameHandlers/TeamChangeHandler.cs
Normal file
@@ -0,0 +1,87 @@
|
||||
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.CS2.API;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.Game.Events.Player;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IBodyTracker bodies =
|
||||
provider.GetRequiredService<IBodyTracker>();
|
||||
|
||||
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 (player == null) return HookResult.Continue;
|
||||
|
||||
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.GetHealth() <= 0) Server.NextWorldUpdate(player.Respawn);
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
if (requestedTeam is CsTeam.CounterTerrorist or CsTeam.Terrorist)
|
||||
if (player.Team is CsTeam.Spectator or CsTeam.None)
|
||||
return HookResult.Continue;
|
||||
|
||||
var apiPlayer = converter.GetPlayer(player);
|
||||
|
||||
// If the player is dead and already identified, let them move to spec
|
||||
if (bodies.Bodies.Keys.Any(b
|
||||
=> b.OfPlayer.Id == apiPlayer.Id && b.IsIdentified))
|
||||
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);
|
||||
|
||||
Server.NextWorldUpdate(() => {
|
||||
var playerDeath = new PlayerDeathEvent(apiPlayer);
|
||||
bus.Dispatch(playerDeath);
|
||||
});
|
||||
return HookResult.Continue;
|
||||
}
|
||||
}
|
||||
109
TTT/CS2/GameHandlers/TraitorChatHandler.cs
Normal file
109
TTT/CS2/GameHandlers/TraitorChatHandler.cs
Normal file
@@ -0,0 +1,109 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Commands;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
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.Extensions;
|
||||
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 IMuted? mutedPlayers = provider.GetService<IMuted>();
|
||||
|
||||
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 += OnChatShare;
|
||||
return;
|
||||
}
|
||||
|
||||
plugin?.AddCommandListener("say_team", onSay);
|
||||
plugin?.AddCommandListener("say", onSay);
|
||||
} catch (KeyNotFoundException) {
|
||||
plugin?.AddCommandListener("say_team", onSay);
|
||||
plugin?.AddCommandListener("say", onSay);
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
if (maulService != null)
|
||||
maulService.getChatShareService().OnChatShare -= OnChatShare;
|
||||
}
|
||||
|
||||
public void Start() { }
|
||||
|
||||
private void OnChatShare(CCSPlayerController? player, CommandInfo info,
|
||||
ref bool canceled) {
|
||||
if (player == null) return;
|
||||
if (mutedPlayers != null
|
||||
&& mutedPlayers.Contains(player.SteamID.ToString())) {
|
||||
canceled = true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!info.GetArg(0).Equals("say_team", StringComparison.OrdinalIgnoreCase))
|
||||
return;
|
||||
if (player.Team == CsTeam.CounterTerrorist) return;
|
||||
var result = onSay(player, info);
|
||||
canceled = true;
|
||||
if (result == HookResult.Handled) return;
|
||||
player?.ExecuteClientCommandFromServer("say " + info.ArgString);
|
||||
}
|
||||
|
||||
private HookResult onSay(CCSPlayerController? player,
|
||||
CommandInfo commandInfo) {
|
||||
if (mutedPlayers != null && player != null && player.GetHealth() > 0
|
||||
&& mutedPlayers.Contains(player?.SteamID.ToString() ?? ""))
|
||||
return HookResult.Handled;
|
||||
|
||||
if (commandInfo.GetArg(0).Equals("say", StringComparison.OrdinalIgnoreCase))
|
||||
return HookResult.Continue;
|
||||
|
||||
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)
|
||||
|| player.GetHealth() <= 0)
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -16,15 +16,15 @@ public static class ArmorItemServicesCollection {
|
||||
}
|
||||
|
||||
public class ArmorItem(IServiceProvider provider) : BaseItem(provider) {
|
||||
private readonly ArmorConfig config = provider
|
||||
.GetService<IStorage<ArmorConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new ArmorConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private ArmorConfig config
|
||||
=> Provider.GetService<IStorage<ArmorConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new ArmorConfig();
|
||||
|
||||
public override string Name => Locale[ArmorMsgs.SHOP_ITEM_ARMOR];
|
||||
public override string Description => Locale[ArmorMsgs.SHOP_ITEM_ARMOR_DESC];
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -18,11 +17,11 @@ public static class BodyPaintServicesCollection {
|
||||
|
||||
public class BodyPaintItem(IServiceProvider provider)
|
||||
: RoleRestrictedItem<TraitorRole>(provider) {
|
||||
private readonly BodyPaintConfig config = provider
|
||||
.GetService<IStorage<BodyPaintConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new BodyPaintConfig();
|
||||
private BodyPaintConfig config
|
||||
=> Provider.GetService<IStorage<BodyPaintConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new BodyPaintConfig();
|
||||
|
||||
public override string Name => Locale[BodyPaintMsgs.SHOP_ITEM_BODY_PAINT];
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -18,16 +17,16 @@ public class BodyPaintListener(IServiceProvider provider)
|
||||
private readonly IBodyTracker bodies =
|
||||
provider.GetRequiredService<IBodyTracker>();
|
||||
|
||||
private readonly BodyPaintConfig config =
|
||||
provider.GetService<IStorage<BodyPaintConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new BodyPaintConfig();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private readonly Dictionary<IPlayer, int> uses = new();
|
||||
|
||||
private BodyPaintConfig config
|
||||
=> Provider.GetService<IStorage<BodyPaintConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new BodyPaintConfig();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.HIGH)]
|
||||
public void BodyIdentify(BodyIdentifyEvent ev) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -18,13 +18,15 @@ public static class CamoServiceCollection {
|
||||
}
|
||||
|
||||
public class CamouflageItem(IServiceProvider provider) : BaseItem(provider) {
|
||||
private readonly CamoConfig config =
|
||||
provider.GetService<IStorage<CamoConfig>>()?.Load().GetAwaiter().GetResult()
|
||||
?? new CamoConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private CamoConfig config
|
||||
=> Provider.GetService<IStorage<CamoConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new CamoConfig();
|
||||
|
||||
public override string Name => Locale[CamoMsgs.SHOP_ITEM_CAMO];
|
||||
public override string Description => Locale[CamoMsgs.SHOP_ITEM_CAMO_DESC];
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
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 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);
|
||||
}
|
||||
}
|
||||
62
TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs
Normal file
62
TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs
Normal file
@@ -0,0 +1,62 @@
|
||||
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.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Utils;
|
||||
|
||||
namespace TTT.CS2.Items.ClusterGrenade;
|
||||
|
||||
public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private ClusterGrenadeConfig config
|
||||
=> provider.GetService<IStorage<ClusterGrenadeConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new ClusterGrenadeConfig();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
[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;
|
||||
}
|
||||
}
|
||||
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));
|
||||
}
|
||||
150
TTT/CS2/Items/Compass/AbstractCompassItem.cs
Normal file
150
TTT/CS2/Items/Compass/AbstractCompassItem.cs
Normal file
@@ -0,0 +1,150 @@
|
||||
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.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;
|
||||
|
||||
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 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>>();
|
||||
}
|
||||
|
||||
protected CompassConfig _Config { get; }
|
||||
|
||||
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>
|
||||
abstract protected IList<Vector> GetTargets(IOnlinePlayer requester);
|
||||
|
||||
/// <summary>
|
||||
/// Whether this player currently owns/has this compass effect.
|
||||
/// </summary>
|
||||
abstract protected 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;
|
||||
if (!player.IsAlive) 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>
|
||||
override protected 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>
|
||||
override protected 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);
|
||||
}
|
||||
}
|
||||
@@ -28,15 +28,15 @@ public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
|
||||
private readonly IBodyTracker bodies =
|
||||
provider.GetRequiredService<IBodyTracker>();
|
||||
|
||||
private readonly DnaScannerConfig config = provider
|
||||
.GetService<IStorage<DnaScannerConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new DnaScannerConfig();
|
||||
|
||||
private readonly Dictionary<string, DateTime> lastMessages = new();
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private DnaScannerConfig config
|
||||
=> Provider.GetService<IStorage<DnaScannerConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new DnaScannerConfig();
|
||||
|
||||
// Low priority to allow body identification to happen first
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.LOW)]
|
||||
|
||||
@@ -18,11 +18,11 @@ public static class DnaScannerServiceCollection {
|
||||
|
||||
public class DnaScanner(IServiceProvider provider)
|
||||
: RoleRestrictedItem<DetectiveRole>(provider) {
|
||||
private readonly DnaScannerConfig config = provider
|
||||
.GetService<IStorage<DnaScannerConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new DnaScannerConfig();
|
||||
private DnaScannerConfig config
|
||||
=> Provider.GetService<IStorage<DnaScannerConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new DnaScannerConfig();
|
||||
|
||||
public override string Name => Locale[DnaMsgs.SHOP_ITEM_DNA];
|
||||
public override string Description => Locale[DnaMsgs.SHOP_ITEM_DNA_DESC];
|
||||
@@ -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 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);
|
||||
}
|
||||
}
|
||||
42
TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs
Normal file
42
TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs
Normal file
@@ -0,0 +1,42 @@
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
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 IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private OneHitKnifeConfig config
|
||||
=> Provider.GetService<IStorage<OneHitKnifeConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new OneHitKnifeConfig();
|
||||
|
||||
[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));
|
||||
}
|
||||
@@ -10,7 +10,7 @@ using TTT.Game.Roles;
|
||||
namespace TTT.CS2.Items.PoisonShots;
|
||||
|
||||
public static class PoisonShotServiceCollection {
|
||||
public static void AddPoisonShots(this IServiceCollection services) {
|
||||
public static void AddPoisonShotsServices(this IServiceCollection services) {
|
||||
services.AddModBehavior<PoisonShotsItem>();
|
||||
services.AddModBehavior<PoisonShotsListener>();
|
||||
}
|
||||
@@ -18,11 +18,11 @@ public static class PoisonShotServiceCollection {
|
||||
|
||||
public class PoisonShotsItem(IServiceProvider provider)
|
||||
: RoleRestrictedItem<TraitorRole>(provider) {
|
||||
private readonly PoisonShotsConfig config = provider
|
||||
.GetService<IStorage<PoisonShotsConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new PoisonShotsConfig();
|
||||
private PoisonShotsConfig config
|
||||
=> Provider.GetService<IStorage<PoisonShotsConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new PoisonShotsConfig();
|
||||
|
||||
public override string Name => Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS];
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user