From a99eb8f08a7856b9b3638d313f244ca17a5a60aa Mon Sep 17 00:00:00 2001 From: Mike <146554836+MikeSus1@users.noreply.github.com> Date: Thu, 19 Dec 2024 22:23:40 +0100 Subject: [PATCH 1/4] Fix EffectType --- EXILED/Exiled.API/Enums/EffectType.cs | 4 ++-- EXILED/Exiled.API/Extensions/EffectTypeExtension.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EXILED/Exiled.API/Enums/EffectType.cs b/EXILED/Exiled.API/Enums/EffectType.cs index b2894486ee..55c9d4021b 100644 --- a/EXILED/Exiled.API/Enums/EffectType.cs +++ b/EXILED/Exiled.API/Enums/EffectType.cs @@ -46,7 +46,7 @@ public enum EffectType /// /// Blurs the player's screen. /// - Blinded, + Blindness, /// /// Increases damage the player receives. Does not apply any standalone damage. @@ -256,7 +256,7 @@ public enum EffectType PitDeath, /// - /// . + /// Blurs the player's screen. /// Blurred, } diff --git a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs index 0b977356e1..c2acb00d39 100644 --- a/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs +++ b/EXILED/Exiled.API/Extensions/EffectTypeExtension.cs @@ -33,7 +33,7 @@ public static class EffectTypeExtension { EffectType.AmnesiaVision, typeof(AmnesiaVision) }, { EffectType.Asphyxiated, typeof(Asphyxiated) }, { EffectType.Bleeding, typeof(Bleeding) }, - { EffectType.Blinded, typeof(Blindness) }, + { EffectType.Blindness, typeof(Blindness) }, { EffectType.BodyshotReduction, typeof(BodyshotReduction) }, { EffectType.Burned, typeof(Burned) }, { EffectType.CardiacArrest, typeof(CardiacArrest) }, @@ -159,7 +159,7 @@ or EffectType.Corroding or EffectType.Decontaminating or EffectType.Hemorrhage o /// Whether the effect is a negative effect. /// public static bool IsNegative(this EffectType effect) => IsHarmful(effect) || effect is EffectType.AmnesiaItems - or EffectType.AmnesiaVision or EffectType.Blinded or EffectType.Burned or EffectType.Concussed or EffectType.Deafened + or EffectType.AmnesiaVision or EffectType.Blindness or EffectType.Burned or EffectType.Concussed or EffectType.Deafened or EffectType.Disabled or EffectType.Ensnared or EffectType.Exhausted or EffectType.Flashed or EffectType.SinkHole or EffectType.Stained or EffectType.InsufficientLighting or EffectType.SoundtrackMute or EffectType.Scanned or EffectType.Slowness; From de56a5b52e331fe5b5232651d1ef60232a31e011 Mon Sep 17 00:00:00 2001 From: Mike <146554836+MikeSus1@users.noreply.github.com> Date: Thu, 19 Dec 2024 22:30:42 +0100 Subject: [PATCH 2/4] fix: ref fix build --- EXILED/Exiled.API/Features/Items/FlashGrenade.cs | 2 +- EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs | 2 +- .../Features/Pickups/Projectiles/FlashbangProjectile.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EXILED/Exiled.API/Features/Items/FlashGrenade.cs b/EXILED/Exiled.API/Features/Items/FlashGrenade.cs index ccebfa394f..4077bb795d 100644 --- a/EXILED/Exiled.API/Features/Items/FlashGrenade.cs +++ b/EXILED/Exiled.API/Features/Items/FlashGrenade.cs @@ -59,7 +59,7 @@ public float MinimalDurationEffect } /// - /// Gets or sets the additional duration of the effect. + /// Gets or sets the additional duration of the effect. /// public float AdditionalBlindedEffect { diff --git a/EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs b/EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs index 3e4c979b50..d5d36d5fb6 100644 --- a/EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs +++ b/EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs @@ -42,7 +42,7 @@ internal FlashGrenadePickup() public float MinimalDurationEffect { get; set; } /// - /// Gets or sets the additional duration of the effect. + /// Gets or sets the additional duration of the effect. /// public float AdditionalBlindedEffect { get; set; } diff --git a/EXILED/Exiled.API/Features/Pickups/Projectiles/FlashbangProjectile.cs b/EXILED/Exiled.API/Features/Pickups/Projectiles/FlashbangProjectile.cs index 8c289c2840..9b57b8307d 100644 --- a/EXILED/Exiled.API/Features/Pickups/Projectiles/FlashbangProjectile.cs +++ b/EXILED/Exiled.API/Features/Pickups/Projectiles/FlashbangProjectile.cs @@ -51,7 +51,7 @@ public float MinimalDurationEffect } /// - /// Gets or sets the additional duration of the effect. + /// Gets or sets the additional duration of the effect. /// public float AdditionalBlindedEffect { From 77d91acc1a4afc1f0f13efc429f039acead482c5 Mon Sep 17 00:00:00 2001 From: Mike <146554836+MikeSus1@users.noreply.github.com> Date: Thu, 19 Dec 2024 22:54:16 +0100 Subject: [PATCH 3/4] Blinded > Blurred replace all blinded by blurred --- EXILED/Exiled.API/Features/Items/FlashGrenade.cs | 12 ++++++------ .../Features/Pickups/FlashGrenadePickup.cs | 8 ++++---- .../Pickups/Projectiles/FlashbangProjectile.cs | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/EXILED/Exiled.API/Features/Items/FlashGrenade.cs b/EXILED/Exiled.API/Features/Items/FlashGrenade.cs index 4077bb795d..8cae9335b8 100644 --- a/EXILED/Exiled.API/Features/Items/FlashGrenade.cs +++ b/EXILED/Exiled.API/Features/Items/FlashGrenade.cs @@ -61,10 +61,10 @@ public float MinimalDurationEffect /// /// Gets or sets the additional duration of the effect. /// - public float AdditionalBlindedEffect + public float AdditionalBlurredEffect { - get => Projectile.AdditionalBlindedEffect; - set => Projectile.AdditionalBlindedEffect = value; + get => Projectile.AdditionalBlurredEffect; + set => Projectile.AdditionalBlurredEffect = value; } /// @@ -105,7 +105,7 @@ public FlashbangProjectile SpawnActive(Vector3 position, Player owner = null) grenade.Base.gameObject.SetActive(true); grenade.MinimalDurationEffect = MinimalDurationEffect; - grenade.AdditionalBlindedEffect = AdditionalBlindedEffect; + grenade.AdditionalBlurredEffect = AdditionalBlurredEffect; grenade.SurfaceDistanceIntensifier = SurfaceDistanceIntensifier; grenade.FuseTime = FuseTime; @@ -125,7 +125,7 @@ public FlashbangProjectile SpawnActive(Vector3 position, Player owner = null) public override Item Clone() => new FlashGrenade() { MinimalDurationEffect = MinimalDurationEffect, - AdditionalBlindedEffect = AdditionalBlindedEffect, + AdditionalBlurredEffect = AdditionalBlurredEffect, SurfaceDistanceIntensifier = SurfaceDistanceIntensifier, FuseTime = FuseTime, Repickable = Repickable, @@ -145,7 +145,7 @@ internal override void ReadPickupInfo(Pickup pickup) if (pickup is FlashGrenadePickup flashGrenadePickup) { MinimalDurationEffect = flashGrenadePickup.MinimalDurationEffect; - AdditionalBlindedEffect = flashGrenadePickup.AdditionalBlindedEffect; + AdditionalBlurredEffect = flashGrenadePickup.AdditionalBlurredEffect; SurfaceDistanceIntensifier = flashGrenadePickup.SurfaceDistanceIntensifier; FuseTime = flashGrenadePickup.FuseTime; } diff --git a/EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs b/EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs index d5d36d5fb6..3cdb59898e 100644 --- a/EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs +++ b/EXILED/Exiled.API/Features/Pickups/FlashGrenadePickup.cs @@ -44,7 +44,7 @@ internal FlashGrenadePickup() /// /// Gets or sets the additional duration of the effect. /// - public float AdditionalBlindedEffect { get; set; } + public float AdditionalBlurredEffect { get; set; } /// /// Gets or sets the how mush the flash grenade going to be intensified when explode at . @@ -58,7 +58,7 @@ internal override void ReadItemInfo(Item item) if (item is FlashGrenade flashGrenadeitem) { MinimalDurationEffect = flashGrenadeitem.MinimalDurationEffect; - AdditionalBlindedEffect = flashGrenadeitem.AdditionalBlindedEffect; + AdditionalBlurredEffect = flashGrenadeitem.AdditionalBlurredEffect; SurfaceDistanceIntensifier = flashGrenadeitem.SurfaceDistanceIntensifier; FuseTime = flashGrenadeitem.FuseTime; } @@ -70,7 +70,7 @@ internal override void WriteProjectileInfo(Projectile projectile) if (projectile is FlashbangProjectile flashbangProjectile) { flashbangProjectile.MinimalDurationEffect = MinimalDurationEffect; - flashbangProjectile.AdditionalBlindedEffect = AdditionalBlindedEffect; + flashbangProjectile.AdditionalBlurredEffect = AdditionalBlurredEffect; flashbangProjectile.SurfaceDistanceIntensifier = SurfaceDistanceIntensifier; flashbangProjectile.FuseTime = FuseTime; } @@ -83,7 +83,7 @@ protected override void InitializeProperties(ItemBase itemBase) if (itemBase is ThrowableItem throwable && throwable.Projectile is FlashbangGrenade flashGrenade) { MinimalDurationEffect = flashGrenade._minimalEffectDuration; - AdditionalBlindedEffect = flashGrenade._additionalBlurDuration; + AdditionalBlurredEffect = flashGrenade._additionalBlurDuration; SurfaceDistanceIntensifier = flashGrenade._surfaceZoneDistanceIntensifier; } } diff --git a/EXILED/Exiled.API/Features/Pickups/Projectiles/FlashbangProjectile.cs b/EXILED/Exiled.API/Features/Pickups/Projectiles/FlashbangProjectile.cs index 9b57b8307d..8d30856743 100644 --- a/EXILED/Exiled.API/Features/Pickups/Projectiles/FlashbangProjectile.cs +++ b/EXILED/Exiled.API/Features/Pickups/Projectiles/FlashbangProjectile.cs @@ -53,7 +53,7 @@ public float MinimalDurationEffect /// /// Gets or sets the additional duration of the effect. /// - public float AdditionalBlindedEffect + public float AdditionalBlurredEffect { get => Base._additionalBlurDuration; set => Base._additionalBlurDuration = value; From b2448f79721a62c54297259a5afcb744fa1f83f0 Mon Sep 17 00:00:00 2001 From: Mike <146554836+MikeSus1@users.noreply.github.com> Date: Thu, 19 Dec 2024 22:55:47 +0100 Subject: [PATCH 4/4] Docs docs blindness effect --- EXILED/Exiled.API/Enums/EffectType.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXILED/Exiled.API/Enums/EffectType.cs b/EXILED/Exiled.API/Enums/EffectType.cs index 55c9d4021b..157c6b51f3 100644 --- a/EXILED/Exiled.API/Enums/EffectType.cs +++ b/EXILED/Exiled.API/Enums/EffectType.cs @@ -44,7 +44,7 @@ public enum EffectType Bleeding, /// - /// Blurs the player's screen. + /// Make the player screen darker. /// Blindness,