Revive skills (Second Chance / Phoenix / Re-Zombie) — unified "on death" logic: - Intercept the lethal hit before it is applied. Previously they reacted after the death was already committed, so one-shots, fall damage and skill-based kills were missed (Phoenix and Re-Zombie were rewritten from a post-death handler to pre-damage interception). Killer Flash: - Kills through real damage instead of forcing a suicide, so revive skills can intercept. Baseball: - Fixed a rare server crash from decoy grenades: a freed decoy's entity index could be reused by another entity and written to (use-after-free). Decoy tracking is now validated per tick (DesignerName gate) and cleared every round. Native crash hardening: - Aimbot: guard the hit-group native pointer before writing (avoids writing to freed/null memory). - Wallhack: detach the glow when the target dies or disconnects (stale FollowEntity on a freed pawn). - Spectator / Cypher / FalconEye / ThirdEye: null-guard the camera SceneNode walk and re-validate the target before teleport/parent (cross-frame freed-entity deref). - CServerSideClient.ForceFullUpdate now bails on a null client handle. Performance: - Added a per-tick player/bomb cache (PlayerManager.GetTickPlayers / GetTickBomb). - Migrated 82 skills from per-skill Utilities.GetPlayers() to the one shared per-tick scan, and the HUD loop reuses it. Much lower per-tick cost at high player counts (verified 10v10). RayTrace: - Prints a single notice when the module is not installed; dependent skills (Long Zeus, Long Knife, Iana, Cypher, Noclip, Shade + the skill-use aim check) no-op instead of failing silently (#43).
145 lines
No EOL
6.3 KiB
C#
145 lines
No EOL
6.3 KiB
C#
using CounterStrikeSharp.API;
|
|
using CounterStrikeSharp.API.Core;
|
|
using CounterStrikeSharp.API.Modules.Entities.Constants;
|
|
using CounterStrikeSharp.API.Modules.Utils;
|
|
using src.utils;
|
|
using System.Collections.Concurrent;
|
|
|
|
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()
|
|
{
|
|
SkillUtils.RegisterSkill(skillName, SkillsInfo.GetValue<string>(skillName, "color"));
|
|
}
|
|
|
|
public static void NewRound()
|
|
{
|
|
decoys.Clear();
|
|
}
|
|
|
|
public static void DecoyStarted(EventDecoyStarted @event)
|
|
{
|
|
var player = PlayerManager.GetPlayerEvent(@event.Userid);
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
var playerInfo = PlayerManager.GetPlayerByIndex(player!.Index);
|
|
if (playerInfo?.Skill != skillName) return;
|
|
|
|
decoys.TryAdd(new Vector(@event.X, @event.Y, @event.Z), 0);
|
|
}
|
|
|
|
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 _);
|
|
}
|
|
|
|
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 eventPlayer = PlayerManager.GetPlayerEvent(player);
|
|
if (eventPlayer == null || !eventPlayer.IsValid) continue;
|
|
|
|
var decoyRadius = SkillsInfo.GetValue<float>(skillName, "triggerRadius");
|
|
|
|
var pawn = eventPlayer.PlayerPawn.Value;
|
|
if (pawn == null || !pawn.IsValid || pawn.AbsOrigin == null) 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 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;
|
|
}
|
|
}
|
|
}
|
|
|
|
public static void GrenadeThrown(EventGrenadeThrown @event)
|
|
{
|
|
var player = PlayerManager.GetPlayerEvent(@event.Userid);
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
var weapon = @event.Weapon;
|
|
if (weapon != "decoy") return;
|
|
|
|
var playerInfo = PlayerManager.GetPlayerByIndex(player!.Index);
|
|
if (playerInfo?.Skill != skillName) return;
|
|
|
|
if (playersWithSkill.TryGetValue(player.Index, out int grenadesLeft) && grenadesLeft > 1)
|
|
{
|
|
playersWithSkill[player.Index] = grenadesLeft - 1;
|
|
player!.GiveNamedItem($"weapon_{weapon}");
|
|
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, grenadesLeft - 1);
|
|
}
|
|
}
|
|
|
|
public static void WeaponEquip(EventItemEquip @event)
|
|
{
|
|
var player = PlayerManager.GetPlayerEvent(@event.Userid);
|
|
var weapon = @event.Item;
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
if (playersWithSkill.TryGetValue(player.Index, out int grenadesLeft) && grenadesLeft > 1)
|
|
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, grenadesLeft);
|
|
}
|
|
|
|
public static void WeaponPickup(EventItemPickup @event)
|
|
{
|
|
var player = PlayerManager.GetPlayerEvent(@event.Userid);
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
var weapon = @event.Item;
|
|
if (string.IsNullOrEmpty(weapon) || weapon != "decoy") return;
|
|
|
|
if (playersWithSkill.TryGetValue(player.Index, out int grenadesLeft) && grenadesLeft > 1)
|
|
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, grenadesLeft);
|
|
}
|
|
|
|
public static void EnableSkill(CCSPlayerController player)
|
|
{
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
int grenadeLimit = SkillsInfo.GetValue<int>(skillName, "grenadeLimit");
|
|
playersWithSkill.TryAdd(player.Index, grenadeLimit);
|
|
|
|
SkillUtils.TryGiveWeapon(player, CsItem.DecoyGrenade);
|
|
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, grenadeLimit);
|
|
}
|
|
|
|
public static void DisableSkill(CCSPlayerController player)
|
|
{
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
playersWithSkill.TryRemove(player.Index, out _);
|
|
SkillUtils.UpdateGrenadeCount(player, CsItem.DecoyGrenade, 1);
|
|
}
|
|
|
|
public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#81f0c4", CsTeam onlyTeam = CsTeam.None, bool disableOnFreezeTime = false, bool needsTeammates = false, string requiredPermission = "", float? hudDuration = null, float? descriptionHudDuration = null, int maxPerServer = -1, Rarity rarity = Rarity.Common, float triggerRadius = 180, float strenght = 30, int grenadeLimit = 3) : SkillsInfo.DefaultSkillInfo(skill, active, color, onlyTeam, disableOnFreezeTime, needsTeammates, requiredPermission, hudDuration, descriptionHudDuration, maxPerServer, rarity)
|
|
{
|
|
public float TriggerRadius { get; set; } = triggerRadius;
|
|
public float Strenght { get; set; } = strenght;
|
|
public int GrenadeLimit { get; set; } = grenadeLimit;
|
|
}
|
|
}
|
|
} |