Merge pull request #42 from UncomplicatedCustomServer/Dev

4.1.0

Author: Mr-Baguetter

README.md

@@ -57,7 +57,7 @@
 
 ## Requirements
 
-- **LabApi** >= `v1.2.0` **or** **Exiled** >= `v9.9.2`
+- **LabApi** >= `v1.1.5` **or** **Exiled** >= `v9.9.2`
 
 ## Installation 
 #### LabApi:
@@ -78,67 +78,71 @@
 After installation, UCI will generate default configuration files in your server's config directory. Here's a basic example of creating a custom item:
 
 ```yaml
-# Sets the ID of the custom item. Custom items cannot share IDs.
 id: 2
-# Sets the name of the custom item.
 name: FunnyGun
-# Sets the description of the custom item. This is shown as part of a hint when the item is equipped or picked up.
 description: A weapon that has a shotgun-like bullet spread
-# The extended description of the custom item. Used by the `.customiteminfo` command
 extended_description: ''
-# Sets the badge name of the custom item. Remove the text in quotes to disable it.
 badge_name: FunnyGun
-# Sets the badge color of the custom item.
 badge_color: pumpkin
-# Sets the weight of the custom item. This affects movement speed when equipped.
 weight: 2
-# Sets the item the custom item will use.
 item: GunFRMG0
-# Sets the scale of the custom item when dropped.
 scale:
   x: 1
   y: 1
   z: 1
-# Defines the spawn settings for the custom item. Information on rooms can be found in the UCI Information forum on Discord.
 spawn:
-# If true, the custom item can spawn. If false, it will not.
   do_spawn: true
-  # The number of custom items to spawn.
   count: 1
   spawn_settings:
-  - chance: 30
-    rotation:
-      x: 0
-      y: 0
-      z: 0
-      w: 0
-    # The room(s) where the custom item can spawn.
-    dynamic_spawn:
-    - room: Lcz914
-      coords:
-        x: 1
-        y: 1
-        z: 1
-# Sets the custom flags of the custom item. Information about custom flags can be found in the UCI Information forum on Discord.
-custom_flags: InfiniteAmmo, ItemGlow, DistruptorTracer
-# Settings for the CustomFlags. You can remove any unused settings.
-flag_settings: []
+  - chance: 100
+    locker_settings:
+      enable: true
+      locker_type: RifleRack
+      room: HczWarhead
+      zone: HeavyContainment
+      chamber: MainChamber
+      offset:
+        x: 0
+        y: 0
+        z: 0
+  - chance: 100
+    locker_settings:
+      enable: true
+      locker_type: RifleRack
+      room: Hcz049
+      zone: HeavyContainment
+      chamber: MainChamber
+      offset:
+        x: 0
+        y: 0
+        z: 0
+custom_modules:
+  InfiniteAmmo: []
+  ItemGlow:
+  - GlowColor: '#00FF00'
+    range: 5
+    intensity: 2
+  DistruptorTracer: []
+  PickupHintOverride:
+  - hint: 'This is a funny gun!'
+    duration: 5
+  EquipHintOverride:
+  - hint: 'You have equipped the funny gun!'
+    duration: 5
 arguments:
   OnShotWeapon: action Example
   OnAimedWeapon: Player::Damage(10, "Test", 'AIMING')
-# Sets the custom data type the item will use.
 custom_item_type: Weapon
-# Specifies the modifications the custom item will have.
 custom_data:
   damage: 2.75
   max_ammo: 150
   max_magazine_ammo: 150
-  max_barrel_ammo: 100
+  max_barrel_ammo: 15
   penetration: 1.24000001
   inaccuracy: 1.24000001
   aiming_inaccuracy: 1.24000001
   damage_falloff_distance: 1
-  attachments: DotScope
+  attachments: DotSight
   enable_friendly_fire: false
 ```
 
@@ -195,7 +199,7 @@ Your donations help us maintain and improve our plugins for the entire SCP:SL co
 
 - **Mr. Baguetter**
   - Discord: `@ender1992`
