cs2/jRandomSkills
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

v1.2.3.b7

Browse source 
## Shared Systems

* **DecoyTracker** - owner-aware decoy tracking shared by FrozenDecoy, GravityDecoy and MagneticDecoy, replacing the per-skill position dictionaries.
* **DebugCategory** - new flag enum backing the numeric `DebugMode`, with automatic migration from the old boolean value.
* **SkillsInfo.GetSkillConfig** - indexed skill config lookup replacing the linear scan used by draws and HUD rendering.
* **SkillNames** - cached enum name table, removing repeated `ToString()` calls from the draw path.
* **SkillUtils.HideCarriedEntities** - shared carried-weapon resolution for C4Camouflage, Ghost and Ninja.

## Performance

* **Skill draw** - replaced the O(n²) config lookup; rounds exceeding the perf threshold dropped from 89% to 0.3%.
* **CheckTransmit** - the weapon chain is now resolved once per hidden pawn instead of once per receiver; Ghost cost down 61%.
* **Pilot** - the exhaust trail is paused and resumed instead of being destroyed and recreated on every jump release.
* **MagneticDecoy** - config reads and the pawn list are hoisted out of the per-decoy loop.
* **FrozenDecoy** - config reads are hoisted out of the per-tick loop.
* **Debug** - the damage hook is only installed when damage logging is enabled.

## Fixes

* **PsychicDefusing** - can no longer finish a defuse and award an extra round after the round has already ended.
* **Spectator** - now picks a different enemy on each activation and no longer creates an unused camera prop every time the skill is switched off.
* **Random** - replaced the shared `Random` instance with `Random.Shared`, preventing degenerate results from concurrent use.
* **Baseball** - decoys are removed when their owner dies or loses the skill.
* **FrozenDecoy, GravityDecoy, MagneticDecoy** - decoys and their ground rings are removed when the skill is taken away.
* **ThirdEye** - fixed the camera check dereferencing a missing `CameraServices`, and the door toggle now verifies the entity class before casting.
* **Round start** - fixed `[gamerules unavailable]` appearing on the first freeze-time end after every map change.
* **Config** - added migration for keys missing from existing configuration files.

## Menu

* **WASDMenuAPI** - fixed a malformed `<font>` tag that wrapped every non-hovered menu row in an unclosed attribute.
* **WSAD menu** - the controls line is no longer dropped when the header line is hidden.
* **HtmlHudCustomisation** - line size options left empty now hide their line instead of emitting an invalid font class.

## Debug

* **DebugMode** - changed from a boolean to a number with concatenated category digits: `1` Skill, `2` Round, `3` Entity, `4` Damage. `123` enables Skill, Round and Entity. `0` disables logging. Existing `true` values migrate automatically.
* **EntityManager** - entity creation, destruction and failures are now logged under the Entity category instead of the server console.
* Startup now reports which debug categories are active.
This commit is contained in:
ByDexter 2026-08-16 16:33:09 +03:00
parent 5c65f4ac71
commit 0033d1e13d
29 changed files with 634 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

56
jRandomSkills - SRC Files/src/player/skills/Baseball.cs
View file

