From 9e8a47e4c60572e825456ee0ca44001c82ae02a2 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Tue, 4 Aug 2020 19:53:22 +0200 Subject: [PATCH 01/24] added Map.SpawnWorkStation --- Synapse/Api/Map.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Synapse/Api/Map.cs b/Synapse/Api/Map.cs index 68de403..266b251 100644 --- a/Synapse/Api/Map.cs +++ b/Synapse/Api/Map.cs @@ -5,6 +5,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using UnityEngine; +using Utf8Json.Internal.DoubleConversion; using Object = UnityEngine.Object; namespace Synapse.Api @@ -175,6 +176,24 @@ public static Vector3 GetRandomSpawnPoint(this RoleType type) public static Pickup SpawnItem(ItemType itemType, float durability, Vector3 position, Quaternion rotation = default, int sight = 0, int barrel = 0, int other = 0) => Player.Host.Inventory.SetPickup(itemType, durability, position, rotation, sight, barrel, other); + public static WorkStation SpawnWorkStation(Vector3 position,Vector3 rotation,Vector3 size) + { + GameObject bench = + Object.Instantiate( + NetworkManager.singleton.spawnPrefabs.Find(p => p.gameObject.name == "Work Station")); + Offset offset = new Offset(); + offset.position = position; + offset.rotation = rotation; + offset.scale = Vector3.one; + bench.gameObject.transform.localScale = size; + + NetworkServer.Spawn(bench); + bench.GetComponent().Networkposition = offset; + bench.AddComponent(); + + return bench.GetComponent(); + } + public static Pickup SpawnItem(ItemType itemType, float durability, Vector3 position, Vector3 scale, Quaternion rotation = default, int sight = 0, int barrel = 0, int other = 0) { var p = Server.Host.Inventory.SetPickup(itemType, -4.656647E+11f, position,Quaternion.identity, 0, 0, 0); From 005213274db31c50716de055aed4ecbc8a001a49 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Tue, 4 Aug 2020 20:01:38 +0200 Subject: [PATCH 02/24] added Map.SpawnRagdoll --- Synapse/Api/Map.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Synapse/Api/Map.cs b/Synapse/Api/Map.cs index 266b251..3237115 100644 --- a/Synapse/Api/Map.cs +++ b/Synapse/Api/Map.cs @@ -194,6 +194,14 @@ public static WorkStation SpawnWorkStation(Vector3 position,Vector3 rotation,Vec return bench.GetComponent(); } + public static void SpawnRagdoll(Vector3 Position,RoleType role,string killer = "World") + { + Server.Host.GetComponent().SpawnRagdoll( + Position, Quaternion.identity, Vector3.zero, (int)role, + new PlayerStats.HitInfo(1000f, killer, DamageTypes.Falldown, 1) + , false, killer, killer, 1); + } + public static Pickup SpawnItem(ItemType itemType, float durability, Vector3 position, Vector3 scale, Quaternion rotation = default, int sight = 0, int barrel = 0, int other = 0) { var p = Server.Host.Inventory.SetPickup(itemType, -4.656647E+11f, position,Quaternion.identity, 0, 0, 0); From 2a73e6899d6aec72f192797359ee082e7db1b3c4 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Wed, 5 Aug 2020 15:45:50 +0200 Subject: [PATCH 03/24] Convert the Commands to Modular Commands --- Synapse/Commands/ReloadConfigsCommand.cs | 33 ++++++++++++++++++ Synapse/Commands/ReloadPermissionsCommand.cs | 33 ++++++++++++++++++ Synapse/Events/EventHandlers.cs | 36 -------------------- Synapse/Synapse.csproj | 2 ++ 4 files changed, 68 insertions(+), 36 deletions(-) create mode 100644 Synapse/Commands/ReloadConfigsCommand.cs create mode 100644 Synapse/Commands/ReloadPermissionsCommand.cs diff --git a/Synapse/Commands/ReloadConfigsCommand.cs b/Synapse/Commands/ReloadConfigsCommand.cs new file mode 100644 index 0000000..1aa6ee7 --- /dev/null +++ b/Synapse/Commands/ReloadConfigsCommand.cs @@ -0,0 +1,33 @@ +using CommandSystem; +using Synapse.Api; +using Synapse.Config; +using System; + +namespace Synapse.Commands +{ + public class ReloadConfigsCommand : ICommand + { + public string Command { get; } = "reloadconfigs"; + + public string[] Aliases { get; } = new string[] + { + "rc", + "reloadc" + }; + + public string Description { get; } = "A Command to Relaod the Configs of Synapse"; + + public bool Execute(ArraySegment arguments,ICommandSender sender,out string respone) + { + if (!sender.GetPlayer().CheckPermission("sy.reload.configs")) + { + respone = "You have no Permission for Reload Configs"; + return false; + } + + ConfigManager.ReloadAllConfigs(); + respone = "Configs Reloaded!"; + return true; + } + } +} diff --git a/Synapse/Commands/ReloadPermissionsCommand.cs b/Synapse/Commands/ReloadPermissionsCommand.cs new file mode 100644 index 0000000..c9ce60e --- /dev/null +++ b/Synapse/Commands/ReloadPermissionsCommand.cs @@ -0,0 +1,33 @@ +using CommandSystem; +using Synapse.Api; +using Synapse.Config; +using System; + +namespace Synapse.Commands +{ + public class ReloadPermissionsCommand : ICommand + { + public string Command { get; } = "reloadpermissions"; + + public string[] Aliases { get; } = new string[] + { + "rp", + "reloadp" + }; + + public string Description { get; } = "A Command to Relaod the Permissions of Synapse"; + + public bool Execute(ArraySegment arguments, ICommandSender sender, out string respone) + { + if (!sender.GetPlayer().CheckPermission("sy.reload.permission")) + { + respone = "You have no Permission for Reload Permissions"; + return false; + } + + PermissionReader.ReloadPermission(); + respone = "Permissions Reloaded!"; + return true; + } + } +} diff --git a/Synapse/Events/EventHandlers.cs b/Synapse/Events/EventHandlers.cs index db36cc5..28cd926 100644 --- a/Synapse/Events/EventHandlers.cs +++ b/Synapse/Events/EventHandlers.cs @@ -1,6 +1,4 @@ using System.Linq; -using Synapse.Api; -using Synapse.Api.Enums; using Synapse.Events.Classes; using Synapse.Config; using UnityEngine; @@ -14,7 +12,6 @@ internal class EventHandlers public EventHandlers() { Events.SyncDataEvent += OnSyncData; - Events.RemoteCommandEvent += OnRemoteCommand; Events.DoorInteractEvent += OnDoorInteract; Events.PlayerJoinEvent += OnPlayerJoin; } @@ -47,38 +44,5 @@ private static void OnSyncData(SyncDataEvent ev) !(Vector3.Distance(ev.Player.Position, ev.Player.GetComponent().worldPosition) >= Escape.radius)) ev.Player.Hub.characterClassManager.CmdRegisterEscape(); } - - private static void OnRemoteCommand(RemoteCommandEvent ev) - { - var args = ev.Command.Split(' '); - switch (args[0].ToUpper()) - { - case "RELOADPERMISSION": - ev.Allow = false; - if (!ev.Player.CheckPermission("sy.reload.permission")) - { - ev.Sender.RaMessage("You have no Permission for Reload Permissions", false, - RaCategory.AdminTools); - return; - } - - PermissionReader.ReloadPermission(); - ev.Sender.RaMessage("Permissions Reloaded!", true, RaCategory.ServerConfigs); - return; - - case "RELOADCONFIGS": - ev.Allow = false; - if (!ev.Player.CheckPermission("sy.reload.configs")) - { - ev.Sender.RaMessage("You have no Permission for Reload Configs", false, - RaCategory.AdminTools); - return; - } - - ConfigManager.ReloadAllConfigs(); - ev.Sender.RaMessage("Configs Reloaded!", true, RaCategory.ServerConfigs); - return; - } - } } } \ No newline at end of file diff --git a/Synapse/Synapse.csproj b/Synapse/Synapse.csproj index eab4490..fded3d9 100644 --- a/Synapse/Synapse.csproj +++ b/Synapse/Synapse.csproj @@ -83,6 +83,8 @@ + + From 1af28f53a840fe6fec842c04080315fa403f6c11 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Wed, 5 Aug 2020 16:07:20 +0200 Subject: [PATCH 04/24] Fixed Modular ClientCommand System but Sadly all Plugins which uses ConsoleCOmmand Event need to be rebuild D: --- Synapse/Commands/PluginsCommand.cs | 32 +++++++++++++++++++ Synapse/Commands/ReloadConfigsCommand.cs | 1 + Synapse/Commands/ReloadPermissionsCommand.cs | 1 + Synapse/Events/Classes/ConsoleCommandEvent.cs | 4 --- .../ServerPatches/ConsoleCommandPatch.cs | 13 ++------ .../Patches/SynapsePatches/CommandsPatch.cs | 9 ++++++ Synapse/Events/ServerEvents.cs | 9 ++---- Synapse/Synapse.csproj | 1 + 8 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 Synapse/Commands/PluginsCommand.cs diff --git a/Synapse/Commands/PluginsCommand.cs b/Synapse/Commands/PluginsCommand.cs new file mode 100644 index 0000000..cf44c6c --- /dev/null +++ b/Synapse/Commands/PluginsCommand.cs @@ -0,0 +1,32 @@ +using CommandSystem; +using System; + +namespace Synapse.Commands +{ + [CommandHandler(typeof(RemoteAdminCommandHandler))] + [CommandHandler(typeof(GameConsoleCommandHandler))] + [CommandHandler(typeof(ClientCommandHandler))] + public class PluginsCommand : ICommand + { + public string Command { get; } = "plugins"; + + public string[] Aliases { get; } = new string[] + { + "pl", + }; + + public string Description { get; } = "A Command to Relaod the Configs of Synapse"; + + public bool Execute(ArraySegment arguments, ICommandSender sender, out string respone) + { + var msg = "\nAll Plugins:"; + foreach(var plugin in Synapse.Plugins) + { + msg += $"\n{plugin.Name} Version: {plugin.Version} by {plugin.Author}"; + } + + respone = msg; + return true; + } + } +} diff --git a/Synapse/Commands/ReloadConfigsCommand.cs b/Synapse/Commands/ReloadConfigsCommand.cs index 1aa6ee7..b934d0c 100644 --- a/Synapse/Commands/ReloadConfigsCommand.cs +++ b/Synapse/Commands/ReloadConfigsCommand.cs @@ -5,6 +5,7 @@ namespace Synapse.Commands { + [CommandHandler(typeof(RemoteAdminCommandHandler))] public class ReloadConfigsCommand : ICommand { public string Command { get; } = "reloadconfigs"; diff --git a/Synapse/Commands/ReloadPermissionsCommand.cs b/Synapse/Commands/ReloadPermissionsCommand.cs index c9ce60e..1e55261 100644 --- a/Synapse/Commands/ReloadPermissionsCommand.cs +++ b/Synapse/Commands/ReloadPermissionsCommand.cs @@ -5,6 +5,7 @@ namespace Synapse.Commands { + [CommandHandler(typeof(RemoteAdminCommandHandler))] public class ReloadPermissionsCommand : ICommand { public string Command { get; } = "reloadpermissions"; diff --git a/Synapse/Events/Classes/ConsoleCommandEvent.cs b/Synapse/Events/Classes/ConsoleCommandEvent.cs index ffbe4bd..6734fcd 100644 --- a/Synapse/Events/Classes/ConsoleCommandEvent.cs +++ b/Synapse/Events/Classes/ConsoleCommandEvent.cs @@ -9,9 +9,5 @@ public class ConsoleCommandEvent public Player Player { get; internal set; } public string Command { get; internal set; } - - public string ReturnMessage { get; set; } - - public string Color { get; set; } } } \ No newline at end of file diff --git a/Synapse/Events/Patches/EventPatches/ServerPatches/ConsoleCommandPatch.cs b/Synapse/Events/Patches/EventPatches/ServerPatches/ConsoleCommandPatch.cs index 8f69e6a..40cc6bf 100644 --- a/Synapse/Events/Patches/EventPatches/ServerPatches/ConsoleCommandPatch.cs +++ b/Synapse/Events/Patches/EventPatches/ServerPatches/ConsoleCommandPatch.cs @@ -9,20 +9,13 @@ namespace Synapse.Events.Patches public class ConsoleCommandPatch { // ReSharper disable once InconsistentNaming - public static bool Prefix(QueryProcessor __instance, ref string query, bool encrypted) + public static bool Prefix(QueryProcessor __instance, string query) { try { - Events.InvokeConsoleCommandEvent(__instance.GetPlayer(), query, out var color, - out var returning); + Events.InvokeConsoleCommandEvent(__instance.GetPlayer(), query, out var allow); - if (string.IsNullOrEmpty(color)) - color = "red"; - - if (!string.IsNullOrEmpty(returning)) - __instance.GCT.SendToClient(__instance.connectionToClient, returning, color); - - return false; + return allow; } catch (Exception e) { diff --git a/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs b/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs index 71cc69a..9508cb6 100644 --- a/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs +++ b/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs @@ -1,6 +1,7 @@ using CommandSystem; using CommandSystem.Commands; using Harmony; +using Synapse.Commands; namespace Synapse.Events.Patches.SynapsePatches { @@ -13,6 +14,8 @@ public static bool Prefix(GameConsoleCommandHandler __instance) __instance.RegisterCommand(new BuildInfoCommand()); __instance.RegisterCommand(ConfigCommand.Create()); __instance.RegisterCommand(new HelpCommand(__instance)); + //Synapse Commands + __instance.RegisterCommand(new PluginsCommand()); return false; } } @@ -23,6 +26,8 @@ internal static class ClientCommandPatch public static bool Prefix(GameConsoleCommandHandler __instance) { __instance.RegisterCommand(new HelpCommand(__instance)); + //Synapse Commands + __instance.RegisterCommand(new PluginsCommand()); return false; } } @@ -37,6 +42,10 @@ public static bool Prefix(GameConsoleCommandHandler __instance) __instance.RegisterCommand(ConfigCommand.Create()); __instance.RegisterCommand(new HelpCommand(__instance)); __instance.RegisterCommand(new IntercomTextCommand()); + //Synapse Commands + __instance.RegisterCommand(new ReloadConfigsCommand()); + __instance.RegisterCommand(new ReloadPermissionsCommand()); + __instance.RegisterCommand(new PluginsCommand()); return false; } } diff --git a/Synapse/Events/ServerEvents.cs b/Synapse/Events/ServerEvents.cs index eff5ea9..9143365 100644 --- a/Synapse/Events/ServerEvents.cs +++ b/Synapse/Events/ServerEvents.cs @@ -61,11 +61,9 @@ internal static void InvokeRemoteCommandEvent(CommandSender sender, string comma public delegate void OnConsoleCommand(ConsoleCommandEvent ev); public static event OnConsoleCommand ConsoleCommandEvent; - internal static void InvokeConsoleCommandEvent(Player player, string command, out string color, - out string returning) + internal static void InvokeConsoleCommandEvent(Player player, string command, out bool allow) { - color = "red"; - returning = ""; + allow = true; if (ConsoleCommandEvent == null) return; var ev = new ConsoleCommandEvent @@ -75,9 +73,6 @@ internal static void InvokeConsoleCommandEvent(Player player, string command, ou }; ConsoleCommandEvent.Invoke(ev); - - color = ev.Color; - returning = ev.ReturnMessage; } public delegate void TeamRespawn(TeamRespawnEvent ev); diff --git a/Synapse/Synapse.csproj b/Synapse/Synapse.csproj index fded3d9..d98fbbf 100644 --- a/Synapse/Synapse.csproj +++ b/Synapse/Synapse.csproj @@ -83,6 +83,7 @@ + From fc091b539533f8b4a3a85161995d919c8dd65fb8 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Wed, 5 Aug 2020 17:08:40 +0200 Subject: [PATCH 05/24] fixed plugin command description --- Synapse/Commands/PluginsCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Synapse/Commands/PluginsCommand.cs b/Synapse/Commands/PluginsCommand.cs index cf44c6c..7c34ceb 100644 --- a/Synapse/Commands/PluginsCommand.cs +++ b/Synapse/Commands/PluginsCommand.cs @@ -15,7 +15,7 @@ public class PluginsCommand : ICommand "pl", }; - public string Description { get; } = "A Command to Relaod the Configs of Synapse"; + public string Description { get; } = "Gives you all Plugins installed on the Server"; public bool Execute(ArraySegment arguments, ICommandSender sender, out string respone) { From 51a2700c15feb697c620fe31c5566dd46277ffb9 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Thu, 6 Aug 2020 09:32:58 +0200 Subject: [PATCH 06/24] added plugin info command --- Synapse/Commands/PluginInfoCommand.cs | 42 +++++++++++++++++++ .../Patches/SynapsePatches/CommandsPatch.cs | 3 ++ Synapse/Synapse.csproj | 1 + 3 files changed, 46 insertions(+) create mode 100644 Synapse/Commands/PluginInfoCommand.cs diff --git a/Synapse/Commands/PluginInfoCommand.cs b/Synapse/Commands/PluginInfoCommand.cs new file mode 100644 index 0000000..9c1f072 --- /dev/null +++ b/Synapse/Commands/PluginInfoCommand.cs @@ -0,0 +1,42 @@ +using CommandSystem; +using System; +using System.Linq; + +namespace Synapse.Commands +{ + [CommandHandler(typeof(RemoteAdminCommandHandler))] + [CommandHandler(typeof(GameConsoleCommandHandler))] + [CommandHandler(typeof(ClientCommandHandler))] + public class PluginInfoCommand : ICommand + { + public string Command { get; } = "plugin"; + + public string[] Aliases { get; } = new string[] + { + "plugininfo", + "pi" + }; + + public string Description { get; } = "Gives you Informations about a Plugin"; + + public bool Execute(ArraySegment arguments, ICommandSender sender, out string respone) + { + if (arguments.Count < 1) + { + respone = "You also have to enter a plugin name: plugin ExamplePlugin"; + return false; + } + + foreach(var plugin in Synapse.Plugins) + if (plugin.Name.ToLower().Contains(arguments.FirstOrDefault().ToLower())) + { + respone = $"The Plugin {plugin.Name} Version {plugin.Version} was created by {plugin.Author} and was made for Synapse v.{plugin.SynapseMajor}.{plugin.SynapseMinor}.{plugin.SynapsePatch}" + + $"\nPlugin Description: {plugin.Description}"; + return true; + } + + respone = "No Plugin with such a name was found!"; + return false; + } + } +} diff --git a/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs b/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs index 9508cb6..b5abe77 100644 --- a/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs +++ b/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs @@ -16,6 +16,7 @@ public static bool Prefix(GameConsoleCommandHandler __instance) __instance.RegisterCommand(new HelpCommand(__instance)); //Synapse Commands __instance.RegisterCommand(new PluginsCommand()); + __instance.RegisterCommand(new PluginInfoCommand()); return false; } } @@ -28,6 +29,7 @@ public static bool Prefix(GameConsoleCommandHandler __instance) __instance.RegisterCommand(new HelpCommand(__instance)); //Synapse Commands __instance.RegisterCommand(new PluginsCommand()); + __instance.RegisterCommand(new PluginInfoCommand()); return false; } } @@ -46,6 +48,7 @@ public static bool Prefix(GameConsoleCommandHandler __instance) __instance.RegisterCommand(new ReloadConfigsCommand()); __instance.RegisterCommand(new ReloadPermissionsCommand()); __instance.RegisterCommand(new PluginsCommand()); + __instance.RegisterCommand(new PluginInfoCommand()); return false; } } diff --git a/Synapse/Synapse.csproj b/Synapse/Synapse.csproj index d98fbbf..1d7b15e 100644 --- a/Synapse/Synapse.csproj +++ b/Synapse/Synapse.csproj @@ -83,6 +83,7 @@ + From d2339342c1e3aef2828c2d73d4bdcdea38e69a29 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Thu, 6 Aug 2020 10:26:43 +0200 Subject: [PATCH 07/24] Update Version Number to v1.3.0 --- Synapse/Properties/AssemblyInfo.cs | 4 ++-- Synapse/Synapse.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Synapse/Properties/AssemblyInfo.cs b/Synapse/Properties/AssemblyInfo.cs index f1c783e..48e8c00 100644 --- a/Synapse/Properties/AssemblyInfo.cs +++ b/Synapse/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.2")] -[assembly: AssemblyFileVersion("1.1.2")] \ No newline at end of file +[assembly: AssemblyVersion("1.3.0")] +[assembly: AssemblyFileVersion("1.3.0")] \ No newline at end of file diff --git a/Synapse/Synapse.cs b/Synapse/Synapse.cs index ec8b8d8..c30c3ce 100644 --- a/Synapse/Synapse.cs +++ b/Synapse/Synapse.cs @@ -17,8 +17,8 @@ public static class Synapse { #region Version private const int MajorVersion = 1; - private const int MinorVerion = 1; - private const int Patch = 2; + private const int MinorVerion = 3; + private const int Patch = 0; public static int VersionNumber => MajorVersion * 100 + MinorVerion * 10 + Patch; public static string Version => $"{MajorVersion}.{MinorVerion}.{Patch}"; From 032d3bea58574c4ad3b586291bcfcf16d7e9b062 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Thu, 6 Aug 2020 10:27:59 +0200 Subject: [PATCH 08/24] Revert "Update Version Number to v1.3.0" This reverts commit d2339342c1e3aef2828c2d73d4bdcdea38e69a29. --- Synapse/Properties/AssemblyInfo.cs | 4 ++-- Synapse/Synapse.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Synapse/Properties/AssemblyInfo.cs b/Synapse/Properties/AssemblyInfo.cs index 48e8c00..f1c783e 100644 --- a/Synapse/Properties/AssemblyInfo.cs +++ b/Synapse/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0")] -[assembly: AssemblyFileVersion("1.3.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.2")] +[assembly: AssemblyFileVersion("1.1.2")] \ No newline at end of file diff --git a/Synapse/Synapse.cs b/Synapse/Synapse.cs index c30c3ce..ec8b8d8 100644 --- a/Synapse/Synapse.cs +++ b/Synapse/Synapse.cs @@ -17,8 +17,8 @@ public static class Synapse { #region Version private const int MajorVersion = 1; - private const int MinorVerion = 3; - private const int Patch = 0; + private const int MinorVerion = 1; + private const int Patch = 2; public static int VersionNumber => MajorVersion * 100 + MinorVerion * 10 + Patch; public static string Version => $"{MajorVersion}.{MinorVerion}.{Patch}"; From 32733c14ccfe5e6bcd27c472e1bfd976945f25af Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Thu, 6 Aug 2020 10:29:51 +0200 Subject: [PATCH 09/24] Sometimes i hate Visual Studios but now it should be the right Version --- Synapse/Properties/AssemblyInfo.cs | 4 ++-- Synapse/Synapse.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Synapse/Properties/AssemblyInfo.cs b/Synapse/Properties/AssemblyInfo.cs index f1c783e..2528c0b 100644 --- a/Synapse/Properties/AssemblyInfo.cs +++ b/Synapse/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.2")] -[assembly: AssemblyFileVersion("1.1.2")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0")] +[assembly: AssemblyFileVersion("1.2.0")] \ No newline at end of file diff --git a/Synapse/Synapse.cs b/Synapse/Synapse.cs index ec8b8d8..47d9642 100644 --- a/Synapse/Synapse.cs +++ b/Synapse/Synapse.cs @@ -17,8 +17,8 @@ public static class Synapse { #region Version private const int MajorVersion = 1; - private const int MinorVerion = 1; - private const int Patch = 2; + private const int MinorVerion = 2; + private const int Patch = 0; public static int VersionNumber => MajorVersion * 100 + MinorVerion * 10 + Patch; public static string Version => $"{MajorVersion}.{MinorVerion}.{Patch}"; From eb80a58b3bd5714d7d8acbf95ab94383a42163e4 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Fri, 7 Aug 2020 13:23:39 +0200 Subject: [PATCH 10/24] added Server.GetObjectsof() --- Synapse/Api/Server.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Synapse/Api/Server.cs b/Synapse/Api/Server.cs index 5024fe8..f1d12ea 100644 --- a/Synapse/Api/Server.cs +++ b/Synapse/Api/Server.cs @@ -3,6 +3,7 @@ using RemoteAdmin; using System; using System.Reflection; +using UnityEngine; namespace Synapse.Api { @@ -70,6 +71,8 @@ public static BanPlayer BanPlayer public static ClientCommandHandler ClientCommandHandler => QueryProcessor.DotCommandHandler; + public static TObject[] GetObjectsOf() where TObject : UnityEngine.Object => UnityEngine.Object.FindObjectsOfType(); + public static int GetMethodHash(Type invokeClass, string methodName) => invokeClass.FullName.GetStableHashCode() * 503 + methodName.GetStableHashCode(); } } From a74218c683a86329ee98e719a1bc69ac816cdb8b Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Fri, 7 Aug 2020 14:46:53 +0200 Subject: [PATCH 11/24] Improved Map.Lifts --- Synapse/Api/Map.cs | 2 +- Synapse/Api/Server.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Synapse/Api/Map.cs b/Synapse/Api/Map.cs index 3237115..34dab61 100644 --- a/Synapse/Api/Map.cs +++ b/Synapse/Api/Map.cs @@ -21,7 +21,7 @@ public static class Map /// /// Gives you a list of all lifts /// - public static List Lifts => Object.FindObjectsOfType().ToList(); + public static List Lifts => Server.GetObjectsOf(); private static Broadcast BroadcastComponent => Player.Host.GetComponent(); diff --git a/Synapse/Api/Server.cs b/Synapse/Api/Server.cs index f1d12ea..348c126 100644 --- a/Synapse/Api/Server.cs +++ b/Synapse/Api/Server.cs @@ -2,8 +2,9 @@ using Mirror; using RemoteAdmin; using System; +using System.Collections.Generic; +using System.Linq; using System.Reflection; -using UnityEngine; namespace Synapse.Api { @@ -71,7 +72,7 @@ public static BanPlayer BanPlayer public static ClientCommandHandler ClientCommandHandler => QueryProcessor.DotCommandHandler; - public static TObject[] GetObjectsOf() where TObject : UnityEngine.Object => UnityEngine.Object.FindObjectsOfType(); + public static List GetObjectsOf() where TObject : UnityEngine.Object => UnityEngine.Object.FindObjectsOfType().ToList(); public static int GetMethodHash(Type invokeClass, string methodName) => invokeClass.FullName.GetStableHashCode() * 503 + methodName.GetStableHashCode(); } From 883717460b95052d483aaa741e97c349ee56bea8 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Fri, 7 Aug 2020 15:51:44 +0200 Subject: [PATCH 12/24] added KeyPress Event --- Synapse/Commands/KeyPressCommand.cs | 57 +++++++++++++++++++ Synapse/Events/Classes/KeyPressEvent.cs | 12 ++++ .../Patches/SynapsePatches/CommandsPatch.cs | 1 + Synapse/Events/PlayerEvents.cs | 16 ++++++ Synapse/Synapse.csproj | 2 + 5 files changed, 88 insertions(+) create mode 100644 Synapse/Commands/KeyPressCommand.cs create mode 100644 Synapse/Events/Classes/KeyPressEvent.cs diff --git a/Synapse/Commands/KeyPressCommand.cs b/Synapse/Commands/KeyPressCommand.cs new file mode 100644 index 0000000..3d73020 --- /dev/null +++ b/Synapse/Commands/KeyPressCommand.cs @@ -0,0 +1,57 @@ +using CommandSystem; +using Synapse.Api; +using System; +using System.Linq; +using UnityEngine; + +namespace Synapse.Commands +{ + [CommandHandler(typeof(ClientCommandHandler))] + public class KeyPressCommand : ICommand + { + public string Command { get; } = "keypress"; + + public string[] Aliases { get; } = new string[] + { + "kp", + "key", + "keybind" + }; + + public string Description { get; } = "A Command for the KeyPressEvent from Synapse!"; + + public bool Execute(ArraySegment arguments, ICommandSender sender, out string respone) + { + if (sender.GetPlayer() == Server.Host) + { + respone = "Nope the Console cant use this!"; + return false; + } + + switch (arguments.FirstOrDefault().ToUpper()) + { + case "SYNC": + var component = sender.GetPlayer().ClassManager; + foreach(var key in (KeyCode[])Enum.GetValues(typeof(KeyCode))) + component.TargetChangeCmdBinding(component.connectionToClient, key, $".key send {(int)key}"); + + respone = "All Keys was synced!"; + return true; + + case "SEND": + if(!Enum.TryParse(arguments.ElementAt(1), out var key2)) + { + respone = "Invalid KeyBind! If they are binded by Synapse please report this!"; + return false; + } + + Events.Events.InvokeKeyPressEvent(sender.GetPlayer(), key2); + respone = "Key was accepted"; + return true; + default: + respone = "Use .key sync in order to sync your binds and use all Features of the Plugins!"; + return false; + } + } + } +} diff --git a/Synapse/Events/Classes/KeyPressEvent.cs b/Synapse/Events/Classes/KeyPressEvent.cs new file mode 100644 index 0000000..cc5821c --- /dev/null +++ b/Synapse/Events/Classes/KeyPressEvent.cs @@ -0,0 +1,12 @@ +using Synapse.Api; +using UnityEngine; + +namespace Synapse.Events.Classes +{ + public class KeyPressEvent + { + public Player Player { get; internal set; } + + public KeyCode Key { get; internal set; } + } +} diff --git a/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs b/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs index b5abe77..df19a6d 100644 --- a/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs +++ b/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs @@ -30,6 +30,7 @@ public static bool Prefix(GameConsoleCommandHandler __instance) //Synapse Commands __instance.RegisterCommand(new PluginsCommand()); __instance.RegisterCommand(new PluginInfoCommand()); + __instance.RegisterCommand(new KeyPressCommand()); return false; } } diff --git a/Synapse/Events/PlayerEvents.cs b/Synapse/Events/PlayerEvents.cs index 1192f9a..3c182f1 100644 --- a/Synapse/Events/PlayerEvents.cs +++ b/Synapse/Events/PlayerEvents.cs @@ -428,5 +428,21 @@ internal static void InvokePlayerTagEvent(Player player, bool show,out bool allo allow = ev.Allow; } + + + public delegate void OnKeyPress(KeyPressEvent ev); + public static event OnKeyPress KeyPressEvent; + internal static void InvokeKeyPressEvent(Player player, KeyCode key) + { + if (KeyPressEvent == null) return; + + var ev = new KeyPressEvent() + { + Player = player, + Key = key + }; + + KeyPressEvent.Invoke(ev); + } } } \ No newline at end of file diff --git a/Synapse/Synapse.csproj b/Synapse/Synapse.csproj index 1d7b15e..da430c3 100644 --- a/Synapse/Synapse.csproj +++ b/Synapse/Synapse.csproj @@ -83,11 +83,13 @@ + + From f5a9e383ea9ff3cbebfc8f2e0e62f95b54336cf3 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Fri, 7 Aug 2020 16:09:03 +0200 Subject: [PATCH 13/24] add try catch to keypress event --- Synapse/Commands/KeyPressCommand.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Synapse/Commands/KeyPressCommand.cs b/Synapse/Commands/KeyPressCommand.cs index 3d73020..7e0b7fd 100644 --- a/Synapse/Commands/KeyPressCommand.cs +++ b/Synapse/Commands/KeyPressCommand.cs @@ -45,7 +45,14 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s return false; } - Events.Events.InvokeKeyPressEvent(sender.GetPlayer(), key2); + try + { + Events.Events.InvokeKeyPressEvent(sender.GetPlayer(), key2); + } + catch (Exception e) + { + Log.Error($"KeyPressEvent Error: {e} "); + } respone = "Key was accepted"; return true; default: From f62c101f9e478326b4541f431fcdcfd12c40c625 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Sat, 8 Aug 2020 16:52:09 +0200 Subject: [PATCH 14/24] added Player.DimScreen() + Player.ShakeScreen() and some fixes --- Synapse/Api/Map.cs | 1 - Synapse/Api/Player.cs | 31 +++++++++++++++++++++++++++++ Synapse/Commands/KeyPressCommand.cs | 6 ++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Synapse/Api/Map.cs b/Synapse/Api/Map.cs index 34dab61..5af870c 100644 --- a/Synapse/Api/Map.cs +++ b/Synapse/Api/Map.cs @@ -5,7 +5,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using UnityEngine; -using Utf8Json.Internal.DoubleConversion; using Object = UnityEngine.Object; namespace Synapse.Api diff --git a/Synapse/Api/Player.cs b/Synapse/Api/Player.cs index 599affa..6d24048 100644 --- a/Synapse/Api/Player.cs +++ b/Synapse/Api/Player.cs @@ -579,5 +579,36 @@ public void SendToServer(ushort port) Connection.Send(msg); NetworkWriterPool.Recycle(writer); } + + public void DimScreen() + { + var component = RoundSummary.singleton; + var writer = NetworkWriterPool.GetWriter(); + var msg = new RpcMessage + { + netId = component.netId, + componentIndex = component.ComponentIndex, + functionHash = Server.GetMethodHash(typeof(RoundSummary), "RpcDimScreen"), + payload = writer.ToArraySegment() + }; + Connection.Send(msg); + NetworkWriterPool.Recycle(writer); + } + + public void ShakeScreen(bool achieve = false) + { + var component = Warhead.Controller; + var writer = NetworkWriterPool.GetWriter(); + writer.WriteBoolean(achieve); + var msg = new RpcMessage + { + netId = component.netId, + componentIndex = component.ComponentIndex, + functionHash = Server.GetMethodHash(typeof(AlphaWarheadController), "RpcShake"), + payload = writer.ToArraySegment() + }; + Connection.Send(msg); + NetworkWriterPool.Recycle(writer); + } } } diff --git a/Synapse/Commands/KeyPressCommand.cs b/Synapse/Commands/KeyPressCommand.cs index 7e0b7fd..73b290e 100644 --- a/Synapse/Commands/KeyPressCommand.cs +++ b/Synapse/Commands/KeyPressCommand.cs @@ -28,6 +28,12 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s return false; } + if (arguments.Count < 1) + { + respone = "Use .key sync in order to sync your binds and use all Features of the Plugins!"; + return false; + } + switch (arguments.FirstOrDefault().ToUpper()) { case "SYNC": From fbd022f233d74569fddcca74ec5e4ad342aff860 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Mon, 10 Aug 2020 09:03:18 +0200 Subject: [PATCH 15/24] improved ModularCommand System and added virtual reloadconfig to Plugin --- Synapse/Api/Plugin/Plugin.cs | 5 ++- Synapse/Config/ConfigManager.cs | 2 +- .../Patches/SynapsePatches/CommandsPatch.cs | 29 +++++++------- Synapse/Synapse.cs | 38 ++++++++++++------- 4 files changed, 42 insertions(+), 32 deletions(-) diff --git a/Synapse/Api/Plugin/Plugin.cs b/Synapse/Api/Plugin/Plugin.cs index 9a4aa0c..571a893 100644 --- a/Synapse/Api/Plugin/Plugin.cs +++ b/Synapse/Api/Plugin/Plugin.cs @@ -15,9 +15,10 @@ public abstract class Plugin // ReSharper disable once NotAccessedField.Global public static YamlConfig Config; + [Obsolete("Please use public override void ReloadConfigs() now!")] public delegate void OnConfigReload(); + [Obsolete("Please use public override void ReloadConfigs() now!")] public event OnConfigReload ConfigReloadEvent; - internal void InvokeConfigReloadEvent() => ConfigReloadEvent?.Invoke(); // ReSharper disable once UnusedAutoPropertyAccessor.Global public Translation Translation { get; internal set; } @@ -81,5 +82,7 @@ public virtual void RegisterCommands() } } } + + public virtual void ReloadConfigs() => ConfigReloadEvent.Invoke(); } } \ No newline at end of file diff --git a/Synapse/Config/ConfigManager.cs b/Synapse/Config/ConfigManager.cs index b5017c5..e921beb 100644 --- a/Synapse/Config/ConfigManager.cs +++ b/Synapse/Config/ConfigManager.cs @@ -19,7 +19,7 @@ internal static void ReloadAllConfigs() foreach (var plugin in Synapse.plugins) try { - plugin.InvokeConfigReloadEvent(); + plugin.ReloadConfigs(); } catch (Exception e) { diff --git a/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs b/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs index df19a6d..806edfa 100644 --- a/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs +++ b/Synapse/Events/Patches/SynapsePatches/CommandsPatch.cs @@ -2,55 +2,52 @@ using CommandSystem.Commands; using Harmony; using Synapse.Commands; +using System.Linq; namespace Synapse.Events.Patches.SynapsePatches { [HarmonyPatch(typeof(GameConsoleCommandHandler), nameof(GameConsoleCommandHandler.LoadGeneratedCommands))] internal static class GameCommandsPatch { - public static bool Prefix(GameConsoleCommandHandler __instance) + public static void Postfix(GameConsoleCommandHandler __instance) { - __instance.RegisterCommand(new ArgsCommand()); - __instance.RegisterCommand(new BuildInfoCommand()); - __instance.RegisterCommand(ConfigCommand.Create()); - __instance.RegisterCommand(new HelpCommand(__instance)); //Synapse Commands __instance.RegisterCommand(new PluginsCommand()); __instance.RegisterCommand(new PluginInfoCommand()); - return false; } } [HarmonyPatch(typeof(ClientCommandHandler), nameof(ClientCommandHandler.LoadGeneratedCommands))] internal static class ClientCommandPatch { - public static bool Prefix(GameConsoleCommandHandler __instance) + public static void Postfix(GameConsoleCommandHandler __instance) { - __instance.RegisterCommand(new HelpCommand(__instance)); //Synapse Commands __instance.RegisterCommand(new PluginsCommand()); __instance.RegisterCommand(new PluginInfoCommand()); __instance.RegisterCommand(new KeyPressCommand()); - return false; } } [HarmonyPatch(typeof(RemoteAdminCommandHandler), nameof(RemoteAdminCommandHandler.LoadGeneratedCommands))] internal static class RemoteCommandsPatch { - public static bool Prefix(GameConsoleCommandHandler __instance) + public static void Postfix(GameConsoleCommandHandler __instance) { - __instance.RegisterCommand(new BuildInfoCommand()); - __instance.RegisterCommand(new ChangeNameCommand()); - __instance.RegisterCommand(ConfigCommand.Create()); - __instance.RegisterCommand(new HelpCommand(__instance)); - __instance.RegisterCommand(new IntercomTextCommand()); //Synapse Commands __instance.RegisterCommand(new ReloadConfigsCommand()); __instance.RegisterCommand(new ReloadPermissionsCommand()); __instance.RegisterCommand(new PluginsCommand()); __instance.RegisterCommand(new PluginInfoCommand()); - return false; + } + } + + [HarmonyPatch(typeof(RefreshCommandsCommand), nameof(RefreshCommandsCommand.Execute))] + internal static class RefreshCommandsPatch + { + public static void Postfix() + { + Synapse.OnReloadCommands(); } } } diff --git a/Synapse/Synapse.cs b/Synapse/Synapse.cs index 47d9642..004e70e 100644 --- a/Synapse/Synapse.cs +++ b/Synapse/Synapse.cs @@ -50,28 +50,18 @@ public static void LoaderExecutionCode() Log.Error("Synapse failed to Start.Restart the Server"); } } - internal static void Start() + private static void Start() { LoadDependencies(); - //Clears all the Commands so that the base game refresh command will be removed - Server.ClientCommandHandler.ClearCommands(); - Server.GameCoreCommandHandler.ClearCommands(); - Server.RaCommandHandler.ClearCommands(); - - HarmonyPatch(); - //Adding all Vanilla Commands back to the Handler but now with the Harmony Patch which removes the command - Server.ClientCommandHandler.LoadGeneratedCommands(); - Server.GameCoreCommandHandler.LoadGeneratedCommands(); - Server.RaCommandHandler.LoadGeneratedCommands(); - foreach (var plugin in Directory.GetFiles(Files.ServerPluginDirectory)) { if (plugin == "Synapse.dll") continue; if (plugin.EndsWith(".dll")) LoadPlugin(plugin); } - + + HarmonyPatch(); ConfigManager.InitializeConfigs(); ServerConsole.ReloadServerName(); _eventHandler = new EventHandlers(); @@ -85,6 +75,7 @@ internal static void Start() } OnEnable(); + OnReloadCommands(); } @@ -138,7 +129,6 @@ private static void LoadPlugin(string pluginPath) }; p.Assembly = assembly; - p.RegisterCommands(); plugins.Add(p); if (p.Details.SynapseMajor * 10 + p.Details.SynapseMinor == MajorVersion * 10 + MinorVerion) Log.Info($"Successfully loaded {p.Details.Name}"); @@ -179,6 +169,26 @@ private static void OnEnable() Log.Error($"Plugin {plugin.Details.Name} threw an exception while enabling {e}"); } } + internal static void OnReloadCommands() + { + Server.ClientCommandHandler.ClearCommands(); + Server.GameCoreCommandHandler.ClearCommands(); + Server.RaCommandHandler.ClearCommands(); + + Server.ClientCommandHandler.LoadGeneratedCommands(); + Server.GameCoreCommandHandler.LoadGeneratedCommands(); + Server.RaCommandHandler.LoadGeneratedCommands(); + + foreach (var plugin in plugins) + try + { + plugin.RegisterCommands(); + } + catch (Exception e) + { + Log.Error($"Plugin {plugin.Details.Name} threw an exception while enabling {e}"); + } + } #endregion } From e88ba8e108db6803b597f128912a12efb7d5c26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=B6ller?= Date: Tue, 11 Aug 2020 09:24:51 +0200 Subject: [PATCH 16/24] + Scp106CreatePortalEvent --- .../Events/Classes/Scp106CreatePortalEvent.cs | 10 ++++++++++ .../ScpPatches/Scp106CreatePortalPatch.cs | 16 ++++++++++++++++ Synapse/Events/ScpEvents.cs | 17 +++++++++++++++++ Synapse/Synapse.csproj | 2 ++ 4 files changed, 45 insertions(+) create mode 100644 Synapse/Events/Classes/Scp106CreatePortalEvent.cs create mode 100644 Synapse/Events/Patches/EventPatches/ScpPatches/Scp106CreatePortalPatch.cs diff --git a/Synapse/Events/Classes/Scp106CreatePortalEvent.cs b/Synapse/Events/Classes/Scp106CreatePortalEvent.cs new file mode 100644 index 0000000..af46ff4 --- /dev/null +++ b/Synapse/Events/Classes/Scp106CreatePortalEvent.cs @@ -0,0 +1,10 @@ +using Synapse.Api; + +namespace Synapse.Events.Classes +{ + public class Scp106CreatePortalEvent + { + public Player Player { get; internal set; } + public bool Allow { get; set; } + } +} \ No newline at end of file diff --git a/Synapse/Events/Patches/EventPatches/ScpPatches/Scp106CreatePortalPatch.cs b/Synapse/Events/Patches/EventPatches/ScpPatches/Scp106CreatePortalPatch.cs new file mode 100644 index 0000000..12bc5f6 --- /dev/null +++ b/Synapse/Events/Patches/EventPatches/ScpPatches/Scp106CreatePortalPatch.cs @@ -0,0 +1,16 @@ +using Harmony; +using Synapse.Api; + +namespace Synapse.Events.Patches +{ + [HarmonyPatch(typeof(Scp106PlayerScript), nameof(Scp106PlayerScript.CallCmdMakePortal))] + public class Scp106CreatePortalPatch + { + private static bool Prefix(Scp106PlayerScript __instance) + { + var allow = true; + Events.InvokeScp106CreatePortalEvent(__instance.gameObject.GetPlayer(), ref allow); + return allow; + } + } +} \ No newline at end of file diff --git a/Synapse/Events/ScpEvents.cs b/Synapse/Events/ScpEvents.cs index 504324b..0ad4a4a 100644 --- a/Synapse/Events/ScpEvents.cs +++ b/Synapse/Events/ScpEvents.cs @@ -88,5 +88,22 @@ internal static void InvokeScp079LvlEvent(Player player,ref int newlvl,ref bool newlvl = ev.NewLvl; allow = ev.Allow; } + + public delegate void OnScp106CreatePortal(Scp106CreatePortalEvent ev); + + public static event OnScp106CreatePortal Scp106CreatePortalEvent; + + internal static void InvokeScp106CreatePortalEvent(Player player, ref bool allow) + { + var ev = new Scp106CreatePortalEvent + { + Allow = allow, + Player = player + }; + + Scp106CreatePortalEvent?.Invoke(ev); + + allow = ev.Allow; + } } } \ No newline at end of file diff --git a/Synapse/Synapse.csproj b/Synapse/Synapse.csproj index da430c3..09097aa 100644 --- a/Synapse/Synapse.csproj +++ b/Synapse/Synapse.csproj @@ -90,7 +90,9 @@ + + From 33ca50def48d514fa2a99780edc4a7709728f88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=B6ller?= Date: Tue, 11 Aug 2020 16:32:20 +0200 Subject: [PATCH 17/24] + DnT in API --- Synapse/Api/Player.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Synapse/Api/Player.cs b/Synapse/Api/Player.cs index 6d24048..b5d4730 100644 --- a/Synapse/Api/Player.cs +++ b/Synapse/Api/Player.cs @@ -393,6 +393,11 @@ public Player Cuffer public string UnitName { get => ClassManager.NetworkCurUnitName; set => ClassManager.NetworkCurUnitName = value; } + /// + /// If the Client sends a DnT Signal, useful for storing data + /// + public bool DoNotTrack => ServerRoles.DoNotTrack; + //Methods /// /// Kicks the player From a5ef8b3062459a7cfbeb1f2bec5e3ad3483887cc Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Wed, 12 Aug 2020 20:52:56 +0200 Subject: [PATCH 18/24] increased RayCastHit Distance for Player.Room to prevent room = null in some high rooms --- Synapse/Api/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Synapse/Api/Player.cs b/Synapse/Api/Player.cs index b5d4730..abdc15c 100644 --- a/Synapse/Api/Player.cs +++ b/Synapse/Api/Player.cs @@ -248,7 +248,7 @@ public Room Room get { var playerPos = Position; - var end = playerPos - new Vector3(0f, 10f, 0f); + var end = playerPos - new Vector3(0f, 30f, 0f); var flag = Physics.Linecast(playerPos, end, out var rayCastHit, -84058629); if (!flag || rayCastHit.transform == null) From 8ed81d87125907a506a4b5f928f84cf2536a501a Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Wed, 12 Aug 2020 20:57:48 +0200 Subject: [PATCH 19/24] added Player.DropAllItems() --- Synapse/Api/Player.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Synapse/Api/Player.cs b/Synapse/Api/Player.cs index abdc15c..f4d7794 100644 --- a/Synapse/Api/Player.cs +++ b/Synapse/Api/Player.cs @@ -516,6 +516,8 @@ public void InstantBroadcast(ushort time, string message) /// public void GiveItem(ItemType itemType, float duration = float.NegativeInfinity, int sight = 0, int barrel = 0, int other = 0) => Hub.inventory.AddNewItem(itemType, duration, sight, barrel, other); + public void DropAllItems() => Inventory.ServerDropAll(); + public void DropItem(Inventory.SyncItemInfo item) { Inventory.SetPickup(item.id, item.durability, Position, Inventory.camera.transform.rotation, item.modSight, item.modBarrel, item.modOther); From 6ded8e08392948c44f75a85d7c6db266b103d078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=B6ller?= Date: Sun, 31 May 2020 23:40:04 +0200 Subject: [PATCH 20/24] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2c6f4e5 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + Synapse: Mod-Loader for SCP: Secret Laboratory + Copyright (C) 2020 Robin Möller und Dimenzio + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Synapse Copyright (C) 2020 Robin Möller und Dimenzio + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 255e644dc7f5e94af3a49ae0b55aef5a0750b051 Mon Sep 17 00:00:00 2001 From: Helight Date: Thu, 13 Aug 2020 02:22:06 +0200 Subject: [PATCH 21/24] Add PlayerHealEvent --- Synapse/Events/Classes/PlayerHealEvent.cs | 15 ++++++++++ .../PlayerPatches/PlayerHealPatch.cs | 28 +++++++++++++++++++ Synapse/Events/PlayerEvents.cs | 22 +++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 Synapse/Events/Classes/PlayerHealEvent.cs create mode 100644 Synapse/Events/Patches/EventPatches/PlayerPatches/PlayerHealPatch.cs diff --git a/Synapse/Events/Classes/PlayerHealEvent.cs b/Synapse/Events/Classes/PlayerHealEvent.cs new file mode 100644 index 0000000..20a0836 --- /dev/null +++ b/Synapse/Events/Classes/PlayerHealEvent.cs @@ -0,0 +1,15 @@ +using System.Diagnostics.CodeAnalysis; +using Synapse.Api; + +namespace Synapse.Events.Classes +{ + [SuppressMessage("ReSharper", "UnusedAutoPropertyAccessor.Global")] + public class PlayerHealEvent + { + public Player Player { get; internal set; } + + public float Amount { get; set; } + + public bool Allow { get; set; } + } +} \ No newline at end of file diff --git a/Synapse/Events/Patches/EventPatches/PlayerPatches/PlayerHealPatch.cs b/Synapse/Events/Patches/EventPatches/PlayerPatches/PlayerHealPatch.cs new file mode 100644 index 0000000..834619d --- /dev/null +++ b/Synapse/Events/Patches/EventPatches/PlayerPatches/PlayerHealPatch.cs @@ -0,0 +1,28 @@ +using System; + using Harmony; +using Synapse; + using Synapse.Api; + + namespace Synapse.Events.Patches +{ + [HarmonyPatch(typeof(PlayerStats), nameof(PlayerStats.HealHPAmount))] + public class PlayerHealPatch + { + public static bool Prefix(PlayerStats __instance, ref float hp) + { + try + { + var player = __instance.GetPlayer(); + + Events.InvokePlayerHealEvent(player, ref hp, out var allow); + + return allow; + } + catch (Exception e) + { + Log.Info($"Player Heal Event Error: {e}"); + return true; + } + } + } +} \ No newline at end of file diff --git a/Synapse/Events/PlayerEvents.cs b/Synapse/Events/PlayerEvents.cs index 3c182f1..ebb8ad6 100644 --- a/Synapse/Events/PlayerEvents.cs +++ b/Synapse/Events/PlayerEvents.cs @@ -444,5 +444,27 @@ internal static void InvokeKeyPressEvent(Player player, KeyCode key) KeyPressEvent.Invoke(ev); } + + public delegate void OnPlayerHeal(PlayerHealEvent ev); + + public static event OnPlayerHeal PlayerHealEvent; + internal static void InvokePlayerHealEvent(Player player, ref float amount, out bool allow) + { + allow = true; + if (PlayerHealEvent == null) return; + + var ev = new PlayerHealEvent + { + Player = player, + Amount = amount, + Allow = allow + }; + + PlayerHealEvent.Invoke(ev); + + allow = ev.Allow; + amount = ev.Amount; + + } } } \ No newline at end of file From 7bf6943cd75e35668a74dc6f1dd56ff63494f979 Mon Sep 17 00:00:00 2001 From: GrafDimenzio Date: Thu, 13 Aug 2020 08:31:42 +0200 Subject: [PATCH 22/24] hopefully fixed Generator Patch now --- .../EventPatches/MapPatches/GeneratorPatches.cs | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Synapse/Events/Patches/EventPatches/MapPatches/GeneratorPatches.cs b/Synapse/Events/Patches/EventPatches/MapPatches/GeneratorPatches.cs index 4c3144a..8f2e7bd 100644 --- a/Synapse/Events/Patches/EventPatches/MapPatches/GeneratorPatches.cs +++ b/Synapse/Events/Patches/EventPatches/MapPatches/GeneratorPatches.cs @@ -15,18 +15,10 @@ public static bool Prefix(Generator079 __instance, GameObject person, PlayerInte { switch (command) { - case PlayerInteract.Generator079Operations.Door: - - - - break; - case PlayerInteract.Generator079Operations.Tablet: if (__instance.isTabletConnected || !__instance.isDoorOpen || __instance._localTime <= 0f || Generator079.mainGenerator.forcedOvercharge) - { return false; - } Inventory component = person.GetComponent(); using (SyncList.SyncListEnumerator enumerator = component.items.GetEnumerator()) { @@ -45,17 +37,16 @@ public static bool Prefix(Generator079 __instance, GameObject person, PlayerInte } } } - break; + return false; case PlayerInteract.Generator079Operations.Cancel: - if (!__instance.isTabletConnected) break; + if (!__instance.isTabletConnected) return false; var allow = true; Events.InvokeGeneratorEjected(person.GetPlayer(), __instance, ref allow); - if (!allow) break; - return true; + return allow; } - return false; + return true; } catch (Exception e) { From a43a129031b418a1835bf6a77d4f241c5cee9018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=B6ller?= Date: Thu, 13 Aug 2020 08:48:12 +0200 Subject: [PATCH 23/24] + Include PlayerHealEvent in Build --- Synapse/Synapse.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Synapse/Synapse.csproj b/Synapse/Synapse.csproj index 09097aa..acd17e1 100644 --- a/Synapse/Synapse.csproj +++ b/Synapse/Synapse.csproj @@ -132,6 +132,7 @@ + @@ -144,6 +145,7 @@ + From 74c8ad44aeb2cfd373a61161fc5f9363cbd2dbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20M=C3=B6ller?= Date: Thu, 13 Aug 2020 08:48:21 +0200 Subject: [PATCH 24/24] * Typo fix --- Synapse/Api/Round.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Synapse/Api/Round.cs b/Synapse/Api/Round.cs index a045e1d..f0a176b 100644 --- a/Synapse/Api/Round.cs +++ b/Synapse/Api/Round.cs @@ -6,9 +6,12 @@ namespace Synapse.Api { public static class Round { + [Obsolete("Please use RoundLength")] public static TimeSpan RoundLenght => RoundStart.RoundLenght; - public static DateTime StartedTime => DateTime.Now - RoundLenght; + public static TimeSpan RoundLength => RoundStart.RoundLenght; + + public static DateTime StartedTime => DateTime.Now - RoundLength; public static bool IsStarted => RoundSummary.RoundInProgress();