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

Refactor Jackal skill to affect all opponents and add alternative skill button

Browse source
This commit is contained in:
Juzlus 2025-09-06 04:30:57 +02:00
parent db3bb38d9b
commit ca73bf50ac
29 changed files with 136 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

54
jRandomSkills - SRC Files/src/player/skills/Darkness.cs
View file

@ -3,6 +3,7 @@ using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Utils;
using jRandomSkills.src.player;
using jRandomSkills.src.utils;
using System.Collections.Generic;
using static jRandomSkills.jRandomSkills;
namespace jRandomSkills
@ -11,7 +12,7 @@ namespace jRandomSkills
{
private const Skills skillName = Skills.Darkness;
private static readonly float brightness = Config.GetValue<float>(skillName, "brightness");
private static readonly Dictionary<CCSPlayerController, CPostProcessingVolume> deafultPostProcessing = [];
private static readonly Dictionary<CCSPlayerController, List<CPostProcessingVolume>> defaultPostProcessings = [];
private static readonly List<CPostProcessingVolume> newPostProcessing = [];
public static void LoadSkill()
@ -36,7 +37,7 @@ namespace jRandomSkills
Instance.RegisterEventHandler<EventRoundEnd>((@event, info) =>
{
foreach (var player in deafultPostProcessing.Keys)
foreach (var player in defaultPostProcessings.Keys)
DisableSkill(player);
foreach (var postProcessing in newPostProcessing)
postProcessing.Remove();
@ -89,7 +90,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("darkness") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("darkness_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)
@ -111,29 +112,40 @@ namespace jRandomSkills
var pawn = player.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid || pawn.CameraServices == null) return;
var postProcessingVolumes = pawn.CameraServices.PostProcessingVolumes.FirstOrDefault();
if (postProcessingVolumes == null || postProcessingVolumes.Value == null) return;
if (!defaultPostProcessings.TryGetValue(player, out _))
defaultPostProcessings[player] = [];
if (deafultPostProcessing.TryGetValue(player, out var oldPostProcessing))
int i = 0;
foreach (var postProcessingVolume in pawn.CameraServices.PostProcessingVolumes)
{
postProcessingVolumes.Raw = oldPostProcessing.EntityHandle.Raw;
deafultPostProcessing.Remove(player);
Utilities.SetStateChanged(pawn, "CBasePlayerPawn", "m_pCameraServices");
return;
if (postProcessingVolume == null || postProcessingVolume.Value == null)
return;
if (dontCreateNew)
{
if (i < defaultPostProcessings[player].Count)
postProcessingVolume.Raw = defaultPostProcessings[player][i].EntityHandle.Raw;
}
else
{
defaultPostProcessings[player].Add(postProcessingVolume.Value);
var postProcessing = Utilities.CreateEntityByName<CPostProcessingVolume>("post_processing_volume");
if (postProcessing == null) return;
postProcessing.ExposureControl = true;
postProcessing.MaxExposure = brightness;
postProcessing.MinExposure = brightness;
newPostProcessing.Add(postProcessing);
postProcessingVolume.Raw = postProcessing.EntityHandle.Raw;
}
i++;
}
if (dontCreateNew)
return;
var postProcessing = Utilities.CreateEntityByName<CPostProcessingVolume>("post_processing_volume");
if (postProcessing == null) return;
postProcessing.ExposureControl = true;
postProcessing.MaxExposure = brightness;
postProcessing.MinExposure = brightness;
deafultPostProcessing.TryAdd(player, postProcessingVolumes.Value);
postProcessingVolumes.Raw = postProcessing.EntityHandle.Raw;
Utilities.SetStateChanged(pawn, "CBasePlayerPawn", "m_pCameraServices");
if (dontCreateNew)
defaultPostProcessings.Remove(player);
}
public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#383838", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float brightness = .01f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

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

@ -71,7 +71,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("deactivator") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("deactivator_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -96,7 +96,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("deaf") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("deaf_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -60,7 +60,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("duplicator") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("duplicator_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p != player && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p != player && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -77,7 +77,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("glitch") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("glitch_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

72
jRandomSkills - SRC Files/src/player/skills/Jackal.cs
View file

@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes;
using CounterStrikeSharp.API.Modules.Utils;
using jRandomSkills.src.player;
using jRandomSkills.src.utils;
using System.Drawing;
using static jRandomSkills.jRandomSkills;
@ -14,13 +13,11 @@ namespace jRandomSkills
private const Skills skillName = Skills.Jackal;
private static readonly int maxStepBeam = Config.GetValue<int>(skillName, "maxStepBeam");
private static bool exists = false;
private static readonly Dictionary<uint, uint> authorBeams = [];
private static readonly Dictionary<CCSPlayerController, List<CBeam>> stepBeams = [];
public static void LoadSkill()
{
SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"), false);
SkillUtils.RegisterSkill(skillName, Config.GetValue<string>(skillName, "color"));
Instance.RegisterEventHandler<EventRoundFreezeEnd>((@event, info) =>
{
@ -44,11 +41,7 @@ namespace jRandomSkills
foreach (var beam in beams)
if (beam != null && beam.IsValid)
beam.Remove();
foreach (var player in stepBeams.Keys)
DisableSkill(player);
authorBeams.Clear();
stepBeams.Clear();
Instance.RemoveListener<Listeners.CheckTransmit>(CheckTransmit);
exists = false;
return HookResult.Continue;
@ -100,12 +93,13 @@ namespace jRandomSkills
var beams = step.Value;
var observedPlayer = Utilities.GetPlayers().FirstOrDefault(p => p?.Pawn?.Value?.Handle == player?.Pawn?.Value?.ObserverServices?.ObserverTarget?.Value?.Handle);
bool playerHasBeam = authorBeams.TryGetValue(player.Index, out uint pIndex) && pIndex == enemy.Index;
bool observerHasBeam = observedPlayer != null && authorBeams.TryGetValue(observedPlayer.Index, out uint oIndex) && oIndex == enemy.Index;
var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
var observerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == observedPlayer?.SteamID);
foreach (var beam in beams)
if (!playerHasBeam && !observerHasBeam)
if (playerInfo?.Skill != skillName && observerInfo?.Skill != skillName)
info.TransmitEntities.Remove(beam);
else if (enemy.Team == player.Team)
info.TransmitEntities.Remove(beam);
}
}
@ -130,60 +124,16 @@ namespace jRandomSkills
return beam;
}
public static void TypeSkill(CCSPlayerController player, string[] commands)
{
if (player == null || !player.IsValid || !player.PawnIsAlive) return;
var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
if (playerInfo?.Skill != skillName) return;
if (playerInfo.SkillChance == 1)
{
player.PrintToChat($" {ChatColors.Red}{Localization.GetTranslation("areareaper_used_info")}");
return;
}
string enemyId = commands[0];
var enemy = Utilities.GetPlayers().FirstOrDefault(p => p.Team != player.Team && p.Index.ToString() == enemyId);
if (enemy == null)
{
player.PrintToChat($" {ChatColors.Red}" + Localization.GetTranslation("selectplayerskill_incorrect_enemy_index"));
return;
}
authorBeams.Add(player.Index, enemy.Index);
stepBeams.Add(enemy, []);
playerInfo.SkillChance = 1;
player.PrintToChat($" {ChatColors.Green}" + Localization.GetTranslation("jackal_player_info", enemy.PlayerName));
}
public static void EnableSkill(CCSPlayerController player)
{
if (!exists)
Instance.RegisterListener<Listeners.CheckTransmit>(CheckTransmit);
exists = true;
var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
if (playerInfo == null) return;
playerInfo.SkillChance = 0;
SkillUtils.PrintToChat(player, Localization.GetTranslation("jackal") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("jackal_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)
player.PrintToChat($" {ChatColors.Green}⠀⠀⠀[{ChatColors.Red}{enemy.Index}{ChatColors.Green}] {enemy.PlayerName}");
}
else
player.PrintToChat($" {ChatColors.Red}⠀⠀⠀{Localization.GetTranslation("selectplayerskill_incorrect_enemy_index")}");
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("selectplayerskill_command")} {ChatColors.Red}index");
}
Instance.RegisterListener<Listeners.CheckTransmit>(CheckTransmit);
public static void DisableSkill(CCSPlayerController player)
{
authorBeams.Remove(player.Index);
stepBeams.Remove(player);
foreach (var _player in Utilities.GetPlayers().Where(p => p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator))
stepBeams.Add(_player, []);
}
exists = true;
}
public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#f542ef", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, int maxStepBeam = 50) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)

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

@ -88,7 +88,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("jammer") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("jammer_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -97,7 +97,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("jumpban") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("jumpban_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -68,7 +68,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("lifeswap") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("lifeswap_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -82,7 +82,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("magnifier") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("magnifier_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -68,7 +68,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("moneyswap") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("moneyswap_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -91,7 +91,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("poison") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("poison_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -101,7 +101,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("primaryban") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("primaryban_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)

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

@ -60,7 +60,7 @@ namespace jRandomSkills
SkillUtils.PrintToChat(player, Localization.GetTranslation("thief") + ":", false);
player.PrintToChat($" {ChatColors.Green}{Localization.GetTranslation("thief_select_info")}");
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot).ToArray();
var enemies = Utilities.GetPlayers().Where(p => p.Team != player.Team && p.IsValid && !p.IsBot && !p.IsHLTV && p.Team != CsTeam.Spectator).ToArray();
if (enemies.Length > 0)
{
foreach (var enemy in enemies)