Skip to content

Commit aa6ca40

Browse files
Someone-193louis1706
Someone-193
and
louis1706
authored
feat: 14.2.4 Fixes (#693)
* Patch and compilation fixes * Enum shenanigans * Remove all xmas obsoletes REVERT THIS AFTER THE UPDATE! * 3 new effects * Update documenation & RoleExtensions * Fix for black candy bug * Rename enums, fix a prefab * lil accidents --------- Co-authored-by: Yamato <[email protected]>
1 parent e3d0f97 commit aa6ca40

32 files changed

+198
-35
lines changed

‎EXILED/Exiled.API/Enums/CameraType.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ public enum CameraType
161161
EzGateBSide,
162162
EzGateAStairwell,
163163
EzGateAUpper,
164+
HczLoadingBay,
165+
HczLoadingBayRamp,
166+
HczLoadingBayStairwell,
164167
#endregion
165168
}
166169
}

‎EXILED/Exiled.API/Enums/DoorType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,5 +369,10 @@ public enum DoorType
369369
/// Represents the door in the <see cref="RoomType.EzGateA"/> Armory.
370370
/// </summary>
371371
GateAArmory,
372+
373+
/// <summary>
374+
/// Represents the door in <see cref="RoomType.HczLoadingBay"/>.
375+
/// </summary>
376+
HczLoadingBay,
372377
}
373378
}

‎EXILED/Exiled.API/Enums/EffectType.cs‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,25 +263,25 @@ public enum EffectType
263263
/// <summary>
264264
/// Makes you a flamingo.
265265
/// </summary>
266-
[Obsolete("Only availaible for Christmas and AprilFools.")]
266+
// [Obsolete("Only availaible for Christmas and AprilFools.")]
267267
BecomingFlamingo,
268268

269269
/// <summary>
270270
/// Makes you a Child after eating Cake.
271271
/// </summary>
272-
[Obsolete("Only availaible for Christmas and AprilFools.")]
272+
// [Obsolete("Only availaible for Christmas and AprilFools.")]
273273
Scp559,
274274

275275
/// <summary>
276276
/// Scp956 found you.
277277
/// </summary>
278-
[Obsolete("Only availaible for Christmas and AprilFools.")]
278+
// [Obsolete("Only availaible for Christmas and AprilFools.")]
279279
Scp956Target,
280280

281281
/// <summary>
282282
/// you are snowed.
283283
/// </summary>
284-
[Obsolete("Only availaible for Christmas and AprilFools.")]
284+
// [Obsolete("Only availaible for Christmas and AprilFools.")]
285285
Snowed,
286286

287287
/// <summary>
@@ -390,5 +390,20 @@ public enum EffectType
390390
/// <see cref="CustomPlayerEffects.Scp1509Resurrected"/>.
391391
/// </summary>
392392
Scp1509Resurrected,
393+
394+
/// <summary>
395+
/// <see cref="CustomPlayerEffects.FocusedVision"/>.
396+
/// </summary>
397+
FocusedVision,
398+
399+
/// <summary>
400+
/// <see cref="CustomPlayerEffects.AnomalousRegeneration"/>.
401+
/// </summary>
402+
AnomalousRegeneration,
403+
404+
/// <summary>
405+
/// <see cref="CustomPlayerEffects.AnomalousTarget"/>.
406+
/// </summary>
407+
AnomalousTarget,
393408
}
394409
}

‎EXILED/Exiled.API/Enums/GlassType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,10 @@ public enum GlassType
8484
/// Represents the window in <see cref="RoomType.EzGateA"/>.
8585
/// </summary>
8686
GateAArmory,
87+
88+
/// <summary>
89+
/// Represents the window in <see cref="RoomType.HczLoadingBay"/>
90+
/// </summary>
91+
HczLoadingBay,
8792
}
8893
}

‎EXILED/Exiled.API/Enums/PrefabType.cs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,5 +417,47 @@ public enum PrefabType
417417

418418
[Prefab(213466224, "SCP-939 Ragdoll Halloween")]
419419
Scp939RagdollHalloween,
420+
421+
[Prefab(689741320, "SCP-559 Cake")]
422+
Scp559Cake,
423+
424+
[Prefab(2657863153, "SCP-956")]
425+
Scp956,
426+
427+
[Prefab(1205960739, "SCP-2536 Tree")]
428+
Scp2536,
429+
430+
[Prefab(2102014206, "Snowpile")]
431+
Snowpile,
432+
433+
[Prefab(3401975113, "Scp018Projectile Christmas")]
434+
Scp018ProjectileChristmas,
435+
436+
[Prefab(3223468476, "SnowballProjectile")]
437+
SnowballProjectile,
438+
439+
[Prefab(296717882, "CoalPickup")]
440+
CoalPickup,
441+
442+
[Prefab(409273101, "TapePlayerPickup")]
443+
Scp1507TapePickup,
444+
445+
[Prefab(3971391978, "Scp021JPickup")]
446+
Scp021JPickup,
447+
448+
[Prefab(142820664, "CoalProjectile")]
449+
CoalProjectile,
450+
451+
[Prefab(2405470903, "Scp2536Projectile")]
452+
Scp2536Projectile,
453+
454+
[Prefab(1496232901, "SCP-173 Ragdoll Variant")]
455+
Scp173RagdollChristmas,
456+
457+
[Prefab(6069361, "SnowPoop - TantrumObj")]
458+
SnowTantrum,
459+
460+
[Prefab(3654754970, "SCP-1507 Ragdoll")]
461+
Scp1507Ragdoll,
420462
}
421463
}

