Skip to content

Merge Meow dev branch #24

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Merge Meow dev branch #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a83fe5
Simplify and organize
MeowServer Sep 29, 2024
63856c3
Separate special role coroutines
MeowServer Sep 29, 2024
e9c1ba2
Minor update
MeowServer Sep 29, 2024
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 HelpSense/HelpSense.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<Compile Include="Helper\Lobby\LobbyHelper.cs" />
<Compile Include="Helper\Lobby\LobbyLocationType.cs" />
<Compile Include="Helper\Misc\RespawnHelper.cs" />
<Compile Include="Helper\SCP\SCPHPChangeSystem.cs" />
<Compile Include="Helper\SCP\SCPHealthSystem.cs" />
<Compile Include="MonoBehaviors\PlayerGlowBehavior.cs" />
<Compile Include="MonoBehaviors\PlayerLightBehavior.cs" />
<Compile Include="Patches\MaxHealthGetPatch.cs" />
Expand Down
2 changes: 1 addition & 1 deletion HelpSense/Helper/Chat/ChatHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class ChatHelper
{
private static CoroutineHandle _coroutine;

private static readonly LinkedList<ChatMessage> MessageList= new();
private static readonly LinkedList<ChatMessage> MessageList = new();

private static readonly Dictionary<Player, HintServiceMeow.Core.Models.Hints.Hint> MessageSlot = new();

Expand Down
4 changes: 2 additions & 2 deletions HelpSense/Helper/SCP/SCPHPChangeSystem.cs → HelpSense/Helper/SCP/SCPHealthSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

namespace HelpSense.Helper.SCP
{
public class SCPHPChangeSystem
public class SCPHealthSystem
{
public static Dictionary<RoleTypeId, float> healthDict = new Dictionary<RoleTypeId, float>()
public static Dictionary<RoleTypeId, float> HealthDict = new()
{
[RoleTypeId.Scp173] = Plugin.Instance.Config.SCPsHP[0],
[RoleTypeId.Scp939] = Plugin.Instance.Config.SCPsHP[1],
Expand Down
195 changes: 7 additions & 188 deletions HelpSense/Helper/SCP/SCPHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,200 +14,19 @@ public class SCPHelper
public Player Player;
public string OldRoleName;
public string OldRoleColor;
public SCPHelper(Player Player, string NewRoleName, string NewRoleColor, List<ItemType> Items)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
AddItems(Player, Items);
}
public SCPHelper(Player Player, string NewRoleName, string NewRoleColor)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
}
public SCPHelper(Player Player, string NewRoleName, string NewRoleColor, Vector3 Vector3)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
Player.Position = Vector3;
}
public SCPHelper(Player Player, RoleTypeId NewRole, string NewRoleName, string NewRoleColor, Vector3 Vector3)
{
this.Player = Player;
Player.SetRole(NewRole);
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
Player.Position = Vector3;
}
public SCPHelper(Player Player, RoleTypeId NewRole, float Health, string NewRoleName, string NewRoleColor)
{
this.Player = Player;
Player.SetRole(NewRole);
Player.Health = Health;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
}
public SCPHelper(Player Player, RoleTypeId NewRole, float Health, string NewRoleName, string NewRoleColor, Vector3 Vector3)
{
this.Player = Player;
Player.SetRole(NewRole);
Player.Health = Health;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
Player.Position = Vector3;
}
public SCPHelper(Player Player, RoleTypeId NewRole, string NewRoleName, string NewRoleColor)
{
this.Player = Player;
Player.SetRole(NewRole);
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
}
public SCPHelper(Player Player, RoleTypeId NewRole, string NewRoleName, string NewRoleColor, List<ItemType> Items)
{
this.Player = Player;
Player.SetRole(NewRole);
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
AddItems(Player, Items);
}
public SCPHelper(Player Player, string NewRoleName, string NewRoleColor, string Broadcast, ushort Time)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
Player.SendBroadcast(Broadcast, Time);
}
public SCPHelper(Player Player, string NewRoleName, string NewRoleColor, List<ItemType> Items, string Broadcast, ushort Time)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
AddItems(Player, Items);
Player.SendBroadcast(Broadcast, Time);
}
public SCPHelper(Player Player, RoleTypeId NewRole, string NewRoleName, string NewRoleColor, List<ItemType> Items, string Broadcast, ushort Time)
{
this.Player = Player;
Player.SetRole(NewRole);
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
AddItems(Player, Items);
Player.SendBroadcast(Broadcast, Time);
}
public SCPHelper(Player Player, float Health, string NewRoleName, string NewRoleColor, List<ItemType> Items)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
AddItems(Player, Items);
Player.Health = Health;
}
public SCPHelper(Player Player, float Health, string NewRoleName, string NewRoleColor)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
Player.Health = Health;
}
public SCPHelper(Player Player, float Health, RoleTypeId NewRole, string NewRoleName, string NewRoleColor, List<ItemType> Items)
{
this.Player = Player;
Player.SetRole(NewRole);
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
AddItems(Player, Items);
Player.Health = Health;
}
public SCPHelper(Player Player, float Health, string NewRoleName, string NewRoleColor, string Broadcast, ushort Time)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
Player.SendBroadcast(Broadcast, Time);
Player.Health = Health;
}
public SCPHelper(Player Player, float Health, string NewRoleName, string NewRoleColor, List<ItemType> Items, string Broadcast, ushort Time)
{
this.Player = Player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
AddItems(Player, Items);
Player.SendBroadcast(Broadcast, Time);
Player.Health = Health;
}
public SCPHelper(Player Player, float Health, RoleTypeId NewRole, string NewRoleName, string NewRoleColor, List<ItemType> Items, string Broadcast, ushort Time)
{
this.Player = Player;
Player.SetRole(NewRole);
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
AddItems(Player, Items);
Player.SendBroadcast(Broadcast, Time);
Player.Health = Health;
}
public SCPHelper(Player Player, float Health, RoleTypeId NewRole, string NewRoleName, string NewRoleColor, string Broadcast, ushort Time)

public SCPHelper(Player player)
{
this.Player = Player;
Player.SetRole(NewRole);
this.Player = player;
OldRoleName = Player.RoleName;
OldRoleColor = Player.RoleColor;
Player.RoleName = NewRoleName;
Player.RoleColor = NewRoleColor;
Player.SendBroadcast(Broadcast, Time);
Player.Health = Health;
}

public void OnPlayerDead(Player Player, string cassie, string tcassie)
{
Player.RoleName = OldRoleName;
Player.RoleColor = OldRoleColor;
XHelper.MessageTranslated(cassie, tcassie);
}

public void AddItems(Player Player, List<ItemType> Items)
public void OnPlayerDead(Player player, string cassieMessage, string translatedCassieMessage)
{
foreach (ItemType Item in Items)
{
Player.AddItem(Item);
}
player.RoleName = OldRoleName;
player.RoleColor = OldRoleColor;
XHelper.MessageTranslated(cassieMessage, translatedCassieMessage);
}
}
}
Loading