Compare commits

...

23 Commits

Author SHA1 Message Date
MSWS
db9ad9303f Reduce M4 cost, reduce station health 2025-10-25 02:25:11 -07:00
MSWS
4ab16d71db Handle map change interrupting rounds 2025-10-25 01:59:16 -07:00
MSWS
627c048183 Delay round effects for speedround due to race condition 2025-10-25 01:47:55 -07:00
MSWS
66d1106d4c Increase time, nerf camo and silent awp 2025-10-25 01:02:46 -07:00
MSWS
f2352ede1f Merge branch 'dev' of github.com:MSWS/TTT into dev 2025-10-24 20:06:20 -07:00
MSWS
f675a87ffd Additional hotpatch 2025-10-24 20:06:04 -07:00
Isaac
d1972fc556 Merge branch 'main' into dev 2025-10-24 19:12:35 -07:00
MSWS
f2dbc72aee Use squared distance 2025-10-24 19:09:45 -07:00
MSWS
77a2289367 Reset special round on round end 2025-10-24 19:08:55 -07:00
Isaac
456ae22b12 feat: Auto RTD (#142) 2025-10-24 18:23:48 -07:00
Isaac
2616b231dc fix: Use Locale (#141) 2025-10-24 18:20:04 -07:00
MSWS
3cb86aa2f8 Working Auto RTD 2025-10-24 18:19:02 -07:00
MSWS
4c72f3dfff Fix duplicate spaces 2025-10-24 18:00:30 -07:00
MSWS
bc45f3fb74 fix: Use Locale 2025-10-24 17:58:15 -07:00
Isaac
2bcf436677 feat: Auto RTD (resolves #140) (#139) 2025-10-24 17:41:08 -07:00
Isaac
9dfb45583b feat: Special Rounds (resolves #133) (#138) 2025-10-24 17:36:55 -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
f6d1b95a38 Update scope management (#135) 2025-10-22 16:02:12 -07:00
Isaac
5393920f95 Bug Fixes, Stats API +semver:minor (#134) 2025-10-22 09:18:27 -07:00
32 changed files with 289 additions and 44 deletions

View File

@@ -1,6 +1,5 @@
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using SpecialRound;
using TTT.API;
using TTT.API.Events;
using TTT.Game.Events.Game;
@@ -18,6 +17,7 @@ public abstract class AbstractSpecialRound(IServiceProvider provider)
public void Dispose() { }
public void Start() { }
public abstract string Name { get; }
public abstract IMsg Description { get; }
public abstract SpecialRoundConfig Config { get; }

View File

@@ -1,6 +1,4 @@
using SpecialRoundAPI;
namespace SpecialRound;
namespace SpecialRoundAPI;
public interface ISpecialRoundStarter {
/// <summary>

View File

@@ -1,6 +1,4 @@
using SpecialRoundAPI;
namespace SpecialRound;
namespace SpecialRoundAPI;
public interface ISpecialRoundTracker {
public AbstractSpecialRound? CurrentRound { get; set; }

View File

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

View File

@@ -67,6 +67,7 @@ public static class CS2ServiceCollection {
collection.AddModBehavior<TeamChangeHandler>();
collection.AddModBehavior<TraitorChatHandler>();
collection.AddModBehavior<PlayerMuter>();
collection.AddModBehavior<MapChangeCausesEndListener>();
// Damage Cancelers
collection.AddModBehavior<OutOfRoundCanceler>();

View File

@@ -1,5 +1,4 @@
using Microsoft.Extensions.DependencyInjection;
using SpecialRound;
using SpecialRoundAPI;
using TTT.API;
using TTT.API.Command;
@@ -14,6 +13,8 @@ public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
public void Dispose() { }
public void Start() { }
public string Id => "specialround";
public Task<CommandResult>
Execute(IOnlinePlayer? executor, ICommandInfo info) {
if (info.ArgCount == 1) {

View File

@@ -24,7 +24,7 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
public static readonly FakeConVar<int> CV_ROUND_DURATION_PER_PLAYER = new(
"css_ttt_round_duration_per_player",
"Additional round duration per player in seconds", 10,
"Additional round duration per player in seconds", 15,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 60));
public static readonly FakeConVar<int> CV_ROUND_DURATION_MAX = new(

View File

@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
public class CS2M4A1Config : IStorage<M4A1Config>, IPluginModule {
public static readonly FakeConVar<int> CV_PRICE = new(
"css_ttt_shop_m4a1_price", "Price of the M4A1 item", 75,
"css_ttt_shop_m4a1_price", "Price of the M4A1 item", 50,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
public static readonly FakeConVar<string> CV_CLEAR_SLOTS = new(

View File

@@ -0,0 +1,24 @@
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes.Registration;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using TTT.API;
using TTT.API.Game;
namespace TTT.CS2.GameHandlers;
public class MapChangeCausesEndListener(IServiceProvider provider)
: IPluginModule {
private readonly IGameManager games =
provider.GetRequiredService<IGameManager>();
public void Dispose() { }
public void Start() { }
[UsedImplicitly]
[GameEventHandler]
public HookResult OnMapChange(EventMapTransition ev, GameEventInfo _) {
games.ActiveGame?.EndGame(new EndReason("Map Change"));
return HookResult.Continue;
}
}

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,6 +21,7 @@ public class TTTServiceCollection : IPluginServiceCollection<TTT> {
serviceCollection.AddCS2Services();
serviceCollection.AddShopServices();
serviceCollection.AddRtdServices();
serviceCollection.AddSpecialRounds();
if (Environment.GetEnvironmentVariable("TTT_STATS_API_URL") == null) return;
serviceCollection.AddStatsServices();

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

@@ -0,0 +1,107 @@
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.Messages;
using TTT.API.Player;
using TTT.CS2.Command;
using TTT.CS2.ThirdParties.eGO;
using TTT.Game.Events.Game;
using TTT.Locale;
using TTT.RTD.lang;
namespace TTT.RTD;
public class AutoRTDCommand(IServiceProvider provider) : ICommand, IListener {
public string Id => "autortd";
private ICookie? autoRtdCookie;
private readonly IPlayerFinder finder =
provider.GetRequiredService<IPlayerFinder>();
private readonly ICommandManager commands =
provider.GetRequiredService<ICommandManager>();
private readonly IMsgLocalizer localizer =
provider.GetRequiredService<IMsgLocalizer>();
public bool MustBeOnMainThread => true;
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(localizer[RtdMsgs.COMMAND_AUTORTD_DISABLED]);
} else {
await autoRtdCookie.Set(executorId, "1");
info.ReplySync(localizer[RtdMsgs.COMMAND_AUTORTD_ENABLED]);
}
playerStatuses[executor.Id] = value != "1";
return CommandResult.SUCCESS;
}
[UsedImplicitly]
[EventHandler]
public void OnRoundStart(GameInitEvent ev) {
var messenger = provider.GetRequiredService<IMessenger>();
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") {
CallingContext = CommandCallingContext.Chat
};
await Server.NextWorldUpdateAsync(() => 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

@@ -26,7 +26,7 @@ public class RTDCommand(IRewardGenerator generator, IPermissionManager perms,
if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
var bypass = perms.HasFlags(executor, "@css/root") && info.ArgCount == 2;
#if DEBUG
bypass = true;
bypass = info.ArgCount == 2;
#endif
if (!bypass && playerRewards.TryGetValue(executor.Id, out var existing)) {

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

@@ -98,7 +98,7 @@ public class PeriodicRewarder(IServiceProvider provider) : ITerrorModule {
if (positions.Count < 2) return 0f;
var totalDistance = 0f;
for (var i = 1; i < positions.Count; i++)
totalDistance += positions[i].Distance(positions[i - 1]);
totalDistance += positions[i].DistanceSquared(positions[i - 1]);
return totalDistance;

View File

@@ -2,5 +2,5 @@ namespace ShopAPI.Configs;
public record CamoConfig : ShopItemConfig {
public override int Price { get; init; } = 75;
public float CamoVisibility { get; init; } = 0.4f;
public float CamoVisibility { get; init; } = 0.6f;
}

View File

@@ -5,7 +5,7 @@ namespace ShopAPI.Configs;
public abstract record StationConfig : ShopItemConfig {
public virtual int HealthIncrements { get; init; } = 5;
public virtual int TotalHealthGiven { get; init; } = 0;
public virtual int StationHealth { get; init; } = 1000;
public virtual int StationHealth { get; init; } = 200;
public virtual float MaxRange { get; init; } = 256;
public virtual TimeSpan HealthInterval { get; init; } =

View File

@@ -3,9 +3,9 @@
namespace ShopAPI.Configs.Traitor;
public record SilentAWPConfig : ShopItemConfig, IWeapon {
public override int Price { get; init; } = 90;
public override int Price { get; init; } = 80;
public int WeaponIndex { get; } = 9;
public string WeaponId { get; } = "weapon_awp";
public int? ReserveAmmo { get; } = 0;
public int? CurrentAmmo { get; } = 2;
public int? CurrentAmmo { get; } = 1;
}

View File

@@ -11,6 +11,7 @@ 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;
@@ -21,14 +22,18 @@ public class BhopRound(IServiceProvider provider)
.GetResult() ?? new BhopRoundConfig();
public override void ApplyRoundEffects() {
Server.ExecuteCommand("sv_enablebunnyhopping 1");
Server.ExecuteCommand("sv_autobunnyhopping 1");
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.ExecuteCommand("sv_enablebunnyhopping 0");
Server.ExecuteCommand("sv_autobunnyhopping 0");
Server.NextWorldUpdate(() => {
Server.ExecuteCommand("sv_enablebunnyhopping 0");
Server.ExecuteCommand("sv_autobunnyhopping 0");
});
}
}

View File

@@ -28,6 +28,7 @@ public class SpeedRound(IServiceProvider provider)
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;
@@ -43,7 +44,8 @@ public class SpeedRound(IServiceProvider provider)
public override void ApplyRoundEffects() {
Provider.GetService<RoundTimerListener>()?.EndTimer?.Dispose();
setTime(config.InitialSeconds);
Server.RunOnTick(Server.TickCount + 2,
() => setTime(config.InitialSeconds));
}
private void addTime(TimeSpan span) {
@@ -66,7 +68,11 @@ public class SpeedRound(IServiceProvider provider)
EndReason.TIMEOUT(new InnocentRole(Provider)))));
}
public override void OnGameState(GameStateUpdateEvent ev) { }
public override void OnGameState(GameStateUpdateEvent ev) {
if (ev.NewState != State.FINISHED) return;
endTimer?.Dispose();
}
[UsedImplicitly]
[EventHandler]

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,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

@@ -1,6 +1,8 @@
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;
@@ -45,19 +47,23 @@ public class SpecialRoundStarter(IServiceProvider provider)
if (Random.Shared.NextSingle() > config.SpecialRoundChance) return;
var specialRound = getSpecialRound();
if (specialRound is null) return;
TryStartSpecialRound(specialRound);
}
private AbstractSpecialRound? getSpecialRound() {
return Provider.GetServices<AbstractSpecialRound>()
private AbstractSpecialRound getSpecialRound() {
return Provider.GetServices<ITerrorModule>()
.OfType<AbstractSpecialRound>()
.OrderBy(_ => Random.Shared.Next())
.FirstOrDefault();
.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;

View File

@@ -0,0 +1,23 @@
using JetBrains.Annotations;
using SpecialRoundAPI;
using TTT.API;
using TTT.API.Events;
using TTT.API.Game;
using TTT.Game.Events.Game;
namespace SpecialRound;
public class SpecialRoundTracker : ISpecialRoundTracker, ITerrorModule,
IListener {
public AbstractSpecialRound? CurrentRound { get; set; }
public int RoundsSinceLastSpecial { get; set; }
public void Dispose() { }
public void Start() { }
[UsedImplicitly]
[EventHandler]
public void OnRoundEnd(GameStateUpdateEvent ev) {
if (ev.NewState != State.FINISHED) return;
CurrentRound = null;
}
}

View File

@@ -1,15 +1,18 @@
using TTT.Locale;
using SpecialRoundAPI;
using TTT.Locale;
namespace SpecialRound.lang;
public class RoundMsgs {
public static IMsg SPECIAL_ROUND_STARTED(string name) {
return MsgFactory.Create(nameof(SPECIAL_ROUND_STARTED), name);
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

@@ -1,3 +1,4 @@
SPECIAL_ROUND_STARTED: "%PREFIX%This round is a {purple}Special Round{grey}! This round is a: {yellow}{0}{grey} round!"
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_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

@@ -133,11 +133,7 @@ public class RoundListener(IServiceProvider provider)
}
private async Task onRoundEnd(IGame game) {
Console.WriteLine("RoundListener: onRoundEnd fired");
if (CurrentRoundId == null) {
Console.WriteLine("RoundListener: currentRoundId is null, skipping");
return;
}
if (CurrentRoundId == null) return;
var ended_at = DateTime.UtcNow;
var winning_role = game.WinningRole != null ?

View File

@@ -9,10 +9,10 @@ public class StatsApi {
public static string ApiNameForRole(IRole role) {
return role switch {
_ when role is TraitorRole => "traitor",
_ when role is DetectiveRole => "detective",
_ when role is InnocentRole => "innocent",
_ => "unknown"
TraitorRole => "traitor",
DetectiveRole => "detective",
InnocentRole => "innocent",
_ => "unknown"
};
}
}

View File

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