-  - Email: `baguetter@thaumielscpsl.site`
+  - Email: `Mr.Baguetter1@gmail.com`
 
 ### Community
 

UncomplicatedCustomItems.sln

@@ -17,8 +17,8 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}.Debug|Any CPU.ActiveCfg = Exiled|Any CPU
-		{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}.Debug|Any CPU.Build.0 = Exiled|Any CPU
+		{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}.Debug|Any CPU.ActiveCfg = LabApi|Any CPU
+		{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}.Debug|Any CPU.Build.0 = LabApi|Any CPU
 		{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}.Debug|x64.ActiveCfg = LabApi|x64
 		{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}.Debug|x64.Build.0 = LabApi|x64
 		{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}.Exiled|Any CPU.ActiveCfg = Exiled|Any CPU

UncomplicatedCustomItems/API/Components/CollisionHandler.cs

@@ -1,6 +1,17 @@
+// -----------------------------------------------------------------------
+// <copyright file="CollisionHandler.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+// This file contains code originally licensed under CC BY-SA 3.0.
+// Modifications and adaptations by UCSC are licensed under GNU AGPL v3.
+// See LICENSE file for full GNU AGPL v3 license text.
+// -----------------------------------------------------------------------
+
 using System;
 using InventorySystem.Items.ThrowableProjectiles;
-using UncomplicatedCustomItems.API.Features.Helper;
+using UncomplicatedCustomItems.API.Features.Manager;
 using UnityEngine;
 
 namespace UncomplicatedCustomItems.API.Components
@@ -9,9 +20,9 @@ public class CollisionHandler : MonoBehaviour
     {
         private bool initialized;
 
-        public GameObject Owner { get; private set; }
+        public GameObject? Owner { get; private set; }
 
-        public EffectGrenade Grenade { get; private set; }
+        public EffectGrenade? Grenade { get; private set; }
 
         public void Init(GameObject owner, ThrownProjectile grenade)
         {
@@ -38,17 +49,17 @@ private void OnCollisionEnter(Collision collision)
                     {
                         LogManager.Error("collision is null!");
                     }
-                    if (!collision.collider)
+                    if (!collision?.collider)
                     {
                         LogManager.Error("water :|");
                     }
-                    if (collision.collider.gameObject == null)
+                    if (collision?.collider.gameObject == null)
                     {
                         LogManager.Error("Null collider gameobject");
                     }
-                    if (!(collision.collider.gameObject == Owner) && !collision.collider.gameObject.TryGetComponent<EffectGrenade>(out var _))
+                    if (!(collision?.collider.gameObject == Owner) && !collision!.collider.gameObject.TryGetComponent<EffectGrenade>(out var _))
                     {
-                        Grenade.TargetTime = 0.10000000149011612;
+                        Grenade?.TargetTime = 0.10000000149011612;
                     }
                 }
             }

UncomplicatedCustomItems/API/Components/DebugUI.cs

