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

60
jRandomSkills - SRC Files/src/player/skills/WeaponsSwap.cs
View file

@ -11,15 +11,15 @@ namespace jRandomSkills
public class WeaponsSwap : ISkill
{
private const Skills skillName = Skills.WeaponsSwap;
private static float timerCooldown = Config.GetValue<float>(skillName, "cooldown");
private static readonly Dictionary<ulong, PlayerSkillInfo> SkillPlayerInfo = new Dictionary<ulong, PlayerSkillInfo>();
private static readonly float timerCooldown = Config.GetValue<float>(skillName, "cooldown");
private static readonly Dictionary<ulong, PlayerSkillInfo> SkillPlayerInfo = [];
private static string[] weapons = { "weapon_deagle", "weapon_revolver", "weapon_glock", "weapon_usp_silencer",
private static readonly string[] weapons = [ "weapon_deagle", "weapon_revolver", "weapon_glock", "weapon_usp_silencer",
"weapon_cz75a", "weapon_fiveseven", "weapon_p250", "weapon_tec9", "weapon_elite", "weapon_hkp2000",
"weapon_mp9", "weapon_mac10", "weapon_bizon", "weapon_mp7", "weapon_ump45", "weapon_p90",
"weapon_mp5sd", "weapon_famas", "weapon_galilar", "weapon_m4a4", "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" };
"weapon_nova", "weapon_xm1014", "weapon_mag7", "weapon_sawedoff", "weapon_m249", "weapon_negev" ];
public static void LoadSkill()
{
@ -31,7 +31,7 @@ namespace jRandomSkills
{
foreach (var player in Utilities.GetPlayers())
{
var playerInfo = Instance.skillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
if (playerInfo?.Skill == skillName)
{
EnableSkill(player);
@ -51,11 +51,13 @@ namespace jRandomSkills
Instance.RegisterEventHandler<EventPlayerDeath>((@event, info) =>
{
var player = @event.Userid;
if (player == null || !player.IsValid) return HookResult.Continue;
var playerInfo = Instance.skillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
if (playerInfo?.Skill == skillName)
if (SkillPlayerInfo.ContainsKey(player.SteamID))
SkillPlayerInfo.Remove(player.SteamID);
var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
if (playerInfo == null) return HookResult.Continue;
if (playerInfo.Skill == skillName)
SkillPlayerInfo.Remove(player.SteamID);
return HookResult.Continue;
});
@ -64,7 +66,7 @@ namespace jRandomSkills
{
foreach (var player in Utilities.GetPlayers())
{
var playerInfo = Instance.skillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
var playerInfo = Instance.SkillPlayer.FirstOrDefault(p => p.SteamID == player.SteamID);
if (playerInfo?.Skill == skillName)
if (SkillPlayerInfo.TryGetValue(player.SteamID, out var skillInfo))
if (skillInfo.LastClick.AddSeconds(4) >= DateTime.Now)
@ -90,8 +92,7 @@ namespace jRandomSkills
public static void DisableSkill(CCSPlayerController player)
{
if (SkillPlayerInfo.ContainsKey(player.SteamID))
SkillPlayerInfo.Remove(player.SteamID);
SkillPlayerInfo.Remove(player.SteamID);
}
private static void UpdateHUD(CCSPlayerController player, PlayerSkillInfo skillInfo, bool showInfo)
@ -115,8 +116,8 @@ namespace jRandomSkills
if (showInfo)
remainingLine = cooldown != 0 ? $"<font class='fontSize-m' color='#FFFFFF'>{Localization.GetTranslation("hud_info", $"<font color='#FF0000'>{cooldown}</font>")}</font> <br>"
: !skillInfo.FindedEnemy ? $"<font class='fontSize-m' color='#FF0000'>{Localization.GetTranslation("hud_info_no_enemy")}</font> <br>"
: !skillInfo.HaveWeapon ? $"<font class='fontSize-m' color='#FF0000'>{Localization.GetTranslation("weaponsswap_hud_info2")}</font> <br>"
: skillInfo != null && !skillInfo.FindedEnemy ? $"<font class='fontSize-m' color='#FF0000'>{Localization.GetTranslation("hud_info_no_enemy")}</font> <br>"
: skillInfo != null && !skillInfo.HaveWeapon ? $"<font class='fontSize-m' color='#FF0000'>{Localization.GetTranslation("weaponsswap_hud_info2")}</font> <br>"
: "";
else
remainingLine = cooldown != 0 ? $"<font class='fontSize-m' color='#FFFFFF'>{Localization.GetTranslation("hud_info", $"<font color='#FF0000'>{cooldown}</font>")}</font> <br>" : "";
@ -135,7 +136,7 @@ namespace jRandomSkills
if (!player.IsValid || !player.PawnIsAlive) return;
if (skillInfo.CanUse)
{
CCSPlayerController enemy = GetRandomEnemy(player);
CCSPlayerController? enemy = GetRandomEnemy(player);
if (enemy == null)
{
skillInfo.FindedEnemy = false;
@ -146,7 +147,7 @@ namespace jRandomSkills
string[]? playerWeapon = GetWeapons(player);
string[]? enemyWeapon = GetWeapons(enemy);
if (playerWeapon.FirstOrDefault(w => weapons.Contains(w)) == null)
if (playerWeapon == null || playerWeapon.FirstOrDefault(w => weapons.Contains(w)) == null)
{
skillInfo.FindedEnemy = true;
skillInfo.HaveWeapon = false;
@ -162,7 +163,7 @@ namespace jRandomSkills
player.RemoveWeapons();
enemy.RemoveWeapons();
GiveWeapons(player, enemyWeapon, playerWeapon.Contains("weapon_c4"));
GiveWeapons(enemy, playerWeapon, enemyWeapon.Contains("weapon_c4"));
GiveWeapons(enemy, playerWeapon, (enemyWeapon != null && enemyWeapon.Contains("weapon_c4")));
}
else
skillInfo.LastClick = DateTime.Now;
@ -171,15 +172,20 @@ namespace jRandomSkills
private static string[]? GetWeapons(CCSPlayerController player)
{
List<string> playerWeapons = new List<string>();
foreach (var weapon in player.PlayerPawn.Value.WeaponServices.MyWeapons)
List<string> playerWeapons = [];
var pawn = player.PlayerPawn.Value;
if (pawn == null || !pawn.IsValid || player.LifeState != (byte)LifeState_t.LIFE_ALIVE) return null;
if (pawn.WeaponServices == null) return null;
foreach (var weapon in pawn.WeaponServices.MyWeapons)
if (weapon.Value != null && weapon.Value.IsValid)
playerWeapons.Add(SkillUtils.GetDesignerName(weapon.Value));
return playerWeapons.Count == 0 ? null : playerWeapons.ToArray();
return playerWeapons.Count == 0 ? null : [.. playerWeapons];
}
private static void GiveWeapons(CCSPlayerController player, string[] weapons, bool addC4)
private static void GiveWeapons(CCSPlayerController player, string[]? weapons, bool addC4)
{
if (weapons == null) return;
foreach (var weapon in weapons)
if (weapon != "weapon_c4")
player.GiveNamedItem(weapon);
@ -187,9 +193,9 @@ namespace jRandomSkills
player.GiveNamedItem("weapon_c4");
}
private static CCSPlayerController GetRandomEnemy(CCSPlayerController player)
private static CCSPlayerController? GetRandomEnemy(CCSPlayerController player)
{
CCSPlayerController[] enemies = Utilities.GetPlayers().FindAll(e => e.Team != player.Team).ToArray();
CCSPlayerController[] enemies = [.. Utilities.GetPlayers().FindAll(e => e.Team != player.Team)];
if (enemies.Length == 0) return null;
return enemies[Instance.Random.Next(enemies.Length)];
}
@ -204,13 +210,9 @@ namespace jRandomSkills
public bool HaveWeapon { get; set; }
}
public class SkillConfig : Config.DefaultSkillInfo
public class SkillConfig(Skills skill = skillName, bool active = true, string color = "#c7e03a", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float cooldown = 30f) : Config.DefaultSkillInfo(skill, active, color, onlyTeam, needsTeammates)
{
public float Cooldown { get; set; }
public SkillConfig(Skills skill = skillName, bool active = true, string color = "#c7e03a", CsTeam onlyTeam = CsTeam.None, bool needsTeammates = false, float cooldown = 30f) : base(skill, active, color, onlyTeam, needsTeammates)
{
Cooldown = cooldown;
}
public float Cooldown { get; set; } = cooldown;
}
}
}