Skip to content

Refactor event handling and improve code formatting #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: dev2.0
Choose a base branch
from
Draft

Refactor event handling and improve code formatting #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ZombieSharp/Models/GameConfigs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public class GameConfigs

// weapons section
public bool WeaponPurchaseEnable { get; set; } = false;
public bool WeaponRestrictEnable { get; set; } = true;
public bool WeaponRestrictEnable { get; set; } = true;
public bool WeaponBuyZoneOnly { get; set; } = false;
}
2 changes: 1 addition & 1 deletion ZombieSharp/Models/ZombiePlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ public ZombiePlayer(MotherZombieStatus status = MotherZombieStatus.NONE, bool zo
Zombie = zombie;
}

public MotherZombieStatus MotherZombie { get; set; } = MotherZombieStatus.NONE;
public MotherZombieStatus MotherZombie { get; set; } = MotherZombieStatus.NONE;
public bool Zombie { get; set; } = false;
}
58 changes: 29 additions & 29 deletions ZombieSharp/Plugin/Classes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void ClassesOnMapStart()

var configPath = Path.Combine(ZombieSharp.ConfigPath, "playerclasses.jsonc");

if(!File.Exists(configPath))
if (!File.Exists(configPath))
{
_logger.LogCritical("[ClassesOnMapStart] Couldn't find a playerclasses.jsonc file!");
return;
Expand All @@ -44,13 +44,13 @@ public void ClassesOnMapStart()
ClassesConfig = JsonConvert.DeserializeObject<Dictionary<string, ClassAttribute>>(File.ReadAllText(configPath));

// settings is loaded before classes so we can get default human and zombie.
if(GameSettings.Settings != null)
if (GameSettings.Settings != null)
{
if(!string.IsNullOrEmpty(GameSettings.Settings.DefaultHumanBuffer))
if (!string.IsNullOrEmpty(GameSettings.Settings.DefaultHumanBuffer))
{
var uniqueName = GameSettings.Settings.DefaultHumanBuffer;

if(!ClassesConfig!.ContainsKey(uniqueName))
if (!ClassesConfig!.ContainsKey(uniqueName))
{
_logger.LogCritical("[ClassesOnMapStart] Couldn't get classes \"{0}\" from playerclasses.jsonc", uniqueName);
}
Expand All @@ -60,11 +60,11 @@ public void ClassesOnMapStart()
_logger.LogInformation("[ClassesOnMapStart] Classes {0} is default class for human", DefaultHuman.Name);
}

if(!string.IsNullOrEmpty(GameSettings.Settings.DefaultZombieBuffer))
if (!string.IsNullOrEmpty(GameSettings.Settings.DefaultZombieBuffer))
{
var uniqueName = GameSettings.Settings.DefaultZombieBuffer;

if(!ClassesConfig!.ContainsKey(uniqueName))
if (!ClassesConfig!.ContainsKey(uniqueName))
{
_logger.LogCritical("[ClassesOnMapStart] Couldn't get classes \"{0}\" from playerclasses.jsonc", uniqueName);
}
Expand All @@ -74,11 +74,11 @@ public void ClassesOnMapStart()
_logger.LogInformation("[ClassesOnMapStart] Classes {0} is default class for human", DefaultZombie.Name);
}

if(!string.IsNullOrEmpty(GameSettings.Settings.MotherZombieBuffer))
if (!string.IsNullOrEmpty(GameSettings.Settings.MotherZombieBuffer))
{
var uniqueName = GameSettings.Settings.MotherZombieBuffer;

if(!ClassesConfig!.ContainsKey(uniqueName))
if (!ClassesConfig!.ContainsKey(uniqueName))
{
_logger.LogCritical("[ClassesOnMapStart] Couldn't get classes \"{0}\" from playerclasses.jsonc", uniqueName);
}
Expand All @@ -88,31 +88,31 @@ public void ClassesOnMapStart()
_logger.LogInformation("[ClassesOnMapStart] Classes {0} is mother zombie classes.", MotherZombie.Name);
}

if(DefaultHuman == null)
if (DefaultHuman == null)
{
_logger.LogCritical("[ClassesOnMapStart] Human class from GameSettings is empty or null!");
}

if(DefaultZombie == null)
if (DefaultZombie == null)
{
_logger.LogCritical("[ClassesOnMapStart] Zombie class from GameSettings is empty or null!");
}

if(MotherZombie == null)
if (MotherZombie == null)
{
_logger.LogInformation("[ClassesOnMapStart] Mother Zombie class from GameSettings is empty or null, when player infect will use their selected zombie class instead.");
}
}
}
}