@ -11,7 +11,7 @@ namespace src.player.skills
public class Baseball : ISkill
{
private const Skills skillName = Skills.Baseball;
private static readonly ConcurrentDictionary<uint, byte> decoys = [];
private static readonly ConcurrentDictionary<uint, uint> decoys = [];
private readonly static ConcurrentDictionary<uint, int> playersWithSkill = [];
public static void LoadSkill()
@ -28,15 +28,37 @@ namespace src.player.skills
private static void KillAllDecoys()
{
foreach (var decoyIndex in decoys.Keys.ToArray())
{
var decoy = Utilities.GetEntityFromIndex<CDecoyProjectile>((int)decoyIndex);
if (decoy != null && decoy.IsValid && decoy.DesignerName == "decoy_projectile")
decoy.AddEntityIOEvent("Kill", decoy, delay: 0.1f);
}
KillDecoy(decoyIndex);
decoys.Clear();
}
private static void KillDecoy(uint decoyIndex)
{
var decoy = Utilities.GetEntityFromIndex<CDecoyProjectile>((int)decoyIndex);
if (decoy != null && decoy.IsValid && decoy.DesignerName == "decoy_projectile")
decoy.AddEntityIOEvent("Kill", decoy, delay: 0.1f);
}
private static void KillOwnerDecoys(uint ownerIndex)
{
foreach (var pair in decoys.ToArray())
{
if (pair.Value != ownerIndex) continue;
KillDecoy(pair.Key);
decoys.TryRemove(pair.Key, out _);
}
}
public static void PlayerDeath(EventPlayerDeath @event)
{
var player = PlayerManager.GetPlayerEvent(@event.Userid);
if (player == null || !player.IsValid) return;
KillOwnerDecoys(player.Index);
}
public static void PlayerHurt(EventPlayerHurt @event)
{
var victim = PlayerManager.GetPlayerEvent(@event.Userid);
@ -76,9 +98,11 @@ namespace src.player.skills
var player = pawn.Controller.Value.As<CCSPlayerController>();
if (player == null || !player.IsValid) return;
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
uint ownerIndex = PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index;
var playerInfo = PlayerManager.GetPlayerByIndex(ownerIndex);
if (playerInfo?.Skill != skillName) return;
decoys.TryAdd(decoy.Index, 0);
decoys.TryAdd(decoy.Index, ownerIndex);
decoy.Collision.CollisionAttribute.InteractsWith = pawn.Collision.CollisionAttribute.InteractsWith;
decoy.Collision.CollisionGroup = pawn.Collision.CollisionGroup;
@ -93,13 +117,8 @@ namespace src.player.skills
if (playerInfo?.Skill != skillName) return;
uint key = (uint)@event.Entityid;
if (decoys.ContainsKey(key))
{
var decoy = Utilities.GetEntityFromIndex<CDecoyProjectile>(@event.Entityid);
if (decoy != null && decoy.IsValid)
decoy.AddEntityIOEvent("Kill", decoy, delay: 0.1f);
decoys.TryRemove(key, out _);
}
if (decoys.TryRemove(key, out _))
KillDecoy(key);
}
public static void OnTick()
@ -194,6 +213,13 @@ namespace src.player.skills
if (player == null || !player.IsValid) return;
playersWithSkill.TryRemove(player.Index, out _);
KillOwnerDecoys(player.Index);
var eventPlayer = PlayerManager.GetPlayerEvent(player);
if (eventPlayer != null && eventPlayer.IsValid && eventPlayer.Index != player.Index)
KillOwnerDecoys(eventPlayer.Index);
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, 1);
}

2
jRandomSkills - SRC Files/src/player/skills/C4Camouflage.cs
View file

@ -125,7 +125,7 @@ namespace src.player.skills
if (info.TransmitEntities.Contains(target.Pawn.Index))
info.TransmitEntities.Remove(target.Pawn.Index);
SkillUtils.HideCarriedEntities(info, target.Pawn);
SkillUtils.HideCarriedEntities(info, target);
if (bomb == null) continue;

71
jRandomSkills - SRC Files/src/player/skills/FrozenDecoy.cs
View file

