Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit ef803b0
Author: VALERA771 <72030575+VALERA771@users.noreply.github.com>
Date:   Mon Nov 13 05:57:25 2023 +0300

    New effects (#2224)

    * new effect

    * same as flashlight?

    * Revert "same as flashlight?"

    This reverts commit ffa76c7.

    * new effects

    * typo fix

    * xml update

    * fix

    * forgor

    * Update Exiled.API/Enums/EffectType.cs

    Co-authored-by: Thunder <thundermaker300@gmail.com>

    * Update Exiled.API/Extensions/EffectTypeExtension.cs

    Co-authored-by: Thunder <thundermaker300@gmail.com>

    * Update Exiled.API/Enums/EffectType.cs

    Co-authored-by: Thunder <thundermaker300@gmail.com>

    * basically what Yamato is saying is

    * Update Exiled.API/Enums/EffectType.cs

    * Update Exiled.API/Enums/EffectType.cs

    * Add using statement

    ---------

    Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
    Co-authored-by: Thunder <thundermaker300@gmail.com>
    Co-authored-by: Misaka-ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com>
  • Loading branch information
Thundermaker300 committed Nov 13, 2023
1 parent 41f7fa3 commit 0f94aca
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 3 deletions.
23 changes: 23 additions & 0 deletions Exiled.API/Enums/EffectType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

namespace Exiled.API.Enums
{
using System;

using Exiled.API.Extensions;

/// <summary>
Expand Down Expand Up @@ -199,5 +201,26 @@ public enum EffectType
/// Teleports the player to the pocket dimension and drains health until the player escapes or is killed. The amount of damage recieved increases the longer the effect is applied.
/// </summary>
PocketCorroding,

/// <summary>
/// Reduces walking sound by 10%.
/// </summary>
SilentWalk,

/// <summary>
/// Makes you a marshmallow guy.
/// </summary>
[Obsolete("Not functional in-game")]
Marshmallow,

/// <summary>
/// The effect that is given to the player when getting attacked by SCP-3114's Strangle ability.
/// </summary>
Strangled,

/// <summary>
/// Makes the player nearly invisible, and allows them to pass through doors.
/// </summary>
Ghostly,
}
}
8 changes: 5 additions & 3 deletions Exiled.API/Extensions/EffectTypeExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ namespace Exiled.API.Extensions
using System.Linq;

using CustomPlayerEffects;

using Enums;

using InventorySystem.Items.MarshmallowMan;
using InventorySystem.Items.Usables.Scp244.Hypothermia;

using PlayerRoles.FirstPersonControl;

/// <summary>
Expand Down Expand Up @@ -66,6 +64,10 @@ public static class EffectTypeExtension
{ EffectType.Traumatized, typeof(Traumatized) },
{ EffectType.AntiScp207, typeof(AntiScp207) },
{ EffectType.Scanned, typeof(Scanned) },
{ EffectType.SilentWalk, typeof(SilentWalk) },
{ EffectType.Marshmallow, typeof(MarshmallowEffect) },
{ EffectType.Strangled, typeof(Strangled) },
{ EffectType.Ghostly, typeof(Ghostly) },
};

/// <summary>
Expand Down

0 comments on commit 0f94aca

Please sign in to comment.