mirror of
https://github.com/MSWS/TTT.git
synced 2025-12-05 22:20:25 -08:00
Compare commits
165 Commits
0.21.0-dev
...
496fd75ca9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
496fd75ca9 | ||
|
|
1765a87039 | ||
|
|
a66a4cb03c | ||
|
|
0d816facba | ||
|
|
43f550779a | ||
|
|
6e4d957636 | ||
|
|
f44c42ddb1 | ||
|
|
e47e85651c | ||
|
|
ba91bfb1cf | ||
|
|
6da8a729ab | ||
|
|
d9f49473eb | ||
|
|
c2ada273a8 | ||
|
|
deb2e1cab2 | ||
|
|
dfe86b0242 | ||
|
|
eff68897a0 | ||
|
|
63afe31e3b | ||
|
|
a7fa2afe15 | ||
|
|
7749deabd3 | ||
|
|
f8b67c5194 | ||
|
|
77281aa8c6 | ||
|
|
20497bbb4d | ||
|
|
133083003d | ||
|
|
ad3603c833 | ||
|
|
6d7149a3f5 | ||
|
|
24cd1295b6 | ||
|
|
125daa515e | ||
|
|
722c29bde7 | ||
|
|
3c0fd74c2a | ||
|
|
60de8b54db | ||
|
|
e7dfbca35d | ||
|
|
3a463b29c6 | ||
|
|
e11a8e20e5 | ||
|
|
b0a7ec60e0 | ||
|
|
0aa28b1076 | ||
|
|
b53920282b | ||
|
|
5167291ab4 | ||
|
|
d76f93c0c7 | ||
|
|
39da6e8702 | ||
|
|
d628df6116 | ||
|
|
da232907f7 | ||
|
|
703144f04b | ||
|
|
3e947959ac | ||
|
|
aed5b4ace4 | ||
|
|
0abbb0c07a | ||
|
|
8131a85bb6 | ||
|
|
8d068b675b | ||
|
|
84d81fc3db | ||
|
|
0531d3afb5 | ||
|
|
eb48bc68f3 | ||
|
|
40b153d938 | ||
|
|
e35551b830 | ||
|
|
bb132b987b | ||
|
|
f92088882e | ||
|
|
3cdf2510bf | ||
|
|
61b8d4eba9 | ||
|
|
1ff4eabd45 | ||
|
|
a0cf6b38f2 | ||
|
|
9145e16b90 | ||
|
|
b3000ecc4e | ||
|
|
f2fde12737 | ||
|
|
e7ed74de0c | ||
|
|
33535abdd7 | ||
|
|
0d8643dfe3 | ||
|
|
50d078f78e | ||
|
|
edbff4e17f | ||
|
|
b4452d7ff3 | ||
|
|
fd32744bf6 | ||
|
|
657306c1c7 | ||
|
|
2c800b471b | ||
|
|
2787823f86 | ||
|
|
29693f99c5 | ||
|
|
a5f419aad9 | ||
|
|
430a8c4a7f | ||
|
|
a7a44b50f9 | ||
|
|
3b4bf490bc | ||
|
|
abe75d0347 | ||
|
|
eb79552ba3 | ||
|
|
e2011b8d24 | ||
|
|
ec41a6f367 | ||
|
|
9b1bed6982 | ||
|
|
8584877739 | ||
|
|
410dd407b3 | ||
|
|
a0bba2c4ba | ||
|
|
8aa508bf6d | ||
|
|
642155b1bc | ||
|
|
bacd288fe7 | ||
|
|
29e28038b8 | ||
|
|
7ce5293ad3 | ||
|
|
b253d8ee12 | ||
|
|
02575b51e2 | ||
|
|
d8d365b497 | ||
|
|
1ac38dc0ad | ||
|
|
62e57ffa97 | ||
|
|
81e6b2e695 | ||
|
|
ae99fab18e | ||
|
|
2ce0457346 | ||
|
|
ed90c54e53 | ||
|
|
06d2d71f76 | ||
|
|
c6ba041a6b | ||
|
|
f283d7407e | ||
|
|
51ff4df545 | ||
|
|
e0ee4bf325 | ||
|
|
4a4c7e0782 | ||
|
|
d4f67ced0c | ||
|
|
33ca0c8385 | ||
|
|
ff2e97a3ce | ||
|
|
a56cdc1285 | ||
|
|
ceda5cba64 | ||
|
|
7c203bcd91 | ||
|
|
99ed6bd69b | ||
|
|
f91fc54897 | ||
|
|
79ab6f9705 | ||
|
|
80a9cb2af1 | ||
|
|
7ca4a6bef4 | ||
|
|
d589a222c8 | ||
|
|
a3fdb590fd | ||
|
|
c4a73f9a24 | ||
|
|
987df197bc | ||
|
|
acb3be9132 | ||
|
|
8fa2377e1e | ||
|
|
bbcc998559 | ||
|
|
56781c6ae8 | ||
|
|
dbe664d18f | ||
|
|
0ca983943d | ||
|
|
5717ab612a | ||
|
|
8cd8e14e18 | ||
|
|
f6b79ef038 | ||
|
|
57ef5e3e24 | ||
|
|
9c99d316aa | ||
|
|
e679c5193b | ||
|
|
6ece0450bb | ||
|
|
daa24a0e87 | ||
|
|
1c8785b388 | ||
|
|
cc52d19108 | ||
|
|
a80c36e3c5 | ||
|
|
ba6b6c448f | ||
|
|
a1d595ce8a | ||
|
|
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 | ||
|
|
23f502a381 |
4
.github/workflows/dotnet.yml
vendored
4
.github/workflows/dotnet.yml
vendored
@@ -13,7 +13,7 @@ jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
fetch-tags: true
|
||||
@@ -51,7 +51,7 @@ jobs:
|
||||
contents: read
|
||||
pull-requests: write
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v5
|
||||
|
||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
MAX_CHANGELOG_CHARS: "50000"
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
fetch-tags: true
|
||||
|
||||
36
LICENSES.MD
36
LICENSES.MD
@@ -1,20 +1,16 @@
|
||||
| Package | Version | License Information Origin | License Expression | License Url | Copyright | Authors | Package Project Url |
|
||||
| ----------------------------------------------------- | -------- | -------------------------- | ------------------ | --------------------------------------- | ----------------------------------------------- | ------------------------------------ | ------------------------------------------------------------------------------------------------ |
|
||||
| CounterStrikeSharp.API | 1.0.332 | Expression | GPL-3.0-only | https://licenses.nuget.org/GPL-3.0-only | | Roflmuffin | http://docs.cssharp.dev/ |
|
||||
| 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 |
|
||||
| xunit.runner.visualstudio | 3.1.3 | Expression | Apache-2.0 | https://licenses.nuget.org/Apache-2.0 | Copyright (C) .NET Foundation | jnewkirk,bradwilson | |
|
||||
| xunit.v3 | 3.0.0 | Expression | Apache-2.0 | https://licenses.nuget.org/Apache-2.0 | Copyright (C) .NET Foundation | jnewkirk,bradwilson | |
|
||||
| YamlDotNet | 16.3.0 | Expression | MIT | https://licenses.nuget.org/MIT | Copyright (c) Antoine Aubry and contributors | Antoine Aubry | https://github.com/aaubry/YamlDotNet/wiki |
|
||||
| Package | Version | License Information Origin | License Expression | License Url | Copyright | Authors | Package Project Url |
|
||||
| ----------------------------------------------------- | -------- | -------------------------- | ------------------ | --------------------------------------- | ----------------------------------------------- | -------------------------------- | ------------------------------------------------------------------------------------------------ |
|
||||
| CounterStrikeSharp.API | 1.0.342 | Expression | GPL-3.0-only | https://licenses.nuget.org/GPL-3.0-only | | Roflmuffin | http://docs.cssharp.dev/ |
|
||||
| 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 |
|
||||
| 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 |
|
||||
| xunit.runner.visualstudio | 3.1.3 | Expression | Apache-2.0 | https://licenses.nuget.org/Apache-2.0 | Copyright (C) .NET Foundation | jnewkirk,bradwilson | |
|
||||
| xunit.v3 | 3.0.0 | Expression | Apache-2.0 | https://licenses.nuget.org/Apache-2.0 | Copyright (C) .NET Foundation | jnewkirk,bradwilson | |
|
||||
| YamlDotNet | 16.3.0 | Expression | MIT | https://licenses.nuget.org/MIT | Copyright (c) Antoine Aubry and contributors | Antoine Aubry | https://github.com/aaubry/YamlDotNet/wiki |
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.332"/>
|
||||
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.346"/>
|
||||
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.3"/>
|
||||
<PackageReference Include="System.Text.Json" Version="8.0.5"/>
|
||||
<PackageReference Include="YamlDotNet" Version="16.3.0"/>
|
||||
|
||||
@@ -16,7 +16,9 @@ survive while eliminating the traitors among them.
|
||||
- [X] Innocents
|
||||
- [X] Shop
|
||||
- [X] Karma
|
||||
- [ ] Statistics
|
||||
- [X] Statistics
|
||||
- [X] Map Integrations
|
||||
- [X] Special Rounds
|
||||
|
||||
## Versioning
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
namespace SpecialRoundAPI;
|
||||
|
||||
public record BhopRoundConfig : SpecialRoundConfig {
|
||||
public override float Weight { get; init; } = 0.2f;
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
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);
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
namespace SpecialRoundAPI;
|
||||
|
||||
public record VanillaRoundConfig : SpecialRoundConfig {
|
||||
public override float Weight { get; init; } = 0.3f;
|
||||
}
|
||||
2
TTT.sln
2
TTT.sln
@@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats", "TTT\Stats\Stats.cs
|
||||
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}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRoundAPI", "TTT\SpecialRoundAPI\SpecialRoundAPI.csproj", "{360FEF16-54DA-42EE-995A-3D31C699287D}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
||||
@@ -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,6 +18,6 @@ public interface IActionLogger {
|
||||
|
||||
void PrintLogs();
|
||||
void PrintLogs(IOnlinePlayer? player);
|
||||
|
||||
|
||||
string[] MakeLogs();
|
||||
}
|
||||
@@ -1,3 +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;
|
||||
|
||||
@@ -21,4 +21,55 @@ public interface IPlayerFinder {
|
||||
var matches = GetOnline().Where(p => p.Name.Contains(name)).ToList();
|
||||
return matches.Count == 1 ? matches[0] : null;
|
||||
}
|
||||
|
||||
List<IOnlinePlayer> GetMulti(string query, out string name,
|
||||
IOnlinePlayer? executor = null) {
|
||||
var result = query switch {
|
||||
"@all" => GetOnline().ToList(),
|
||||
"@me" => executor != null ? new List<IOnlinePlayer> { executor } : [],
|
||||
"@!me" => executor != null ?
|
||||
GetOnline().Where(p => p.Id != executor.Id).ToList() :
|
||||
GetOnline().ToList(),
|
||||
_ => GetSingle(query) != null ?
|
||||
new List<IOnlinePlayer> { GetSingle(query)! } : []
|
||||
};
|
||||
|
||||
name = "no players found";
|
||||
name = query switch {
|
||||
"@all" => "all players",
|
||||
"@me" => executor != null ? executor.Name : "no one",
|
||||
"@!me" => executor != null ?
|
||||
$"all players except {executor.Name}" :
|
||||
"all players",
|
||||
_ => GetSingle(query) != null ?
|
||||
GetSingle(query)!.Name :
|
||||
"no players found"
|
||||
};
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
IOnlinePlayer? GetSingle(string query) {
|
||||
if (query.StartsWith("#")) {
|
||||
var id = query[1..];
|
||||
var byId = GetPlayerById(id);
|
||||
if (byId != null) return byId;
|
||||
var byName = GetOnline().FirstOrDefault(p => p.Name == id);
|
||||
return byName;
|
||||
}
|
||||
|
||||
var byNameExact = GetOnline().FirstOrDefault(p => p.Name == query);
|
||||
if (byNameExact != null) return byNameExact;
|
||||
|
||||
var contains = GetOnline().Where(p => p.Name.Contains(query)).ToList();
|
||||
|
||||
if (contains.Count == 1) return contains[0];
|
||||
|
||||
contains = GetOnline()
|
||||
.Where(p
|
||||
=> p.Name.Contains(query, StringComparison.InvariantCultureIgnoreCase))
|
||||
.ToList();
|
||||
|
||||
return contains.Count == 1 ? contains[0] : null;
|
||||
}
|
||||
}
|
||||
5
TTT/CS2/API/Items/ITripwireActivator.cs
Normal file
5
TTT/CS2/API/Items/ITripwireActivator.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
namespace TTT.CS2.API.Items;
|
||||
|
||||
public interface ITripwireActivator {
|
||||
public void ActivateTripwire(TripwireInstance tripwire);
|
||||
}
|
||||
6
TTT/CS2/API/Items/ITripwireTracker.cs
Normal file
6
TTT/CS2/API/Items/ITripwireTracker.cs
Normal file
@@ -0,0 +1,6 @@
|
||||
namespace TTT.CS2.API.Items;
|
||||
|
||||
public interface ITripwireTracker {
|
||||
public List<TripwireInstance> ActiveTripwires { get; }
|
||||
void RemoveTripwire(TripwireInstance instance);
|
||||
}
|
||||
13
TTT/CS2/API/Items/TripwireInstance.cs
Normal file
13
TTT/CS2/API/Items/TripwireInstance.cs
Normal file
@@ -0,0 +1,13 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using TTT.API.Player;
|
||||
|
||||
namespace TTT.CS2.API.Items;
|
||||
|
||||
public record TripwireInstance(IOnlinePlayer owner, CEnvBeam Beam,
|
||||
CDynamicProp TripwireProp, Vector StartPos, Vector EndPos) {
|
||||
public override string ToString() {
|
||||
return
|
||||
$"TripwireInstance(Owner={owner}, StartPos={StartPos}, EndPos={EndPos})";
|
||||
}
|
||||
}
|
||||
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,11 +9,11 @@
|
||||
</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"/>
|
||||
<ProjectReference Include="..\SpecialRoundAPI\SpecialRoundAPI.csproj"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -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;
|
||||
@@ -50,25 +52,40 @@ public static class CS2ServiceCollection {
|
||||
.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>();
|
||||
collection.AddModBehavior<IStorage<TripwireConfig>, CS2TripwireConfig>();
|
||||
|
||||
// TTT - CS2 Specific optionals
|
||||
collection.AddScoped<ITextSpawner, TextSpawner>();
|
||||
|
||||
// GameHandlers
|
||||
collection.AddModBehavior<BodySpawner>();
|
||||
collection.AddModBehavior<BombPlantSuppressor>();
|
||||
collection.AddModBehavior<BuyMenuHandler>();
|
||||
collection.AddModBehavior<CombatHandler>();
|
||||
collection.AddModBehavior<DamageCanceler>();
|
||||
collection.AddModBehavior<MapChangeCausesEndListener>();
|
||||
collection.AddModBehavior<MapZoneRemover>();
|
||||
collection.AddModBehavior<NameUpdater>();
|
||||
collection.AddModBehavior<PlayerConnectionsHandler>();
|
||||
collection.AddModBehavior<PlayerMuter>();
|
||||
collection.AddModBehavior<PropMover>();
|
||||
collection.AddModBehavior<RoundStart_GameStartHandler>();
|
||||
collection.AddModBehavior<BombPlantSuppressor>();
|
||||
collection.AddModBehavior<MapZoneRemover>();
|
||||
collection.AddModBehavior<BuyMenuHandler>();
|
||||
collection.AddModBehavior<TeamChangeHandler>();
|
||||
collection.AddModBehavior<TraitorChatHandler>();
|
||||
collection.AddModBehavior<PlayerMuter>();
|
||||
collection.AddModBehavior<MapChangeCausesEndListener>();
|
||||
collection.AddModBehavior<EntityTargetHandlers>();
|
||||
|
||||
// Damage Cancelers
|
||||
collection.AddModBehavior<OutOfRoundCanceler>();
|
||||
@@ -78,12 +95,14 @@ public static class CS2ServiceCollection {
|
||||
collection.AddModBehavior<AfkTimerListener>();
|
||||
collection.AddModBehavior<BodyPickupListener>();
|
||||
collection.AddModBehavior<IBodyTracker, BodyTracker>();
|
||||
collection.AddModBehavior<KarmaBanner>();
|
||||
collection.AddModBehavior<KarmaSyncer>();
|
||||
collection.AddModBehavior<LateSpawnListener>();
|
||||
collection.AddModBehavior<MapHookListener>();
|
||||
collection.AddModBehavior<PlayerStatsTracker>();
|
||||
collection.AddModBehavior<RoundTimerListener>();
|
||||
collection.AddModBehavior<ScreenColorApplier>();
|
||||
collection.AddModBehavior<KarmaBanner>();
|
||||
collection.AddModBehavior<KarmaSyncer>();
|
||||
collection.AddModBehavior<WardenTagAssigner>();
|
||||
|
||||
// Commands
|
||||
collection.AddModBehavior<TestCommand>();
|
||||
|
||||
@@ -6,7 +6,6 @@ using TTT.API;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Messages;
|
||||
using TTT.API.Player;
|
||||
using TTT.Game;
|
||||
using TTT.Game.Commands;
|
||||
using TTT.Game.lang;
|
||||
|
||||
|
||||
@@ -41,15 +41,15 @@ public class PlayerPingShopAlias(IServiceProvider provider) : IPluginModule {
|
||||
|
||||
private void onButton(CCSPlayerController? player, int index) {
|
||||
if (player == null) return;
|
||||
if (converter.GetPlayer(player) is not IOnlinePlayer gamePlayer) return;
|
||||
if (converter.GetPlayer(player) is not IOnlinePlayer apiPlayer) return;
|
||||
|
||||
var lastUpdated = itemSorter.GetLastUpdate(gamePlayer);
|
||||
var lastUpdated = itemSorter.GetLastUpdate(apiPlayer);
|
||||
if (lastUpdated == null
|
||||
|| DateTime.Now - lastUpdated > TimeSpan.FromSeconds(20))
|
||||
return;
|
||||
var cmdInfo = new CS2CommandInfo(provider, gamePlayer, 0, "css_shop", "buy",
|
||||
(index - 1).ToString());
|
||||
cmdInfo.CallingContext = CommandCallingContext.Chat;
|
||||
var cmdInfo = new CS2CommandInfo(provider, apiPlayer, 0, "css_shop", "buy",
|
||||
(index - 1).ToString()) { CallingContext = CommandCallingContext.Chat };
|
||||
provider.GetRequiredService<ICommandManager>().ProcessCommand(cmdInfo);
|
||||
itemSorter.InvalidateOrder(apiPlayer);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,7 @@
|
||||
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;
|
||||
@@ -33,25 +31,15 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {
|
||||
return Task.FromResult(CommandResult.ERROR);
|
||||
}
|
||||
|
||||
var target = executor;
|
||||
List<IOnlinePlayer> targets = [executor];
|
||||
|
||||
Server.NextWorldUpdateAsync(() => {
|
||||
if (info.ArgCount == 3) {
|
||||
var result = finder.GetPlayerByName(info.Args[2]);
|
||||
if (result == null) {
|
||||
info.ReplySync($"Player '{info.Args[2]}' not found.");
|
||||
return;
|
||||
}
|
||||
var name = executor.Name;
|
||||
if (info.ArgCount == 3)
|
||||
targets = finder.GetMulti(info.Args[2], out name, executor);
|
||||
foreach (var player in targets) shop.GiveItem(player, item);
|
||||
|
||||
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}.");
|
||||
info.ReplySync($"Gave item '{item.Name}' to {name}.");
|
||||
});
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
@@ -9,17 +9,12 @@ namespace TTT.CS2.Command.Test;
|
||||
|
||||
public class ReloadModuleCommand(IServiceProvider provider)
|
||||
: ICommand, IPluginModule {
|
||||
private BasePlugin? plugin;
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
private BasePlugin? plugin;
|
||||
|
||||
public string Id => "reload";
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
if (plugin == null) return;
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public string[] Usage => ["<module>"];
|
||||
|
||||
public Task<CommandResult>
|
||||
@@ -59,4 +54,9 @@ public class ReloadModuleCommand(IServiceProvider provider)
|
||||
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
if (plugin == null) return;
|
||||
this.plugin = plugin;
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,9 @@ public class SetRoleCommand(IServiceProvider provider) : ICommand {
|
||||
|
||||
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
|
||||
|
||||
private readonly IPlayerFinder finder =
|
||||
provider.GetRequiredService<IPlayerFinder>();
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
public string Id => "setrole";
|
||||
@@ -24,7 +27,10 @@ public class SetRoleCommand(IServiceProvider provider) : ICommand {
|
||||
Execute(IOnlinePlayer? executor, ICommandInfo info) {
|
||||
if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
|
||||
|
||||
IRole roleToAssign = new TraitorRole(provider);
|
||||
// IOnlinePlayer targetPlayer = executor;
|
||||
List<IOnlinePlayer> targets = [executor];
|
||||
var targetName = executor.Name;
|
||||
IRole roleToAssign = new TraitorRole(provider);
|
||||
if (info.ArgCount == 2)
|
||||
switch (info.Args[1].ToLowerInvariant()) {
|
||||
case "d" or "det" or "detective" or "ct":
|
||||
@@ -33,18 +39,29 @@ public class SetRoleCommand(IServiceProvider provider) : ICommand {
|
||||
case "i" or "inn" or "innocent":
|
||||
roleToAssign = new InnocentRole(provider);
|
||||
break;
|
||||
default:
|
||||
targets = finder.GetMulti(info.Args[1], out targetName, executor);
|
||||
break;
|
||||
}
|
||||
|
||||
if (info.ArgCount == 3)
|
||||
targets = finder.GetMulti(info.Args[2], out targetName, executor);
|
||||
|
||||
Server.NextWorldUpdate(() => {
|
||||
var ev = new PlayerRoleAssignEvent(executor, roleToAssign);
|
||||
bus.Dispatch(ev);
|
||||
if (ev.IsCanceled) {
|
||||
info.ReplySync("Role assignment was canceled.");
|
||||
return;
|
||||
foreach (var player in targets) {
|
||||
var ev = new PlayerRoleAssignEvent(player, roleToAssign);
|
||||
bus.Dispatch(ev);
|
||||
if (ev.IsCanceled) {
|
||||
info.ReplySync("Role assignment was canceled.");
|
||||
return;
|
||||
}
|
||||
|
||||
assigner.Write(player, [ev.Role]);
|
||||
ev.Role.OnAssign(player);
|
||||
}
|
||||
|
||||
assigner.Write(executor, [ev.Role]);
|
||||
ev.Role.OnAssign(executor);
|
||||
info.ReplySync(
|
||||
"Assigned " + roleToAssign.Name + " to " + targetName + ".");
|
||||
});
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Memory;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API.Command;
|
||||
using TTT.API.Player;
|
||||
@@ -23,19 +22,7 @@ public class SetTargetCommand(IServiceProvider provider) : ICommand {
|
||||
Server.NextWorldUpdate(() => {
|
||||
var gamePlayer = converter.GetPlayer(executor);
|
||||
if (gamePlayer == null) return;
|
||||
|
||||
gamePlayer.AcceptInput("AddContext", null, null, "TRAITOR:1");
|
||||
|
||||
info.ReplySync("Target: " + gamePlayer.Target);
|
||||
gamePlayer.Target = "TRAITOR";
|
||||
info.ReplySync("New Target: " + gamePlayer.Target);
|
||||
if (gamePlayer.Pawn.Value != null)
|
||||
gamePlayer.Pawn.Value.Globalname = "TRAITOR";
|
||||
info.ReplySync("New Globalname: " + gamePlayer.Pawn.Value?.Globalname);
|
||||
gamePlayer.AcceptInput("name", null, null, "TRAITOR");
|
||||
gamePlayer.AcceptInput("targetname", null, null, "TRAITOR");
|
||||
gamePlayer.AddEntityIOEvent("targetname", null, null, "TRAITOR");
|
||||
gamePlayer.Globalname = "TRAITOR";
|
||||
gamePlayer.Pawn.Value?.AcceptInput("AddContext", null, null, "TRAITOR:1");
|
||||
});
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ 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;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using CounterStrikeSharp.API;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using SpecialRoundAPI;
|
||||
using TTT.API;
|
||||
using TTT.API.Command;
|
||||
@@ -7,8 +8,8 @@ using TTT.API.Player;
|
||||
namespace TTT.CS2.Command.Test;
|
||||
|
||||
public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
|
||||
private readonly ISpecialRoundStarter tracker =
|
||||
provider.GetRequiredService<ISpecialRoundStarter>();
|
||||
private readonly ISpecialRoundStarter? tracker =
|
||||
provider.GetService<ISpecialRoundStarter>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
@@ -17,25 +18,32 @@ public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
|
||||
|
||||
public Task<CommandResult>
|
||||
Execute(IOnlinePlayer? executor, ICommandInfo info) {
|
||||
if (tracker == null) {
|
||||
info.ReplySync("Special round tracker is not available.");
|
||||
return Task.FromResult(CommandResult.ERROR);
|
||||
}
|
||||
|
||||
if (info.ArgCount == 1) {
|
||||
tracker.TryStartSpecialRound(null);
|
||||
Server.NextWorldUpdate(() => tracker.TryStartSpecialRound());
|
||||
info.ReplySync("Started a random special round.");
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
|
||||
var rounds = provider.GetServices<ITerrorModule>()
|
||||
.OfType<AbstractSpecialRound>()
|
||||
.ToDictionary(r => r.GetType().Name.ToLower(), r => r);
|
||||
.ToDictionary(r => r.Name.ToLower().Replace(" ", ""), r => r);
|
||||
|
||||
var roundName = info.Args[1].ToLower();
|
||||
var roundName = string.Join("", info.Args.Skip(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);
|
||||
}
|
||||
|
||||
tracker.TryStartSpecialRound(round);
|
||||
info.ReplySync($"Started special round '{roundName}'.");
|
||||
Server.NextWorldUpdate(() => {
|
||||
tracker.TryStartSpecialRound([round]);
|
||||
info.ReplySync($"Started special round '{roundName}'.");
|
||||
});
|
||||
return Task.FromResult(CommandResult.SUCCESS);
|
||||
}
|
||||
}
|
||||
@@ -48,36 +48,34 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
|
||||
|
||||
public static readonly FakeConVar<int> CV_TRAITOR_ARMOR = new(
|
||||
"css_ttt_rolearmor_traitor",
|
||||
"Amount of armor to give to traitors at start of round", 100,
|
||||
"Amount of armor to give to traitors at start of round", 0,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_DETECTIVE_ARMOR = new(
|
||||
"css_ttt_rolearmor_detective",
|
||||
"Amount of armor to give to detectives at start of round", 100,
|
||||
"Amount of armor to give to detectives at start of round", 0,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_INNOCENT_ARMOR = new(
|
||||
"css_ttt_rolearmor_innocent",
|
||||
"Amount of armor to give to innocents at start of round", 100,
|
||||
"Amount of armor to give to innocents at start of round", 0,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
|
||||
|
||||
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", 1,
|
||||
|
||||
@@ -44,7 +44,7 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
|
||||
// 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,
|
||||
"Karma gained when Innocent kills a Traitor", 2, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(-50, 50));
|
||||
|
||||
public static readonly FakeConVar<int> CV_TRAITOR_ON_DETECTIVE = new(
|
||||
@@ -55,32 +55,32 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
|
||||
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));
|
||||
-2, 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,
|
||||
"Karma lost when Innocent kills another Innocent", -8,
|
||||
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));
|
||||
"Karma lost when Traitor kills another Traitor", -12,
|
||||
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,
|
||||
"Karma lost when Innocent kills a Detective", -15, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<int>(-50, 50));
|
||||
|
||||
public static readonly FakeConVar<int> CV_KARMA_PER_ROUND = new(
|
||||
"css_ttt_karma_per_round",
|
||||
"Amount of karma a player will gain at the end of each round", 2,
|
||||
"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",
|
||||
4, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
|
||||
1, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -10,13 +10,13 @@ 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,
|
||||
"css_ttt_shop_camo_price", "Price of the Camo item", 65,
|
||||
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.4f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
|
||||
0.5f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
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", 110,
|
||||
"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(
|
||||
|
||||
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,11 +7,11 @@ 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(
|
||||
"css_ttt_shop_taser_price", "Price of the Taser item", 120,
|
||||
"css_ttt_shop_taser_price", "Price of the Taser item", 110,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<string> CV_WEAPON = new(
|
||||
116
TTT/CS2/Configs/ShopItems/CS2TripwireConfig.cs
Normal file
116
TTT/CS2/Configs/ShopItems/CS2TripwireConfig.cs
Normal file
@@ -0,0 +1,116 @@
|
||||
using System.Drawing;
|
||||
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 CS2TripwireConfig : IStorage<TripwireConfig>, IPluginModule {
|
||||
public static readonly FakeConVar<int> CV_PRICE = new(
|
||||
"css_ttt_shop_tripwire_price", "Price of the Tripwire item (Traitor)", 45,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
|
||||
|
||||
public static readonly FakeConVar<int> CV_EXPLOSION_POWER = new(
|
||||
"css_ttt_shop_tripwire_explosion_power",
|
||||
"Explosion power of the Tripwire in damage units", 1000,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 10000));
|
||||
|
||||
public static readonly FakeConVar<float> CV_FALLOFF_DELAY = new(
|
||||
"css_ttt_shop_tripwire_falloff_delay",
|
||||
"Damage falloff of tripwire explosion, higher = quicker falloff", 0.015f,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
|
||||
|
||||
public static readonly FakeConVar<float> CV_FF_MULTIPLIER = new(
|
||||
"css_ttt_shop_tripwire_friendlyfire_multiplier",
|
||||
"Damage multiplier applied to friendly fire from Tripwire", 0.5f,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
|
||||
|
||||
public static readonly FakeConVar<bool> CV_FF_TRIGGERS = new(
|
||||
"css_ttt_shop_tripwire_friendlyfire_triggers",
|
||||
"Whether Tripwires can be triggered by teammates", true);
|
||||
|
||||
public static readonly FakeConVar<float> CV_MAX_DISTANCE_SQUARED = new(
|
||||
"css_ttt_shop_tripwire_max_distance_squared",
|
||||
"Maximum placement distance squared for Tripwire", 50000f,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1000000f));
|
||||
|
||||
public static readonly FakeConVar<float> CV_INITIATION_TIME = new(
|
||||
"css_ttt_shop_tripwire_initiation_time",
|
||||
"Seconds before Tripwire becomes active", 2f, ConVarFlags.FCVAR_NONE,
|
||||
new RangeValidator<float>(0f, 10f));
|
||||
|
||||
public static readonly FakeConVar<float> CV_SIZE_SQUARED = new(
|
||||
"css_ttt_shop_tripwire_size_squared",
|
||||
"Size of tripwire for the purposes of bullet/defuse-detection", 10f,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(1f, 100000f));
|
||||
|
||||
public static readonly FakeConVar<int> CV_COLOR_R = new(
|
||||
"css_ttt_shop_tripwire_color_r", "Tripwire color red channel (0–255)", 255,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
|
||||
|
||||
public static readonly FakeConVar<int> CV_COLOR_G = new(
|
||||
"css_ttt_shop_tripwire_color_g", "Tripwire color green channel (0–255)", 0,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
|
||||
|
||||
public static readonly FakeConVar<int> CV_COLOR_B = new(
|
||||
"css_ttt_shop_tripwire_color_b", "Tripwire color blue channel (0–255)", 0,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
|
||||
|
||||
public static readonly FakeConVar<int> CV_COLOR_A = new(
|
||||
"css_ttt_shop_tripwire_color_a", "Tripwire color alpha (0–255)", 32,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
|
||||
|
||||
public static readonly FakeConVar<float> CV_THICKNESS = new(
|
||||
"css_ttt_shop_tripwire_thickness", "Visual thickness of the Tripwire beam",
|
||||
0.5f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0.01f, 5f));
|
||||
|
||||
public static readonly FakeConVar<float> CV_DEFUSE_TIME = new(
|
||||
"css_ttt_shop_tripwire_defuse_time",
|
||||
"Time required to fully defuse the Tripwire (in seconds)", 6f,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 30f));
|
||||
|
||||
public static readonly FakeConVar<float> CV_DEFUSE_RATE = new(
|
||||
"css_ttt_shop_tripwire_defuse_rate",
|
||||
"Rate at which Tripwire defuses are processed (in seconds)", 0.5f,
|
||||
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0.01f, 5f));
|
||||
|
||||
public static readonly FakeConVar<int> CV_DEFUSE_REWARD = new(
|
||||
"css_ttt_shop_tripwire_defuse_reward",
|
||||
"Amount of money rewarded to a player for successfully defusing a tripwire",
|
||||
20, 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<TripwireConfig?> Load() {
|
||||
var cfg = new TripwireConfig {
|
||||
Price = CV_PRICE.Value,
|
||||
ExplosionPower = CV_EXPLOSION_POWER.Value,
|
||||
FalloffDelay = CV_FALLOFF_DELAY.Value,
|
||||
FriendlyFireMultiplier = CV_FF_MULTIPLIER.Value,
|
||||
FriendlyFireTriggers = CV_FF_TRIGGERS.Value,
|
||||
MaxPlacementDistanceSquared = CV_MAX_DISTANCE_SQUARED.Value,
|
||||
TripwireInitiationTime = TimeSpan.FromSeconds(CV_INITIATION_TIME.Value),
|
||||
TripwireSizeSquared = CV_SIZE_SQUARED.Value,
|
||||
TripwireColor =
|
||||
Color.FromArgb(CV_COLOR_A.Value, CV_COLOR_R.Value, CV_COLOR_G.Value,
|
||||
CV_COLOR_B.Value),
|
||||
TripwireThickness = CV_THICKNESS.Value,
|
||||
DefuseTime = TimeSpan.FromSeconds(CV_DEFUSE_TIME.Value),
|
||||
DefuseRate = TimeSpan.FromSeconds(CV_DEFUSE_RATE.Value),
|
||||
DefuseReward = CV_DEFUSE_REWARD.Value
|
||||
};
|
||||
|
||||
return Task.FromResult<TripwireConfig?>(cfg);
|
||||
}
|
||||
}
|
||||
@@ -119,8 +119,11 @@ public static class PlayerExtensions {
|
||||
SELF(player.Slot), 0.2f, 1);
|
||||
}
|
||||
|
||||
private static RecipientFilter SELF(int slot) => new(slot);
|
||||
private static RecipientFilter SELF(int slot) {
|
||||
return new RecipientFilter(slot);
|
||||
}
|
||||
|
||||
private static RecipientFilter OTHERS(int slot)
|
||||
=> new(ulong.MaxValue & ~(1ul << slot));
|
||||
private static RecipientFilter OTHERS(int slot) {
|
||||
return new RecipientFilter(ulong.MaxValue & ~(1ul << slot));
|
||||
}
|
||||
}
|
||||
@@ -97,4 +97,11 @@ public static class VectorExtensions {
|
||||
public static Vector toVector(this Vector3 vec) {
|
||||
return new Vector(vec.X, vec.Y, vec.Z);
|
||||
}
|
||||
|
||||
public static QAngle toAngle(this Vector vec) {
|
||||
var pitch = (float)(Math.Atan2(-vec.Z,
|
||||
Math.Sqrt(vec.X * vec.X + vec.Y * vec.Y)) * (180.0 / Math.PI));
|
||||
var yaw = (float)(Math.Atan2(vec.Y, vec.X) * (180.0 / Math.PI));
|
||||
return new QAngle(pitch, yaw, 0);
|
||||
}
|
||||
}
|
||||
@@ -29,9 +29,9 @@ public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
|
||||
{ "weapon_usp_silencer", "M4A1" },
|
||||
{ "weapon_sg556", "M4A1" },
|
||||
{ "weapon_mp5sd", "M4A1" },
|
||||
{ "weapon_decoy", "healthshot" },
|
||||
{ "weapon_awp", "AWP" },
|
||||
{ "weapon_hegrenade", "Cluster" }
|
||||
{ "weapon_hegrenade", "Cluster" },
|
||||
{ "weapon_decoy", "Teleport Decoy" }
|
||||
};
|
||||
|
||||
public void Dispose() { }
|
||||
@@ -49,6 +49,14 @@ public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
@@ -7,8 +7,10 @@ using TTT.API;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.CS2.API;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
@@ -21,6 +23,9 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IGameManager games =
|
||||
provider.GetRequiredService<IGameManager>();
|
||||
|
||||
private readonly IRoleAssigner roles =
|
||||
provider.GetRequiredService<IRoleAssigner>();
|
||||
|
||||
private readonly IAliveSpoofer spoofer =
|
||||
provider.GetRequiredService<IAliveSpoofer>();
|
||||
|
||||
@@ -45,13 +50,36 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
|
||||
if (games.ActiveGame is not { State: State.IN_PROGRESS })
|
||||
return HookResult.Continue;
|
||||
|
||||
if (ev.Attacker != null) ev.FireEventToClient(ev.Attacker);
|
||||
if (ev.Attacker != null) {
|
||||
ev.FireEventToClient(ev.Attacker);
|
||||
var apiPlayer = converter.GetPlayer(ev.Attacker);
|
||||
var role = roles.GetRoles(apiPlayer);
|
||||
if (role.Any(r => r is TraitorRole))
|
||||
foreach (var p in Utilities.GetPlayers()) {
|
||||
var apiP = converter.GetPlayer(p);
|
||||
if (apiP.Id == apiPlayer.Id) continue;
|
||||
var r = roles.GetRoles(converter.GetPlayer(p));
|
||||
if (role.Intersect(r).Any()) ev.FireEventToClient(p);
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
private void hideAndTrackStats(EventPlayerDeath ev,
|
||||
CCSPlayerController player) {
|
||||
var victimStats = player.ActionTrackingServices?.MatchStats;
|
||||
@@ -89,6 +117,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 _) {
|
||||
|
||||
@@ -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,64 +0,0 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Messages;
|
||||
|
||||
namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class EntityTargetHandlers(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
plugin?.HookEntityOutput("*", "*", handler);
|
||||
}
|
||||
|
||||
private HookResult handler(CEntityIOOutput output, string name,
|
||||
CEntityInstance activator, CEntityInstance caller, CVariant value,
|
||||
float delay) {
|
||||
if (caller.DesignerName == "prop_dynamic") return HookResult.Continue;
|
||||
messenger.Debug("Entity Output Triggered: " + name);
|
||||
messenger.Debug("Activator: " + activator.DesignerName);
|
||||
messenger.Debug("Caller: " + caller.DesignerName);
|
||||
messenger.Debug("Value: " + value + " " + value.GetType());
|
||||
caller.AcceptInput("OnPass");
|
||||
activator.AcceptInput("OnPass");
|
||||
if (caller.DesignerName != "filter_activator_name")
|
||||
return HookResult.Continue;
|
||||
var csPlayer =
|
||||
Utilities.GetPlayerFromIndex((int)activator.EntityHandle.Index);
|
||||
if (csPlayer != null && csPlayer.IsValid) {
|
||||
messenger.DebugAnnounce(
|
||||
$"Filter Activator Name triggered by player: {csPlayer.PlayerName} {(int)csPlayer.Index}");
|
||||
}
|
||||
|
||||
var ptrPlayer = new CCSPlayerController(activator.Handle);
|
||||
if (ptrPlayer.IsValid) {
|
||||
messenger.DebugAnnounce(
|
||||
$"Filter Activator Name triggered by player controller: {ptrPlayer.PlayerName} {(int)ptrPlayer.Index}");
|
||||
}
|
||||
|
||||
messenger.DebugAnnounce(output + " - " + output.Description);
|
||||
|
||||
var connections = output.Connections;
|
||||
if (connections != null) debugConnection(connections);
|
||||
|
||||
caller.AcceptInput("OnPass");
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
private void debugConnection(EntityIOConnection_t connection) {
|
||||
messenger.DebugAnnounce("Connection:");
|
||||
messenger.DebugAnnounce(" Target: " + connection.Target);
|
||||
messenger.DebugAnnounce(" Input: " + connection.TargetInput);
|
||||
messenger.DebugAnnounce(" Parameter: " + connection.ValueOverride);
|
||||
messenger.DebugAnnounce(" Delay: " + connection.Delay);
|
||||
messenger.DebugAnnounce(" Times to fire: " + connection.TimesToFire);
|
||||
|
||||
if (connection.Next != null) debugConnection(connection.Next);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using TTT.API;
|
||||
using TTT.API.Game;
|
||||
@@ -20,7 +19,8 @@ public class MapChangeCausesEndListener(IServiceProvider provider)
|
||||
}
|
||||
|
||||
private void onMapChange(string mapName) {
|
||||
if (games.ActiveGame is not { State: State.IN_PROGRESS or State.COUNTDOWN })
|
||||
return;
|
||||
games.ActiveGame?.EndGame(new EndReason("Map Change"));
|
||||
Server.PrintToConsole("Detected map change, ending active game.");
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -18,15 +18,15 @@ 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>();
|
||||
|
||||
private readonly IGameManager game =
|
||||
provider.GetRequiredService<IGameManager>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
@@ -66,8 +66,6 @@ public class PlayerMuter(IServiceProvider provider) : IPluginModule {
|
||||
public void OnGameEvent(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.FINISHED) return;
|
||||
|
||||
foreach (var p in Utilities.GetPlayers()) {
|
||||
p.VoiceFlags &= ~VoiceFlags.Muted;
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -12,18 +12,18 @@ namespace TTT.CS2.GameHandlers;
|
||||
|
||||
public class RoundStart_GameStartHandler(IServiceProvider provider)
|
||||
: IPluginModule {
|
||||
private 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() { }
|
||||
|
||||
@@ -11,12 +11,14 @@ using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.CS2.API;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.Game;
|
||||
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 =
|
||||
@@ -25,9 +27,6 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IGameManager games =
|
||||
provider.GetRequiredService<IGameManager>();
|
||||
|
||||
private readonly IBodyTracker bodies =
|
||||
provider.GetRequiredService<IBodyTracker>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
|
||||
@@ -29,11 +29,11 @@ public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
|
||||
|
||||
private readonly IRoleAssigner roles =
|
||||
provider.GetRequiredService<IRoleAssigner>();
|
||||
|
||||
private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
|
||||
|
||||
private IActain? maulService;
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
@@ -79,7 +79,7 @@ public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
|
||||
|
||||
private HookResult onSay(CCSPlayerController? player,
|
||||
CommandInfo commandInfo) {
|
||||
if (mutedPlayers != null
|
||||
if (mutedPlayers != null && player != null && player.GetHealth() > 0
|
||||
&& mutedPlayers.Contains(player?.SteamID.ToString() ?? ""))
|
||||
return HookResult.Handled;
|
||||
|
||||
|
||||
@@ -16,15 +16,15 @@ public static class ArmorItemServicesCollection {
|
||||
}
|
||||
|
||||
public class ArmorItem(IServiceProvider provider) : BaseItem(provider) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private ArmorConfig config
|
||||
=> Provider.GetService<IStorage<ArmorConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new ArmorConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
public override string Name => Locale[ArmorMsgs.SHOP_ITEM_ARMOR];
|
||||
public override string Description => Locale[ArmorMsgs.SHOP_ITEM_ARMOR_DESC];
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
@@ -17,16 +17,16 @@ public class BodyPaintListener(IServiceProvider provider)
|
||||
private readonly IBodyTracker bodies =
|
||||
provider.GetRequiredService<IBodyTracker>();
|
||||
|
||||
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();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private readonly Dictionary<IPlayer, int> uses = new();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.HIGH)]
|
||||
public void BodyIdentify(BodyIdentifyEvent ev) {
|
||||
|
||||
@@ -18,15 +18,15 @@ public static class CamoServiceCollection {
|
||||
}
|
||||
|
||||
public class CamouflageItem(IServiceProvider provider) : BaseItem(provider) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private CamoConfig config
|
||||
=> Provider.GetService<IStorage<CamoConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new CamoConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
public override string Name => Locale[CamoMsgs.SHOP_ITEM_CAMO];
|
||||
public override string Description => Locale[CamoMsgs.SHOP_ITEM_CAMO_DESC];
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
using System.Reactive.Concurrency;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core.Attributes.Registration;
|
||||
using CounterStrikeSharp.API.Modules.Memory;
|
||||
using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
@@ -11,23 +8,25 @@ using ShopAPI;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
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();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
@@ -60,7 +59,4 @@ public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
|
||||
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
}
|
||||
@@ -1,5 +1,3 @@
|
||||
using System.Linq;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Timers;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
@@ -10,7 +8,6 @@ using ShopAPI.Configs;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
@@ -18,17 +15,15 @@ using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.Utils;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Items.Compass;
|
||||
|
||||
/// <summary>
|
||||
/// Base compass that renders a heading toward the nearest target returned by GetTargets.
|
||||
/// Child classes decide which targets to expose and who owns the item.
|
||||
/// 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 CompassConfig _Config { get; }
|
||||
protected readonly IPlayerConverter<CCSPlayerController> Converter;
|
||||
protected readonly ISet<IPlayer> Owners = new HashSet<IPlayer>();
|
||||
|
||||
@@ -42,6 +37,8 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
}
|
||||
|
||||
protected CompassConfig _Config { get; }
|
||||
|
||||
public override ShopItemConfig Config => _Config;
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
@@ -56,14 +53,14 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Return world positions to point at for this player.
|
||||
/// Return world positions to point at for this player.
|
||||
/// </summary>
|
||||
protected abstract IList<Vector> GetTargets(IOnlinePlayer requester);
|
||||
abstract protected IList<Vector> GetTargets(IOnlinePlayer requester);
|
||||
|
||||
/// <summary>
|
||||
/// Whether this player currently owns/has this compass effect.
|
||||
/// Whether this player currently owns/has this compass effect.
|
||||
/// </summary>
|
||||
protected abstract bool OwnsItem(IOnlinePlayer player);
|
||||
abstract protected bool OwnsItem(IOnlinePlayer player);
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) { Owners.Add(player); }
|
||||
|
||||
|
||||
@@ -27,11 +27,11 @@ public class BodyCompassItem(IServiceProvider provider)
|
||||
=> 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.
|
||||
/// For innocents: point to nearest traitor.
|
||||
/// For traitors: point to nearest non-traitor (ally list in original code).
|
||||
/// Returns target world positions as vectors.
|
||||
/// </summary>
|
||||
protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
|
||||
override protected IList<Vector> GetTargets(IOnlinePlayer requester) {
|
||||
if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
|
||||
return Array.Empty<Vector>();
|
||||
|
||||
|
||||
@@ -23,11 +23,11 @@ public class InnoCompassItem(IServiceProvider provider)
|
||||
=> 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.
|
||||
/// For innocents: point to nearest traitor.
|
||||
/// For traitors: point to nearest non-traitor (ally list in original code).
|
||||
/// Returns target world positions as vectors.
|
||||
/// </summary>
|
||||
protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
|
||||
override protected IList<Vector> GetTargets(IOnlinePlayer requester) {
|
||||
if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
|
||||
return Array.Empty<Vector>();
|
||||
|
||||
|
||||
@@ -28,15 +28,15 @@ public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
|
||||
private readonly IBodyTracker bodies =
|
||||
provider.GetRequiredService<IBodyTracker>();
|
||||
|
||||
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();
|
||||
|
||||
private readonly Dictionary<string, DateTime> lastMessages = new();
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
// Low priority to allow body identification to happen first
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.LOW)]
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.Game;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Locale;
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ using ShopAPI;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Listeners;
|
||||
@@ -13,14 +12,14 @@ 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();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnDamage(PlayerDamagedEvent ev) {
|
||||
|
||||
@@ -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>();
|
||||
}
|
||||
|
||||
@@ -3,16 +3,20 @@ using System.Reactive.Concurrency;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core.Attributes.Registration;
|
||||
using CounterStrikeSharp.API.Modules.UserMessages;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using SpecialRoundAPI;
|
||||
using TTT.API;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.RayTrace.Class;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Events.Player;
|
||||
@@ -24,15 +28,11 @@ public class PoisonShotsListener(IServiceProvider provider)
|
||||
: BaseListener(provider), IPluginModule {
|
||||
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
|
||||
|
||||
private PoisonShotsConfig config
|
||||
=> Provider.GetService<IStorage<PoisonShotsConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new PoisonShotsConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly Dictionary<string, IPlayer> killedWithPoison = new();
|
||||
|
||||
private readonly Dictionary<IPlayer, int> poisonShots = new();
|
||||
|
||||
private readonly List<IDisposable> poisonTimers = [];
|
||||
@@ -42,18 +42,27 @@ public class PoisonShotsListener(IServiceProvider provider)
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private readonly Dictionary<string, IPlayer> killedWithPoison = new();
|
||||
private PoisonShotsConfig config
|
||||
=> Provider.GetService<IStorage<PoisonShotsConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new PoisonShotsConfig();
|
||||
|
||||
public override void Dispose() {
|
||||
base.Dispose();
|
||||
foreach (var timer in poisonTimers) timer.Dispose();
|
||||
}
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
base.Start();
|
||||
plugin?.HookUserMessage(452, onWeaponSound);
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnFire(EventWeaponFire ev, GameEventInfo _) {
|
||||
if (ev.Userid == null) return HookResult.Continue;
|
||||
if (!Tag.GUNS.Contains(ev.Weapon)) return HookResult.Continue;
|
||||
if (!Tag.PISTOLS.Contains(ev.Weapon)) return HookResult.Continue;
|
||||
if (converter.GetPlayer(ev.Userid) is not IOnlinePlayer player)
|
||||
return HookResult.Continue;
|
||||
var remainingShots = usePoisonShot(player);
|
||||
@@ -69,7 +78,7 @@ public class PoisonShotsListener(IServiceProvider provider)
|
||||
if (ev.Attacker == null) return;
|
||||
if (!poisonShots.TryGetValue(ev.Attacker, out var shot) || shot <= 0)
|
||||
return;
|
||||
if (ev.Weapon == null || !Tag.GUNS.Contains(ev.Weapon)) return;
|
||||
if (ev.Weapon == null || !Tag.PISTOLS.Contains(ev.Weapon)) return;
|
||||
Messenger.Message(ev.Attacker,
|
||||
Locale[PoisonShotMsgs.SHOP_ITEM_POISON_HIT(ev.Player)]);
|
||||
addPoisonEffect(ev.Player, ev.Attacker);
|
||||
@@ -156,13 +165,47 @@ public class PoisonShotsListener(IServiceProvider provider)
|
||||
return 0;
|
||||
}
|
||||
|
||||
private class PoisonEffect(IPlayer player, IPlayer shooter) {
|
||||
public IPlayer Player { get; } = player;
|
||||
public IPlayer Shooter { get; } = shooter;
|
||||
public int Ticks { get; set; }
|
||||
public int DamageGiven { get; set; }
|
||||
private HookResult onWeaponSound(UserMessage msg) {
|
||||
var defIndex = msg.ReadUInt("item_def_index");
|
||||
|
||||
if (!WeaponSoundIndex.PISTOLS.Contains(defIndex))
|
||||
return HookResult.Continue;
|
||||
var splits = msg.DebugString.Split("\n");
|
||||
if (splits.Length < 5) return HookResult.Continue;
|
||||
var angleLines = msg.DebugString.Split("\n")[1..4]
|
||||
.Select(s => s.Trim())
|
||||
.ToList();
|
||||
if (!angleLines[0].Contains('x') || !angleLines[1].Contains('y')
|
||||
|| !angleLines[2].Contains('z'))
|
||||
return HookResult.Continue;
|
||||
var x = float.Parse(angleLines[0].Split(' ')[1]);
|
||||
var y = float.Parse(angleLines[1].Split(' ')[1]);
|
||||
var z = float.Parse(angleLines[2].Split(' ')[1]);
|
||||
var vec = new Vector(x, y, z);
|
||||
var player = findPlayerByCoord(vec);
|
||||
|
||||
if (player == null) return HookResult.Continue;
|
||||
if (converter.GetPlayer(player) is not IOnlinePlayer apiPlayer)
|
||||
return HookResult.Continue;
|
||||
|
||||
if (poisonShots.TryGetValue(apiPlayer, out var shots) && shots > 0) {
|
||||
msg.Recipients.Clear();
|
||||
return HookResult.Handled;
|
||||
}
|
||||
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
private CCSPlayerController? findPlayerByCoord(Vector vec) {
|
||||
foreach (var pl in Utilities.GetPlayers()) {
|
||||
var origin = pl.GetEyePosition();
|
||||
if (origin == null) continue;
|
||||
var dist = vec.DistanceSquared(origin);
|
||||
if (dist < 1) return pl;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
@@ -173,4 +216,11 @@ public class PoisonShotsListener(IServiceProvider provider)
|
||||
return;
|
||||
ev.Body.Killer = shooter as IOnlinePlayer;
|
||||
}
|
||||
|
||||
private class PoisonEffect(IPlayer player, IPlayer shooter) {
|
||||
public IPlayer Player { get; } = player;
|
||||
public IPlayer Shooter { get; } = shooter;
|
||||
public int Ticks { get; set; }
|
||||
public int DamageGiven { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ using TTT.Game.Roles;
|
||||
namespace TTT.CS2.Items.PoisonSmoke;
|
||||
|
||||
public static class PoisonSmokeServiceCollection {
|
||||
public static void AddPoisonSmoke(this IServiceCollection services) {
|
||||
public static void AddPoisonSmokeServices(this IServiceCollection services) {
|
||||
services.AddModBehavior<PoisonSmokeItem>();
|
||||
services.AddModBehavior<PoisonSmokeListener>();
|
||||
}
|
||||
|
||||
@@ -12,7 +12,6 @@ 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.Game.Events.Body;
|
||||
@@ -25,20 +24,20 @@ namespace TTT.CS2.Items.PoisonSmoke;
|
||||
|
||||
public class PoisonSmokeListener(IServiceProvider provider)
|
||||
: BaseListener(provider), IPluginModule {
|
||||
private PoisonSmokeConfig config
|
||||
=> Provider.GetService<IStorage<PoisonSmokeConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new PoisonSmokeConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly ISet<string> killedWithPoison = new HashSet<string>();
|
||||
|
||||
private readonly List<IDisposable> poisonSmokes = [];
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
private readonly ISet<string> killedWithPoison = new HashSet<string>();
|
||||
private PoisonSmokeConfig config
|
||||
=> Provider.GetService<IStorage<PoisonSmokeConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new PoisonSmokeConfig();
|
||||
|
||||
public override void Dispose() {
|
||||
base.Dispose();
|
||||
@@ -129,15 +128,6 @@ public class PoisonSmokeListener(IServiceProvider provider)
|
||||
return effect.DamageGiven < config.PoisonConfig.TotalDamage;
|
||||
}
|
||||
|
||||
private class PoisonEffect(CSmokeGrenadeProjectile projectile,
|
||||
IOnlinePlayer attacker) {
|
||||
public int Ticks { get; set; }
|
||||
public int DamageGiven { get; set; }
|
||||
public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
|
||||
public CSmokeGrenadeProjectile Projectile { get; } = projectile;
|
||||
public IPlayer Attacker { get; } = attacker;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameEnd(GameStateUpdateEvent ev) {
|
||||
@@ -153,4 +143,13 @@ public class PoisonSmokeListener(IServiceProvider provider)
|
||||
if (ev.Body.Killer == null || ev.Body.Killer.Id == ev.Body.OfPlayer.Id)
|
||||
ev.IsCanceled = true;
|
||||
}
|
||||
|
||||
private class PoisonEffect(CSmokeGrenadeProjectile projectile,
|
||||
IOnlinePlayer attacker) {
|
||||
public int Ticks { get; set; }
|
||||
public int DamageGiven { get; set; }
|
||||
public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
|
||||
public CSmokeGrenadeProjectile Projectile { get; } = projectile;
|
||||
public IPlayer Attacker { get; } = attacker;
|
||||
}
|
||||
}
|
||||
@@ -24,18 +24,18 @@ public static class SilentAWPServiceCollection {
|
||||
|
||||
public class SilentAWPItem(IServiceProvider provider)
|
||||
: RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
|
||||
private SilentAWPConfig config
|
||||
=> Provider.GetService<IStorage<SilentAWPConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new SilentAWPConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> playerConverter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IDictionary<string, int> silentShots =
|
||||
new Dictionary<string, int>();
|
||||
|
||||
private SilentAWPConfig config
|
||||
=> Provider.GetService<IStorage<SilentAWPConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new SilentAWPConfig();
|
||||
|
||||
public override string Name => Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP];
|
||||
|
||||
public override string Description
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
@@ -7,10 +7,8 @@ using TTT.API.Events;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.Utils;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Events.Player;
|
||||
@@ -32,46 +30,42 @@ public class DamageStation(IServiceProvider provider)
|
||||
.GetResult() ?? new DamageStationConfig()), IListener {
|
||||
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IPlayerFinder finder =
|
||||
provider.GetRequiredService<IPlayerFinder>();
|
||||
|
||||
private readonly IRoleAssigner roles =
|
||||
provider.GetRequiredService<IRoleAssigner>();
|
||||
private readonly Dictionary<string, StationInfo> killedWithStation = new();
|
||||
|
||||
public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HURT];
|
||||
|
||||
public override string Description
|
||||
=> Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
|
||||
|
||||
private Dictionary<string, StationInfo> killedWithStation =
|
||||
new Dictionary<string, StationInfo>();
|
||||
|
||||
override protected void onInterval() {
|
||||
var players = finder.GetOnline();
|
||||
var toRemove = new List<CPhysicsPropMultiplayer>();
|
||||
foreach (var (prop, info) in props) {
|
||||
if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
|
||||
> Math.Abs(_Config.TotalHealthGiven)) {
|
||||
toRemove.Add(prop);
|
||||
continue;
|
||||
}
|
||||
var playerMapping = players
|
||||
.Select(p => (ApiPlayer: p, GamePlayer: Converter.GetPlayer(p)))
|
||||
.Where(m
|
||||
=> m.GamePlayer != null
|
||||
&& !Roles.GetRoles(m.ApiPlayer).Any(r => r is TraitorRole))
|
||||
.ToList();
|
||||
|
||||
if (!prop.IsValid || prop.AbsOrigin == null) {
|
||||
// accumulate contributions per player: ApiPlayer -> list of (stationInfo, damage, gamePlayer)
|
||||
var playerDamageMap =
|
||||
new Dictionary<IOnlinePlayer, List<(StationInfo info, int damage,
|
||||
CCSPlayerController gamePlayer)>>();
|
||||
|
||||
foreach (var (prop, info) in Props) {
|
||||
if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
|
||||
> Math.Abs(_Config.TotalHealthGiven) || !prop.IsValid
|
||||
|| prop.AbsOrigin == null) {
|
||||
toRemove.Add(prop);
|
||||
continue;
|
||||
}
|
||||
|
||||
var propPos = prop.AbsOrigin;
|
||||
|
||||
var playerMapping = players.Select(p
|
||||
=> (ApiPlayer: p, GamePlayer: converter.GetPlayer(p)))
|
||||
.Where(m => m.GamePlayer != null);
|
||||
|
||||
var playerDists = playerMapping
|
||||
.Where(t => !roles.GetRoles(t.ApiPlayer).OfType<TraitorRole>().Any())
|
||||
.Select(t => (t.ApiPlayer, Origin: t.GamePlayer!.Pawn.Value?.AbsOrigin,
|
||||
t.GamePlayer))
|
||||
.Where(t => t is { Origin: not null, ApiPlayer.IsAlive: true })
|
||||
@@ -83,31 +77,73 @@ public class DamageStation(IServiceProvider provider)
|
||||
foreach (var (player, dist, gamePlayer) in playerDists) {
|
||||
var healthScale = 1.0 - dist / _Config.MaxRange;
|
||||
var damageAmount =
|
||||
(int)Math.Floor(_Config.HealthIncrements * healthScale);
|
||||
Math.Abs((int)Math.Floor(_Config.HealthIncrements * healthScale));
|
||||
|
||||
var dmgEvent = new PlayerDamagedEvent(player,
|
||||
info.Owner as IOnlinePlayer, damageAmount) { Weapon = $"[{Name}]" };
|
||||
if (damageAmount <= 0) continue;
|
||||
|
||||
bus.Dispatch(dmgEvent);
|
||||
|
||||
damageAmount = -dmgEvent.DmgDealt;
|
||||
|
||||
if (player.Health + damageAmount <= 0) {
|
||||
killedWithStation[player.Id] = info;
|
||||
var playerDeath = new PlayerDeathEvent(player)
|
||||
.WithKiller(info.Owner as IOnlinePlayer)
|
||||
.WithWeapon($"[{Name}]");
|
||||
bus.Dispatch(playerDeath);
|
||||
if (!playerDamageMap.TryGetValue(player, out var list)) {
|
||||
list = [];
|
||||
playerDamageMap[player] = list;
|
||||
}
|
||||
|
||||
player.Health += damageAmount;
|
||||
info.HealthGiven += damageAmount;
|
||||
|
||||
gamePlayer.EmitSound("Player.DamageFall", null, 0.2f);
|
||||
list.Add((info, damageAmount, gamePlayer));
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var prop in toRemove) props.Remove(prop);
|
||||
// Apply accumulated damage per player once
|
||||
applyDamage(playerDamageMap);
|
||||
|
||||
// remove invalid/expired props
|
||||
foreach (var prop in toRemove) Props.Remove(prop);
|
||||
}
|
||||
|
||||
private void applyDamage(
|
||||
Dictionary<IOnlinePlayer, List<(StationInfo info, int damage,
|
||||
CCSPlayerController gamePlayer)>> playerDamageMap) {
|
||||
foreach (var kv in playerDamageMap) {
|
||||
var player = kv.Key;
|
||||
var contribs = kv.Value;
|
||||
|
||||
var totalDamage = contribs.Sum(c => c.damage);
|
||||
|
||||
if (totalDamage <= 0) continue;
|
||||
|
||||
// choose the station that contributed the most damage to attribute the kill to
|
||||
var dominantInfo = contribs.OrderByDescending(c => c.damage).First().info;
|
||||
var gamePlayer = contribs.First().gamePlayer;
|
||||
|
||||
// dispatch single PlayerDamagedEvent with total damage
|
||||
var dmgEvent = new PlayerDamagedEvent(player,
|
||||
dominantInfo.Owner as IOnlinePlayer, totalDamage) {
|
||||
Weapon = $"[{Name}]"
|
||||
};
|
||||
|
||||
bus.Dispatch(dmgEvent);
|
||||
|
||||
totalDamage = dmgEvent.DmgDealt;
|
||||
|
||||
// if this will kill the player, attribute death to the dominant station
|
||||
if (player.Health - totalDamage <= 0) {
|
||||
killedWithStation[player.Id] = dominantInfo;
|
||||
var playerDeath = new PlayerDeathEvent(player)
|
||||
.WithKiller(dominantInfo.Owner as IOnlinePlayer)
|
||||
.WithWeapon($"[{Name}]");
|
||||
bus.Dispatch(playerDeath);
|
||||
}
|
||||
|
||||
gamePlayer.EmitSound("Player.DamageFall", SELF(gamePlayer.Slot), 0.2f);
|
||||
|
||||
// apply damage to player's health
|
||||
player.Health -= totalDamage;
|
||||
|
||||
// update each station's HealthGiven by its own contribution
|
||||
foreach (var (info, damage, _) in contribs) info.HealthGiven += damage;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static RecipientFilter SELF(int slot) {
|
||||
return new RecipientFilter(slot);
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
|
||||
@@ -10,7 +10,8 @@ using TTT.Game.Roles;
|
||||
namespace TTT.CS2.Items.Station;
|
||||
|
||||
public static class HealthStationCollection {
|
||||
public static void AddHealthStation(this IServiceCollection collection) {
|
||||
public static void
|
||||
AddHealthStationServices(this IServiceCollection collection) {
|
||||
collection.AddModBehavior<HealthStation>();
|
||||
}
|
||||
}
|
||||
@@ -29,7 +30,29 @@ public class HealthStation(IServiceProvider provider)
|
||||
override protected void onInterval() {
|
||||
var players = Utilities.GetPlayers();
|
||||
var toRemove = new List<CPhysicsPropMultiplayer>();
|
||||
foreach (var (prop, info) in props) {
|
||||
|
||||
// build per-player potential heal contributions and gather props to remove
|
||||
var perPlayerContrib = BuildPerPlayerContributions(players, toRemove);
|
||||
|
||||
// apply the accumulated heals in a single pass per player
|
||||
applyAccumulatedHeals(perPlayerContrib);
|
||||
|
||||
// remove invalid/expired props
|
||||
foreach (var prop in toRemove) Props.Remove(prop);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Scan all props and build a map: Player -> list of (StationInfo, potentialHeal).
|
||||
/// Also fills toRemove for invalid/expired props.
|
||||
/// </summary>
|
||||
private
|
||||
Dictionary<CCSPlayerController, List<(StationInfo info, int potential)>>
|
||||
BuildPerPlayerContributions(IReadOnlyList<CCSPlayerController> players,
|
||||
List<CPhysicsPropMultiplayer> toRemove) {
|
||||
var result =
|
||||
new Dictionary<CCSPlayerController, List<(StationInfo, int)>>();
|
||||
|
||||
foreach (var (prop, info) in Props) {
|
||||
if (_Config.TotalHealthGiven != 0
|
||||
&& Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
|
||||
toRemove.Add(prop);
|
||||
@@ -51,19 +74,130 @@ public class HealthStation(IServiceProvider provider)
|
||||
.ToList();
|
||||
|
||||
foreach (var (player, dist) in playerDists) {
|
||||
var maxHp = player.Pawn.Value?.MaxHealth ?? 100;
|
||||
var healthScale = 1.0 - dist / _Config.MaxRange;
|
||||
var maxHealAmo =
|
||||
(int)Math.Ceiling(_Config.HealthIncrements * healthScale);
|
||||
var newHealth = Math.Min(player.GetHealth() + maxHealAmo, maxHp);
|
||||
var healthGiven = newHealth - player.GetHealth();
|
||||
player.SetHealth(newHealth);
|
||||
info.HealthGiven += healthGiven;
|
||||
var potentialHeal = ComputePotentialHeal(dist);
|
||||
if (potentialHeal <= 0) continue;
|
||||
|
||||
if (healthGiven > 0) player.EmitSound("HealthShot.Pickup", null, 0.1f);
|
||||
if (!result.TryGetValue(player, out var list)) {
|
||||
list = [];
|
||||
result[player] = list;
|
||||
}
|
||||
|
||||
list.Add((info, potentialHeal));
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var prop in toRemove) props.Remove(prop);
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Compute potential heal from a station given the distance.
|
||||
/// Mirrors your original logic: ceil(HealthIncrements * healthScale).
|
||||
/// </summary>
|
||||
private int ComputePotentialHeal(double dist) {
|
||||
var healthScale = 1.0 - dist / _Config.MaxRange;
|
||||
return (int)Math.Ceiling(_Config.HealthIncrements * healthScale);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Apply heals to each player once per tick.
|
||||
/// Distributes the actual heal proportionally across contributing stations,
|
||||
/// updates station.Info.HealthGiven and emits a single pickup sound if needed.
|
||||
/// </summary>
|
||||
private void applyAccumulatedHeals(
|
||||
Dictionary<CCSPlayerController, List<(StationInfo info, int potential)>>
|
||||
perPlayerContrib) {
|
||||
foreach (var kv in perPlayerContrib) {
|
||||
var player = kv.Key;
|
||||
var contribs = kv.Value;
|
||||
|
||||
var maxHp = player.Pawn.Value?.MaxHealth ?? 100;
|
||||
var currentHp = player.GetHealth();
|
||||
if (currentHp >= maxHp) continue;
|
||||
|
||||
var totalPotential = contribs.Sum(c => c.potential);
|
||||
if (totalPotential <= 0) continue;
|
||||
|
||||
var totalHealAvailable = Math.Min(totalPotential, maxHp - currentHp);
|
||||
if (totalHealAvailable <= 0) continue;
|
||||
|
||||
var potentials = contribs.Select(c => c.potential).ToList();
|
||||
var allocations =
|
||||
allocateProportionalInteger(totalHealAvailable, potentials);
|
||||
|
||||
// safety clamp: never allocate more than a station's potential
|
||||
for (var i = 0; i < allocations.Count; i++)
|
||||
if (allocations[i] > potentials[i])
|
||||
allocations[i] = potentials[i];
|
||||
|
||||
// if clamping reduced the total, try to redistribute remaining amount
|
||||
var allocatedSum = allocations.Sum();
|
||||
if (allocatedSum < totalHealAvailable) {
|
||||
var remaining = totalHealAvailable - allocatedSum;
|
||||
for (var i = 0; i < allocations.Count && remaining > 0; i++) {
|
||||
var headroom = potentials[i] - allocations[i];
|
||||
if (headroom <= 0) continue;
|
||||
var give = Math.Min(headroom, remaining);
|
||||
allocations[i] += give;
|
||||
remaining -= give;
|
||||
}
|
||||
|
||||
allocatedSum = allocations.Sum();
|
||||
}
|
||||
|
||||
// apply heal to player
|
||||
var actualAllocated = Math.Min(allocatedSum, maxHp - currentHp);
|
||||
if (actualAllocated <= 0) continue;
|
||||
|
||||
var newHealth = Math.Min(currentHp + actualAllocated, maxHp);
|
||||
player.SetHealth(newHealth);
|
||||
|
||||
// update station HealthGiven
|
||||
for (var i = 0; i < allocations.Count; i++) {
|
||||
var info = contribs[i].info;
|
||||
var allocated = allocations[i];
|
||||
if (allocated > 0) info.HealthGiven += allocated;
|
||||
}
|
||||
|
||||
// emit a single pickup sound if any heal applied
|
||||
player.EmitSound("HealthShot.Pickup", null, 0.1f);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Proportionally distribute an integer total across integer potentials.
|
||||
/// Uses floor of shares and assigns leftover to largest fractional remainders.
|
||||
/// Returns a list of allocations with same length as potentials.
|
||||
/// </summary>
|
||||
private List<int>
|
||||
allocateProportionalInteger(int total, List<int> potentials) {
|
||||
var allocations = new List<int>(new int[potentials.Count]);
|
||||
var remainders = new List<(int idx, double rem)>();
|
||||
var sumBase = 0;
|
||||
var totalPotential = potentials.Sum();
|
||||
|
||||
if (totalPotential <= 0) return allocations;
|
||||
|
||||
for (var i = 0; i < potentials.Count; i++) {
|
||||
var potential = potentials[i];
|
||||
var share = (double)potential / totalPotential * total;
|
||||
var baseAlloc = (int)Math.Floor(share);
|
||||
var rem = share - baseAlloc;
|
||||
allocations[i] = baseAlloc;
|
||||
sumBase += baseAlloc;
|
||||
remainders.Add((i, rem));
|
||||
}
|
||||
|
||||
var leftover = total - sumBase;
|
||||
if (leftover <= 0) return allocations;
|
||||
|
||||
remainders = remainders.OrderByDescending(r => r.rem).ToList();
|
||||
var idx = 0;
|
||||
while (leftover > 0 && idx < remainders.Count) {
|
||||
allocations[remainders[idx].idx] += 1;
|
||||
leftover--;
|
||||
idx++;
|
||||
}
|
||||
|
||||
return allocations;
|
||||
}
|
||||
}
|
||||
@@ -23,9 +23,9 @@ public abstract class StationItem<T>(IServiceProvider provider,
|
||||
protected readonly IPlayerConverter<CCSPlayerController> Converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly long PROP_SIZE_SQUARED = 500;
|
||||
private readonly long PROP_SIZE_SQUARED = 700;
|
||||
|
||||
protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
|
||||
protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> Props =
|
||||
new();
|
||||
|
||||
private readonly IScheduler scheduler =
|
||||
@@ -60,7 +60,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
|
||||
public HookResult OnBulletImpact(EventBulletImpact ev, GameEventInfo info) {
|
||||
var hitVec = new Vector(ev.X, ev.Y, ev.Z);
|
||||
|
||||
var nearest = props
|
||||
var nearest = Props
|
||||
.Select(kv => (kv.Key, kv.Value,
|
||||
Distance: kv.Key.AbsOrigin!.DistanceSquared(hitVec)))
|
||||
.Where(t => t.Key is { IsValid: true, AbsOrigin: not null })
|
||||
@@ -76,7 +76,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
|
||||
|
||||
if (nearest.Value.Health <= 0) {
|
||||
nearest.Key.AcceptInput("Kill");
|
||||
props.Remove(nearest.Key);
|
||||
Props.Remove(nearest.Key);
|
||||
return HookResult.Continue;
|
||||
}
|
||||
|
||||
@@ -105,8 +105,8 @@ public abstract class StationItem<T>(IServiceProvider provider,
|
||||
"weapon_deagle" => 40,
|
||||
_ when Tag.PISTOLS.Contains(designerWeapon) => 10,
|
||||
_ when Tag.SMGS.Contains(designerWeapon) => 15,
|
||||
_ when Tag.SHOTGUNS.Contains(designerWeapon) => 25,
|
||||
_ when Tag.RIFLES.Contains(designerWeapon) => 45,
|
||||
_ when Tag.SHOTGUNS.Contains(designerWeapon) => 15,
|
||||
_ when Tag.RIFLES.Contains(designerWeapon) => 35,
|
||||
_ => 5
|
||||
};
|
||||
}
|
||||
@@ -119,7 +119,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
|
||||
|
||||
if (prop == null) return;
|
||||
|
||||
props[prop] = new StationInfo(prop, _Config.StationHealth, player);
|
||||
Props[prop] = new StationInfo(prop, _Config.StationHealth, player);
|
||||
|
||||
prop.SetModel("models/props/cs_office/microwave.vmdl");
|
||||
prop.DispatchSpawn();
|
||||
|
||||
39
TTT/CS2/Items/TeleportDecoy/TeleportDecoyItem.cs
Normal file
39
TTT/CS2/Items/TeleportDecoy/TeleportDecoyItem.cs
Normal file
@@ -0,0 +1,39 @@
|
||||
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.TeleportDecoy;
|
||||
|
||||
public static class TeleportDecoyServiceCollection {
|
||||
public static void AddTeleportDecoyServices(
|
||||
this IServiceCollection collection) {
|
||||
collection.AddModBehavior<TeleportDecoyItem>();
|
||||
collection.AddModBehavior<TeleportDecoyListener>();
|
||||
}
|
||||
}
|
||||
|
||||
public class TeleportDecoyItem(IServiceProvider provider)
|
||||
: RoleRestrictedItem<TraitorRole>(provider) {
|
||||
public override string Name
|
||||
=> Locale[TeleportDecoyMsgs.SHOP_ITEM_TELEPORT_DECOY];
|
||||
|
||||
public override string Description
|
||||
=> Locale[TeleportDecoyMsgs.SHOP_ITEM_TELEPORT_DECOY_DESC];
|
||||
|
||||
private TeleportDecoyConfig config
|
||||
=> Provider.GetService<IStorage<TeleportDecoyConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new TeleportDecoyConfig();
|
||||
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) {
|
||||
Inventory.GiveWeapon(player, new BaseWeapon("weapon_decoy"));
|
||||
}
|
||||
}
|
||||
36
TTT/CS2/Items/TeleportDecoy/TeleportDecoyListener.cs
Normal file
36
TTT/CS2/Items/TeleportDecoy/TeleportDecoyListener.cs
Normal file
@@ -0,0 +1,36 @@
|
||||
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 TTT.API;
|
||||
using TTT.API.Player;
|
||||
|
||||
namespace TTT.CS2.Items.TeleportDecoy;
|
||||
|
||||
public class TeleportDecoyListener(IServiceProvider provider) : IPluginModule {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IShop shop = provider.GetRequiredService<IShop>();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnDecoyDetonate(EventDecoyDetonate 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<TeleportDecoyItem>(player)) return HookResult.Continue;
|
||||
|
||||
shop.RemoveItem<TeleportDecoyItem>(player);
|
||||
|
||||
var vec = new Vector(ev.X, ev.Y, ev.Z + 16);
|
||||
ev.Userid.Pawn.Value?.Teleport(vec);
|
||||
return HookResult.Continue;
|
||||
}
|
||||
}
|
||||
11
TTT/CS2/Items/TeleportDecoy/TeleportDecoyMsgs.cs
Normal file
11
TTT/CS2/Items/TeleportDecoy/TeleportDecoyMsgs.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.Items.TeleportDecoy;
|
||||
|
||||
public class TeleportDecoyMsgs {
|
||||
public static IMsg SHOP_ITEM_TELEPORT_DECOY
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_TELEPORT_DECOY));
|
||||
|
||||
public static IMsg SHOP_ITEM_TELEPORT_DECOY_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_TELEPORT_DECOY_DESC));
|
||||
}
|
||||
47
TTT/CS2/Items/Tripwire/TripwireDamageListener.cs
Normal file
47
TTT/CS2/Items/Tripwire/TripwireDamageListener.cs
Normal file
@@ -0,0 +1,47 @@
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Core.Attributes.Registration;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.API.Items;
|
||||
using TTT.CS2.Extensions;
|
||||
|
||||
namespace TTT.CS2.Items.Tripwire;
|
||||
|
||||
public class TripwireDamageListener(IServiceProvider provider) : IPluginModule {
|
||||
private readonly ITripwireActivator? tripwireActivator =
|
||||
provider.GetRequiredService<ITripwireActivator>();
|
||||
|
||||
private readonly ITripwireTracker? tripwires =
|
||||
provider.GetService<ITripwireTracker>();
|
||||
|
||||
private TripwireConfig config
|
||||
=> provider.GetService<IStorage<TripwireConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new TripwireConfig();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
[UsedImplicitly]
|
||||
[GameEventHandler]
|
||||
public HookResult OnBulletImpact(EventBulletImpact ev, GameEventInfo info) {
|
||||
if (tripwires == null) return HookResult.Continue;
|
||||
var hitVec = new Vector(ev.X, ev.Y, ev.Z);
|
||||
|
||||
var nearest = tripwires.ActiveTripwires
|
||||
.OrderBy(wire => wire.TripwireProp.AbsOrigin.DistanceSquared(hitVec))
|
||||
.FirstOrDefault();
|
||||
|
||||
if (nearest == null) return HookResult.Continue;
|
||||
var distSquared = nearest.TripwireProp.AbsOrigin.DistanceSquared(hitVec);
|
||||
if (distSquared > config.TripwireSizeSquared) return HookResult.Continue;
|
||||
|
||||
tripwireActivator?.ActivateTripwire(nearest);
|
||||
return HookResult.Continue;
|
||||
}
|
||||
}
|
||||
129
TTT/CS2/Items/Tripwire/TripwireDefuserListener.cs
Normal file
129
TTT/CS2/Items/Tripwire/TripwireDefuserListener.cs
Normal file
@@ -0,0 +1,129 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Messages;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.API.Items;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.RayTrace.Class;
|
||||
using TTT.CS2.RayTrace.Enum;
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.Items.Tripwire;
|
||||
|
||||
public class TripwireDefuserListener(IServiceProvider provider)
|
||||
: IPluginModule {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IMsgLocalizer locale =
|
||||
provider.GetRequiredService<IMsgLocalizer>();
|
||||
|
||||
private readonly IMessenger messenger =
|
||||
provider.GetRequiredService<IMessenger>();
|
||||
|
||||
private readonly ITripwireTracker? tripwireTracker =
|
||||
provider.GetService<ITripwireTracker>();
|
||||
|
||||
private TripwireConfig config
|
||||
=> provider.GetService<IStorage<TripwireConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new TripwireConfig();
|
||||
|
||||
public void Dispose() { }
|
||||
public void Start() { }
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
if (tripwireTracker == null) return;
|
||||
plugin
|
||||
?.RegisterListener<
|
||||
CounterStrikeSharp.API.Core.Listeners.OnPlayerButtonsChanged>(
|
||||
onButtonsChanged);
|
||||
}
|
||||
|
||||
private void onButtonsChanged(CCSPlayerController player,
|
||||
PlayerButtons pressed, PlayerButtons released) {
|
||||
if (tripwireTracker == null) return;
|
||||
if ((pressed & PlayerButtons.Use) != PlayerButtons.Use) return;
|
||||
|
||||
var instance = getTargetTripwire(player);
|
||||
if (instance == null) return;
|
||||
|
||||
startDefuseTimer(player, instance);
|
||||
}
|
||||
|
||||
private TripwireInstance? getTargetTripwire(CCSPlayerController player) {
|
||||
if (tripwireTracker == null) return null;
|
||||
var raytrace =
|
||||
player.GetGameTraceByEyePosition(TraceMask.MaskSolid, Contents.NoDraw,
|
||||
player);
|
||||
|
||||
if (raytrace == null || tripwireTracker.ActiveTripwires.Count == 0)
|
||||
return null;
|
||||
var raytracePos = raytrace.Value.EndPos.toVector();
|
||||
|
||||
var closest =
|
||||
tripwireTracker?.ActiveTripwires.MinBy(i
|
||||
=> i.StartPos.DistanceSquared(raytracePos));
|
||||
|
||||
if (closest == null || closest.StartPos.DistanceSquared(raytracePos)
|
||||
> config.TripwireSizeSquared)
|
||||
return null;
|
||||
|
||||
if (player.Pawn.Value?.AbsOrigin == null
|
||||
|| closest.StartPos.DistanceSquared(player.Pawn.Value.AbsOrigin)
|
||||
> config.MaxPlacementDistanceSquared)
|
||||
return null;
|
||||
|
||||
return closest;
|
||||
}
|
||||
|
||||
private void startDefuseTimer(CCSPlayerController player,
|
||||
TripwireInstance instance) {
|
||||
tickDefuse(player, instance, DateTime.Now);
|
||||
}
|
||||
|
||||
private void tickDefuse(CCSPlayerController player, TripwireInstance instance,
|
||||
DateTime startTime) {
|
||||
if (!player.IsValid) return;
|
||||
var apiPlayer = converter.GetPlayer(player);
|
||||
|
||||
if ((player.Buttons & PlayerButtons.Use) != PlayerButtons.Use) {
|
||||
messenger.Message(apiPlayer,
|
||||
locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED]);
|
||||
return;
|
||||
}
|
||||
|
||||
var progress = (DateTime.Now - startTime) / config.DefuseTime;
|
||||
var timeLeft = config.DefuseTime - config.DefuseTime * progress;
|
||||
|
||||
if (progress >= 1) {
|
||||
instance.TripwireProp.EmitSound("c4.disarmfinish", null, 0.2f, 1.5f);
|
||||
tripwireTracker?.RemoveTripwire(instance);
|
||||
if (apiPlayer is IOnlinePlayer online)
|
||||
provider.GetService<IShop>()
|
||||
?.AddBalance(online, config.DefuseReward, "Tripwire Defusal");
|
||||
return;
|
||||
}
|
||||
|
||||
var target = getTargetTripwire(player);
|
||||
if (target != instance) {
|
||||
messenger.Message(apiPlayer,
|
||||
locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED]);
|
||||
return;
|
||||
}
|
||||
|
||||
player.PrintToCenter(
|
||||
locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING(progress, timeLeft)]);
|
||||
var pitch = 1.5f - (float)progress;
|
||||
player.EmitSound("c4.keypressquiet", pitch: pitch);
|
||||
var ticksDelay = (int)Math.Round(64 * config.DefuseRate.TotalSeconds);
|
||||
Server.RunOnTick(Server.TickCount + ticksDelay,
|
||||
() => tickDefuse(player, instance, startTime));
|
||||
}
|
||||
}
|
||||
165
TTT/CS2/Items/Tripwire/TripwireItem.cs
Normal file
165
TTT/CS2/Items/Tripwire/TripwireItem.cs
Normal file
@@ -0,0 +1,165 @@
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Reactive.Concurrency;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI;
|
||||
using ShopAPI.Configs;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Extensions;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.API.Items;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.RayTrace.Class;
|
||||
using TTT.CS2.RayTrace.Enum;
|
||||
using TTT.CS2.RayTrace.Struct;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Items.Tripwire;
|
||||
|
||||
public static class TripwireServiceCollection {
|
||||
public static void AddTripwireServices(this IServiceCollection services) {
|
||||
services.AddModBehavior<ITripwireTracker, TripwireItem>();
|
||||
services.AddModBehavior<ITripwireActivator, TripwireMovementListener>();
|
||||
services.AddModBehavior<TripwireDamageListener>();
|
||||
services.AddModBehavior<TripwireDefuserListener>();
|
||||
}
|
||||
}
|
||||
|
||||
public class TripwireItem(IServiceProvider provider)
|
||||
: RoleRestrictedItem<TraitorRole>(provider), IPluginModule, ITripwireTracker {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly IScheduler scheduler =
|
||||
provider.GetRequiredService<IScheduler>();
|
||||
|
||||
private TripwireConfig config
|
||||
=> Provider.GetService<IStorage<TripwireConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new TripwireConfig();
|
||||
|
||||
public override string Name => Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE];
|
||||
|
||||
public override string Description
|
||||
=> Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DESC];
|
||||
|
||||
public override ShopItemConfig Config => config;
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
Start();
|
||||
plugin
|
||||
?.RegisterListener<
|
||||
CounterStrikeSharp.API.Core.Listeners.OnServerPrecacheResources>(
|
||||
onPrecache);
|
||||
}
|
||||
|
||||
public List<TripwireInstance> ActiveTripwires { get; } = [];
|
||||
|
||||
public void RemoveTripwire(TripwireInstance instance) {
|
||||
instance.Beam.Remove();
|
||||
instance.TripwireProp.Remove();
|
||||
ActiveTripwires.Remove(instance);
|
||||
}
|
||||
|
||||
private void onPrecache(ResourceManifest manifest) {
|
||||
manifest.AddResource(
|
||||
"models/generic/conveyor_control_panel_01/conveyor_button_02.vmdl");
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameEvent(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.FINISHED) return;
|
||||
ActiveTripwires.Clear();
|
||||
}
|
||||
|
||||
public override void OnPurchase(IOnlinePlayer player) {
|
||||
Server.NextWorldUpdate(() => {
|
||||
if (!placeTripwire(player, out var originTrace, out var endTrace,
|
||||
out var tripwire))
|
||||
return;
|
||||
|
||||
scheduler.Schedule(config.TripwireInitiationTime,
|
||||
() => {
|
||||
Server.NextWorldUpdate(() => {
|
||||
createTripwireBeam(player, tripwire,
|
||||
originTrace.Value.EndPos.toVector(),
|
||||
endTrace.Value.EndPos.toVector());
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private bool placeTripwire(IOnlinePlayer player,
|
||||
[NotNullWhen(true)] out CGameTrace? originTrace,
|
||||
[NotNullWhen(true)] out CGameTrace? endTrace,
|
||||
[NotNullWhen(true)] out CDynamicProp? tripwire) {
|
||||
tripwire = null;
|
||||
originTrace = null;
|
||||
endTrace = null;
|
||||
var gamePlayer = converter.GetPlayer(player);
|
||||
var playerPawn = gamePlayer?.PlayerPawn.Value;
|
||||
if (gamePlayer == null || playerPawn == null) return false;
|
||||
|
||||
originTrace = gamePlayer.GetGameTraceByEyePosition(TraceMask.MaskSolid,
|
||||
Contents.NoDraw, gamePlayer);
|
||||
var origin = gamePlayer.GetEyePosition();
|
||||
if (origin == null || originTrace == null) return false;
|
||||
|
||||
if (origin.DistanceSquared(originTrace.Value.EndPos.toVector())
|
||||
> config.MaxPlacementDistanceSquared) {
|
||||
Shop.AddBalance(player, config.Price, "Refund");
|
||||
Messenger.Message(player, Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_TOOFAR]);
|
||||
return false;
|
||||
}
|
||||
|
||||
var angles = originTrace.Value.Normal.toVector().toAngle();
|
||||
|
||||
endTrace = TraceRay.TraceShape(originTrace.Value.EndPos.toVector(), angles,
|
||||
TraceMask.MaskSolid, Contents.NoDraw, gamePlayer);
|
||||
|
||||
tripwire = Utilities.CreateEntityByName<CDynamicProp>("prop_dynamic");
|
||||
if (tripwire == null) return false;
|
||||
|
||||
tripwire.SetModel(
|
||||
"models/generic/conveyor_control_panel_01/conveyor_button_02.vmdl");
|
||||
tripwire.DispatchSpawn();
|
||||
|
||||
tripwire.Teleport(originTrace.Value.EndPos.toVector(),
|
||||
originTrace.Value.Normal.toVector().toAngle());
|
||||
tripwire.EmitSound("Weapon_ELITE.Clipout");
|
||||
return true;
|
||||
}
|
||||
|
||||
private void createTripwireBeam(IOnlinePlayer owner, CDynamicProp prop,
|
||||
Vector start, Vector end) {
|
||||
prop.EmitSound("C4.ExplodeTriggerTrip");
|
||||
var beam = createBeamEnt(start, end);
|
||||
if (beam == null) return;
|
||||
|
||||
var instance = new TripwireInstance(owner, beam, prop, start, end);
|
||||
ActiveTripwires.Add(instance);
|
||||
}
|
||||
|
||||
private CEnvBeam? createBeamEnt(Vector start, Vector end) {
|
||||
var beam = Utilities.CreateEntityByName<CEnvBeam>("env_beam");
|
||||
if (beam == null) return null;
|
||||
beam.RenderMode = RenderMode_t.kRenderTransAlpha;
|
||||
beam.Width = config.TripwireThickness;
|
||||
beam.Render = config.TripwireColor;
|
||||
beam.EndPos.X = end.X;
|
||||
beam.EndPos.Y = end.Y;
|
||||
beam.EndPos.Z = end.Z;
|
||||
beam.Teleport(start);
|
||||
return beam;
|
||||
}
|
||||
}
|
||||
137
TTT/CS2/Items/Tripwire/TripwireMovementListener.cs
Normal file
137
TTT/CS2/Items/Tripwire/TripwireMovementListener.cs
Normal file
@@ -0,0 +1,137 @@
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Timers;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using JetBrains.Annotations;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using ShopAPI.Configs.Traitor;
|
||||
using TTT.API;
|
||||
using TTT.API.Events;
|
||||
using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.API.Items;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.RayTrace.Class;
|
||||
using TTT.CS2.RayTrace.Enum;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Listeners;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Items.Tripwire;
|
||||
|
||||
public class TripwireMovementListener(IServiceProvider provider)
|
||||
: BaseListener(provider), IPluginModule, ITripwireActivator {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly Dictionary<string, TripwireInstance> killedWithTripwire =
|
||||
new();
|
||||
|
||||
private readonly ITripwireTracker? tripwireTracker =
|
||||
provider.GetService<ITripwireTracker>();
|
||||
|
||||
private TripwireConfig config
|
||||
=> Provider.GetService<IStorage<TripwireConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new TripwireConfig();
|
||||
|
||||
public void Start(BasePlugin? plugin) {
|
||||
if (tripwireTracker == null) return;
|
||||
plugin?.AddTimer(0.2f, checkTripwires, TimerFlags.REPEAT);
|
||||
}
|
||||
|
||||
public void ActivateTripwire(TripwireInstance instance) {
|
||||
tripwireTracker?.RemoveTripwire(instance);
|
||||
instance.TripwireProp.EmitSound("Flashbang.ExplodeDistant");
|
||||
|
||||
foreach (var player in Finder.GetOnline()) {
|
||||
if (!dealTripwireDamage(instance, player, out var gamePlayer)) continue;
|
||||
gamePlayer.EmitSound("Player.BurnDamage");
|
||||
}
|
||||
}
|
||||
|
||||
private void checkTripwires() {
|
||||
if (tripwireTracker == null) return;
|
||||
foreach (var wire in new List<TripwireInstance>(tripwireTracker
|
||||
.ActiveTripwires)) {
|
||||
var ray = TraceRay.TraceShape(wire.StartPos, wire.EndPos, Contents.Player,
|
||||
wire.TripwireProp.Handle);
|
||||
if (!ray.DidHit() || !ray.HitPlayer(out var player)) continue;
|
||||
|
||||
if (!config.FriendlyFireTriggers && player != null) {
|
||||
var apiPlayer = converter.GetPlayer(player);
|
||||
var role = Roles.GetRoles(apiPlayer);
|
||||
if (role.Any(r => r is TraitorRole)) continue;
|
||||
}
|
||||
|
||||
ActivateTripwire(wire);
|
||||
}
|
||||
}
|
||||
|
||||
private float getDamage(float distance) {
|
||||
return config.ExplosionPower
|
||||
* MathF.Pow(MathF.E, -distance * config.FalloffDelay);
|
||||
}
|
||||
|
||||
private int getDamage(CCSPlayerController gamePlayer, IOnlinePlayer player,
|
||||
Vector tripwire) {
|
||||
var origin = gamePlayer.Pawn.Value?.AbsOrigin;
|
||||
if (origin == null) return 0;
|
||||
var distance = tripwire.Distance(origin);
|
||||
var damage = getDamage(distance);
|
||||
if (Roles.GetRoles(player).Any(r => r is TraitorRole))
|
||||
damage *= config.FriendlyFireMultiplier;
|
||||
|
||||
return (int)Math.Floor(damage);
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameEnd(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.FINISHED) return;
|
||||
|
||||
killedWithTripwire.Clear();
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRagdollSpawn(BodyCreateEvent ev) {
|
||||
if (!killedWithTripwire.TryGetValue(ev.Body.Id, out var info)) return;
|
||||
if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
|
||||
return;
|
||||
ev.Body.Killer = info.owner;
|
||||
}
|
||||
|
||||
private bool dealTripwireDamage(TripwireInstance instance,
|
||||
IOnlinePlayer player,
|
||||
[NotNullWhen(true)] out CCSPlayerController? gamePlayer) {
|
||||
gamePlayer = null;
|
||||
if (!player.IsAlive) return false;
|
||||
|
||||
gamePlayer = converter.GetPlayer(player);
|
||||
if (gamePlayer == null) return false;
|
||||
var damage = getDamage(gamePlayer, player, instance.StartPos);
|
||||
|
||||
if (damage < 1) return false;
|
||||
|
||||
Event ev;
|
||||
if (player.Health - damage <= 0) {
|
||||
killedWithTripwire[player.Id] = instance;
|
||||
ev = new PlayerDeathEvent(player).WithKiller(instance.owner)
|
||||
.WithWeapon("[Tripwire]");
|
||||
} else {
|
||||
ev = new PlayerDamagedEvent(player, instance.owner, damage) {
|
||||
Weapon = "[Tripwire]"
|
||||
};
|
||||
}
|
||||
|
||||
Bus.Dispatch(ev);
|
||||
|
||||
player.Health -= damage;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
23
TTT/CS2/Items/Tripwire/TripwireMsgs.cs
Normal file
23
TTT/CS2/Items/Tripwire/TripwireMsgs.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
using TTT.Locale;
|
||||
|
||||
namespace TTT.CS2.Items.Tripwire;
|
||||
|
||||
public class TripwireMsgs {
|
||||
public static IMsg SHOP_ITEM_TRIPWIRE
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE));
|
||||
|
||||
public static IMsg SHOP_ITEM_TRIPWIRE_DESC
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DESC));
|
||||
|
||||
public static IMsg SHOP_ITEM_TRIPWIRE_TOOFAR
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_TOOFAR));
|
||||
|
||||
public static IMsg SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED
|
||||
=> MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED));
|
||||
|
||||
public static IMsg
|
||||
SHOP_ITEM_TRIPWIRE_DEFUSING(double progress, TimeSpan time) {
|
||||
return MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DEFUSING),
|
||||
progress.ToString("P0"), time.TotalSeconds.ToString("F1"));
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
using System.Drawing;
|
||||
using System.Reactive.Concurrency;
|
||||
using System.Reactive.Concurrency;
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
@@ -11,27 +10,25 @@ using TTT.API.Player;
|
||||
using TTT.API.Storage;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.CS2.lang;
|
||||
using TTT.CS2.Utils;
|
||||
using TTT.Game;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Listeners;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Listeners;
|
||||
|
||||
public class AfkTimerListener(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private IDisposable? specTimer, specWarnTimer;
|
||||
|
||||
private TTTConfig config
|
||||
=> Provider.GetRequiredService<IStorage<TTTConfig>>()
|
||||
.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new TTTConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private IDisposable? specTimer, specWarnTimer;
|
||||
|
||||
public override void Dispose() {
|
||||
base.Dispose();
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@ using TTT.API.Player;
|
||||
using TTT.CS2.API;
|
||||
using TTT.CS2.Events;
|
||||
using TTT.CS2.Extensions;
|
||||
using TTT.Game;
|
||||
using TTT.Game.Events.Body;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Game.Listeners;
|
||||
@@ -35,6 +34,8 @@ public class BodyPickupListener(IServiceProvider provider)
|
||||
if (ev.Player is not IOnlinePlayer online)
|
||||
throw new InvalidOperationException("Player is not an online player.");
|
||||
|
||||
if (ev.Player.Id == body.OfPlayer.Id) return;
|
||||
|
||||
var identifyEvent = new BodyIdentifyEvent(body, online);
|
||||
|
||||
Bus.Dispatch(identifyEvent);
|
||||
|
||||
@@ -15,12 +15,6 @@ using TTT.Karma.lang;
|
||||
namespace TTT.CS2.Listeners;
|
||||
|
||||
public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
|
||||
private KarmaConfig config
|
||||
=> Provider.GetService<IStorage<KarmaConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new KarmaConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
@@ -31,6 +25,12 @@ public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
|
||||
|
||||
private readonly Dictionary<IPlayer, DateTime> lastWarned = new();
|
||||
|
||||
private KarmaConfig config
|
||||
=> Provider.GetService<IStorage<KarmaConfig>>()
|
||||
?.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new KarmaConfig();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
|
||||
public void OnKarmaUpdate(KarmaUpdateEvent ev) {
|
||||
|
||||
48
TTT/CS2/Listeners/MapHookListener.cs
Normal file
48
TTT/CS2/Listeners/MapHookListener.cs
Normal file
@@ -0,0 +1,48 @@
|
||||
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.Events.Player;
|
||||
using TTT.Game.Listeners;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Listeners;
|
||||
|
||||
public class MapHookListener(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
|
||||
public void OnRoleAssign(PlayerRoleAssignEvent ev) {
|
||||
var player = converter.GetPlayer(ev.Player);
|
||||
if (player == null) return;
|
||||
|
||||
switch (ev.Role) {
|
||||
case TraitorRole:
|
||||
player.Pawn.Value?.AcceptInput("AddContext", null, null, "TRAITOR:1");
|
||||
break;
|
||||
case DetectiveRole:
|
||||
player.Pawn.Value?.AcceptInput("AddContext", null, null, "DETECTIVE:1");
|
||||
break;
|
||||
case InnocentRole:
|
||||
player.Pawn.Value?.AcceptInput("AddContext", null, null, "INNOCENT:1");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRoundEnd(GameInitEvent ev) {
|
||||
foreach (var player in Utilities.GetPlayers()) {
|
||||
if (player.Pawn.Value == null) continue;
|
||||
player.Pawn.Value.AcceptInput("RemoveContext", null, null, "TRAITOR");
|
||||
player.Pawn.Value.AcceptInput("RemoveContext", null, null, "DETECTIVE");
|
||||
player.Pawn.Value.AcceptInput("RemoveContext", null, null, "INNOCENT");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,8 +20,8 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
|
||||
|
||||
private readonly ISet<int> revealedDeaths = new HashSet<int>();
|
||||
|
||||
private readonly IDictionary<int, (int, int)> roundKillsAndAssists =
|
||||
new Dictionary<int, (int, int)>();
|
||||
private readonly IDictionary<int, RoundData> roundStats =
|
||||
new Dictionary<int, RoundData>();
|
||||
|
||||
public void Dispose() { }
|
||||
|
||||
@@ -50,24 +50,39 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
|
||||
ev.Assister == null ? null : converter.GetPlayer(ev.Assister);
|
||||
|
||||
if (killer != null) {
|
||||
roundKillsAndAssists.TryGetValue(killer.Slot, out var def);
|
||||
def.Item1++;
|
||||
roundKillsAndAssists[killer.Slot] = def;
|
||||
roundStats.TryGetValue(killer.Slot, out var def);
|
||||
def ??= new RoundData();
|
||||
def.Kills++;
|
||||
roundStats[killer.Slot] = def;
|
||||
}
|
||||
|
||||
if (assister != null && assister != killer) {
|
||||
roundKillsAndAssists.TryGetValue(assister.Slot, out var def);
|
||||
def.Item2++;
|
||||
roundKillsAndAssists[assister.Slot] = def;
|
||||
roundStats.TryGetValue(assister.Slot, out var def);
|
||||
def ??= new RoundData();
|
||||
def.Assists++;
|
||||
roundStats[assister.Slot] = def;
|
||||
}
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(Priority = Priority.HIGH)]
|
||||
public void OnDamage(PlayerDamagedEvent ev) {
|
||||
var attacker =
|
||||
ev.Attacker == null ? null : converter.GetPlayer(ev.Attacker);
|
||||
if (attacker == null) return;
|
||||
|
||||
roundStats.TryGetValue(attacker.Slot, out var def);
|
||||
def ??= new RoundData();
|
||||
def.Damage += ev.DmgDealt;
|
||||
roundStats[attacker.Slot] = def;
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRoundEnd(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState == State.IN_PROGRESS) {
|
||||
revealedDeaths.Clear();
|
||||
roundKillsAndAssists.Clear();
|
||||
roundStats.Clear();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -100,17 +115,24 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
|
||||
var online = finder.GetOnline()
|
||||
.Select(p => converter.GetPlayer(p))
|
||||
.OfType<CCSPlayerController>()
|
||||
.Where(p => p.IsValid && roundKillsAndAssists.ContainsKey(p.Slot));
|
||||
.Where(p => p.IsValid && roundStats.ContainsKey(p.Slot));
|
||||
|
||||
foreach (var player in online) {
|
||||
var stats = player.ActionTrackingServices?.MatchStats;
|
||||
if (stats == null) continue;
|
||||
|
||||
var (kills, assists) = roundKillsAndAssists[player.Slot];
|
||||
stats.Kills += kills;
|
||||
stats.Assists += assists;
|
||||
if (!roundStats.TryGetValue(player.Slot, out var data)) continue;
|
||||
|
||||
stats.Kills += data.Kills;
|
||||
stats.Assists += data.Assists;
|
||||
Utilities.SetStateChanged(player, "CCSPlayerController",
|
||||
"m_pActionTrackingServices");
|
||||
}
|
||||
}
|
||||
|
||||
private record RoundData {
|
||||
public int Assists;
|
||||
public int Damage;
|
||||
public int Kills;
|
||||
}
|
||||
}
|
||||
@@ -22,17 +22,17 @@ namespace TTT.CS2.Listeners;
|
||||
|
||||
public class RoundTimerListener(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
public IDisposable? EndTimer;
|
||||
|
||||
private TTTConfig config
|
||||
=> Provider.GetRequiredService<IStorage<TTTConfig>>()
|
||||
.Load()
|
||||
.GetAwaiter()
|
||||
.GetResult() ?? new TTTConfig();
|
||||
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
public IDisposable? EndTimer;
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler(IgnoreCanceled = true)]
|
||||
public void OnRoundStart(GameStateUpdateEvent ev) {
|
||||
|
||||
66
TTT/CS2/Listeners/WardenTagAssigner.cs
Normal file
66
TTT/CS2/Listeners/WardenTagAssigner.cs
Normal file
@@ -0,0 +1,66 @@
|
||||
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.ThirdParties.eGO;
|
||||
using TTT.Game.Events.Game;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Listeners;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.CS2.Listeners;
|
||||
|
||||
public class WardenTagAssigner(IServiceProvider provider)
|
||||
: BaseListener(provider) {
|
||||
private readonly IPlayerConverter<CCSPlayerController> converter =
|
||||
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
|
||||
|
||||
private readonly Dictionary<string, (string, char)> oldTags = new();
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnRoleAssign(PlayerRoleAssignEvent ev) {
|
||||
var maul = EgoApi.MAUL.Get();
|
||||
if (maul == null) return;
|
||||
if (ev.Role is not DetectiveRole) return;
|
||||
var gamePlayer = converter.GetPlayer(ev.Player);
|
||||
if (gamePlayer == null) return;
|
||||
|
||||
Task.Run(async () => {
|
||||
var oldTag = await maul.getTagService().GetTag(gamePlayer.SteamID);
|
||||
var oldTagColor =
|
||||
await maul.getTagService().GetTagColor(gamePlayer.SteamID);
|
||||
if (oldTag != "[DETECTIVE]")
|
||||
oldTags[ev.Player.Id] = (oldTag, oldTagColor);
|
||||
|
||||
await Server.NextWorldUpdateAsync(() => {
|
||||
maul.getTagService().SetTag(gamePlayer, "[DETECTIVE]", false);
|
||||
maul.getTagService()
|
||||
.SetTagColor(gamePlayer, ChatColors.DarkBlue, false);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
[UsedImplicitly]
|
||||
[EventHandler]
|
||||
public void OnGameEnd(GameStateUpdateEvent ev) {
|
||||
if (ev.NewState != State.FINISHED) return;
|
||||
var maul = EgoApi.MAUL.Get();
|
||||
if (maul == null) return;
|
||||
|
||||
foreach (var (playerId, (oldTag, oldTagColor)) in oldTags) {
|
||||
var apiPlayer = Finder.GetPlayerById(playerId);
|
||||
if (apiPlayer == null) continue;
|
||||
var csPlayer = converter.GetPlayer(apiPlayer);
|
||||
if (csPlayer == null || !csPlayer.IsValid) continue;
|
||||
maul.getTagService().SetTag(csPlayer, oldTag, false);
|
||||
maul.getTagService().SetTagColor(csPlayer, oldTagColor, false);
|
||||
}
|
||||
|
||||
oldTags.Clear();
|
||||
}
|
||||
}
|
||||
@@ -9,8 +9,8 @@ namespace TTT.CS2.Player;
|
||||
|
||||
public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
|
||||
private readonly HashSet<CCSPlayerController> _fakeAlivePlayers = new();
|
||||
private BasePlugin? plugin;
|
||||
public ISet<CCSPlayerController> FakeAlivePlayers => _fakeAlivePlayers;
|
||||
private BasePlugin? plugin = null;
|
||||
|
||||
public void SpoofAlive(CCSPlayerController player) {
|
||||
if (player.IsBot) {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
using CounterStrikeSharp.API;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Utils;
|
||||
using TTT.API.Player;
|
||||
using TTT.CS2.Extensions;
|
||||
|
||||
namespace TTT.CS2.Player;
|
||||
|
||||
@@ -53,7 +55,7 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
|
||||
}
|
||||
|
||||
public string Id { get; }
|
||||
public string Name { get; }
|
||||
public string Name { get; set; }
|
||||
|
||||
public int Health {
|
||||
get => Player?.Pawn.Value != null ? Player.Pawn.Value.Health : 0;
|
||||
@@ -86,17 +88,20 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
|
||||
}
|
||||
|
||||
public int Armor {
|
||||
get => Player?.PawnArmor ?? 0;
|
||||
get => Player != null && Player.IsValid ? Player.GetArmor().Item1 : 0;
|
||||
|
||||
set {
|
||||
if (Player == null) return;
|
||||
Player.PawnArmor = value;
|
||||
Utilities.SetStateChanged(Player, "CCSPlayerController", "m_iPawnArmor");
|
||||
if (Player == null || !Player.IsValid) return;
|
||||
Player.SetArmor(value);
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsAlive {
|
||||
get => Player != null && Player.Pawn.Value is { Health: > 0 };
|
||||
get
|
||||
=> Player != null && Player.IsValid && Player is {
|
||||
Team : CsTeam.CounterTerrorist or CsTeam.Terrorist,
|
||||
Pawn.Value.Health: > 0
|
||||
};
|
||||
|
||||
set
|
||||
=> throw new NotSupportedException(
|
||||
@@ -114,14 +119,7 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
|
||||
|
||||
// Goal: Pad the name to a fixed width for better alignment in logs
|
||||
// Left-align ID, right-align name
|
||||
private string createPaddedName() {
|
||||
var onlineLengths = Utilities.GetPlayers()
|
||||
.Select(p => p.PlayerName.Length)
|
||||
.ToList();
|
||||
if (onlineLengths.Count == 0) return CreatePaddedName(Id, Name, 13);
|
||||
var namePadding = Math.Min(onlineLengths.Max(), 24);
|
||||
return CreatePaddedName(Id, Name, namePadding + 8);
|
||||
}
|
||||
private string createPaddedName() { return CreatePaddedName(Id, Name, 24); }
|
||||
|
||||
public static string CreatePaddedName(string id, string name, int len) {
|
||||
var suffix = id.Length > 5 ? id[^5..] : id.PadLeft(5, '0');
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
using System.Net;
|
||||
using System.Numerics;
|
||||
using System.Runtime.InteropServices;
|
||||
using CounterStrikeSharp.API;
|
||||
using System.Runtime.InteropServices;
|
||||
using CounterStrikeSharp.API.Core;
|
||||
using CounterStrikeSharp.API.Modules.Memory;
|
||||
using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
|
||||
|
||||
@@ -18,13 +18,13 @@ public class GrenadeDataHelper {
|
||||
heGrenadeSignature);
|
||||
}
|
||||
|
||||
private delegate int CHEGrenadeProjectile_CreateDelegate(IntPtr position,
|
||||
IntPtr angle, IntPtr velocity, IntPtr velocityAngle, IntPtr thrower,
|
||||
int weaponId, byte team);
|
||||
|
||||
public static int CreateGrenade(Vector position, QAngle angle,
|
||||
Vector velocity, Vector velocityAngle, IntPtr thrower, CsTeam team) {
|
||||
return CHEGrenadeProjectile_CreateFunc(position.Handle, angle.Handle,
|
||||
velocity.Handle, velocityAngle.Handle, thrower, 44, (byte)team);
|
||||
}
|
||||
|
||||
private delegate int CHEGrenadeProjectile_CreateDelegate(IntPtr position,
|
||||
IntPtr angle, IntPtr velocity, IntPtr velocityAngle, IntPtr thrower,
|
||||
int weaponId, byte team);
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.Game;
|
||||
using TTT.Game.lang;
|
||||
using TTT.Locale;
|
||||
|
||||
@@ -13,6 +12,8 @@ public static class CS2Msgs {
|
||||
public static IMsg DEAD_MUTE_REMINDER
|
||||
=> MsgFactory.Create(nameof(DEAD_MUTE_REMINDER));
|
||||
|
||||
public static IMsg AFK_MOVED => MsgFactory.Create(nameof(AFK_MOVED));
|
||||
|
||||
public static IMsg TASER_SCANNED(IPlayer scannedPlayer, IRole role) {
|
||||
var rolePrefix = GameMsgs.GetRolePrefix(role);
|
||||
return MsgFactory.Create(nameof(TASER_SCANNED),
|
||||
@@ -23,8 +24,6 @@ public static class CS2Msgs {
|
||||
return MsgFactory.Create(nameof(AFK_WARNING), span.TotalSeconds);
|
||||
}
|
||||
|
||||
public static IMsg AFK_MOVED => MsgFactory.Create(nameof(AFK_MOVED));
|
||||
|
||||
public static IMsg TRAITOR_CHAT_FORMAT(IOnlinePlayer player, string msg) {
|
||||
return MsgFactory.Create(nameof(TRAITOR_CHAT_FORMAT), player.Name, msg);
|
||||
}
|
||||
|
||||
@@ -8,45 +8,54 @@ AFK_MOVED: "%PREFIX%You were moved to spectators for being AFK."
|
||||
DEAD_MUTE_REMINDER: "%PREFIX%You are dead and cannot be heard."
|
||||
|
||||
SHOP_ITEM_DNA: "DNA Scanner"
|
||||
SHOP_ITEM_DNA_DESC: "Scan bodies to reveal the person who killed them."
|
||||
SHOP_ITEM_DNA_DESC: "Scan bodies to reveal the person who killed them"
|
||||
SHOP_ITEM_DNA_SCANNED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, their killer was {red}{2}{grey}."
|
||||
SHOP_ITEM_DNA_SCANNED_OTHER: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, {2}."
|
||||
SHOP_ITEM_DNA_EXPIRED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, but the DNA has expired."
|
||||
|
||||
SHOP_ITEM_STATION_HEALTH: "Health Station"
|
||||
SHOP_ITEM_STATION_HEALTH_DESC: "A health station that heals players around it."
|
||||
SHOP_ITEM_STATION_HEALTH_DESC: "The health station will heall all players around it"
|
||||
SHOP_ITEM_STATION_HURT: "Hurt Station"
|
||||
SHOP_ITEM_STATION_HURT_DESC: "A station that hurts non-Traitors around it."
|
||||
SHOP_ITEM_STATION_HURT_DESC: "The hurt station will damage all non-Traitors around it"
|
||||
|
||||
SHOP_ITEM_CAMO: "Camouflage"
|
||||
SHOP_ITEM_CAMO_DESC: "Disguise yourself and make yourself harder to see."
|
||||
SHOP_ITEM_CAMO_DESC: "You are now harder to see"
|
||||
|
||||
SHOP_ITEM_BODY_PAINT: "Body Paint"
|
||||
SHOP_ITEM_BODY_PAINT_DESC: "Paint bodies to make them appear identified."
|
||||
SHOP_ITEM_BODY_PAINT_DESC: "Interacting with bodies will now paint them, making them appear identified"
|
||||
SHOP_ITEM_BODY_PAINT_OUT: "%PREFIX% You ran out of body paint."
|
||||
|
||||
SHOP_ITEM_POISON_SHOTS: "Poison Shots"
|
||||
SHOP_ITEM_POISON_SHOTS_DESC: "Your bullets are coated in a mildly poisonous substance."
|
||||
SHOP_ITEM_POISON_SHOTS_DESC: "The next 5 shots from your {red}pistols{grey} are coated with poison"
|
||||
SHOP_ITEM_POISON_HIT: "%PREFIX% You hit {green}{0}{grey} with a {lightpurple}poison shot{grey}."
|
||||
SHOP_ITEM_POISON_OUT: "%PREFIX% You are out of poison shots."
|
||||
|
||||
SHOP_ITEM_POISON_SMOKE: "Poison Smoke"
|
||||
SHOP_ITEM_POISON_SMOKE_DESC: "Throw a grenade that releases poisonous gas."
|
||||
SHOP_ITEM_POISON_SMOKE_DESC: "The smoke grenade will damage all non-Traitors inside it over time"
|
||||
|
||||
SHOP_ITEM_ARMOR: "Armor with Helmet"
|
||||
SHOP_ITEM_ARMOR_DESC: "Wear armor that reduces incoming damage."
|
||||
SHOP_ITEM_ARMOR_DESC: ""
|
||||
|
||||
SHOP_ITEM_ONE_HIT_KNIFE: "One-Hit Knife"
|
||||
SHOP_ITEM_ONE_HIT_KNIFE_DESC: "Your next knife hit will be a guaranteed kill."
|
||||
SHOP_ITEM_ONE_HIT_KNIFE_DESC: "Your {red}next knife{grey} attack will instantly kill your target"
|
||||
|
||||
SHOP_ITEM_COMPASS_PLAYER: "Player Compass"
|
||||
SHOP_ITEM_COMPASS_PLAYER_DESC: "Reveals the direction that the nearest non-Traitor is in."
|
||||
SHOP_ITEM_COMPASS_PLAYER_DESC: ""
|
||||
|
||||
SHOP_ITEM_COMPASS_BODY: "Body Compass"
|
||||
SHOP_ITEM_COMPASS_BODY_DESC: "Reveals the direction that the nearest unidentified body is in."
|
||||
SHOP_ITEM_COMPASS_BODY_DESC: ""
|
||||
|
||||
SHOP_ITEM_SILENT_AWP: "Silent AWP"
|
||||
SHOP_ITEM_SILENT_AWP_DESC: "Receive a silenced AWP with limited ammo."
|
||||
SHOP_ITEM_SILENT_AWP_DESC: ""
|
||||
|
||||
SHOP_ITEM_CLUSTER_GRENADE: "Cluster Grenade"
|
||||
SHOP_ITEM_CLUSTER_GRENADE_DESC: "A grenade that splits into multiple smaller grenades."
|
||||
SHOP_ITEM_CLUSTER_GRENADE_DESC: ""
|
||||
|
||||
SHOP_ITEM_TELEPORT_DECOY: "Teleport Decoy"
|
||||
SHOP_ITEM_TELEPORT_DECOY_DESC: "The decoy will teleport you to its location {default}once it explodes{grey}"
|
||||
|
||||
SHOP_ITEM_TRIPWIRE: "Tripwire"
|
||||
SHOP_ITEM_TRIPWIRE_DESC: "The tripwire will activate once anyone crosses it"
|
||||
SHOP_ITEM_TRIPWIRE_TOOFAR: "%PREFIX%You are too far away to place the tripwire."
|
||||
SHOP_ITEM_TRIPWIRE_DEFUSING: "Defusing... ({0}, {1} second%s% left)."
|
||||
SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED: "%PREFIX%You stopped defusing the tripwire."
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.342"/>
|
||||
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.346"/>
|
||||
<PackageReference Include="System.Reactive" Version="6.0.1"/>
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.Game.Actions;
|
||||
|
||||
@@ -24,6 +25,12 @@ public class DamagedAction(IRoleAssigner roles, IPlayer victim,
|
||||
public string Verb => "damaged";
|
||||
public string Details => $"for {Damage} damage with {Weapon}";
|
||||
|
||||
public string Prefix
|
||||
=> PlayerRole != null && OtherRole != null
|
||||
&& PlayerRole is TraitorRole != OtherRole is TraitorRole ?
|
||||
"" :
|
||||
"[BAD] ";
|
||||
|
||||
#region ConstructorAliases
|
||||
|
||||
public DamagedAction(IServiceProvider provider, IPlayer victim,
|
||||
|
||||
@@ -3,6 +3,7 @@ using TTT.API.Game;
|
||||
using TTT.API.Player;
|
||||
using TTT.API.Role;
|
||||
using TTT.Game.Events.Player;
|
||||
using TTT.Game.Roles;
|
||||
|
||||
namespace TTT.Game.Actions;
|
||||
|
||||
@@ -10,7 +11,7 @@ public class DeathAction(IRoleAssigner roles, IPlayer victim, IPlayer? killer)
|
||||
: IAction {
|
||||
public DeathAction(IRoleAssigner roles, PlayerDeathEvent ev) : this(roles,
|
||||
ev.Player, ev.Killer) {
|
||||
Details = $"using {ev.Weapon}";
|
||||
if (!string.IsNullOrWhiteSpace(ev.Weapon)) Details = $"using {ev.Weapon}";
|
||||
}
|
||||
|
||||
public IPlayer Player { get; } = victim;
|
||||
@@ -34,10 +35,16 @@ public class DeathAction(IRoleAssigner roles, IPlayer victim, IPlayer? killer)
|
||||
$" [{OtherRole.Name.First(char.IsAsciiLetter)}]" :
|
||||
"";
|
||||
return Other is not null ?
|
||||
$"{Other}{oRole} {Verb} {Player}{pRole} {Details}" :
|
||||
$"{Player}{pRole} {Verb} {Details}";
|
||||
$"{Prefix}{Other}{oRole} {Verb} {Player}{pRole} {Details}" :
|
||||
$"{Prefix}{Player}{pRole} {Verb} {Details}";
|
||||
}
|
||||
|
||||
public string Prefix
|
||||
=> PlayerRole != null && OtherRole != null
|
||||
&& PlayerRole is TraitorRole != OtherRole is TraitorRole ?
|
||||
"" :
|
||||
"[BAD] ";
|
||||
|
||||
#region ConstructorAliases
|
||||
|
||||
public DeathAction(IServiceProvider provider, IPlayer victim, IPlayer? killer)
|
||||
|
||||
@@ -11,5 +11,7 @@ public class RoleAssignedAction(IPlayer player, IRole role) : IAction {
|
||||
public IRole? OtherRole { get; } = null;
|
||||
public string Id => "basegame.action.roleassigned";
|
||||
public string Verb => "was assigned";
|
||||
public string Details { get; } = role.Name;
|
||||
|
||||
public string Details { get; } =
|
||||
new(role.Name.Where(char.IsAsciiLetter).ToArray());
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user