Compare commits

...

22 Commits

Author SHA1 Message Date
Isaac
2bcf436677 feat: Auto RTD (resolves #140) (#139) 2025-10-24 17:41:08 -07:00
MSWS
3fa1558011 feat: Auto RTD 2025-10-24 17:36:36 -07:00
MSWS
6c7bc22395 Add vanilla round 2025-10-24 17:06:35 -07:00
MSWS
c95fba0fc5 Send messages 2025-10-24 16:44:09 -07:00
Isaac
40c7a6d471 Fix services (#137) 2025-10-24 16:03:35 -07:00
MSWS
b79519f6b4 Fix services 2025-10-24 16:01:56 -07:00
Isaac
bea87d20f3 Feat/special rounds (#136) 2025-10-24 15:23:48 -07:00
MSWS
5bbc621d86 Fix circular dependencies 2025-10-24 15:21:48 -07:00
MSWS
5ed244f84c Add list of special rounds to feedback 2025-10-24 15:16:54 -07:00
MSWS
31d2354e6f Basic work for special rounds 2025-10-24 15:16:03 -07:00
MSWS
44d9644694 Start work on special rounds 2025-10-24 01:38:14 -07:00
MSWS
cf1d040b44 Update scope management 2025-10-22 15:58:55 -07:00
MSWS
8158206101 Increase unit test delay again 2025-10-22 09:15:15 -07:00
MSWS
06f8f083df fix: Services typo 2025-10-22 09:12:18 -07:00
Isaac
5c18a046b8 Update TTT/Stats/StatsServiceCollection.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Isaac <git@msws.xyz>
2025-10-22 09:11:14 -07:00
Isaac
063813baca Merge branch 'main' into dev 2025-10-22 09:09:57 -07:00
MSWS
a10ce25846 Additional api updates 2025-10-22 03:05:36 -07:00
MSWS
89077c8361 Add api feedback 2025-10-22 01:12:43 -07:00
MSWS
fd3ffc6d59 Revert "Add api feedback"
This reverts commit f9e2734390.
2025-10-22 01:11:55 -07:00
MSWS
f9e2734390 Add api feedback 2025-10-22 01:11:43 -07:00
MSWS
251d8efeaf Add api feedback 2025-10-22 01:04:45 -07:00
Isaac
247f7de49b Shop Balancing, AFK Management, Exploration based rewards (resolves #116) (#132) 2025-10-20 20:08:20 -07:00
44 changed files with 808 additions and 218 deletions

View File

@@ -0,0 +1,29 @@
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Events;
using TTT.Game.Events.Game;
using TTT.Locale;
namespace SpecialRoundAPI;
public abstract class AbstractSpecialRound(IServiceProvider provider)
: ITerrorModule, IListener {
protected readonly IServiceProvider Provider = provider;
protected readonly ISpecialRoundTracker Tracker =
provider.GetRequiredService<ISpecialRoundTracker>();
public void Dispose() { }
public void Start() { }
public abstract string Name { get; }
public abstract IMsg Description { get; }
public abstract SpecialRoundConfig Config { get; }
public abstract void ApplyRoundEffects();
[UsedImplicitly]
[EventHandler]
public abstract void OnGameState(GameStateUpdateEvent ev);
}

View File

@@ -0,0 +1,5 @@
namespace SpecialRoundAPI;
public record BhopRoundConfig : SpecialRoundConfig {
public override float Weight { get; init; } = 0.2f;
}

View File

@@ -0,0 +1,13 @@
namespace SpecialRoundAPI;
public interface ISpecialRoundStarter {
/// <summary>
/// Attempts to start the given special round.
/// Will bypass most checks, but may still return null if starting the round
/// is not possible.
/// </summary>
/// <param name="round"></param>
/// <returns></returns>
public AbstractSpecialRound?
TryStartSpecialRound(AbstractSpecialRound? round);
}

View File

@@ -0,0 +1,6 @@
namespace SpecialRoundAPI;
public interface ISpecialRoundTracker {
public AbstractSpecialRound? CurrentRound { get; set; }
public int RoundsSinceLastSpecial { get; set; }
}

View File

@@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Locale\Locale.csproj" />
<ProjectReference Include="..\..\TTT\API\API.csproj" />
<ProjectReference Include="..\..\TTT\Game\Game.csproj" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,5 @@
namespace SpecialRoundAPI;
public abstract record SpecialRoundConfig {
public abstract float Weight { get; init; }
}

View File

@@ -0,0 +1,8 @@
namespace SpecialRoundAPI;
public record SpeedRoundConfig : SpecialRoundConfig {
public override float Weight { get; init; } = 0.4f;
public TimeSpan InitialSeconds { get; init; } = TimeSpan.FromSeconds(60);
public TimeSpan SecondsPerKill { get; init; } = TimeSpan.FromSeconds(10);
}

View File

@@ -0,0 +1,5 @@
namespace SpecialRoundAPI;
public record VanillaRoundConfig : SpecialRoundConfig {
public override float Weight { get; init; } = 0.3f;
}

12
TTT.sln
View File

@@ -27,6 +27,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RTD", "TTT\RTD\RTD.csproj",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats", "TTT\Stats\Stats.csproj", "{256473A2-6ACD-440C-83FA-6056147656C7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRound", "TTT\SpecialRound\SpecialRound.csproj", "{5092069A-3CFA-41C8-B685-341040AB435C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRoundAPI", "SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj", "{360FEF16-54DA-42EE-995A-3D31C699287D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -84,6 +88,14 @@ Global
{256473A2-6ACD-440C-83FA-6056147656C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{256473A2-6ACD-440C-83FA-6056147656C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{256473A2-6ACD-440C-83FA-6056147656C7}.Release|Any CPU.Build.0 = Release|Any CPU
{5092069A-3CFA-41C8-B685-341040AB435C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5092069A-3CFA-41C8-B685-341040AB435C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5092069A-3CFA-41C8-B685-341040AB435C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5092069A-3CFA-41C8-B685-341040AB435C}.Release|Any CPU.Build.0 = Release|Any CPU
{360FEF16-54DA-42EE-995A-3D31C699287D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{360FEF16-54DA-42EE-995A-3D31C699287D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{360FEF16-54DA-42EE-995A-3D31C699287D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{360FEF16-54DA-42EE-995A-3D31C699287D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection

View File

@@ -9,6 +9,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj" />
<ProjectReference Include="..\API\API.csproj"/>
<ProjectReference Include="..\Game\Game.csproj"/>
<ProjectReference Include="..\Karma\Karma.csproj"/>

View File

@@ -0,0 +1,41 @@
using Microsoft.Extensions.DependencyInjection;
using SpecialRoundAPI;
using TTT.API;
using TTT.API.Command;
using TTT.API.Player;
namespace TTT.CS2.Command.Test;
public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
private readonly ISpecialRoundStarter tracker =
provider.GetRequiredService<ISpecialRoundStarter>();
public void Dispose() { }
public void Start() { }
public string Id => "specialround";
public Task<CommandResult>
Execute(IOnlinePlayer? executor, ICommandInfo info) {
if (info.ArgCount == 1) {
tracker.TryStartSpecialRound(null);
info.ReplySync("Started a random special round.");
return Task.FromResult(CommandResult.SUCCESS);
}
var rounds = provider.GetServices<ITerrorModule>()
.OfType<AbstractSpecialRound>()
.ToDictionary(r => r.GetType().Name.ToLower(), r => r);
var roundName = info.Args[1].ToLower();
if (!rounds.TryGetValue(roundName, out var round)) {
info.ReplySync($"No special round found with name '{roundName}'.");
foreach (var name in rounds.Keys) info.ReplySync($"- {name}");
return Task.FromResult(CommandResult.INVALID_ARGS);
}
tracker.TryStartSpecialRound(round);
info.ReplySync($"Started special round '{roundName}'.");
return Task.FromResult(CommandResult.SUCCESS);
}
}

View File

@@ -28,6 +28,7 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
subCommands.Add("credits", new CreditsCommand(provider));
subCommands.Add("spec", new SpecCommand(provider));
subCommands.Add("reload", new ReloadModuleCommand(provider));
subCommands.Add("specialround", new SpecialRoundCommand(provider));
}
public Task<CommandResult>

View File

@@ -31,7 +31,7 @@ public class RoundTimerListener(IServiceProvider provider)
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private IDisposable? endTimer;
public IDisposable? EndTimer;
[UsedImplicitly]
[EventHandler(IgnoreCanceled = true)]
@@ -63,14 +63,14 @@ public class RoundTimerListener(IServiceProvider provider)
player.Respawn();
});
if (ev.NewState == State.FINISHED) endTimer?.Dispose();
if (ev.NewState == State.FINISHED) EndTimer?.Dispose();
if (ev.NewState != State.IN_PROGRESS) return;
var duration = config.RoundCfg.RoundDuration(ev.Game.Players.Count);
Server.NextWorldUpdate(()
=> RoundUtil.SetTimeRemaining((int)duration.TotalSeconds));
endTimer?.Dispose();
endTimer = Scheduler.Schedule(duration,
EndTimer?.Dispose();
EndTimer = Scheduler.Schedule(duration,
() => {
Server.NextWorldUpdate(()
=> ev.Game.EndGame(EndReason.TIMEOUT(new InnocentRole(Provider))));
@@ -137,6 +137,6 @@ public class RoundTimerListener(IServiceProvider provider)
public override void Dispose() {
base.Dispose();
endTimer?.Dispose();
EndTimer?.Dispose();
}
}

View File

@@ -11,11 +11,4 @@
<ProjectReference Include="..\Game\Game.csproj"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.66"/>
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9"/>
<PackageReference Include="MySqlConnector" Version="2.4.0"/>
<PackageReference Include="SQLite" Version="3.13.0"/>
</ItemGroup>
</Project>

View File

@@ -4,8 +4,6 @@ using System.Diagnostics;
using System.Reactive.Concurrency;
using System.Reactive.Linq;
using System.Reactive.Threading.Tasks;
using Dapper;
using Microsoft.Data.Sqlite;
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Events;
using TTT.API.Player;
@@ -15,142 +13,38 @@ using TTT.Karma.Events;
namespace TTT.Karma;
public sealed class KarmaStorage(IServiceProvider provider) : IKarmaService {
// Toggle immediate writes. If false, every Write triggers a flush
private const bool EnableCache = true;
private readonly IEventBus _bus = provider.GetRequiredService<IEventBus>();
private readonly HttpClient client =
provider.GetRequiredService<HttpClient>();
private readonly SemaphoreSlim _flushGate = new(1, 1);
private KarmaConfig config
=> provider.GetService<IStorage<KarmaConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new KarmaConfig();
// Cache keyed by stable player id to avoid relying on IPlayer equality
private readonly ConcurrentDictionary<string, int> _karmaCache = new();
public async Task<int> Load(IPlayer key) {
var result = await client.GetAsync("user/" + key.Id);
private readonly IScheduler _scheduler =
provider.GetRequiredService<IScheduler>();
if (!result.IsSuccessStatusCode) return config.DefaultKarma;
private KarmaConfig _config = new();
private IDbConnection? _connection;
private IDisposable? _flushSubscription;
var content = await result.Content.ReadAsStringAsync();
var json = System.Text.Json.JsonDocument.Parse(content);
if (!json.RootElement.TryGetProperty("karma", out var karmaElement))
return config.DefaultKarma;
public string Id => nameof(KarmaStorage);
public string Version => GitVersionInformation.FullSemVer;
public void Start() {
// Open a dedicated connection used only by this service
_connection = new SqliteConnection(_config.DbString);
_connection.Open();
// Ensure schema before any reads or writes
_connection.Execute(@"CREATE TABLE IF NOT EXISTS PlayerKarma (
PlayerId TEXT PRIMARY KEY,
Karma INTEGER NOT NULL
)");
// Periodic flush with proper error handling and serialization
_flushSubscription = Observable
.Interval(TimeSpan.FromSeconds(30), _scheduler)
.SelectMany(_ => FlushAsync().ToObservable())
.Subscribe(_ => { }, // no-op on success
ex => {
// Replace with your logger if available
Trace.TraceError($"Karma flush failed: {ex}");
});
return karmaElement.GetInt32();
}
public async Task<int> Load(IPlayer player) {
if (player is null) throw new ArgumentNullException(nameof(player));
var key = player.Id;
public Task Write(IPlayer key, int newData) {
var data = new { steam_id = key.Id, karma = newData };
if (EnableCache && _karmaCache.TryGetValue(key, out var cached))
return cached;
var payload = new StringContent(
System.Text.Json.JsonSerializer.Serialize(data),
System.Text.Encoding.UTF8, "application/json");
var conn = EnsureConnection();
// Parameterize the default value to keep SQL static
var sql = @"
SELECT COALESCE(
(SELECT Karma FROM PlayerKarma WHERE PlayerId = @PlayerId),
@DefaultKarma
)";
var karma = await conn.QuerySingleAsync<int>(sql,
new { PlayerId = key, _config.DefaultKarma });
if (EnableCache) _karmaCache[key] = karma;
return karma;
return client.PatchAsync("user/" + key.Id, payload);
}
public async Task Write(IPlayer player, int newValue) {
if (player is null) throw new ArgumentNullException(nameof(player));
var key = player.Id;
var max = _config.MaxKarma(player);
if (newValue > max)
throw new ArgumentOutOfRangeException(nameof(newValue),
$"Karma must be less than {max} for player {key}.");
int oldValue;
if (!_karmaCache.TryGetValue(key, out oldValue))
oldValue = await Load(player);
if (oldValue == newValue) return;
var evt = new KarmaUpdateEvent(player, oldValue, newValue);
try { _bus.Dispatch(evt); } catch {
// Replace with your logger if available
Trace.TraceError("Exception during KarmaUpdateEvent dispatch.");
throw;
}
if (evt.IsCanceled) return;
_karmaCache[key] = newValue;
if (!EnableCache) await FlushAsync();
}
public void Dispose() {
try {
_flushSubscription?.Dispose();
// Best effort final flush
if (_connection is { State: ConnectionState.Open })
FlushAsync().GetAwaiter().GetResult();
} catch (Exception ex) {
Trace.TraceError($"Dispose flush failed: {ex}");
} finally {
_connection?.Dispose();
_flushGate.Dispose();
}
}
private async Task FlushAsync() {
var conn = EnsureConnection();
// Fast path if there is nothing to flush
if (_karmaCache.IsEmpty) return;
await _flushGate.WaitAsync().ConfigureAwait(false);
try {
// Snapshot to avoid long lock on dictionary and to provide a stable view
var snapshot = _karmaCache.ToArray();
if (snapshot.Length == 0) return;
using var tx = conn.BeginTransaction();
const string upsert = @"
INSERT INTO PlayerKarma (PlayerId, Karma)
VALUES (@PlayerId, @Karma)
ON CONFLICT(PlayerId) DO UPDATE SET Karma = excluded.Karma
";
foreach (var (playerId, karma) in snapshot)
await conn.ExecuteAsync(upsert,
new { PlayerId = playerId, Karma = karma }, tx);
tx.Commit();
} finally { _flushGate.Release(); }
}
private IDbConnection EnsureConnection() {
if (_connection is not { State: ConnectionState.Open })
throw new InvalidOperationException(
"Storage connection is not initialized.");
return _connection;
}
public void Dispose() { }
public void Start() { }
}

View File

@@ -14,6 +14,7 @@
<ProjectReference Include="..\Shop\Shop.csproj"/>
<ProjectReference Include="..\RTD\RTD.csproj"/>
<ProjectReference Include="..\Stats\Stats.csproj"/>
<ProjectReference Include="..\SpecialRound\SpecialRound.csproj"/>
</ItemGroup>
<ItemGroup>

View File

@@ -2,6 +2,7 @@ using System.Reactive.Concurrency;
using CounterStrikeSharp.API.Core;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using SpecialRound;
using Stats;
using TTT.CS2;
using TTT.Game;
@@ -20,8 +21,9 @@ public class TTTServiceCollection : IPluginServiceCollection<TTT> {
serviceCollection.AddCS2Services();
serviceCollection.AddShopServices();
serviceCollection.AddRtdServices();
serviceCollection.AddSpecialRounds();
if (Environment.GetEnvironmentVariable("TTT_STATS_API_URL") == null) return;
serviceCollection.AddStatsSerivces();
serviceCollection.AddStatsServices();
}
}

99
TTT/RTD/AutoRTDCommand.cs Normal file
View File

@@ -0,0 +1,99 @@
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Commands;
using JetBrains.Annotations;
using MAULActainShared.plugin.models;
using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Command;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Player;
using TTT.CS2.Command;
using TTT.CS2.ThirdParties.eGO;
using TTT.Game.Events.Game;
namespace TTT.RTD;
public class AutoRTDCommand(IServiceProvider provider) : ICommand {
public string Id => "autortd";
private ICookie? autoRtdCookie;
private readonly IPlayerFinder finder =
provider.GetRequiredService<IPlayerFinder>();
private readonly ICommandManager commands =
provider.GetRequiredService<ICommandManager>();
public void Dispose() { }
public void Start() {
Task.Run(async () => {
var api = EgoApi.MAUL.Get();
if (api != null) {
await api.getCookieService().RegClientCookie("ttt_autortd");
autoRtdCookie =
await api.getCookieService().FindClientCookie("ttt_autortd");
}
});
}
public string[] RequiredFlags => ["@ttt/autortd"];
private Dictionary<string, bool> playerStatuses = new();
public async Task<CommandResult> Execute(IOnlinePlayer? executor,
ICommandInfo info) {
if (executor == null) return CommandResult.PLAYER_ONLY;
if (autoRtdCookie == null) {
info.ReplySync("AutoRTD system is not available.");
return CommandResult.SUCCESS;
}
if (!ulong.TryParse(executor.Id, out var executorId)) {
info.ReplySync("Your player ID is invalid for AutoRTD.");
return CommandResult.SUCCESS;
}
var value = await autoRtdCookie.Get(executorId);
if (value == "1") {
await autoRtdCookie.Set(executorId, "0");
info.ReplySync("AutoRTD has been disabled.");
} else {
await autoRtdCookie.Set(executorId, "1");
info.ReplySync("AutoRTD has been enabled.");
}
playerStatuses[executor.Id] = value != "1";
return CommandResult.SUCCESS;
}
[UsedImplicitly]
[EventHandler]
public void OnRoundStart(GameStateUpdateEvent ev) {
if (ev.NewState != State.WAITING) return;
Task.Run(async () => {
foreach (var player in finder.GetOnline()) {
if (!playerStatuses.TryGetValue(player.Id, out var status)) {
await fetchCookie(player);
status = playerStatuses.GetValueOrDefault(player.Id, false);
}
if (!status) continue;
var info = new CS2CommandInfo(provider, player, 0, "css_rtd");
info.CallingContext = CommandCallingContext.Chat;
await commands.ProcessCommand(info);
}
});
}
private async Task fetchCookie(IPlayer player) {
if (autoRtdCookie == null) return;
if (!ulong.TryParse(player.Id, out var playerId)) return;
var value = await autoRtdCookie.Get(playerId);
playerStatuses[player.Id] = value == "1";
}
}

View File

@@ -15,4 +15,10 @@
<ProjectReference Include="..\Shop\Shop.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="MAULActainShared">
<HintPath>..\CS2\ThirdParties\Binaries\MAULActainShared.dll</HintPath>
</Reference>
</ItemGroup>
</Project>

View File

@@ -9,6 +9,7 @@ public static class RtdServiceExtensions {
services.AddModBehavior<IRewardGenerator, RewardGenerator>();
services.AddModBehavior<RtdStatsCommand>();
services.AddModBehavior<RTDCommand>();
services.AddModBehavior<AutoRTDCommand>();
services.AddSingleton<IMuted, Muted>();
}
}

View File

@@ -20,4 +20,10 @@ public class RtdMsgs {
public static IMsg CREDITS_REWARD_DESC(int amo)
=> MsgFactory.Create(nameof(CREDITS_REWARD_DESC), amo);
public static IMsg COMMAND_AUTORTD_ENABLED
=> MsgFactory.Create(nameof(COMMAND_AUTORTD_ENABLED));
public static IMsg COMMAND_AUTORTD_DISABLED
=> MsgFactory.Create(nameof(COMMAND_AUTORTD_DISABLED));
}

View File

@@ -4,4 +4,6 @@ RTD_CANNOT_ROLL_YET: "%RTD_PREFIX%You must wait until death to roll the die."
RTD_ROLLED: "%RTD_PREFIX%You rolled {default}{0}{grey}, {1}."
RTD_MUTED: "%RTD_PREFIX%You cannot speak due to your dice roll."
CREDITS_REWARD: "{0} %CREDITS_NAME%%s%"
CREDITS_REWARD_DESC: "you will receive {yellow}{0} %CREDITS_NAME%%s%{grey} next round"
CREDITS_REWARD_DESC: "you will receive {yellow}{0} %CREDITS_NAME%%s%{grey} next round"
COMMAND_AUTORTD_ENABLED: "%RTD_PREFIX% Auto-RTD has been {green}enabled{grey}."
COMMAND_AUTORTD_DISABLED: "%RTD_PREFIX% Auto-RTD has been {red}disabled{grey}."

View File

@@ -0,0 +1,39 @@
using CounterStrikeSharp.API;
using Microsoft.Extensions.DependencyInjection;
using SpecialRound.lang;
using SpecialRoundAPI;
using TTT.API.Game;
using TTT.API.Storage;
using TTT.Game.Events.Game;
using TTT.Locale;
namespace SpecialRound.Rounds;
public class BhopRound(IServiceProvider provider)
: AbstractSpecialRound(provider) {
public override string Name => "BHop";
public override IMsg Description => RoundMsgs.SPECIAL_ROUND_BHOP;
public override SpecialRoundConfig Config => config;
private BhopRoundConfig config
=> Provider.GetService<IStorage<BhopRoundConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new BhopRoundConfig();
public override void ApplyRoundEffects() {
Server.NextWorldUpdate(() => {
Server.ExecuteCommand("sv_enablebunnyhopping 1");
Server.ExecuteCommand("sv_autobunnyhopping 1");
});
}
public override void OnGameState(GameStateUpdateEvent ev) {
if (ev.NewState != State.FINISHED) return;
Server.NextWorldUpdate(() => {
Server.ExecuteCommand("sv_enablebunnyhopping 0");
Server.ExecuteCommand("sv_autobunnyhopping 0");
});
}
}

View File

@@ -0,0 +1,88 @@
using System.Reactive.Concurrency;
using CounterStrikeSharp.API;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using SpecialRound.lang;
using SpecialRoundAPI;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Role;
using TTT.API.Storage;
using TTT.CS2.Listeners;
using TTT.CS2.Utils;
using TTT.Game.Events.Game;
using TTT.Game.Events.Player;
using TTT.Game.Roles;
using TTT.Locale;
namespace SpecialRound.Rounds;
public class SpeedRound(IServiceProvider provider)
: AbstractSpecialRound(provider) {
private readonly IScheduler scheduler =
provider.GetRequiredService<IScheduler>();
private readonly IGameManager games =
provider.GetRequiredService<IGameManager>();
private readonly IRoleAssigner roles =
provider.GetRequiredService<IRoleAssigner>();
public override string Name => "Speed";
public override IMsg Description => RoundMsgs.SPECIAL_ROUND_SPEED;
public override SpecialRoundConfig Config => config;
private SpeedRoundConfig config
=> Provider.GetService<IStorage<SpeedRoundConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new SpeedRoundConfig();
private IDisposable? endTimer;
public override void ApplyRoundEffects() {
Provider.GetService<RoundTimerListener>()?.EndTimer?.Dispose();
setTime(config.InitialSeconds);
}
private void addTime(TimeSpan span) {
Server.NextWorldUpdate(() => {
var remaining = RoundUtil.GetTimeRemaining();
var newSpan = TimeSpan.FromSeconds(remaining + (int)span.TotalSeconds);
setTime(newSpan);
});
}
private void setTime(TimeSpan span) {
Server.NextWorldUpdate(() => {
RoundUtil.SetTimeRemaining((int)span.TotalSeconds);
});
endTimer?.Dispose();
endTimer = scheduler.Schedule(span,
() => Server.NextWorldUpdate(() => games.ActiveGame?.EndGame(
EndReason.TIMEOUT(new InnocentRole(Provider)))));
}
public override void OnGameState(GameStateUpdateEvent ev) {
if (ev.NewState != State.FINISHED) return;
endTimer?.Dispose();
}
[UsedImplicitly]
[EventHandler]
public void OnDeath(PlayerDeathEvent ev) {
var game = games.ActiveGame;
if (game == null) return;
if (Tracker.CurrentRound != this) return;
var victimRoles = roles.GetRoles(ev.Victim);
if (!victimRoles.Any(r => r is InnocentRole)) return;
addTime(config.SecondsPerKill);
}
}

View File

@@ -0,0 +1,36 @@
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI.Events;
using SpecialRound.lang;
using SpecialRoundAPI;
using TTT.API.Events;
using TTT.API.Storage;
using TTT.Game.Events.Game;
using TTT.Locale;
namespace SpecialRound.Rounds;
public class VanillaRound(IServiceProvider provider)
: AbstractSpecialRound(provider) {
public override string Name => "Vanilla";
public override IMsg Description => RoundMsgs.SPECIAL_ROUND_VANILLA;
private VanillaRoundConfig config
=> Provider.GetService<IStorage<VanillaRoundConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new VanillaRoundConfig();
public override SpecialRoundConfig Config => config;
public override void ApplyRoundEffects() { }
public override void OnGameState(GameStateUpdateEvent ev) { }
[UsedImplicitly]
[EventHandler(Priority = Priority.HIGH)]
public void OnPurchase(PlayerPurchaseItemEvent ev) {
if (Tracker.CurrentRound != this) return;
ev.IsCanceled = true;
}
}

View File

@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj" />
<ProjectReference Include="..\API\API.csproj" />
<ProjectReference Include="..\CS2\CS2.csproj" />
<ProjectReference Include="..\Game\Game.csproj" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,17 @@
using Microsoft.Extensions.DependencyInjection;
using SpecialRound.Rounds;
using SpecialRoundAPI;
using TTT.API.Extensions;
namespace SpecialRound;
public static class SpecialRoundCollection {
public static void AddSpecialRounds(this IServiceCollection services) {
services.AddModBehavior<ISpecialRoundStarter, SpecialRoundStarter>();
services.AddModBehavior<ISpecialRoundTracker, SpecialRoundTracker>();
services.AddModBehavior<SpeedRound>();
services.AddModBehavior<BhopRound>();
services.AddModBehavior<VanillaRound>();
}
}

View File

@@ -0,0 +1,72 @@
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Utils;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using SpecialRound.lang;
using SpecialRoundAPI;
using TTT.API;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Storage;
using TTT.Game.Events.Game;
using TTT.Game.Listeners;
namespace SpecialRound;
public class SpecialRoundStarter(IServiceProvider provider)
: BaseListener(provider), IPluginModule, ISpecialRoundStarter {
private readonly ISpecialRoundTracker tracker =
provider.GetRequiredService<ISpecialRoundTracker>();
private SpecialRoundsConfig config
=> Provider.GetService<IStorage<SpecialRoundsConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new SpecialRoundsConfig();
private int roundsSinceMapChange = 0;
public void Start(BasePlugin? plugin) {
plugin?.RegisterListener<Listeners.OnMapStart>(onMapChange);
}
private void onMapChange(string mapName) { roundsSinceMapChange = 0; }
[UsedImplicitly]
[EventHandler]
public void OnRound(GameStateUpdateEvent ev) {
if (ev.NewState != State.IN_PROGRESS) return;
roundsSinceMapChange++;
tracker.RoundsSinceLastSpecial++;
if (tracker.RoundsSinceLastSpecial < config.MinRoundsBetweenSpecial) return;
if (ev.Game.Players.Count < config.MinPlayersForSpecial) return;
if (roundsSinceMapChange < config.MinRoundsAfterMapChange) return;
if (Random.Shared.NextSingle() > config.SpecialRoundChance) return;
var specialRound = getSpecialRound();
TryStartSpecialRound(specialRound);
}
private AbstractSpecialRound getSpecialRound() {
return Provider.GetServices<ITerrorModule>()
.OfType<AbstractSpecialRound>()
.OrderBy(_ => Random.Shared.Next())
.First();
}
public AbstractSpecialRound?
TryStartSpecialRound(AbstractSpecialRound? round) {
round ??= getSpecialRound();
Messenger.MessageAll(Locale[RoundMsgs.SPECIAL_ROUND_STARTED(round)]);
Messenger.MessageAll(Locale[round.Description]);
round?.ApplyRoundEffects();
tracker.CurrentRound = round;
tracker.RoundsSinceLastSpecial = 0;
return round;
}
}

View File

@@ -0,0 +1,11 @@
using SpecialRoundAPI;
using TTT.API;
namespace SpecialRound;
public class SpecialRoundTracker : ISpecialRoundTracker, ITerrorModule {
public AbstractSpecialRound? CurrentRound { get; set; }
public int RoundsSinceLastSpecial { get; set; }
public void Dispose() { }
public void Start() { }
}

View File

@@ -0,0 +1,8 @@
namespace SpecialRound;
public record SpecialRoundsConfig {
public int MinRoundsBetweenSpecial { get; init; } = 3;
public int MinPlayersForSpecial { get; init; } = 8;
public int MinRoundsAfterMapChange { get; init; } = 2;
public float SpecialRoundChance { get; init; } = 0.2f;
}

View File

@@ -0,0 +1,18 @@
using SpecialRoundAPI;
using TTT.Locale;
namespace SpecialRound.lang;
public class RoundMsgs {
public static IMsg SPECIAL_ROUND_STARTED(AbstractSpecialRound round) {
return MsgFactory.Create(nameof(SPECIAL_ROUND_STARTED), round.Name);
}
public static IMsg SPECIAL_ROUND_SPEED
=> MsgFactory.Create(nameof(SPECIAL_ROUND_SPEED));
public static IMsg SPECIAL_ROUND_BHOP
=> MsgFactory.Create(nameof(SPECIAL_ROUND_BHOP));
public static IMsg SPECIAL_ROUND_VANILLA
=> MsgFactory.Create(nameof(SPECIAL_ROUND_VANILLA)); }

View File

@@ -0,0 +1,4 @@
SPECIAL_ROUND_STARTED: "%PREFIX%This round is a {purple}Special Round{grey}! This round is a {lightpurple}{0}{grey} round!"
SPECIAL_ROUND_SPEED: " {yellow}SPEED{grey}: The round is faster than usual! {red}Traitors{grey} must kill to gain more time."
SPECIAL_ROUND_BHOP: " {Yellow}BHOP{grey}: Bunny hopping is enabled! Hold jump to move faster!"
SPECIAL_ROUND_VANILLA: " {green}VANILLA{grey}: The shop has been disabled!"

View File

@@ -13,6 +13,9 @@ public class KillListener(IServiceProvider provider) : IListener {
private readonly IGameManager game =
provider.GetRequiredService<IGameManager>();
private readonly IRoundTracker? roundTracker =
provider.GetService<IRoundTracker>();
public void Dispose() { }
[UsedImplicitly]
@@ -24,6 +27,7 @@ public class KillListener(IServiceProvider provider) : IListener {
var data = new {
killer_steam_id = ev.Killer.Id,
victim_steam_id = ev.Victim.Id,
round_id = roundTracker?.CurrentRoundId,
weapon = ev.Weapon
};
@@ -31,6 +35,6 @@ public class KillListener(IServiceProvider provider) : IListener {
System.Text.Json.JsonSerializer.Serialize(data),
System.Text.Encoding.UTF8, "application/json");
Task.Run(async () => { await client.PostAsync("kill", payload); });
Task.Run(async () => await client.PostAsync("kill", payload));
}
}

View File

@@ -1,8 +1,11 @@
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using Stats.lang;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Messages;
using TTT.Game.Events.Game;
using TTT.Locale;
namespace Stats;
@@ -13,6 +16,12 @@ public class LogsUploader(IServiceProvider provider) : IListener {
private readonly IRoundTracker roundTracker =
provider.GetRequiredService<IRoundTracker>();
private readonly IMsgLocalizer localizer =
provider.GetRequiredService<IMsgLocalizer>();
private readonly IMessenger messenger =
provider.GetRequiredService<IMessenger>();
public void Dispose() { }
[UsedImplicitly]
@@ -29,7 +38,13 @@ public class LogsUploader(IServiceProvider provider) : IListener {
System.Text.Encoding.UTF8, "application/json");
Task.Run(async () => {
await client.PatchAsync("round/" + roundTracker.CurrentRoundId, payload);
var id = roundTracker.CurrentRoundId;
if (id == null) return;
var result = await client.PatchAsync("round/" + id.Value, payload);
if (!result.IsSuccessStatusCode) return;
await messenger.MessageAll(localizer[StatsMsgs.API_ROUND_END(id.Value)]);
});
}
}

View File

@@ -27,13 +27,13 @@ public class PlayerCreationListener(IServiceProvider provider) : IListener {
private async Task putPlayer(IPlayer player) {
var client = provider.GetRequiredService<HttpClient>();
var userJson = new { steam_id = player.Id, name = player.Name };
var userJson = new { name = player.Name };
var content = new StringContent(
System.Text.Json.JsonSerializer.Serialize(userJson),
System.Text.Encoding.UTF8, "application/json");
var response = await client.PutAsync("user", content);
var response = await client.PutAsync("user/" + player.Id, content);
response.EnsureSuccessStatusCode();
}
}

View File

@@ -9,12 +9,19 @@ public class PurchaseListener(IServiceProvider provider) : IListener {
private readonly HttpClient client =
provider.GetRequiredService<HttpClient>();
private readonly IRoundTracker? roundTracker =
provider.GetService<IRoundTracker>();
public void Dispose() { }
[UsedImplicitly]
[EventHandler]
public void OnPurchase(PlayerPurchaseItemEvent ev) {
var body = new { steam_id = ev.Player.Id, item_id = ev.Item.Id };
var body = new {
steam_id = ev.Player.Id,
item_id = ev.Item.Id,
round_id = roundTracker?.CurrentRoundId
};
var payload = new StringContent(
System.Text.Json.JsonSerializer.Serialize(body),

View File

@@ -3,14 +3,17 @@ using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core.Attributes;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using Stats.lang;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Messages;
using TTT.API.Player;
using TTT.API.Role;
using TTT.Game.Events.Body;
using TTT.Game.Events.Game;
using TTT.Game.Events.Player;
using TTT.Game.Roles;
using TTT.Locale;
namespace Stats;
@@ -23,12 +26,18 @@ public class RoundListener(IServiceProvider provider)
private readonly IRoleAssigner roles =
provider.GetRequiredService<IRoleAssigner>();
private readonly IMessenger messenger =
provider.GetRequiredService<IMessenger>();
private readonly IMsgLocalizer localizer =
provider.GetRequiredService<IMsgLocalizer>();
private Dictionary<string, (int, int, int)> kills = new();
private Dictionary<string, int> bodiesFound = new();
private HashSet<string> deaths = new();
[UsedImplicitly]
[EventHandler]
[EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
public void OnGameState(GameStateUpdateEvent ev) {
if (ev.NewState == State.IN_PROGRESS) {
kills.Clear();
@@ -36,8 +45,9 @@ public class RoundListener(IServiceProvider provider)
Task.Run(async () => await onRoundStart(ev.Game));
}
var game = ev.Game;
if (ev.NewState == State.FINISHED)
Task.Run(async () => await onRoundEnd(ev.Game));
Task.Run(async () => await onRoundEnd(game));
}
[UsedImplicitly]
@@ -77,45 +87,51 @@ public class RoundListener(IServiceProvider provider)
await Server.NextWorldUpdateAsync(() => {
var map_name = Server.MapName;
var startedAt = DateTime.UtcNow;
Task.Run(async () => {
var data = new {
map_name, startedAt, participants = getParticipants(game)
};
var content = new StringContent(
System.Text.Json.JsonSerializer.Serialize(data),
System.Text.Encoding.UTF8, "application/json");
Console.WriteLine("json data: "
+ System.Text.Json.JsonSerializer.Serialize(data));
var client = provider.GetRequiredService<HttpClient>();
Console.WriteLine("RoundListener: sending POST /round to "
+ client.BaseAddress + "round");
var response = await provider.GetRequiredService<HttpClient>()
.PostAsync("round", content);
var json = await response.Content.ReadAsStringAsync();
var jsonDoc = System.Text.Json.JsonDocument.Parse(json);
Console.WriteLine("response json: " + json);
CurrentRoundId = jsonDoc.RootElement.GetProperty("round_id").GetInt32();
if (response.StatusCode == HttpStatusCode.Conflict)
await client.DeleteAsync("round/" + CurrentRoundId);
// Retry
response = await client.PostAsync("round", content);
Console.WriteLine("response status: " + response.StatusCode);
jsonDoc = System.Text.Json.JsonDocument.Parse(
await response.Content.ReadAsStringAsync());
CurrentRoundId = jsonDoc.RootElement.GetProperty("round_id").GetInt32();
});
Task.Run(async () => await createNewRound(game, map_name, startedAt));
});
}
private async Task createNewRound(IGame game, string map_name,
DateTime startedAt) {
var data = new {
map_name, startedAt, participants = getParticipants(game)
};
var content = new StringContent(
System.Text.Json.JsonSerializer.Serialize(data),
System.Text.Encoding.UTF8, "application/json");
var client = provider.GetRequiredService<HttpClient>();
var response = await provider.GetRequiredService<HttpClient>()
.PostAsync("round", content);
var json = await response.Content.ReadAsStringAsync();
var jsonDoc = System.Text.Json.JsonDocument.Parse(json);
CurrentRoundId = jsonDoc.RootElement.GetProperty("round_id").GetInt32();
if (response.StatusCode == HttpStatusCode.Created) {
await notifyNewRound(CurrentRoundId.Value);
return;
}
if (response.StatusCode == HttpStatusCode.Conflict)
await client.DeleteAsync("round/" + CurrentRoundId);
// Retry
response = await client.PostAsync("round", content);
jsonDoc = System.Text.Json.JsonDocument.Parse(
await response.Content.ReadAsStringAsync());
CurrentRoundId = jsonDoc.RootElement.GetProperty("round_id").GetInt32();
if (response.StatusCode == HttpStatusCode.Created) {
await notifyNewRound(CurrentRoundId.Value);
}
}
private Task notifyNewRound(int id) {
return messenger.MessageAll(localizer[StatsMsgs.API_ROUND_START(id)]);
}
private async Task onRoundEnd(IGame game) {
Console.WriteLine("RoundListener: onRoundEnd fired");
if (CurrentRoundId == null) {
@@ -123,39 +139,27 @@ public class RoundListener(IServiceProvider provider)
return;
}
var finishedAt = DateTime.UtcNow;
var ended_at = DateTime.UtcNow;
var winning_role = game.WinningRole != null ?
StatsApi.ApiNameForRole(game.WinningRole) :
null;
var participants = getParticipants(game);
await Task.Run(async () => {
var winningRole = game.WinningRole;
var data = new {
finishedAt,
winning_role =
winningRole != null ? StatsApi.ApiName(winningRole) : null,
participants = getParticipants(game)
};
var data = new { ended_at, winning_role, participants };
var content = new StringContent(
System.Text.Json.JsonSerializer.Serialize(data),
System.Text.Encoding.UTF8, "application/json");
Console.WriteLine("json data: "
+ System.Text.Json.JsonSerializer.Serialize(data));
var client = provider.GetRequiredService<HttpClient>();
Console.WriteLine("RoundListener: sending PATCH /round/" + CurrentRoundId
+ " to " + client.BaseAddress + "round/" + CurrentRoundId);
var response = await client.PatchAsync(
"round/" + CurrentRoundId, content);
Console.WriteLine("response status: " + response.StatusCode);
CurrentRoundId = null;
await client.PatchAsync("round/" + CurrentRoundId, content);
});
}
private record Participant {
public string steam_id { get; init; }
public string role { get; init; }
public required string steam_id { get; init; }
public required string role { get; init; }
public int? inno_kills { get; init; }
public int? traitor_kills { get; init; }
public int? detective_kills { get; init; }
@@ -170,7 +174,7 @@ public class RoundListener(IServiceProvider provider)
var playerRoles = roles.GetRoles(player);
if (playerRoles.Count == 0) continue;
var role = StatsApi.ApiName(playerRoles.First());
var role = StatsApi.ApiNameForRole(playerRoles.First());
kills.TryGetValue(player.Id, out var killCounts);
bodiesFound.TryGetValue(player.Id, out var foundCount);

View File

@@ -16,7 +16,7 @@ public class ShopRegistrar(IServiceProvider provider) : ITerrorModule {
public void Start() {
Task.Run(async () => {
await Task.Delay(TimeSpan.FromSeconds(5));
await Task.Delay(TimeSpan.FromSeconds(1));
List<Task> tasks = [];
foreach (var item in shop.Items) {
@@ -25,10 +25,16 @@ public class ShopRegistrar(IServiceProvider provider) : ITerrorModule {
};
data = item switch {
RoleRestrictedItem<TraitorRole> => data with { team_restriction = "traitor" },
RoleRestrictedItem<DetectiveRole> => data with { team_restriction = "detective" },
RoleRestrictedItem<InnocentRole> => data with { team_restriction = "innocent" },
_ => data
RoleRestrictedItem<TraitorRole> => data with {
team_restriction = "traitor"
},
RoleRestrictedItem<DetectiveRole> => data with {
team_restriction = "detective"
},
RoleRestrictedItem<InnocentRole> => data with {
team_restriction = "innocent"
},
_ => data
};
var payload = new StringContent(
@@ -36,7 +42,7 @@ public class ShopRegistrar(IServiceProvider provider) : ITerrorModule {
System.Text.Encoding.UTF8, "application/json");
Console.WriteLine(
$"Registering shop item {item.Name} with stats api, data: {System.Text.Json.JsonSerializer.Serialize(data)}");
$"[Stats] Registering shop item '{item.Name}' at '{client.BaseAddress}item/{item.Id}'");
tasks.Add(client.PutAsync("item/" + item.Id, payload));
}

View File

@@ -7,7 +7,7 @@ public class StatsApi {
public static string? API_URL
=> Environment.GetEnvironmentVariable("TTT_STATS_API_URL");
public static string ApiName(IRole role) {
public static string ApiNameForRole(IRole role) {
return role switch {
_ when role is TraitorRole => "traitor",
_ when role is DetectiveRole => "detective",

84
TTT/Stats/StatsCommand.cs Normal file
View File

@@ -0,0 +1,84 @@
using System.Net.Http.Json;
using CounterStrikeSharp.API.Modules.Utils;
using Microsoft.Extensions.DependencyInjection;
using TTT.API.Command;
using TTT.API.Player;
namespace Stats;
public class StatsCommand(IServiceProvider provider) : ICommand {
private readonly HttpClient client =
provider.GetRequiredService<HttpClient>();
public void Dispose() { }
public void Start() { }
public string Id => "stats";
public async Task<CommandResult> Execute(IOnlinePlayer? executor,
ICommandInfo info) {
if (executor == null) return CommandResult.PLAYER_ONLY;
var response = await client.GetAsync("user/summary/" + executor.Id);
if (!response.IsSuccessStatusCode) return CommandResult.ERROR;
var body = await response.Content.ReadAsStringAsync();
var statsInfo =
System.Text.Json.JsonSerializer.Deserialize<StatsResponse>(body);
if (statsInfo == null) return CommandResult.ERROR;
info.ReplySync(
$" {ChatColors.Grey}Stats for {ChatColors.Default}{statsInfo.name}");
info.ReplySync(
$" {ChatColors.DarkRed}K{ChatColors.Red}D{ChatColors.LightRed}R{ChatColors.Grey}: {ChatColors.Yellow}{statsInfo.kdr:F2}");
info.ReplySync($" {ChatColors.Blue}Good Kills: {ChatColors.LightYellow}"
+ statsInfo.good_kills);
info.ReplySync(
$" {ChatColors.Red}Bad Kills: {ChatColors.LightYellow}{statsInfo.bad_kills}");
if (statsInfo.rounds_played != null)
printRoleDictionary(info, $" {ChatColors.Default}Rounds Played",
statsInfo.rounds_played);
if (statsInfo.rounds_won != null)
printRoleDictionary(info, $" {ChatColors.Green}Rounds Won",
statsInfo.rounds_won);
if (statsInfo.kills_as != null)
printRoleDictionary(info, $" {ChatColors.Red}Kills As",
statsInfo.kills_as);
if (statsInfo.deaths_as != null)
printRoleDictionary(info, $" {ChatColors.Grey}Deaths As",
statsInfo.deaths_as);
info.ReplySync(
$" {ChatColors.Silver}Bodies Found: {ChatColors.LightYellow}{statsInfo.bodies_found}");
return CommandResult.SUCCESS;
}
private void
printRoleDictionary(ICommandInfo info, string title,
Dictionary<string, int> dict) {
info.ReplySync(title
+ $"{ChatColors.Grey}: {ChatColors.Lime}Innocent {ChatColors.Default}- "
+ ChatColors.Yellow + dict.GetValueOrDefault("innocent", 0)
+ $"{ChatColors.Default}, {ChatColors.Red}Traitor {ChatColors.Default}- "
+ ChatColors.Yellow + dict.GetValueOrDefault("traitor", 0)
+ $"{ChatColors.Grey}, {ChatColors.LightBlue}Detective {ChatColors.Default}- "
+ ChatColors.Yellow + dict.GetValueOrDefault("detective", 0));
}
record StatsResponse {
public required string steam_id { get; init; }
public required string name { get; init; }
public float kdr { get; init; }
public int good_kills { get; init; }
public int bad_kills { get; init; }
public int bodies_found { get; init; }
public Dictionary<string, int>? rounds_played { get; init; }
public Dictionary<string, int>? kills_as { get; init; }
public Dictionary<string, int>? deaths_as { get; init; }
public Dictionary<string, int>? rounds_won { get; init; }
}
}

View File

@@ -4,16 +4,19 @@ using TTT.API.Extensions;
namespace Stats;
public static class StatsServiceCollection {
public static void AddStatsSerivces(this IServiceCollection collection) {
public static void AddStatsServices(this IServiceCollection collection) {
var client = new HttpClient();
client.BaseAddress = new Uri(StatsApi.API_URL!);
collection.AddScoped<HttpClient>(_ => client);
collection.AddSingleton<HttpClient>(_ => client);
collection.AddModBehavior<PlayerCreationListener>();
collection.AddModBehavior<IRoundTracker, RoundListener>();
collection.AddModBehavior<ShopRegistrar>();
collection.AddModBehavior<PurchaseListener>();
collection.AddModBehavior<LogsUploader>();
collection.AddModBehavior<KillListener>();
collection.AddModBehavior<StatsCommand>();
Console.WriteLine($"[Stats] Stats services registered with API URL: {client.BaseAddress.ToString()}");
}
}

View File

@@ -0,0 +1,11 @@
using TTT.Locale;
namespace Stats.lang;
public class StatsMsgs {
public static IMsg API_ROUND_START(int roundId)
=> MsgFactory.Create(nameof(API_ROUND_START), roundId);
public static IMsg API_ROUND_END(int roundId)
=> MsgFactory.Create(nameof(API_ROUND_END), roundId);
}

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

@@ -0,0 +1,2 @@
API_ROUND_START: "%PREFIX% Round {yellow}#{0} {grey}has started!"
API_ROUND_END: "%PREFIX% Round end! Logs are available at {blue}http://ttt.localhost/round/{0}{grey}."

View File

@@ -91,7 +91,7 @@ public class KarmaListenerTests {
bus.Dispatch(deathEvent);
game.EndGame();
await Task.Delay(TimeSpan.FromMilliseconds(20),
await Task.Delay(TimeSpan.FromMilliseconds(50),
TestContext.Current
.CancellationToken); // Wait for the karma update to process