Merge pull request #6 from SynapseSL/development

Synapse v.2.1.0

Synapse/Api/Door.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using System.Linq;
 
 namespace Synapse.Api
 {
@@ -18,6 +19,8 @@ public class Door
 
         public bool Locked { get => door.locked; set => door.SetLock(value); }
 
+        public Room Room { get => Map.Get.Rooms.OrderBy(x => Vector3.Distance(x.Position, Position)).FirstOrDefault(); }
+
         public global::Door.AccessRequirements PermissionLevels { get => door.PermissionLevels; set => door.PermissionLevels = value; }
     }
 }

Synapse/Api/Enum/DoorType.cs

@@ -0,0 +1,14 @@
+namespace Synapse.Api.Enum
+{
+    /* This should be in the v.2.1.0 but Scp:SL just released the update
+     public enum DoorType
+    {
+        LCZ,
+        HCZ,
+        EZ,
+        Gate,
+        CheckPoint,
+        AirLock
+    }
+    */
+}

Synapse/Api/Enum/ItemState.cs

@@ -0,0 +1,10 @@
+namespace Synapse.Api.Enum
+{
+    public enum ItemState
+    {
+        Destroyed,
+        Despawned,
+        Inventory,
+        Map
+    }
+}

Synapse/Api/Enum/ZoneType.cs

@@ -2,8 +2,7 @@
 {
    public enum ZoneType
     {
-        None = -1,
-        Lobby,
+        None,
         LCZ,
         HCZ,
         Entrance,

Synapse/Api/Events/EventHandler.cs

@@ -1,5 +1,6 @@
 using Synapse.Config;
 using System.Linq;
+using System.IO;
 using UnityEngine;
 
 namespace Synapse.Api.Events
@@ -27,6 +28,29 @@ private void KeyPress(SynapseEventArguments.PlayerKeyPressEventArgs ev)
                 case KeyCode.Alpha2:
                     ev.Player.Jail.UnJailPlayer();
                     break;
+
+                case KeyCode.Alpha3:
+                    var msg = $"All Gameobject on MapSeed: {SynapseController.Server.Map.Seed}";
+
+                    foreach (var go in SynapseController.Server.GetObjectsOf<GameObject>())
+                        msg += $"\n{go.name} - Position: {go.transform.position}";
+
+                    var path = Path.Combine(SynapseController.Server.Files.SynapseDirectory, "Gameobjects.txt");
+
+                    if (!File.Exists(path))
+                        File.Create(path).Close();
+
+                    File.WriteAllText(path,msg);
+                    break;
+
+                case KeyCode.Alpha4:
+                    msg = "All Rooms:";
+
+                    foreach (var room in SynapseController.Server.Map.Rooms)
+                        msg += $"\nName:{room.RoomName} Zone:{room.Zone} Type:{room.RoomType}";
+
+                    ev.Player.SendConsoleMessage(msg);
+                    break;
             }
         }
 

Synapse/Api/Events/PlayerEvents.cs

@@ -32,7 +32,7 @@ internal PlayerEvents() {}
 
         public event EventHandler.OnSynapseEvent<PlayerHealEventArgs> PlayerHealEvent;
 
-        public event EventHandler.OnSynapseEvent<PlayerEscapeEventArgs> PlayerEscapseEvent;
+        public event EventHandler.OnSynapseEvent<PlayerEscapeEventArgs> PlayerEscapesEvent;
 
         public event EventHandler.OnSynapseEvent<PlayerSyncDataEventArgs> PlayerSyncDataEvent;
 
@@ -168,7 +168,7 @@ internal void InvokePlayerEscapeEvent(Player player, ref RoleType spawnRoleType,
                 IsCuffed = isCuffed,
                 SpawnRole = spawnRoleType
             };
-            PlayerEscapseEvent?.Invoke(ev);
+            PlayerEscapesEvent?.Invoke(ev);
 
             spawnRoleType = ev.SpawnRole;
             allow = ev.Allow;

Synapse/Api/Items/SynapseItem.cs

