diff --git a/Commands/PluginEnable.cs b/Commands/PluginEnable.cs index 3bbe794..ae0f08b 100644 --- a/Commands/PluginEnable.cs +++ b/Commands/PluginEnable.cs @@ -83,11 +83,6 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s } } - Timing.CallDelayed(5f, () => - { - VeryUsualDay.Instance.SupplyBoxCoords = Room.Get(RoomType.EzGateB).Position + new Vector3(-6.193f, 2.243f, -5.901f); - }); - if (VeryUsualDay.Instance.Config.AuthToken != "") { foreach (var player in Player.List) @@ -105,10 +100,28 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s } } } - + + VeryUsualDay.Instance.SupplyBoxCoords = Room.Get(RoomType.EzGateB).Position + new Vector3(-6.193f, 2.243f, -5.901f); + + if (Room.Get(RoomType.Lcz173).Rotation == new Quaternion(0, 1, 0, 0)) + { + VeryUsualDay.Instance.VaseCoords = Room.Get(RoomType.Lcz173).Position + new Vector3(-20.193f, 13.6f, -8f); + } + else if (Room.Get(RoomType.Lcz173).Rotation == new Quaternion(0, 0.70711f, 0, 0.70711f)) + { + VeryUsualDay.Instance.VaseCoords = Room.Get(RoomType.Lcz173).Position + new Vector3(8f, 13.6f, -20.193f); + } + else if (Room.Get(RoomType.Lcz173).Rotation == new Quaternion(0, 0, 0, 1)) + { + VeryUsualDay.Instance.VaseCoords = Room.Get(RoomType.Lcz173).Position + new Vector3(20.193f, 13.6f, 8f); + } + else if (Room.Get(RoomType.Lcz173).Rotation == new Quaternion(0, 0.70711f, 0, -0.70711f)) + { + VeryUsualDay.Instance.VaseCoords = Room.Get(RoomType.Lcz173).Position + new Vector3(8f, 13.6f, 20.193f); + } var vase = Item.Create(ItemType.SCP244a); vase.Scale = new Vector3(8f, 8f, 8f); - vase.CreatePickup(Room.Get(RoomType.Lcz173).Position + new Vector3(20.193f, 13.6f, 7.638f)); + vase.CreatePickup(VeryUsualDay.Instance.VaseCoords); response = "Режим FX включён."; } diff --git a/Commands/Spawn01922.cs b/Commands/Spawn01922.cs index 5ad7471..d90e9f7 100644 --- a/Commands/Spawn01922.cs +++ b/Commands/Spawn01922.cs @@ -7,7 +7,7 @@ namespace VeryUsualDay.Commands { [CommandHandler(typeof(RemoteAdminCommandHandler))] - public class Spawn01922 + public class Spawn01922 : ICommand { public string Command => "spawn019-2-2"; public string[] Aliases => new string[] { }; diff --git a/Utils/Scp01921.cs b/Utils/Scp01921.cs index 81ff3f9..27dbc3e 100644 --- a/Utils/Scp01921.cs +++ b/Utils/Scp01921.cs @@ -28,7 +28,7 @@ private void _spawn() User.Health = hp; User.Scale = new Vector3(0.6f, 0.6f, 0.6f); User.IsGodModeEnabled = false; - User.Teleport(Room.Get(RoomType.Lcz173).Position + new Vector3(20.193f, 13.7f, 7.638f)); + User.Teleport(VeryUsualDay.Instance.VaseCoords); VeryUsualDay.Instance.ScpPlayers.Add(User.Id, VeryUsualDay.Scps.Scp01921); }); diff --git a/Utils/Scp01922.cs b/Utils/Scp01922.cs index e309720..e504dd9 100644 --- a/Utils/Scp01922.cs +++ b/Utils/Scp01922.cs @@ -29,7 +29,7 @@ private void _spawn() User.Scale = new Vector3(0.6f, 0.6f, 0.6f); User.IsGodModeEnabled = false; User.EnableEffect(EffectType.Disabled); - User.Teleport(Room.Get(RoomType.Lcz173).Position + new Vector3(20.193f, 13.7f, 7.638f)); + User.Teleport(VeryUsualDay.Instance.VaseCoords); VeryUsualDay.Instance.ScpPlayers.Add(User.Id, VeryUsualDay.Scps.Scp01922); }); diff --git a/VeryUsualDay.cs b/VeryUsualDay.cs index bd78192..d2a46a8 100644 --- a/VeryUsualDay.cs +++ b/VeryUsualDay.cs @@ -28,7 +28,7 @@ public class VeryUsualDay : Plugin public override string Author => "JustMarfix"; public override string Name => "VeryUsualDay (FX Version)"; - public override Version Version => new Version(5, 0, 0); + public override Version Version => new Version(5, 1, 0); public bool IsEnabledInRound { get; set; } public bool IsLunchtimeActive { get; set; } @@ -51,6 +51,7 @@ public class VeryUsualDay : Plugin public readonly Vector3 SpawnPosition = new Vector3(139.487f, 995.392f, -16.762f); public static readonly Vector3 PrisonPosition = new Vector3(130.233f, 993.766f, 21.049f); public Vector3 SupplyBoxCoords = new Vector3(); + public Vector3 VaseCoords = new Vector3(); public readonly List EmfSupplyCoords = new List {