MS/TTT
1
0
Fork 0
mirror of https://github.com/MSWS/TTT.git synced 2025-12-05 22:20:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Update naming for protected vars in station items

Browse Source
This commit is contained in:
MSWS
2025-11-05 04:42:06 -08:00
parent 1ff4eabd45
commit 61b8d4eba9
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
TTT/CS2/Items/Station/DamageStation.cs
View File

@@ -30,9 +30,6 @@ 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>();
@@ -47,13 +44,13 @@ public class DamageStation(IServiceProvider provider)
var players = finder.GetOnline();
var toRemove = new List<CPhysicsPropMultiplayer>();
var playerMapping = players
.Select(p => (ApiPlayer: p, GamePlayer: converter.GetPlayer(p)))
.Select(p => (ApiPlayer: p, GamePlayer: Converter.GetPlayer(p)))
.Where(m
=> m.GamePlayer != null
&& !Roles.GetRoles(m.ApiPlayer).Any(r => r is TraitorRole))
.ToList();
foreach (var (prop, info) in props) {
foreach (var (prop, info) in Props) {
if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
> Math.Abs(_Config.TotalHealthGiven)) {
toRemove.Add(prop);
@@ -102,7 +99,7 @@ public class DamageStation(IServiceProvider provider)
}
}
foreach (var prop in toRemove) props.Remove(prop);
foreach (var prop in toRemove) Props.Remove(prop);
}
private static RecipientFilter SELF(int slot) {

4
TTT/CS2/Items/Station/HealthStation.cs
View File

@@ -30,7 +30,7 @@ public class HealthStation(IServiceProvider provider)
override protected void onInterval() {
var players = Utilities.GetPlayers();
var toRemove = new List<CPhysicsPropMultiplayer>();
foreach (var (prop, info) in props) {
foreach (var (prop, info) in Props) {
if (_Config.TotalHealthGiven != 0
&& Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
toRemove.Add(prop);
@@ -65,6 +65,6 @@ public class HealthStation(IServiceProvider provider)
}
}
foreach (var prop in toRemove) props.Remove(prop);
foreach (var prop in toRemove) Props.Remove(prop);
}
}

12
TTT/CS2/Items/Station/StationItem.cs
View File

@@ -20,12 +20,12 @@ public abstract class StationItem<T>(IServiceProvider provider,
: RoleRestrictedItem<T>(provider), IPluginModule where T : IRole {
protected readonly StationConfig _Config = config;
protected readonly IPlayerConverter<CCSPlayerController> converter =
protected readonly IPlayerConverter<CCSPlayerController> Converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
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;
}
@@ -119,12 +119,12 @@ 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();
var gamePlayer = converter.GetPlayer(player);
var gamePlayer = Converter.GetPlayer(player);
if (gamePlayer == null || !gamePlayer.Pawn.IsValid
|| gamePlayer.Pawn.Value == null)
return;