@@ -56,6 +56,20 @@ public SynapseItem(ItemType item, float durability, int sight, int barrel, int o
 
         public readonly string Name;
 
+        public Enum.ItemState State
+        {
+            get
+            {
+                if (deactivated) return Enum.ItemState.Destroyed;
+
+                if (ItemHolder != null) return Enum.ItemState.Inventory;
+
+                if (pickup != null) return Enum.ItemState.Map;
+
+                return Enum.ItemState.Despawned;
+            }
+        }
+
         public Player ItemHolder { get; private set; }
 
         private float durabillity;
@@ -171,9 +185,7 @@ public void PickUp(Player player)
 
             if (ItemHolder != null) return;
 
-            if (player.VanillaItems.Count >= 8) return;
-
-            if(!IsCustomItem && (ItemType == ItemType.Ammo556 || ItemType == ItemType.Ammo762 || ItemType == ItemType.Ammo9mm))
+            if (!IsCustomItem && (ItemType == ItemType.Ammo556 || ItemType == ItemType.Ammo762 || ItemType == ItemType.Ammo9mm))
             {
                 switch (ItemType)
                 {
@@ -194,6 +206,8 @@ public void PickUp(Player player)
                 return;
             }
 
+            if (player.VanillaItems.Count >= 8) return;
+
             Inventory._uniqId++;
             itemInfo = new Inventory.SyncItemInfo()
             {

Synapse/Api/Map.cs

@@ -103,7 +103,7 @@ public void Explode(Vector3 position)
         {
             var component = Server.Get.Host.GetComponent<Grenades.GrenadeManager>();
             var component2 = Object.Instantiate(component.availableGrenades[0].grenadeInstance).GetComponent<Grenades.Grenade>();
-            component2.FullInitData(component, position, Quaternion.identity, Vector3.zero, Vector3.zero);
+            component2.FullInitData(component, position, Quaternion.identity, Vector3.zero, Vector3.zero,Team.RIP);
             component2.NetworkfuseTime = 0.10000000149011612;
             NetworkServer.Spawn(component2.gameObject);
         }
@@ -113,7 +113,7 @@ internal void AddObjects()
             foreach (var tesla in SynapseController.Server.GetObjectsOf<TeslaGate>())
                 SynapseController.Server.Map.Teslas.Add(new Tesla(tesla));
 
-            foreach (var room in SynapseController.Server.GetObjectsOf<Transform>().Where(x => x.CompareTag("Room") || x.name == "Root_*&*Outside Cams" || x.name == "PocketWorld" || x.name == "Start Positions"))
+            foreach (var room in SynapseController.Server.GetObjectsOf<Transform>().Where(x => x.CompareTag("Room") || x.name == "Root_*&*Outside Cams" || x.name == "PocketWorld"))
                 Rooms.Add(new Room(room.gameObject));
 
             foreach (var station in Server.Get.GetObjectsOf<global::WorkStation>())

Synapse/Api/Player.cs

@@ -27,6 +27,7 @@ internal Player()
             Jail = new Jail(this);
             ActiveBroadcasts = new BroadcastList(this);
             Inventory = new PlayerInventory(this);
+            GrenadeManager = GetComponent<Grenades.GrenadeManager>();
         }
 
         #region Methods
@@ -102,8 +103,10 @@ public void RaLogout()
             Hub.serverRoles.TargetCloseRemoteAdmin(Connection);
         }
 
+        public void Heal(float hp) => PlayerStats.HealHPAmount(hp);
+
         public void Hurt(int amount, DamageTypes.DamageType damagetype = default, Player attacker = null) =>
-            PlayerStats.HurtPlayer(new PlayerStats.HitInfo(amount, attacker == null ? "WORLD" : attacker.NickName, damagetype, attacker == null ? PlayerId : attacker.PlayerId), attacker == null ? gameObject : attacker.gameObject);
+            PlayerStats.HurtPlayer(new PlayerStats.HitInfo(amount, attacker == null ? "WORLD" : attacker.NickName, damagetype, attacker == null ? 0 : attacker.PlayerId), gameObject);
 
         public void SendToServer(ushort port)
         {
@@ -167,6 +170,9 @@ public void ShakeScreen(bool achieve = false)
 
         public Broadcast SendBroadcast(ushort time,string message,bool instant = false)
         {
+            if(this == Server.Get.Host)
+                Logger.Get.Send($"Broadcast: {message}", ConsoleColor.White);
+
             var bc = new Broadcast(message, time,this);
             ActiveBroadcasts.Add(bc, instant);
             return bc;
@@ -440,7 +446,20 @@ public RoleType RoleType
 
         public Room Room
         {
-            get => SynapseController.Server.Map.Rooms.OrderBy(x => Vector3.Distance(x.Position, Position)).FirstOrDefault();
+            get
+            {
+                var pos = Position;
+                pos.y -= 50f;
+
+                if (Physics.Linecast(Position,pos,out var info, -84058629) && info.transform != null)
+                {
+                    var room = Map.Get.Rooms.FirstOrDefault(x => x.GameObject == info.transform.gameObject);
+                    if (room != null)
+                        return room;
+                }
+
+                return SynapseController.Server.Map.Rooms.OrderBy(x => Vector3.Distance(x.Position, Position)).FirstOrDefault();
+            }
             set => Position = value.Position;
         }
 
@@ -632,9 +651,9 @@ public CommandSender CommandSender
 
         public bool IsDead => Team == Team.RIP;
 
-        public bool IsZooming => Hub.weaponManager.ZoomInProgress();
+        public bool IsZooming => WeaponManager.ZoomInProgress();
 
-        public bool IsReloading => Hub.weaponManager.IsReloading();
+        public bool IsReloading => WeaponManager.IsReloading();
 
         public bool IsCuffed => Cuffer != null;
 
@@ -662,6 +681,10 @@ public CommandSender CommandSender
         #region ReferenceHub
         public Transform CameraReference => Hub.PlayerCameraReference;
 
+        public Grenades.GrenadeManager GrenadeManager { get; }
+
+        public WeaponManager WeaponManager => Hub.weaponManager;
+
         public AmmoBox AmmoBox => Hub.ammoBox;
 
         public HintDisplay HintDisplay => Hub.hints;

Synapse/Api/Plugin/Processors/ConfigInjector.cs

@@ -16,14 +16,30 @@ public void Process(PluginLoadContext context)
                     if (configAttribute == null) continue;
                     var section = configAttribute.section;
                     Type t = FieldInfo.GetFieldFromHandle(field.FieldHandle).FieldType;
-                    if (section == null) section = t.FullName?.Replace("."," ");
+                    if (section == null) section = t.FullName?.Replace(".", " ");
 
                     if (!typeof(IConfigSection).IsAssignableFrom(t))
                         continue;
 
                     object typeObj = Activator.CreateInstance(t);
                     object config = SynapseController.Server.Configs.GetOrSetDefault(section, typeObj);
-                    field.SetValue(context.Plugin,config);
+                    field.SetValue(context.Plugin, config);
+                }
+
+                foreach (var property in context.PluginType.GetProperties())
+                {
+                    var configAttribute = property.GetCustomAttribute<Config>();
+                    if (configAttribute == null) continue;
+                    var section = configAttribute.section;
+                    Type t = property.PropertyType;
+                    if (section == null) section = t.FullName?.Replace(".", " ");
+
+                    if (!typeof(IConfigSection).IsAssignableFrom(t))
+                        continue;
+
+                    object typeObj = Activator.CreateInstance(t);
+                    object config = SynapseController.Server.Configs.GetOrSetDefault(section, typeObj);
+                    property.SetValue(context.Plugin, config);
                 }
             }
             catch (Exception e)

Synapse/Api/Roles/RoleManager.cs

@@ -13,7 +13,7 @@ internal RoleManager() { }
 
         internal void Init()
         {
-            SynapseController.Server.Events.Player.PlayerEscapseEvent += OnEscape;
+            SynapseController.Server.Events.Player.PlayerEscapesEvent += OnEscape;
             SynapseController.Server.Events.Player.PlayerLeaveEvent += OnLeave;
             SynapseController.Server.Events.Player.PlayerEnterFemurEvent += OnFemur;
             SynapseController.Server.Events.Server.RemoteAdminCommandEvent += OnRa;