@ -10,7 +10,6 @@ namespace src.player.skills
public class FrozenDecoy : ISkill
{
private const Skills skillName = Skills.FrozenDecoy;
private static readonly ConcurrentDictionary<Vector, byte> decoys = [];
private readonly static ConcurrentDictionary<uint, int> playersWithSkill = [];
public static void LoadSkill()
@ -21,14 +20,12 @@ namespace src.player.skills
public static void NewRound()
{
decoys.Clear();
DecoyRing.ClearAll(skillName);
DecoyTracker.Clear(skillName);
}
public static void RoundEnd()
{
decoys.Clear();
DecoyRing.ClearAll(skillName);
DecoyTracker.Clear(skillName);
}
public static void DecoyStarted(EventDecoyStarted @event)
@ -40,43 +37,51 @@ namespace src.player.skills
if (playerInfo?.Skill != skillName) return;
Vector pos = new(@event.X, @event.Y, @event.Z);
decoys.TryAdd(pos, 0);
DecoyTracker.Add(skillName, (uint)@event.Entityid, pos, player.Index);
DecoyRing.Show(skillName, (uint)@event.Entityid, pos, SkillsInfo.GetValue<float>(skillName, "triggerRadius"));
}
public static void DecoyDetonate(EventDecoyDetonate @event)
{
var player = PlayerManager.GetPlayerEvent(@event.Userid);
if (player == null || !player.IsValid) return;
var playerInfo = PlayerManager.GetPlayerByIndex(player!.Index);
if (playerInfo?.Skill != skillName) return;
foreach (var decoy in decoys.Keys.Where(v => v.X == @event.X && v.Y == @event.Y && v.Z == @event.Z))
decoys.TryRemove(decoy, out _);
DecoyRing.Hide(skillName, (uint)@event.Entityid);
DecoyTracker.Remove(skillName, (uint)@event.Entityid);
}
public static void OnTick()
{
foreach (Vector decoyPos in decoys.Keys)
foreach (var player in PlayerManager.GetTickPlayers().Where(p => p.IsValid && p.Team is CsTeam.CounterTerrorist or CsTeam.Terrorist))
var decoyPositions = DecoyTracker.Positions(skillName);
if (decoyPositions.Length == 0) return;
float decoyRadius = SkillsInfo.GetValue<float>(skillName, "triggerRadius");
int slownessMultiplier = SkillsInfo.GetValue<int>(skillName, "slownessMultiplier");
List<CCSPlayerPawn> pawns = [];
foreach (var player in PlayerManager.GetTickPlayers())
{
if (player == null || !player.IsValid) continue;
if (player.Team is not (CsTeam.CounterTerrorist or CsTeam.Terrorist)) continue;
var eventPlayer = PlayerManager.GetPlayerEvent(player);
if (eventPlayer == null || !eventPlayer.IsValid) continue;
var pawn = eventPlayer.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null) continue;
pawns.Add(pawn);
}
if (pawns.Count == 0) return;
foreach (Vector decoyPos in decoyPositions)
foreach (var pawn in pawns)
{
var eventPlayer = PlayerManager.GetPlayerEvent(player);
if (eventPlayer == null || !eventPlayer.IsValid) continue;
var origin = pawn.AbsOrigin;
if (origin == null) continue;
var decoyRadius = SkillsInfo.GetValue<float>(skillName, "triggerRadius");
double distance = SkillUtils.GetDistance(decoyPos, origin);
if (distance > decoyRadius) continue;
var pawn = eventPlayer.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null) continue;
double distance = SkillUtils.GetDistance(decoyPos, pawn.AbsOrigin);
if (distance <= decoyRadius)
{
double modifier = Math.Clamp(distance / decoyRadius, 0f, 1f);
pawn.VelocityModifier = (float)Math.Pow(modifier, SkillsInfo.GetValue<int>(skillName, "slownessMultiplier"));
}
double modifier = Math.Clamp(distance / decoyRadius, 0f, 1f);
pawn.VelocityModifier = (float)Math.Pow(modifier, slownessMultiplier);
}
}
@ -137,6 +142,12 @@ namespace src.player.skills
if (player == null || !player.IsValid) return;
playersWithSkill.TryRemove(player.Index, out _);
DecoyTracker.RemoveOwner(skillName, player.Index);
var eventPlayer = PlayerManager.GetPlayerEvent(player);
if (eventPlayer != null && eventPlayer.IsValid && eventPlayer.Index != player.Index)
DecoyTracker.RemoveOwner(skillName, eventPlayer.Index);
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, 1);
}

