v1.2.4.b1
This commit is contained in:
parent
273aa0ff59
commit
332210f58b
14 changed files with 177 additions and 9 deletions
|
|
@ -111,7 +111,6 @@ namespace src.player.skills
|
|||
foreach (var (info, player) in infoList)
|
||||
{
|
||||
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
||||
if (!player.PawnIsAlive) continue;
|
||||
|
||||
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
||||
|
||||
|
|
|
|||
|
|
@ -138,6 +138,11 @@ namespace src.player.skills
|
|||
else
|
||||
skillList.RemoveAll(s => Event.terroristSkills.Any(s2 => s2.Name == s.Skill.ToString()));
|
||||
|
||||
int playerCount = PlayerManager.GetTickPlayers().Count(p => p != null && p.IsValid && !p.IsHLTV && (p.Team == CsTeam.Terrorist || p.Team == CsTeam.CounterTerrorist));
|
||||
SkillsInfo.DefaultSkillInfo[] skillsMinPlayer = SkillsInfo.LoadedConfig.Where(s => s.MinPlayer > 0 && playerCount < s.MinPlayer).ToArray();
|
||||
if (skillsMinPlayer.Length != 0)
|
||||
skillList.RemoveAll(s => skillsMinPlayer.Any(s2 => s2.Name == s.Skill.ToString()));
|
||||
|
||||
return skillList.Count == 0 ? [Event.noneSkill] : skillList;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ namespace src.player.skills
|
|||
foreach (var (info, player) in infoList)
|
||||
{
|
||||
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
||||
if (!player.PawnIsAlive) continue;
|
||||
|
||||
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ namespace src.player.skills
|
|||
|
||||
foreach (var (info, player) in infoList)
|
||||
{
|
||||
if (player == null || !player.IsValid || !player.PawnIsAlive) continue;
|
||||
if (player == null || !player.IsValid) continue;
|
||||
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
||||
|
||||
if (playerInfo?.Skill != skillName)
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ namespace src.player.skills
|
|||
|
||||
foreach (var (info, player) in infoList)
|
||||
{
|
||||
if (player == null || !player.IsValid || !player.PawnIsAlive) continue;
|
||||
if (player == null || !player.IsValid) continue;
|
||||
|
||||
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
||||
bool isJackalOwner = playerInfo?.Skill == skillName;
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ namespace src.player.skills
|
|||
|
||||
foreach (var (info, viewer) in infoList)
|
||||
{
|
||||
if (viewer == null || !viewer.IsValid || !viewer.PawnIsAlive) continue;
|
||||
if (viewer == null || !viewer.IsValid) continue;
|
||||
|
||||
foreach (var kvp in targetVolumes)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ namespace src.player.skills
|
|||
foreach (var (info, player) in infoList)
|
||||
{
|
||||
if (player == null || !player.IsValid || player.Team == CsTeam.Spectator) continue;
|
||||
if (!player.PawnIsAlive) continue;
|
||||
|
||||
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget.Value?.Handle ?? nint.Zero;
|
||||
|
||||
|
|
|
|||
|
|
@ -444,7 +444,7 @@ namespace src.player.skills
|
|||
|
||||
foreach (var (info, player) in infoList)
|
||||
{
|
||||
if (player == null || !player.IsValid || !player.PawnIsAlive) continue;
|
||||
if (player == null || !player.IsValid) continue;
|
||||
|
||||
uint viewerIndex = PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index;
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ namespace src.player.skills
|
|||
|
||||
foreach (var (info, player) in infoList)
|
||||
{
|
||||
if (player == null || !player.IsValid || !player.PawnIsAlive) continue;
|
||||
if (player == null || !player.IsValid) continue;
|
||||
|
||||
var playerInfo = PlayerManager.GetPlayerByIndex((PlayerManager.GetPlayerEvent(player)?.Index ?? player.Index));
|
||||
var targetHandle = player.Pawn.Value?.ObserverServices?.ObserverTarget?.Value?.Handle ?? nint.Zero;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue