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).
243 lines
No EOL
10 KiB
C#
243 lines
No EOL
10 KiB
C#
using CounterStrikeSharp.API;
|
|
using CounterStrikeSharp.API.Core;
|
|
using CounterStrikeSharp.API.Modules.Utils;
|
|
using src.utils;
|
|
using System.Collections.Concurrent;
|
|
using static src.jRandomSkills;
|
|
|
|
namespace src.player.skills
|
|
{
|
|
public class SniperElite : ISkill
|
|
{
|
|
private const Skills skillName = Skills.SniperElite;
|
|
private static readonly ConcurrentDictionary<uint, List<uint>> playerAWPIndexes = [];
|
|
private static readonly ConcurrentDictionary<uint, string> savedWeapons = [];
|
|
private static readonly ConcurrentDictionary<uint, byte> isProcessing = [];
|
|
private static readonly object setLock = new();
|
|
|
|
private const string weapon_awp = "weapon_awp";
|
|
private static readonly string[] rifles =
|
|
[
|
|
"weapon_mp9", "weapon_mac10", "weapon_bizon", "weapon_mp7", "weapon_ump45", "weapon_p90",
|
|
"weapon_mp5sd", "weapon_famas", "weapon_galilar", "weapon_m4a1", "weapon_m4a1_silencer", "weapon_ak47",
|
|
"weapon_aug", "weapon_sg553", "weapon_ssg08", "weapon_awp", "weapon_scar20", "weapon_g3sg1",
|
|
"weapon_nova", "weapon_xm1014", "weapon_mag7", "weapon_sawedoff", "weapon_m249", "weapon_negev"
|
|
];
|
|
|
|
public static void LoadSkill()
|
|
{
|
|
SkillUtils.RegisterSkill(skillName, SkillsInfo.GetValue<string>(skillName, "color"));
|
|
}
|
|
|
|
public static void NewRound()
|
|
{
|
|
|
|
lock (setLock)
|
|
{
|
|
var allIndexes = playerAWPIndexes.Values.SelectMany(l => l).ToArray();
|
|
foreach (var idx in allIndexes)
|
|
SkillUtils.SafeKillEntity<CBasePlayerWeapon>(idx);
|
|
|
|
savedWeapons.Clear();
|
|
playerAWPIndexes.Clear();
|
|
isProcessing.Clear();
|
|
}
|
|
}
|
|
|
|
public static void PlayerDeath(EventPlayerDeath @event)
|
|
{
|
|
var player = PlayerManager.GetPlayerEvent(@event.Userid);
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
var playerInfo = PlayerManager.GetPlayerByIndex(player!.Index);
|
|
if (playerInfo?.Skill == skillName)
|
|
DisableSkill(player);
|
|
}
|
|
|
|
public static void WeaponEquip(EventItemEquip @event)
|
|
{
|
|
var player = PlayerManager.GetPlayerEvent(@event.Userid);
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
var playerInfo = PlayerManager.GetPlayerByIndex(player!.Index);
|
|
if (playerInfo?.Skill == skillName)
|
|
{
|
|
if (rifles.Contains(@event.Item) && @event.Item != weapon_awp)
|
|
savedWeapons.AddOrUpdate(player.Index, string.Empty, (_, _) => string.Empty);
|
|
DeleteDroppedAWP(player);
|
|
}
|
|
}
|
|
|
|
public static void EnableSkill(CCSPlayerController player)
|
|
{
|
|
savedWeapons.TryAdd(player.Index, string.Empty);
|
|
}
|
|
|
|
public static void DisableSkill(CCSPlayerController player)
|
|
{
|
|
player.ExecuteClientCommand("slot3");
|
|
|
|
if (playerAWPIndexes.TryGetValue(player.Index, out var AWPs))
|
|
foreach (var index in AWPs.ToList())
|
|
SkillUtils.SafeKillEntity<CBasePlayerWeapon>(index);
|
|
|
|
if (savedWeapons.TryGetValue(player.Index, out string? savedWeapon) && !string.IsNullOrWhiteSpace(savedWeapon))
|
|
Server.NextFrame(() =>
|
|
{
|
|
if (player == null || !player.IsValid || player.LifeState != (byte)LifeState_t.LIFE_ALIVE) return;
|
|
|
|
var pawn = player.PlayerPawn.Value;
|
|
if (pawn == null || !pawn.IsValid) return;
|
|
|
|
var itemServices = pawn.ItemServices;
|
|
if (itemServices != null && itemServices.Handle != IntPtr.Zero)
|
|
player.GiveNamedItem(savedWeapon);
|
|
});
|
|
|
|
Server.NextFrame(() =>
|
|
{
|
|
if (player != null && player.IsValid && player.PawnIsAlive)
|
|
player.ExecuteClientCommand("lastinv");
|
|
});
|
|
|
|
savedWeapons.TryRemove(player.Index, out _);
|
|
playerAWPIndexes.TryRemove(player.Index, out _);
|
|
isProcessing.TryRemove(player.Index, out _);
|
|
}
|
|
|
|
public static void UseSkill(CCSPlayerController player)
|
|
{
|
|
if (player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid || isProcessing.ContainsKey(player.Index)) return;
|
|
if (savedWeapons.ContainsKey(player.Index))
|
|
RemoveAndGiveWeapon(player);
|
|
}
|
|
|
|
private static void RemoveAndGiveWeapon(CCSPlayerController player)
|
|
{
|
|
uint playerIndex = player.Index;
|
|
try
|
|
{
|
|
if (!isProcessing.TryAdd(playerIndex, 0)) return;
|
|
|
|
CBasePlayerWeapon? activeRifle = GetActiveRifle(player);
|
|
string weaponToGive = weapon_awp;
|
|
|
|
if (activeRifle != null && activeRifle.IsValid)
|
|
{
|
|
string currentWeaponName = SkillUtils.GetDesignerName(activeRifle);
|
|
bool isScriptAWP = false;
|
|
|
|
lock (setLock)
|
|
isScriptAWP = playerAWPIndexes.TryGetValue(playerIndex, out var indexes) && indexes.Contains(activeRifle.Index);
|
|
|
|
if (isScriptAWP)
|
|
{
|
|
if (savedWeapons.TryGetValue(playerIndex, out var savedWeapon) && !string.IsNullOrEmpty(savedWeapon))
|
|
{
|
|
weaponToGive = savedWeapon;
|
|
savedWeapons.AddOrUpdate(playerIndex, string.Empty, (_, _) => string.Empty);
|
|
}
|
|
else
|
|
{
|
|
isProcessing.TryRemove(playerIndex, out _);
|
|
return;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
savedWeapons.AddOrUpdate(playerIndex, currentWeaponName, (_, _) => currentWeaponName);
|
|
weaponToGive = weapon_awp + "_script";
|
|
}
|
|
|
|
SkillUtils.SafeKillEntity<CBasePlayerWeapon>(activeRifle.Index);
|
|
}
|
|
else
|
|
{
|
|
if (savedWeapons.TryGetValue(playerIndex, out string? savedWeapon) && !string.IsNullOrEmpty(savedWeapon))
|
|
{
|
|
weaponToGive = savedWeapon;
|
|
savedWeapons.AddOrUpdate(playerIndex, string.Empty, (_, _) => string.Empty);
|
|
}
|
|
else
|
|
weaponToGive = weapon_awp + "_script";
|
|
}
|
|
|
|
Instance.AddTimer(.15f, () =>
|
|
{
|
|
var player = Utilities.GetPlayerFromIndex((int)playerIndex);
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
if (player != null && player.IsValid && player.PlayerPawn != null && player.PlayerPawn.Value != null && player.PlayerPawn.Value.IsValid)
|
|
{
|
|
var createdWeapon = player.PlayerPawn.Value?.ItemServices?.As<CCSPlayer_ItemServices>().GiveNamedItem<CEntityInstance>(weaponToGive.Replace("_script", ""));
|
|
|
|
if (createdWeapon != null && createdWeapon.IsValid && weaponToGive.EndsWith("_script"))
|
|
{
|
|
CBasePlayerWeapon weapon = createdWeapon.As<CBasePlayerWeapon>();
|
|
if (weapon?.AttributeManager.Item.NetworkedDynamicAttributes != null)
|
|
weapon.AttributeManager.Item.CustomName = player.GetTranslation("sniperelite_customname");
|
|
|
|
lock (setLock)
|
|
{
|
|
if (!playerAWPIndexes.ContainsKey(playerIndex))
|
|
playerAWPIndexes.TryAdd(playerIndex, []);
|
|
|
|
if (playerAWPIndexes.TryGetValue(playerIndex, out var list))
|
|
list.Add(createdWeapon.Index);
|
|
}
|
|
}
|
|
}
|
|
|
|
DeleteDroppedAWP(player);
|
|
isProcessing.TryRemove(playerIndex, out _);
|
|
}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
|
|
}
|
|
catch
|
|
{
|
|
isProcessing.TryRemove(playerIndex, out _);
|
|
}
|
|
}
|
|
|
|
private static void DeleteDroppedAWP(CCSPlayerController? player)
|
|
{
|
|
if (player == null || !player.IsValid) return;
|
|
|
|
var pawn = player.PlayerPawn.Value;
|
|
if (pawn == null || !pawn.IsValid || pawn.WeaponServices == null) return;
|
|
|
|
var myWeapons = pawn.WeaponServices.MyWeapons;
|
|
ConcurrentBag<uint> myWeaponsIndexes = [.. myWeapons
|
|
.Where(w => w != null && w.IsValid && w.Value != null && w.Value.IsValid)
|
|
.Select(w => w.Value!.Index)];
|
|
|
|
lock (setLock)
|
|
{
|
|
if (playerAWPIndexes.TryGetValue(player.Index, out var AWPs))
|
|
foreach (var index in AWPs.ToList())
|
|
if (!myWeaponsIndexes.Contains(index))
|
|
{
|
|
var ent = Utilities.GetEntityFromIndex<CBaseEntity>((int)index);
|
|
if (ent != null && ent.IsValid)
|
|
ent.AddEntityIOEvent("Kill", ent, delay: 0.1f);
|
|
|
|
AWPs.Remove(index);
|
|
}
|
|
}
|
|
}
|
|
|
|
private static CBasePlayerWeapon? GetActiveRifle(CCSPlayerController player)
|
|
{
|
|
var pawn = player.PlayerPawn.Value;
|
|
if (pawn == null || !pawn.IsValid || pawn.WeaponServices == null) return null;
|
|
|
|
var activeWeapon = pawn.WeaponServices?.ActiveWeapon.Value;
|
|
if (activeWeapon != null && activeWeapon.IsValid && rifles.Contains(activeWeapon.DesignerName))
|
|
return activeWeapon;
|
|
return null;
|
|
}
|
|
|
|
public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#e0873a", 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) : SkillsInfo.DefaultSkillInfo(skill, active, color, onlyTeam, disableOnFreezeTime, needsTeammates, requiredPermission, hudDuration, descriptionHudDuration, maxPerServer, rarity)
|
|
{
|
|
}
|
|
}
|
|
} |