2
jRandomSkills - SRC Files/src/player/skills/Ghost.cs
View file

@ -85,7 +85,7 @@ namespace src.player.skills
if (info.TransmitEntities.Contains(target.Pawn.Index))
info.TransmitEntities.Remove(target.Pawn.Index);
SkillUtils.HideCarriedEntities(info, target.Pawn);
SkillUtils.HideCarriedEntities(info, target);
// Hide the bomb as well, but only while this hidden player is the one holding it.
if (bomb == null || !target.HoldsBomb) continue;

41
jRandomSkills - SRC Files/src/player/skills/GravityDecoy.cs
View file

@ -13,7 +13,6 @@ namespace src.player.skills
private const float defaultGravity = 1f;
private static readonly ConcurrentDictionary<Vector, byte> decoys = [];
private static readonly ConcurrentDictionary<uint, int> playersWithSkill = [];
private static readonly ConcurrentDictionary<uint, byte> affected = [];
private static readonly ConcurrentDictionary<uint, byte> restoreOnRespawn = [];
@ -27,15 +26,13 @@ namespace src.player.skills
public static void NewRound()
{
RestoreAll();
decoys.Clear();
DecoyRing.ClearAll(skillName);
DecoyTracker.Clear(skillName);
}
public static void RoundEnd()
{
RestoreAll();
decoys.Clear();
DecoyRing.ClearAll(skillName);
DecoyTracker.Clear(skillName);
}
public static void DecoyStarted(EventDecoyStarted @event)
@ -47,31 +44,24 @@ namespace src.player.skills
if (playerInfo?.Skill != skillName) return;
Vector pos = new(@event.X, @event.Y, @event.Z);
decoys.TryAdd(pos, 0);
DecoyTracker.Add(skillName, (uint)@event.Entityid, pos, player.Index);
DecoyRing.Show(skillName, (uint)@event.Entityid, pos, SkillsInfo.GetValue<float>(skillName, "triggerRadius"));
}
public static void DecoyDetonate(EventDecoyDetonate @event)
{
var player = PlayerManager.GetPlayerEvent(@event.Userid);
if (player == null || !player.IsValid) return;
DecoyTracker.Remove(skillName, (uint)@event.Entityid);
var playerInfo = PlayerManager.GetPlayerByIndex(player!.Index);
if (playerInfo?.Skill != skillName) return;
foreach (var decoy in decoys.Keys.Where(v => v.X == @event.X && v.Y == @event.Y && v.Z == @event.Z))
decoys.TryRemove(decoy, out _);
DecoyRing.Hide(skillName, (uint)@event.Entityid);
if (decoys.IsEmpty) RestoreAll();
if (DecoyTracker.IsEmpty(skillName)) RestoreAll();
}
public static void OnTick()
{
if (decoys.IsEmpty && affected.IsEmpty && restoreOnRespawn.IsEmpty) return;
var decoyPositions = DecoyTracker.Positions(skillName);
if (decoys.IsEmpty && !affected.IsEmpty) RestoreAll();
if (decoyPositions.Length == 0 && affected.IsEmpty && restoreOnRespawn.IsEmpty) return;
if (decoyPositions.Length == 0 && !affected.IsEmpty) RestoreAll();
float radius = SkillsInfo.GetValue<float>(skillName, "triggerRadius");
float gravity = SkillsInfo.GetValue<float>(skillName, "gravityScale");
@ -91,7 +81,9 @@ namespace src.player.skills
if (restoreOnRespawn.TryRemove(eventPlayer.Index, out _))
pawn.ActualGravityScale = defaultGravity;
bool inside = !decoys.IsEmpty && decoys.Keys.Any(d => SkillUtils.GetDistance(d, pawn.AbsOrigin) <= radius);
bool inside = false;
foreach (var decoyPos in decoyPositions)
if (SkillUtils.GetDistance(decoyPos, pawn.AbsOrigin) <= radius) { inside = true; break; }
if (inside)
{
@ -176,6 +168,15 @@ namespace src.player.skills
if (player == null || !player.IsValid) return;
playersWithSkill.TryRemove(player.Index, out _);
DecoyTracker.RemoveOwner(skillName, player.Index);
var eventPlayer = PlayerManager.GetPlayerEvent(player);
if (eventPlayer != null && eventPlayer.IsValid && eventPlayer.Index != player.Index)
DecoyTracker.RemoveOwner(skillName, eventPlayer.Index);
if (DecoyTracker.IsEmpty(skillName)) RestoreAll();
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, 1);
}

