From 5fb601f74176222ce30df3502ff0bc3a3bf5caa7 Mon Sep 17 00:00:00 2001 From: Jesus-QC Date: Mon, 3 Jan 2022 20:14:11 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BetterDrops/BetterDrops.cs | 2 +- BetterDrops/Commands/SpawnCommand.cs | 7 +++++-- BetterDrops/Features/Components/DropController.cs | 6 ++++-- BetterDrops/PluginConfig.cs | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/BetterDrops/BetterDrops.cs b/BetterDrops/BetterDrops.cs index b71498a..7ad8af3 100644 --- a/BetterDrops/BetterDrops.cs +++ b/BetterDrops/BetterDrops.cs @@ -12,7 +12,7 @@ public class BetterDrops : Plugin public override string Author { get; } = "Jesus-QC"; public override string Name { get; } = "BetterDrops"; public override string Prefix { get; } = "better_drops"; - public override Version Version { get; } = new Version(1, 0, 1); + public override Version Version { get; } = new Version(1, 0, 2); public override Version RequiredExiledVersion { get; } = new Version(4, 1, 7); public static PluginConfig Cfg; diff --git a/BetterDrops/Commands/SpawnCommand.cs b/BetterDrops/Commands/SpawnCommand.cs index 71a030e..f3859ba 100644 --- a/BetterDrops/Commands/SpawnCommand.cs +++ b/BetterDrops/Commands/SpawnCommand.cs @@ -11,7 +11,7 @@ namespace BetterDrops.Commands public class SpawnCommand : ICommand { public string Command { get; } = "SpawnDrop"; - public string[] Aliases { get; } = {}; + public string[] Aliases { get; } = Array.Empty(); public string Description { get; } = "Spawns drops"; public bool Execute(ArraySegment arguments, ICommandSender sender, out string response) @@ -34,9 +34,12 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s new Drop(Team.MTF.GetRandomDropSpawnPoint()).Spawn(); else if (arguments.At(0).ToLower() == "chaos") new Drop(Team.CHI.GetRandomDropSpawnPoint()).Spawn(); + + response = "Done!"; + return true; } - else if(arguments.Count > 2) + if(arguments.Count > 2) { if (!float.TryParse(arguments.At(0), out var x) || !float.TryParse(arguments.At(1), out var y) || !float.TryParse(arguments.At(2), out var z)) { diff --git a/BetterDrops/Features/Components/DropController.cs b/BetterDrops/Features/Components/DropController.cs index 29e0596..acf0ce1 100644 --- a/BetterDrops/Features/Components/DropController.cs +++ b/BetterDrops/Features/Components/DropController.cs @@ -19,6 +19,8 @@ private void Start() ChangeLayers(transform, BetterDrops.Cfg.DropLayer); _rigidbody = gameObject.AddComponent(); + _rigidbody.mass = 20; + _rigidbody.drag = 3; _rigidbody.constraints = RigidbodyConstraints.FreezeRotationZ | RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionZ; } @@ -62,10 +64,10 @@ private void OnTriggerEnter(Collider other) foreach (var face in faces) { var r = face.AddComponent(); - r.AddExplosionForce(5, transform.position, 1); + r.AddExplosionForce(20, transform.position, 1); } - BetterDrops.EventManager.Coroutines.Add(Timing.CallDelayed(30, () => Destroy(gameObject))); + BetterDrops.EventManager.Coroutines.Add(Timing.CallDelayed(5, () => Destroy(gameObject))); } private static void ChangeLayers(Transform t, int layer) diff --git a/BetterDrops/PluginConfig.cs b/BetterDrops/PluginConfig.cs index fd63827..a9b6c61 100644 --- a/BetterDrops/PluginConfig.cs +++ b/BetterDrops/PluginConfig.cs @@ -12,7 +12,7 @@ public class PluginConfig : IConfig public int DropLayer { get; set; } = 6; [Description("The possible items inside the drop")] - public List PossibleItems { get; set; } = new List {ItemType.Coal, ItemType.Coin, ItemType.GunCrossvec, ItemType.GunLogicer, ItemType.GunRevolver, ItemType.GunShotgun, ItemType.GunAK, ItemType.GunCOM15, ItemType.GunE11SR, ItemType.Ammo9x19, ItemType.Ammo12gauge, ItemType.Adrenaline, ItemType.Flashlight, ItemType.Medkit, ItemType.GrenadeFlash, ItemType.GrenadeHE}; + public List PossibleItems { get; set; } = new List {ItemType.Coin, ItemType.GunCrossvec, ItemType.GunLogicer, ItemType.GunRevolver, ItemType.GunShotgun, ItemType.GunAK, ItemType.GunCOM15, ItemType.GunE11SR, ItemType.Ammo9x19, ItemType.Ammo12gauge, ItemType.Adrenaline, ItemType.Flashlight, ItemType.Medkit, ItemType.GrenadeFlash, ItemType.GrenadeHE}; [Description("Should drops spawn on MTFs spawns")] public bool MtfDrops { get; set; } = true;