public void ClassesOnClientPutInServer(CCSPlayerController client)
{
if(DefaultHuman == null || DefaultZombie == null)
if (DefaultHuman == null || DefaultZombie == null)
{
_logger.LogError("[ClassesOnClientPutInServer] Default class is null!");
}

if(PlayerData.PlayerClassesData == null)
if (PlayerData.PlayerClassesData == null)
{
_logger.LogError("[ClassesOnClientPutInServer] PlayerClassesData is null!");
return;
Expand All @@ -121,48 +121,48 @@ public void ClassesOnClientPutInServer(CCSPlayerController client)
PlayerData.PlayerClassesData[client].HumanClass = DefaultHuman;
PlayerData.PlayerClassesData[client].ZombieClass = DefaultZombie;

if(PlayerData.PlayerClassesData?[client].HumanClass == null)
if (PlayerData.PlayerClassesData?[client].HumanClass == null)
_logger.LogInformation("[ClassesOnClientPutInServer] {0} is not null, but client got null anyway.", DefaultHuman?.Name);

if(PlayerData.PlayerClassesData?[client].ZombieClass == null)
if (PlayerData.PlayerClassesData?[client].ZombieClass == null)
_logger.LogInformation("[ClassesOnClientPutInServer] {0} is not null, but client got null anyway.", DefaultZombie?.Name);
}

public void ClassesApplyToPlayer(CCSPlayerController client, ClassAttribute? data)
{
if(client == null)
if (client == null)
{
_logger.LogError("[ClassesApplyToPlayer] Player is null!");
return;
}

if(data == null)
if (data == null)
{
_logger.LogError("[ClassesApplyToPlayer] Class data is null!");
return;
}

var playerPawn = client.PlayerPawn.Value;

if(playerPawn == null)
if (playerPawn == null)
{
_logger.LogError("[ClassesApplyToPlayer] Player Pawn is null!");
return;
}

// if the model is not empty string and model path is not same as current model we have.
if(!string.IsNullOrEmpty(data.Model))
if (!string.IsNullOrEmpty(data.Model))
{
// set it.
if(data.Model != "default")
if (data.Model != "default")
playerPawn.SetModel(data.Model);

// change to cs2 default model blyat
else
{
if(data.Team == 0)
if (data.Team == 0)
playerPawn.SetModel("characters/models/tm_phoenix/tm_phoenix.vmdl");

else
playerPawn.SetModel("characters/models/ctm_sas/ctm_sas.vmdl");
}
Expand All @@ -172,7 +172,7 @@ public void ClassesApplyToPlayer(CCSPlayerController client, ClassAttribute? dat
playerPawn.Health = data.Health;

// if zombie then remove their kevlar
if(data.Team == 0)
if (data.Team == 0)
{
playerPawn.ArmorValue = 0;
client.PawnHasHelmet = false;
Expand All @@ -187,23 +187,23 @@ public void ClassesApplyToPlayer(CCSPlayerController client, ClassAttribute? dat

public void ClassesOnPlayerHurt(CCSPlayerController? client)
{
_core?.AddTimer(0.3f, () =>
_core?.AddTimer(0.3f, () =>
{
// need to be alive
if(client == null || !client.PawnIsAlive)
if (client == null || !client.PawnIsAlive)
return;

// prevent error obviously.
if(!PlayerData.PlayerClassesData!.ContainsKey(client))
if (!PlayerData.PlayerClassesData!.ContainsKey(client))
{
return;
}

if(PlayerData.PlayerClassesData?[client].ActiveClass == null)
if (PlayerData.PlayerClassesData?[client].ActiveClass == null)
return;

// if speed is equal to 250 then we don't need this.
if(PlayerData.PlayerClassesData?[client].ActiveClass?.Speed == 250f)
if (PlayerData.PlayerClassesData?[client].ActiveClass?.Speed == 250f)
return;

// set speed back to velomodify
Expand Down
Loading