81
jRandomSkills - SRC Files/src/player/skills/MagneticDecoy.cs
View file

@ -10,7 +10,6 @@ namespace src.player.skills
public class MagneticDecoy : ISkill
{
private const Skills skillName = Skills.MagneticDecoy;
private static readonly ConcurrentDictionary<Vector, byte> decoys = [];
private readonly static ConcurrentDictionary<uint, int> playersWithSkill = [];
public static void LoadSkill()
@ -21,14 +20,12 @@ namespace src.player.skills
public static void NewRound()
{
decoys.Clear();
DecoyRing.ClearAll(skillName);
DecoyTracker.Clear(skillName);
}
public static void RoundEnd()
{
decoys.Clear();
DecoyRing.ClearAll(skillName);
DecoyTracker.Clear(skillName);
}
public static void DecoyStarted(EventDecoyStarted @event)
@ -40,50 +37,58 @@ namespace src.player.skills
if (playerInfo?.Skill != skillName) return;
Vector pos = new(@event.X, @event.Y, @event.Z);
decoys.TryAdd(pos, 0);
DecoyTracker.Add(skillName, (uint)@event.Entityid, pos, player.Index);
DecoyRing.Show(skillName, (uint)@event.Entityid, pos, SkillsInfo.GetValue<float>(skillName, "triggerRadius"));
}
public static void DecoyDetonate(EventDecoyDetonate @event)
{
var player = PlayerManager.GetPlayerEvent(@event.Userid);
if (player == null || !player.IsValid) return;
var playerInfo = PlayerManager.GetPlayerByIndex(player!.Index);
if (playerInfo?.Skill != skillName) return;
foreach (var decoy in decoys.Keys.Where(v => v.X == @event.X && v.Y == @event.Y && v.Z == @event.Z))
decoys.TryRemove(decoy, out _);
DecoyRing.Hide(skillName, (uint)@event.Entityid);
DecoyTracker.Remove(skillName, (uint)@event.Entityid);
}
public static void OnTick()
{
foreach (Vector decoyPos in decoys.Keys)
foreach (var player in PlayerManager.GetTickPlayers().Where(p => p.IsValid && p.Team is CsTeam.CounterTerrorist or CsTeam.Terrorist))
var decoyPositions = DecoyTracker.Positions(skillName);
if (decoyPositions.Length == 0) return;
float decoyRadius = SkillsInfo.GetValue<float>(skillName, "triggerRadius");
float baseStrenght = SkillsInfo.GetValue<float>(skillName, "strenght");
List<CCSPlayerPawn> pawns = [];
foreach (var player in PlayerManager.GetTickPlayers())
{
if (player == null || !player.IsValid) continue;
if (player.Team is not (CsTeam.CounterTerrorist or CsTeam.Terrorist)) continue;
var eventPlayer = PlayerManager.GetPlayerEvent(player);
if (eventPlayer == null || !eventPlayer.IsValid) continue;
var pawn = eventPlayer.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null) continue;
pawns.Add(pawn);
}
if (pawns.Count == 0) return;
foreach (Vector decoyPos in decoyPositions)
foreach (var pawn in pawns)
{
var eventPlayer = PlayerManager.GetPlayerEvent(player);
if (eventPlayer == null || !eventPlayer.IsValid) continue;
var origin = pawn.AbsOrigin;
if (origin == null) continue;
var decoyRadius = SkillsInfo.GetValue<float>(skillName, "triggerRadius");
double distance = SkillUtils.GetDistance(decoyPos, origin);
if (distance > decoyRadius || distance <= 10) continue;
var pawn = eventPlayer.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null) continue;
Vector direction = new(decoyPos.X - origin.X, decoyPos.Y - origin.Y, 0);
float length = direction.Length();
if (length <= 0) continue;
double distance = SkillUtils.GetDistance(decoyPos, pawn.AbsOrigin);
if (distance <= decoyRadius && distance > 10)
{
Vector direction = new(decoyPos.X - pawn.AbsOrigin.X, decoyPos.Y - pawn.AbsOrigin.Y, 0);
float length = direction.Length();
Vector normalized = direction / length;
float strenght = baseStrenght * (1 - (float)(distance / decoyRadius));
Vector normalized = direction / length;
float ratio = 1 - (float)(distance / decoyRadius);
float strenght = SkillsInfo.GetValue<float>(skillName, "strenght") * ratio;
pawn.AbsVelocity.X += normalized.X * strenght;
pawn.AbsVelocity.Y += normalized.Y * strenght;
}
pawn.AbsVelocity.X += normalized.X * strenght;
pawn.AbsVelocity.Y += normalized.Y * strenght;
}
}
@ -144,6 +149,12 @@ namespace src.player.skills
if (player == null || !player.IsValid) return;
playersWithSkill.TryRemove(player.Index, out _);
DecoyTracker.RemoveOwner(skillName, player.Index);
var eventPlayer = PlayerManager.GetPlayerEvent(player);
if (eventPlayer != null && eventPlayer.IsValid && eventPlayer.Index != player.Index)
DecoyTracker.RemoveOwner(skillName, eventPlayer.Index);
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, 1);
}