‎EXILED/Exiled.API/Enums/ProjectileType.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ public enum ProjectileType
5151
/// Coal.
5252
/// Used by <see cref="ItemType.Coal"/>.
5353
/// </summary>
54-
[Obsolete("Only availaible for Christmas and AprilFools.")]
54+
// [Obsolete("Only availaible for Christmas and AprilFools.")]
5555
Coal,
5656

5757
/// <summary>
5858
/// SpecialCoal.
5959
/// Used by <see cref="ItemType.SpecialCoal"/>.
6060
/// </summary>
61-
[Obsolete("Only availaible for Christmas and AprilFools.")]
61+
// [Obsolete("Only availaible for Christmas and AprilFools.")]
6262
SpecialCoal,
6363

6464
/// <summary>
6565
/// Snowball.
6666
/// Used by <see cref="ItemType.Snowball"/>.
6767
/// </summary>
68-
[Obsolete("Only availaible for Christmas.")]
68+
// [Obsolete("Only availaible for Christmas.")]
6969
Snowball,
7070
}
7171
}

‎EXILED/Exiled.API/Enums/RoomType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,5 +353,10 @@ public enum RoomType
353353
/// Heavy Containment Zone's straight hall room with lava.
354354
/// </summary>
355355
HczDss12 = HczIncineratorWayside,
356+
357+
/// <summary>
358+
/// Heavy Containment Zone's T-intersection with a ramp in it.
359+
/// </summary>
360+
HczLoadingBay,
356361
}
357362
}

‎EXILED/Exiled.API/Enums/Side.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,10 @@ public enum Side
5252
/// No team. Same as <see cref="Team.Dead"/>.
5353
/// </summary>
5454
None,
55+
56+
/// <summary>
57+
/// Contains <see cref="RoleTypeId.Flamingo"/> and <see cref="RoleTypeId.AlphaFlamingo"/>. Same as <see cref="Team.Flamingos"/>.
58+
/// </summary>
59+
Flamingos,
5560
}
5661
}

‎EXILED/Exiled.API/Extensions/EffectTypeExtension.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ public static class EffectTypeExtension
101101
{ EffectType.TraumatizedByEvil, typeof(TraumatizedByEvil) },
102102
{ EffectType.WhiteCandy, typeof(WhiteCandy) },
103103
{ EffectType.Scp1509Resurrected, typeof(Scp1509Resurrected) },
104+
{ EffectType.FocusedVision, typeof(FocusedVision) },
105+
{ EffectType.AnomalousRegeneration, typeof(AnomalousRegeneration) },
106+
{ EffectType.AnomalousTarget, typeof(AnomalousTarget) },
104107
#pragma warning restore CS0618
105108
});
106109

‎EXILED/Exiled.API/Extensions/RoleExtensions.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public static class RoleExtensions
7070
Team.FoundationForces or Team.Scientists => Side.Mtf,
7171
Team.ChaosInsurgency or Team.ClassD => Side.ChaosInsurgency,
7272
Team.OtherAlive => Side.Tutorial,
73+
Team.Flamingos => Side.Flamingos,
7374
_ => Side.None,
7475
};
7576

@@ -80,12 +81,13 @@ public static class RoleExtensions
8081
/// <returns><see cref="Team"/>.</returns>
8182
public static Team GetTeam(this RoleTypeId roleType) => roleType switch
8283
{
83-
RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman => Team.ChaosInsurgency,
84+
RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman or RoleTypeId.ChaosFlamingo => Team.ChaosInsurgency,
8485
RoleTypeId.Scientist => Team.Scientists,
8586
RoleTypeId.ClassD => Team.ClassD,
86-
RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 => Team.SCPs,
87-
RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist => Team.FoundationForces,
87+
RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 or RoleTypeId.Scp3114 or RoleTypeId.ZombieFlamingo=> Team.SCPs,
88+
RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist or RoleTypeId.NtfFlamingo => Team.FoundationForces,
8889
RoleTypeId.Tutorial => Team.OtherAlive,
90+
RoleTypeId.Flamingo or RoleTypeId.AlphaFlamingo => Team.Flamingos,
8991
_ => Team.Dead,
9092
};
9193

@@ -131,6 +133,7 @@ public static bool TryGetRoleBase<T>(this RoleTypeId roleType, out T roleBase)
131133
Team.ClassD or Team.ChaosInsurgency => LeadingTeam.ChaosInsurgency,
132134
Team.FoundationForces or Team.Scientists => LeadingTeam.FacilityForces,
133135
Team.SCPs => LeadingTeam.Anomalies,
136+
Team.Flamingos => LeadingTeam.Flamingo,
134137
_ => LeadingTeam.Draw,
135138
};
136139

0 commit comments

Comments
 (0)