improve bloodfueled & serpents

CustomClasses/BloodFueledManager.cs

@@ -1,8 +1,11 @@
+using CustomPlayerEffects;
+using InventorySystem.Items.Usables.Scp330;
 using LabApi.Events.Handlers;
 using LabApi.Features.Wrappers;
 using MEC;
 using PlayerRoles.FirstPersonControl;
 using PlayerRoles.PlayableScps.Scp939;
+using static LabApi.Features.Wrappers.Server;
 using Logger = LabApi.Features.Console.Logger;
 using Random = System.Random;
 
@@ -32,8 +35,6 @@ public class BloodFueledStaminaEffect : CustomPlayerEffect, IStaminaModifier
 
 public class BloodFueledManager
 {
-    private readonly CustomClasses _plugin;
-    
     public static bool IsBloodFueled(Player player)
     {
         try
@@ -46,9 +47,8 @@ public class BloodFueledManager
         }
     }
 
-    public BloodFueledManager(CustomClasses plugin)
+    public BloodFueledManager()
     {
-        _plugin = plugin;
         PlayerEvents.Hurt += ev =>
         {
             if (ev.DamageHandler is not Scp939DamageHandler damageHandler) return;
@@ -56,6 +56,13 @@ public class BloodFueledManager
             if (attacker == null) return;
             if (!IsBloodFueled(attacker)) return;
 
+            var isAffectedByBloodCloud = Scp939AmnesticCloudInstance.ActiveInstances.Where(x=>x.Owner && x.Owner == ev.Attacker?.ReferenceHub).Any(x=>x.AffectedPlayers.Contains(ev.Player.ReferenceHub));
+
+            if (isAffectedByBloodCloud)
+            {
+                attacker.Heal(10);
+                attacker.StaminaRemaining += 0.1f;
+            }
             
             if (ev.Player.Health <= 0)
             {
@@ -69,6 +76,34 @@ public class BloodFueledManager
         };
 
         Timing.RunCoroutine(DrainBlood());
+        
+        PlayerEvents.EnteringHazard += ev =>
+        {
+            if (ev.Hazard is not AmnesticCloudHazard amnesticCloud) return;
+            if (amnesticCloud.Owner == null || !IsBloodFueled(amnesticCloud.Owner)) return;
+
+            ev.Player.EnableEffect<Invigorated>(1, float.PositiveInfinity);
+        };
+
+        PlayerEvents.StayingInHazard += ev =>
+        {
+            if (ev.Hazard is not AmnesticCloudHazard amnesticCloud) return;
+            if (amnesticCloud.Owner == null || !IsBloodFueled(amnesticCloud.Owner)) return;
+            
+            foreach (var affectedPlayer in ev.AffectedPlayers)
+            {
+                // ReSharper disable once PossibleLossOfFraction
+                affectedPlayer.Heal(10 / MaxTps);
+            }
+        };
+
+        PlayerEvents.LeavingHazard += ev =>
+        {
+            if (ev.Hazard is not AmnesticCloudHazard amnesticCloud) return;
+            if (amnesticCloud.Owner == null || !IsBloodFueled(amnesticCloud.Owner)) return;
+            
+            ev.Player.DisableEffect<Invigorated>();
+        };
     }
 
     public static IEnumerator<float> DrainBlood()
@@ -99,8 +134,8 @@ public class BloodFueledHandler : CustomClassHandler
 {
     public override void HandleSpawn(Player player, CustomClassConfig config, Random random)
     {
-        player.SendBroadcast("You are the <color=#6e2e99>Blood Fueled</color>!", CustomClasses.BroadcastDuration);
+        player.SendBroadcast("You are SCP-939-<color=#C50000>Blood Fueled</color> \n Your stamina bar has been replaced by a <color=#C50000>blood meter</color>. \n You refill it by <color=#C50000>damaging</color> or <color=#C50000>killing</color> Humans. \n <color=#C50000><b>Don't let it run out.</color></b>", CustomClasses.BroadcastDuration);
-        const string customInfo = "<color=#A0A0A0>Blood Fueled</color>";
+        const string customInfo = "<color=#C50000>Blood Fueled</color>";
         if (!Player.ValidateCustomInfo(customInfo, out var reason))
         {
             Logger.Error($"Invalid custom info for Blood Fueled: {reason}");

CustomClasses/CustomClasses.cs

@@ -17,7 +17,6 @@ using LabApi.Loader.Features.Plugins;
 using MapGeneration;
 using MEC;
 using PlayerRoles;
-using PlayerRoles.PlayableScps.Scp106;
 using Scp914.Processors;
 using UnityEngine;
 using Logger = LabApi.Features.Console.Logger;
@@ -35,7 +34,7 @@ public sealed class CustomClasses : Plugin
     public readonly CustomClassManager ClassManager = new();
     public SerpentsHandManager SerpentsHandManager;
     public NegromancerManager NegromancerManager;
-    public BloodFueledManager BloodFueledManager;
+    public BloodFueledManager BloodFueledManager = new();
 
     /// <inheritdoc/>
     public override string Name => "CustomClasses";
@@ -160,7 +159,6 @@ public sealed class CustomClasses : Plugin
         }
         
         NegromancerManager = new NegromancerManager(this);
-        BloodFueledManager = new BloodFueledManager(this);
         
         Instance = this;
     }
@@ -223,8 +221,7 @@ public sealed class CustomClasses : Plugin
         {
             if (random.Next(0, 100) > SerpentsHandConfig.BaseChance + state.ExtraChance)
             {
-                state.SetSpawned();
+                SerpentsHandManager.SpawnSerpentWave();
-                state.SetWillSpawn();
 
                 ClassManager.TryHandleSpawn(spectator, ScoutConfig, typeof(ScoutConfig), () =>
                 {
@@ -370,7 +367,7 @@ public class CustomClassManager
     /// <param name="position">The base position.</param>
     public void TeleportPlayerToAround(Player player, Vector3 position)
     {
-        player.Position = position + new Vector3(0, 1, 0) + new Vector3((float)(_random.NextDouble() * 2 - 1), 0, (float)(_random.NextDouble() * 2 - 1));
+        player.Position = position + new Vector3(0, 0.5f, 0) + new Vector3((float)(_random.NextDouble() * 2 - 1), 0, (float)(_random.NextDouble() * 2 - 1));
     }
 
     /// <summary>

CustomClasses/ExtendedClass.cs

@@ -0,0 +1,8 @@
+using PlayerRoles;
+
+namespace CustomClasses;
+
+public abstract class ExtendedClass: PlayerRoleBase
+{
+    
+}

CustomClasses/SerpentsHandManager.cs

@@ -1,3 +1,4 @@
+using AdminToys;
 using CommandSystem;
 using CustomPlayerEffects;
 using HintServiceMeow.Core.Enum;
@@ -9,16 +10,29 @@ using LabApi.Events.Handlers;
 using LabApi.Features.Permissions;
 using LabApi.Features.Wrappers;
 using MEC;
+using Mirror;
 using PlayerRoles;
 using UnityEngine;
+using LightSourceToy = LabApi.Features.Wrappers.LightSourceToy;
 using Logger = LabApi.Features.Console.Logger;
+using PrimitiveObjectToy = LabApi.Features.Wrappers.PrimitiveObjectToy;
 using Random = System.Random;
 
 namespace CustomClasses;
 
 public class SerpentsHandManager
 {
-    public static bool IsSerpentsHand(Player player) => player.CustomInfo.Contains("SerpentsHand");
+    public static bool IsSerpentsHand(Player player)
+    {
+        try
+        {
+            return player.CustomInfo.Contains("SerpentsHand");
+        }
+        catch
+        {
+            return false;
+        }
+    }
     
     private readonly CustomClasses _customClasses;
     public SerpentsHandManager(CustomClasses customClasses)
@@ -114,8 +128,6 @@ public class SerpentsHandManager
         {
             yield return Timing.WaitForSeconds(1);
             
-            RoundSummary.singleton.ExtraTargets = Player.ReadyList.Count(IsSerpentsHand);
-
             if (_customClasses.ClassManager.GetSpawnState(typeof(SerpentsHandConfig)) is not SerpentsHandState state) continue;
 
             foreach (var player in Player.ReadyList)
@@ -138,19 +150,63 @@ public class SerpentsHandManager
         }
         // ReSharper disable once IteratorNeverReturns
     }
+
+    public void SpawnSerpentWave()
+    {
+        var state = (SerpentsHandState)CustomClasses.Instance.ClassManager.GetSpawnState(typeof(SerpentsHandConfig));
+
+        var serpentsHandConfig = _customClasses.SerpentsHandConfig;
+        
+        state.SetSpawned();
+        state.SetWillSpawn();
+
+        var possibleLocations = (Vector3[])serpentsHandConfig.SpawnLocations.Clone();
+
+        possibleLocations.ShuffleListSecure();
+
+        var spawnLocation = possibleLocations[0];
+                
+        foreach (var possibleLocation in possibleLocations)
+        {
+            if (Player.ReadyList.Any(p => (p.Position - possibleLocation).SqrMagnitudeIgnoreY() < 400))
+            {
+                continue;
+            }
+
+            spawnLocation = possibleLocation;
+            break;
+        }
+
+        state.SpawnLocation = spawnLocation;
+        
+        var light = LightSourceToy.Create(spawnLocation + new Vector3(0, 2, 0), Quaternion.identity);
+        light.Color = Color.blue;
+        light.Intensity = 3;
+        light.Range = 40;
+
+        var spaceTimeHole = PrimitiveObjectToy.Create(spawnLocation + new Vector3(0, 2, 0), Quaternion.identity);
+        spaceTimeHole.Color = new Color(44.7f, 73.7f, 83.1f, 0.5f);
+        spaceTimeHole.Flags = PrimitiveFlags.Visible;
+        spaceTimeHole.Scale *= 2;
+
+        Timing.CallDelayed(20, () =>
+        {
+            spaceTimeHole.Destroy();
+            light.Destroy();
+        });
+    }
 }
 
 public sealed record SerpentsHandState: SpawnState
 {
-    public bool HasSpawned => _hasSpawned || PanicDisable || Warhead.IsDetonated;
+    public bool HasSpawned => _hasSpawned || Warhead.IsDetonated;
     public float ExtraChance;
     public int Points;
-    public bool WillSpawn => _willSpawn && !PanicDisable && !Warhead.IsDetonated;
+    public bool WillSpawn => _willSpawn && !Warhead.IsDetonated;
     
     private bool _hasSpawned;
     private bool _willSpawn;
-
+    public Vector3? SpawnLocation;
-    public bool PanicDisable;
     
     public override void Reset()
     {
@@ -159,6 +215,7 @@ public sealed record SerpentsHandState: SpawnState
         ExtraChance = 0f;
         Points = 0;
         _willSpawn = false;
+        SpawnLocation = null;
     }
     
     public void SetSpawned()
@@ -184,7 +241,9 @@ public sealed class SerpentsHandConfig : CustomClassConfig
     public override RoleTypeId RequiredRole { get; set; } = RoleTypeId.Tutorial;
     public override ItemType[] Items { get; set; } = [ItemType.Painkillers, ItemType.Medkit, ItemType.ArmorCombat];
 
-    public const float BaseChance = 20f;
+    public const float BaseChance = 90f;
+
+    public readonly Vector3[] SpawnLocations = [new(0.22f, 300.96f, -0.31f), new(123.921f, 288.792f, 20.929f)];
 }
 
 public class SerpentsHandHandler : SimpleAddItemHandler
@@ -193,9 +252,11 @@ public class SerpentsHandHandler : SimpleAddItemHandler
     {
         base.HandleSpawn(player, config, random);
         
-        // player.Position = new Vector3(123.921f + (float)(random.NextDouble() * 2 - 1), 288.792f, 20.929f + (float)(random.NextDouble() * 2 - 1));
+        var spawnLocation = ((SerpentsHandState)CustomClasses.Instance.ClassManager.GetSpawnState(
-        
+            typeof(SerpentsHandConfig))).SpawnLocation;
-        player.Position = new Vector3(0.22f + (float)(random.NextDouble() * 2 - 1), 300.96f, -0.31f + (float)(random.NextDouble() * 2 - 1));
+        if (spawnLocation !=
+            null)
+            CustomClasses.Instance.ClassManager.TeleportPlayerToAround(player, (Vector3)spawnLocation);
 
         ItemType[] guns = [ItemType.GunAK, ItemType.GunE11SR, ItemType.GunCrossvec];
         var gun = guns[random.Next(0, guns.Length-1)];
@@ -233,52 +294,37 @@ public class SerpentsHandHandler : SimpleAddItemHandler
         player.EnableEffect<MovementBoost>(20, 30);
         
         player.SendBroadcast("You're a <color=#2E8B57>Serpent's Hand</color> member!", CustomClasses.BroadcastDuration);
-    }
-}
         
+        player.EnableEffect<SpawnProtected>(1, 20f);
+    }
+}
 
 [CommandHandler(typeof(RemoteAdminCommandHandler))]
-public class PanicDisableRemoteAdminCommand : ICommand
-{
-    public string Command => "panicdisableserpentshand";
-    public string[] Aliases => [];
-    public string Description => "Panic disable Serpents Hand.";
-
-    public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
-    {
-        var state = (SerpentsHandState)CustomClasses.Instance.ClassManager.GetSpawnState(typeof(SerpentsHandConfig));
-        state.PanicDisable = true;
-
-        response = "Serpents Hand has been disabled.";
-        return true;
-    }
-}
-
 [CommandHandler(typeof(ClientCommandHandler))]
-public class PanicDisableCommand : ICommand
+public class SpawnSerpentsCommand : ICommand
 {
-    public string Command => "panicdisableserpentshand";
+    public string Command => "spsh";
     public string[] Aliases => [];
-    public string Description => "Panic disable Serpents Hand.";
+    public string Description => "Makes sure serpents hand spawns";
 
     public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
     {
-        if (!Player.TryGet(sender, out var player))
+        var executor = Player.Get(sender);
+        if (executor == null)
         {
             response = "You must be a player to use this command!";
             return false;
         }
 
-        if (!player.HasPermissions("panicdisable.serpentshand") && player.UserId != "76561198372587687@steam")
+        if (!executor.HasPermissions("customclasses.setcustomclass"))
         {
-            response = "You must have the permission to use this command!";
+            response = "You do not have permission to use this command!";
             return false;
         }
         
-        var state = (SerpentsHandState)CustomClasses.Instance.ClassManager.GetSpawnState(typeof(SerpentsHandConfig));
+        CustomClasses.Instance.SerpentsHandManager.SpawnSerpentWave();
-        state.PanicDisable = true;
 
-        response = "Serpents Hand has been disabled.";
+        response = "success";
         return true;
     }
 }

build_deploy.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+./build.sh
+./deploy.sh