2
jRandomSkills - SRC Files/src/player/skills/Ninja.cs
View file

@ -83,7 +83,7 @@ namespace src.player.skills
if (info.TransmitEntities.Contains(target.Pawn.Index))
info.TransmitEntities.Remove(target.Pawn.Index);
SkillUtils.HideCarriedEntities(info, target.Pawn);
SkillUtils.HideCarriedEntities(info, target);
if (bomb == null || !target.HoldsBomb) continue;

40
jRandomSkills - SRC Files/src/player/skills/Pilot.cs
View file

@ -120,7 +120,9 @@ namespace src.player.skills
}
else
{
if (pilotInfo.TrailIndex != null)
PauseTrail(pilotInfo);
if (isOnGround)
ClearTrail(pilotInfo);
if (pilotInfo.Fuel <= 0)
@ -164,8 +166,13 @@ namespace src.player.skills
if (pilotInfo.TrailIndex != null)
{
var existing = Utilities.GetEntityFromIndex<CParticleSystem>((int)pilotInfo.TrailIndex.Value);
if (existing != null && existing.IsValid) return;
pilotInfo.TrailIndex = null;
if (existing != null && existing.IsValid)
{
ResumeTrail(pilotInfo);
return;
}
ClearTrail(pilotInfo);
}
if (pawn.AbsOrigin == null) return;
@ -179,6 +186,29 @@ namespace src.player.skills
particle.AcceptInput("Start");
pilotInfo.TrailIndex = particle.Index;
pilotInfo.TrailActive = true;
}
private static void ResumeTrail(Pilot_PlayerInfo pilotInfo)
{
if (pilotInfo.TrailActive || pilotInfo.TrailIndex == null) return;
var particle = Utilities.GetEntityFromIndex<CParticleSystem>((int)pilotInfo.TrailIndex.Value);
if (particle != null && particle.IsValid)
particle.AcceptInput("Start");
pilotInfo.TrailActive = true;
}
private static void PauseTrail(Pilot_PlayerInfo pilotInfo)
{
if (!pilotInfo.TrailActive || pilotInfo.TrailIndex == null) return;
var particle = Utilities.GetEntityFromIndex<CParticleSystem>((int)pilotInfo.TrailIndex.Value);
if (particle != null && particle.IsValid)
particle.AcceptInput("Stop");
pilotInfo.TrailActive = false;
}
private static void StopTrail(Pilot_PlayerInfo pilotInfo)
@ -187,6 +217,7 @@ namespace src.player.skills
uint index = pilotInfo.TrailIndex.Value;
pilotInfo.TrailIndex = null;
pilotInfo.TrailActive = false;
var particle = Utilities.GetEntityFromIndex<CParticleSystem>((int)index);
if (particle != null && particle.IsValid)
@ -252,9 +283,10 @@ namespace src.player.skills
public float LastJumpTime { get; set; } = 0;
public bool IsFlying { get; set; } = false;
public uint? TrailIndex { get; set; }
public bool TrailActive { get; set; }
}
public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#1466F5", CsTeam onlyTeam = CsTeam.None, bool disableOnFreezeTime = true, bool needsTeammates = false, string requiredPermission = "", float? hudDuration = null, float? descriptionHudDuration = null, int maxPerServer = -1, Rarity rarity = Rarity.Common, float maximumFuel = 150f, float fuelConsumption = .64f, float refuelling = .1f, string particleName = "particles/inferno_fx/incgrenade_thrown_trail.vpcf", float particleOffset = 0f) : SkillsInfo.DefaultSkillInfo(skill, active, color, onlyTeam, disableOnFreezeTime, needsTeammates, requiredPermission, hudDuration, descriptionHudDuration, maxPerServer, rarity)
public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#1466F5", CsTeam onlyTeam = CsTeam.None, bool disableOnFreezeTime = true, bool needsTeammates = false, string requiredPermission = "", float? hudDuration = null, float? descriptionHudDuration = null, int maxPerServer = -1, Rarity rarity = Rarity.Common, float maximumFuel = 150f, float fuelConsumption = .64f, float refuelling = .1f, string particleName = "particles/inferno_fx/incgrenade_thrown_trail.vpcf", float particleOffset = 10f) : SkillsInfo.DefaultSkillInfo(skill, active, color, onlyTeam, disableOnFreezeTime, needsTeammates, requiredPermission, hudDuration, descriptionHudDuration, maxPerServer, rarity)
{
public string ParticleName { get; set; } = particleName;
public float ParticleOffset { get; set; } = particleOffset;

20
jRandomSkills - SRC Files/src/player/skills/PsychicDefusing.cs
View file

@ -12,6 +12,7 @@ namespace src.player.skills
private const Skills skillName = Skills.PsychicDefusing;
private static readonly ConcurrentDictionary<uint, PlayerSkillInfo> SkillPlayerInfo = [];
private static Vector? bombLocation = null;
private static bool roundEnded;
private static readonly float tickRate = 64f;
private static readonly object setLock = new();
@ -26,6 +27,17 @@ namespace src.player.skills
{
SkillPlayerInfo.Clear();
bombLocation = null;
roundEnded = false;
}
}
public static void RoundEnd()
{
lock (setLock)
{
roundEnded = true;
bombLocation = null;
SkillPlayerInfo.Clear();
}
}
@ -48,7 +60,8 @@ namespace src.player.skills
public static void OnTick()
{
if (bombLocation == null) return;
var bomb = bombLocation;
if (roundEnded || bomb == null) return;
foreach (var skillInfo in SkillPlayerInfo)
{
var playerIndex = skillInfo.Key;
@ -60,7 +73,7 @@ namespace src.player.skills
var pawn = player.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid) continue;
if (pawn.AbsOrigin == null || SkillUtils.GetDistance(pawn.AbsOrigin, bombLocation) > SkillsInfo.GetValue<float>(skillName, "maxDefusingRange"))
if (pawn.AbsOrigin == null || SkillUtils.GetDistance(pawn.AbsOrigin, bomb) > SkillsInfo.GetValue<float>(skillName, "maxDefusingRange"))
{
info.Defusing = false;
info.DefusingTime = SkillsInfo.GetValue<float>(skillName, "defusingTime");
@ -76,13 +89,14 @@ namespace src.player.skills
if (info.DefusingTime <= 0)
{
var plantedBomb = Utilities.FindAllEntitiesByDesignerName<CPlantedC4>("planted_c4").FirstOrDefault();
if (plantedBomb != null)
if (plantedBomb != null && plantedBomb.IsValid && plantedBomb.BombTicking && !plantedBomb.BombDefused)
{
plantedBomb.AddEntityIOEvent("Kill", plantedBomb, delay: 0.1f);
SkillUtils.TerminateRound(CsTeam.CounterTerrorist);
}
SkillUtils.ResetPrintHTML(player);
SkillPlayerInfo.Clear();
bombLocation = null;
}
UpdateHUD(player, info);

10
jRandomSkills - SRC Files/src/player/skills/Spectator.cs
View file

@ -116,7 +116,7 @@ namespace src.player.skills
if (cam != null && cam.IsValid)
EntityManager.DestroyEntity(cam.Index);
if (!forceToDefault)
if (!forceToDefault && pawn.CameraServices.ViewEntity.Raw == orginalCameraRaw)
newCameraRaw = CreateCamera(player);
}
else
@ -140,7 +140,7 @@ namespace src.player.skills
Utilities.SetStateChanged(pawn, "CBasePlayerPawn", "m_pCameraServices");
if (forceToDefault && cameras.TryGetValue(player.Index, out var current) && current.Item2 != 0)
if (defaultCam && cameras.TryGetValue(player.Index, out var current) && current.Item2 != 0)
cameras[player.Index] = (current.Item1, 0, current.Item3);
BlockWeapon(player, !defaultCam);
@ -165,7 +165,11 @@ namespace src.player.skills
return 0;
}
var enemy = enemies[Instance.Random.Next(enemies.Count)];
uint lastTarget = cameras.TryGetValue(player.Index, out var previous) ? previous.Item3 : 0;
if (lastTarget != 0 && enemies.Count > 1)
enemies.RemoveAll(p => p.Index == lastTarget);
var enemy = enemies[Random.Shared.Next(enemies.Count)];
var pawn = enemy.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid || pawn.CameraServices == null || pawn.AbsOrigin == null)

