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

Refactor skill lookup logic and vote system, update language files

Browse source 
Refactored command handling to improve player and skill lookup logic, replaced some list operations with direct queries, and updated method signatures for clarity and null safety. The vote system was reworked to support more robust vote tracking, cooldowns, and localized chat messages. Language files were updated to add new vote-related translations. Various code style and nullability improvements were made throughout the plugin.
This commit is contained in:
Juzlus 2025-09-04 04:53:23 +02:00
parent 54b265d43d
commit e33975fe8b
117 changed files with 1532 additions and 1674 deletions
Download patch file Download diff file Expand all files Collapse all files

35
jRandomSkills - SRC Files/src/player/skills/SecondLife.cs
View file

@ -9,8 +9,8 @@ namespace jRandomSkills
public class SecondLife : ISkill
{
private const Skills skillName = Skills.SecondLife;
private static int secondLifeHealth = Config.GetValue<int>(skillName, "startHealth");
private static HashSet<nint> secondLifePlayers = new HashSet<nint>();
private static readonly int secondLifeHealth = Config.GetValue<int>(skillName, "startHealth");
private static readonly HashSet<nint> secondLifePlayers = [];
public static void LoadSkill()
{
@ -24,7 +24,7 @@ namespace jRandomSkills
{
if (player == null || !player.IsValid || player.PlayerPawn?.Value == null) continue;
var playerInfo = Instance.skillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
if (playerInfo?.Skill != skillName) continue;
EnableSkill(player);
}
@ -45,16 +45,18 @@ namespace jRandomSkills
int damage = @event.DmgHealth;
if (!Instance.IsPlayerValid(victim)) return HookResult.Continue;
var victimInfo = Instance.skillPlayer.FirstOrDefault(p => p.SteamID == victim.SteamID);
var victimInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == victim?.SteamID);
if (victimInfo == null || victimInfo.Skill != skillName) return HookResult.Continue;
var victimPawn = victim.PlayerPawn.Value;
if (victimPawn.Health > 0 || secondLifePlayers.TryGetValue(victim.Handle, out _) == true)
var victimPawn = victim!.PlayerPawn.Value;
if (victimPawn!.Health > 0 || secondLifePlayers.TryGetValue(victim.Handle, out _) == true)
return HookResult.Continue;
secondLifePlayers.Add(victim.Handle);
SetHealth(victim, secondLifeHealth);
victimPawn.Teleport(GetSpawnVector(victim), victimPawn.AbsRotation, null);
var spawn = GetSpawnVector(victim);
if (spawn != null)
victimPawn.Teleport(spawn, victimPawn.AbsRotation, null);
return HookResult.Stop;
});
}
@ -83,25 +85,24 @@ namespace jRandomSkills
Utilities.SetStateChanged(pawn, "CCSPlayerPawn", "m_ArmorValue");
}
private static Vector GetSpawnVector(CCSPlayerController player)
private static Vector? GetSpawnVector(CCSPlayerController player)
{
var abs = player.PlayerPawn.Value.AbsOrigin;
var pawn = player.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid) return null;
var abs = pawn.AbsOrigin;
var spawns = Utilities.FindAllEntitiesByDesignerName<SpawnPoint>(player.Team == CsTeam.Terrorist ? "info_player_terrorist" : "info_player_counterterrorist").ToList();
if (spawns.Any())
if (spawns.Count != 0)
{
var randomSpawn = spawns[Instance.Random.Next(spawns.Count)];
return randomSpawn.AbsOrigin;
}
return new Vector(abs.X, abs.Y, abs.Z);
return abs == null ? null : new Vector(abs.X, abs.Y, abs.Z);
}
public class SkillConfig : Config.DefaultSkillInfo
public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#d41c1c", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, int startHealth = 50) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)
{
public int StartHealth { get; set; }
public SkillConfig(Skills skill = skillName, bool active = true, string color = "#d41c1c", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, int startHealth = 50) : base(skill, active, color, onlyTeam, needsTeammates)
{
StartHealth = startHealth;
}
public int StartHealth { get; set; } = startHealth;
}
}
}