Skip to content
This repository was archived by the owner on Jan 13, 2023. It is now read-only.

Commit 5225a68

Browse files
authored
Add Effect and DamageType (#157)
* Add Effect and DamageType
1 parent 72b8682 commit 5225a68

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

Exiled.API/Enums/DamageType.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,10 @@ public enum DamageType
208208
/// Damage caused by <see cref="ItemType.ParticleDisruptor"/>.
209209
/// </summary>
210210
ParticleDisruptor,
211+
212+
/// <summary>
213+
/// Damage caused by SCP-956.
214+
/// </summary>
215+
Scp956,
211216
}
212217
}

Exiled.API/Enums/EffectType.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,5 +166,15 @@ public enum EffectType
166166
/// Cause the player more effective for fight.
167167
/// </summary>
168168
Scp1853,
169+
170+
/// <summary>
171+
/// Player will be followed by Scp956 the Pinata.
172+
/// </summary>
173+
Scp956,
174+
175+
/// <summary>
176+
/// Effect give to player after eating SCP-559 cake.
177+
/// </summary>
178+
Scp559,
169179
}
170180
}

Exiled.API/Extensions/DamageTypeExtensions.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public static class DamageTypeExtensions
134134
/// <returns>Returns whether the <see cref="DamageType"/> is caused by status effect or not.</returns>
135135
public static bool IsStatusEffect(this DamageType type) => type switch
136136
{
137-
DamageType.Asphyxiation or DamageType.Poison or DamageType.Bleeding or DamageType.Scp207 or DamageType.Hypothermia => true,
137+
DamageType.Asphyxiation or DamageType.Poison or DamageType.Bleeding or DamageType.Scp207 or DamageType.Hypothermia or DamageType.Scp956 => true,
138138
_ => false,
139139
};
140140

@@ -163,7 +163,8 @@ public static DamageType GetDamageType(DamageHandlerBase damageHandlerBase)
163163
return DamageType.MicroHid;
164164
case DisruptorDamageHandler:
165165
return DamageType.ParticleDisruptor;
166-
166+
case Scp956DamageHandler:
167+
return DamageType.Scp956;
167168
case FirearmDamageHandler firearmDamageHandler:
168169
{
169170
return ItemConversion.ContainsKey(firearmDamageHandler.WeaponType) ? ItemConversion[firearmDamageHandler.WeaponType] : DamageType.Firearm;

Exiled.API/Extensions/EffectTypeExtension.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public static class EffectTypeExtension
5757
EffectType.Vitality => typeof(Vitality),
5858
EffectType.Hypothermia => typeof(Hypothermia),
5959
EffectType.Scp1853 => typeof(Scp1853),
60+
EffectType.Scp956 => typeof(Scp956Target),
6061

6162
// This should never happen
6263
_ => throw new InvalidOperationException("Invalid effect enum provided"),

0 commit comments

Comments
 (0)