5
jRandomSkills - SRC Files/src/player/skills/ThirdEye.cs
View file

@ -52,8 +52,11 @@ namespace src.player.skills
var pawn = player.PlayerPawn?.Value;
if (pawn == null || !pawn.IsValid) return true;
var cameraServices = pawn.CameraServices;
if (cameraServices == null) return true;
if (cameras.TryGetValue(player.Index, out var cameraInfo) && cameraInfo.Item1 != 0)
return pawn?.CameraServices?.ViewEntity.Raw == cameraInfo.Item1;
return cameraServices.ViewEntity.Raw == cameraInfo.Item1;
return true;
}

2
jRandomSkills - SRC Files/src/player/skills/TrueArmor.cs
View file

@ -68,7 +68,7 @@ namespace src.player.skills
Utilities.SetStateChanged(victimPawn, "CCSPlayerPawn", "m_ArmorValue");
Debug.WriteToDebug($"[TrueArmor] {victim.PlayerName}: raw={damage:0.#} absorbed={absorbed:0.#} " +
$"passed={info.Damage:0.#} armor={armor}->{pending[victim.Index]} hp={victimPawn.Health}");
$"passed={info.Damage:0.#} armor={armor}->{pending[victim.Index]} hp={victimPawn.Health}", DebugCategory.Damage);
}
public static void OnTakeDamagePost(DynamicHook h)