@@ -22,8 +22,8 @@ public enum Segment
 
     public class DebugUI : MonoBehaviour
     {
-        private Player Player;
-        private StringBuilder Builder;
+        private Player? Player;
+        private StringBuilder? Builder;
         public readonly List<Segment> ActiveSegments = [];
 
         public void Init(Player player)
@@ -34,7 +34,7 @@ public void Init(Player player)
 
         private void Update()
         {
-            if (ActiveSegments.Count <= 0)
+            if (ActiveSegments.Count <= 0 || Builder == null || Player == null)
                 return;
 
             Builder.Clear();
@@ -59,19 +59,19 @@ public void AddSegment(Segment segment)
 
         private void HandleBaseSegment()
         {
-            if (!ActiveSegments.Contains(Segment.Base))
+            if (!ActiveSegments.Contains(Segment.Base) || Builder == null || Player == null)
                 return;
 
             Builder.AppendLine($"UCI Debug Menu {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
             Builder.AppendLine($"");
-            Builder.AppendLine($"Room Name: {Player.CachedRoom.Name}");
-            Builder.AppendLine($"Local Position: {Player.CachedRoom.LocalPosition(Player.Position)}");
-            Builder.AppendLine($"World Position: {Player.CachedRoom.Position}");
+            Builder.AppendLine($"Room Name: {Player.CachedRoom?.Name ?? RoomName.Unnamed}");
+            Builder.AppendLine($"Local Position: {Player.CachedRoom?.LocalPosition(Player.Position)}");
+            Builder.AppendLine($"World Position: {Player.CachedRoom?.Position}");
         }
 
         private void HandleTotalItemsSegment()
         {
-            if (!ActiveSegments.Contains(Segment.TotalItems))
+            if (!ActiveSegments.Contains(Segment.TotalItems) || Builder == null || Player == null)
                 return;
 
             Builder.AppendLine($"Total Custom Items: {CustomItem.List.Count()}");
@@ -82,13 +82,13 @@ private void HandleTotalItemsSegment()
 
         private void HandleZoneInformationSegment()
         {
-            if (!ActiveSegments.Contains(Segment.ZoneInformation))
+            if (!ActiveSegments.Contains(Segment.ZoneInformation) || Builder == null || Player == null)
                 return;
 
-            Builder.AppendLine($"Total Custom Items on Surface Zone: {SummonedCustomItem.List.Where(s => s.IsPickup && s.Pickup.Room.Zone == FacilityZone.Surface).Count() + SummonedAPICustomItem.List.Where(s => s.IsPickup && s.Pickup.Room.Zone == FacilityZone.Surface).Count()}");
-            Builder.AppendLine($"Total Custom Items in Entrance Zone: {SummonedCustomItem.List.Where(s => s.IsPickup && s.Pickup.Room.Zone == FacilityZone.Entrance).Count() + SummonedAPICustomItem.List.Where(s => s.IsPickup && s.Pickup.Room.Zone == FacilityZone.Entrance).Count()}");
-            Builder.AppendLine($"Total Custom Items in Heavy Containment Zone: {SummonedCustomItem.List.Where(s => s.IsPickup && s.Pickup.Room.Zone == FacilityZone.HeavyContainment).Count() + SummonedAPICustomItem.List.Where(s => s.IsPickup && s.Pickup.Room.Zone == FacilityZone.HeavyContainment).Count()}");
-            Builder.AppendLine($"Total Custom Items in Light Containment Zone: {SummonedCustomItem.List.Where(s => s.IsPickup && s.Pickup.Room.Zone == FacilityZone.LightContainment).Count() + SummonedAPICustomItem.List.Where(s => s.IsPickup && s.Pickup.Room.Zone == FacilityZone.LightContainment).Count()}");
+            Builder.AppendLine($"Total Custom Items on Surface Zone: {SummonedCustomItem.List.Where(s => s.IsPickup && s.Pickup!.Room!.Zone == FacilityZone.Surface).Count() + SummonedAPICustomItem.List.Where(s => s.IsPickup && s.Pickup!.Room!.Zone == FacilityZone.Surface).Count()}");
+            Builder.AppendLine($"Total Custom Items in Entrance Zone: {SummonedCustomItem.List.Where(s => s.IsPickup && s.Pickup!.Room!.Zone == FacilityZone.Entrance).Count() + SummonedAPICustomItem.List.Where(s => s.IsPickup && s.Pickup!.Room!.Zone == FacilityZone.Entrance).Count()}");
+            Builder.AppendLine($"Total Custom Items in Heavy Containment Zone: {SummonedCustomItem.List.Where(s => s.IsPickup && s.Pickup!.Room!.Zone == FacilityZone.HeavyContainment).Count() + SummonedAPICustomItem.List.Where(s => s.IsPickup && s.Pickup!.Room!.Zone == FacilityZone.HeavyContainment).Count()}");
+            Builder.AppendLine($"Total Custom Items in Light Containment Zone: {SummonedCustomItem.List.Where(s => s.IsPickup && s.Pickup!.Room!.Zone == FacilityZone.LightContainment).Count() + SummonedAPICustomItem.List.Where(s => s.IsPickup && s.Pickup!.Room!.Zone == FacilityZone.LightContainment).Count()}");
         }
     }
 }