Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ChangingGroupEventArgs.NewGroup having no effect. #2197

Closed
wants to merge 316 commits into from
Closed
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
316 commits
Select commit Hold shift + click to select a range
40c5be9
Merge branch 'dev' into Fix-DroppingScp330Event-Desync-client-candy
louis1706 Sep 26, 2023
db28b73
Merge branch 'dev' into Scp106ReworkTranspiller
louis1706 Sep 26, 2023
0ad449b
Merge branch 'dev' into Scp049ReworkingTranspiler
louis1706 Sep 26, 2023
961d92d
Merge branch 'dev' into ReworkingScp079Transpiller
louis1706 Sep 26, 2023
0cff451
Merge branch 'dev' into Scp079Role-fix
louis1706 Sep 26, 2023
9bcf023
Grenade Fix
louis1706 Sep 26, 2023
4df362a
Oups Fix Config CanFlashbangsAffectThrower
louis1706 Sep 26, 2023
7b82430
better doc
louis1706 Sep 26, 2023
b869ac4
ExitStalking
louis1706 Sep 29, 2023
6ad479a
Fix Error
louis1706 Sep 29, 2023
e36721d
Fix event
louis1706 Sep 29, 2023
522b587
NetherCode
louis1706 Sep 29, 2023
d1df2bf
Merge branch 'dev' into Scp106ReworkTranspiller
louis1706 Sep 30, 2023
148e59b
Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…
louis1706 Oct 7, 2023
fcfad21
fix cringe logic
IRacle1 Oct 7, 2023
b3a5dee
EnableEffect should have intensity argument
louis1706 Oct 8, 2023
db01dfd
Preventing Error + add a new ctor for Effect class
louis1706 Oct 8, 2023
a87cf97
Fix NW
louis1706 Oct 8, 2023
99bfa79
FUCK that so dumb
louis1706 Oct 8, 2023
90bcaff
nah, cringe logic
IRacle1 Oct 8, 2023
73d622f
:)
IRacle1 Oct 8, 2023
4474c5d
Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…
louis1706 Oct 9, 2023
458f533
Merge branch 'dev' into Fix-DroppingScp330Event-Desync-client-candy
louis1706 Oct 9, 2023
c5b7d1a
Update Consuming.cs
louis1706 Oct 9, 2023
b7cafa7
fix
NotIntense Oct 9, 2023
80d4a78
Update
NotIntense Oct 9, 2023
564b6a4
u
IRacle1 Oct 10, 2023
fed2fac
Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…
louis1706 Oct 10, 2023
8ccc2ed
Merge branch 'dev' into EnableEffect-should-have-intensity-argument
louis1706 Oct 10, 2023
73141ac
Fix
louis1706 Oct 11, 2023
3ffbd53
I will re add setter later when i found a good way to do them
louis1706 Oct 11, 2023
d02f8f9
Merge branch 'dev' into Scp079Role-fix
louis1706 Oct 11, 2023
528b425
Merge branch 'dev' into ReworkingScp079Transpiller
louis1706 Oct 11, 2023
24bd5e8
Merge branch 'dev' into Scp106ReworkTranspiller
louis1706 Oct 11, 2023
dd3d535
Revert "NetherCode"
louis1706 Oct 11, 2023
0cd64fe
will add this later
louis1706 Oct 11, 2023
e427dec
RemoveError
louis1706 Oct 11, 2023
d4cfa93
Remove Error
louis1706 Oct 11, 2023
2042b37
Update ZoneBlackoutEventArgs.cs
louis1706 Oct 11, 2023
d2908b4
Fix error
louis1706 Oct 11, 2023
68a0b25
Space
louis1706 Oct 11, 2023
d5a6008
Bruh
louis1706 Oct 11, 2023
7116059
No Fix
louis1706 Oct 11, 2023
800277d
Fix ILCode Error
louis1706 Oct 11, 2023
a12c6bd
Callvirt
louis1706 Oct 11, 2023
df6a951
No needed it's not bool Prefix
louis1706 Oct 11, 2023
3ec3d38
Failed instead of return
louis1706 Oct 12, 2023
32ed9dd
CanScp049SenseTutorial Patch
louis1706 Oct 12, 2023
f558661
miss register event
louis1706 Oct 12, 2023
fecc678
.
louis1706 Oct 12, 2023
d5bd9e3
Fix typos
NaoUnderscore Oct 13, 2023
82673ac
Merge branch 'dev' into EnableEffect-should-have-intensity-argument
louis1706 Oct 13, 2023
98c4b35
DecontaminationFeatures
louis1706 Oct 14, 2023
d20376e
it's also global when final
louis1706 Oct 14, 2023
0a5b883
Fix
louis1706 Oct 14, 2023
19d03bc
LazyFix
louis1706 Oct 14, 2023
ad7e5a5
0
louis1706 Oct 14, 2023
6d4431e
Obsolete
louis1706 Oct 14, 2023
49f3697
Merge branch 'dev' into dev
louis1706 Oct 15, 2023
4538343
better
IRacle1 Oct 15, 2023
9c9a321
Merge branch 'dev' into somechanges
IRacle1 Oct 15, 2023
3caacc9
Update DecontaminationState.cs
louis1706 Oct 15, 2023
b27326f
SendStaffMessage
louis1706 Oct 18, 2023
b237a59
Idk if this is needed
louis1706 Oct 18, 2023
fa9f125
autommatically find exiled version
louis1706 Oct 19, 2023
2a4de86
Merge branch 'dev' into AutomaticFind-ExiledVersion
Thundermaker300 Oct 19, 2023
1f4ec7a
Merge branch 'dev' into AutomaticFind-ExiledVersion
louis1706 Oct 19, 2023
b336974
Merge branch 'dev' into somechanges
louis1706 Oct 20, 2023
f0ba294
Fix Crash null string
louis1706 Oct 21, 2023
3dce27e
Fix ILError
louis1706 Oct 22, 2023
a5c6c30
Fix Skill Issue from someone else
louis1706 Oct 22, 2023
53da193
Obsolete value instead of deleting them
louis1706 Oct 23, 2023
7e9cbd6
doc
louis1706 Oct 23, 2023
32a5102
Merge branch 'dev' into EnableEffect-should-have-intensity-argument
louis1706 Oct 23, 2023
26c6f66
Merge branch 'AutomaticFind-ExiledVersion' into Exiled8.3
louis1706 Oct 24, 2023
253e075
Merge branch 'LazyFix' into Exiled8.3
louis1706 Oct 24, 2023
f312d00
Merge branch 'dev' into DecontaminationAPI
louis1706 Oct 24, 2023
2ecbb4e
Merge branch 'DecontaminationAPI' into Exiled8.3
louis1706 Oct 24, 2023
6295a11
Merge branch 'EnableEffect-should-have-intensity-argument' into Exile…
louis1706 Oct 24, 2023
e49dc4f
Merge branch 'Fix-Bug-than-Grenade-do-not-make-damage-correctly' into…
louis1706 Oct 24, 2023
056adf9
Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…
louis1706 Oct 24, 2023
2d985ba
Merge remote-tracking branch 'origin/Fix-DroppingScp330Event-Desync-c…
louis1706 Oct 24, 2023
0c356b3
Merge branch 'Scp106ReworkTranspiller' into Exiled8.3
louis1706 Oct 24, 2023
82a1cd9
Merge branch 'Scp079Role-fix' into Exiled8.3
louis1706 Oct 24, 2023
7548440
.
louis1706 Oct 24, 2023
1a6249e
DisableCustomConst
louis1706 Oct 24, 2023
31f955f
Merge branch 'Scp106ReworkTranspiller' into Exiled8.3
louis1706 Oct 24, 2023
2b1ab05
.
louis1706 Oct 24, 2023
12d5c7c
Merge branch 'dev' into SendStaffMessage
louis1706 Oct 24, 2023
d359369
.
louis1706 Oct 24, 2023
71cd44e
Merge branch 'Other-Transpiler-Fix' into Exiled8.3
louis1706 Oct 24, 2023
30aa880
Merge branch 'SendStaffMessage' into Exiled8.3
louis1706 Oct 24, 2023
9e0fda6
Merge branch 'DecontaminationAPI' into Exiled8.3
louis1706 Oct 24, 2023
12d6430
Fix
louis1706 Oct 24, 2023
bda1def
Merge branch 'Scp106ReworkTranspiller' into Exiled8.3
louis1706 Oct 24, 2023
4423850
Fix doc
louis1706 Oct 24, 2023
1314105
Merge branch 'EnableEffect-should-have-intensity-argument' into Exile…
louis1706 Oct 24, 2023
c62e414
Merge branch 'Exiled8.3' into dev
louis1706 Oct 24, 2023
a357a4e
Merge pull request #62 from NotIntense/dev
louis1706 Oct 24, 2023
6f457a7
not needed
louis1706 Oct 24, 2023
d706541
Merge branch 'pr/2136' into Exiled8.3
louis1706 Oct 24, 2023
01a4c2d
Merge pull request #63 from IRacle1/somechanges
louis1706 Oct 24, 2023
1819df1
Merge branch 'Fix-Bug-than-Grenade-do-not-make-damage-correctly' into…
louis1706 Oct 24, 2023
9632cd7
Revert "Fix UsedItem event not being called (#2163)"
louis1706 Oct 24, 2023
babec0e
Merge branch 'revert-2163-UsedItemFixNotCall' into Exiled8.3
louis1706 Oct 24, 2023
bb19b8e
Merge branch 'dev' into somechanges
louis1706 Oct 24, 2023
f840f13
Fix
louis1706 Oct 24, 2023
2b73b47
Merge branch 'dev' into Scp106ReworkTranspiller
louis1706 Oct 24, 2023
3932aa3
Merge branch 'dev' into Scp049ReworkingTranspiler
louis1706 Oct 24, 2023
10d0f5f
.
louis1706 Oct 24, 2023
e08ae84
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 Oct 24, 2023
389af2d
Merge branch 'Fix-DroppingScp330Event-Desync-client-candy' into Exile…
louis1706 Oct 24, 2023
a01d702
Merge branch 'ReworkingScp079Transpiller' into Exiled8.3
louis1706 Oct 24, 2023
5e0dd78
Implement Scp0492.Conssumed
louis1706 Oct 24, 2023
497d1fd
Implement Scp0492.Conssumed
louis1706 Oct 24, 2023
1b95fe9
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 Oct 24, 2023
9b690c9
Few Fix
louis1706 Oct 24, 2023
09c36e0
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 Oct 24, 2023
ace9aac
Fix Item always being null
louis1706 Oct 25, 2023
da79ede
Merge branch 'dev' into Fix-CancelledItemEvent
louis1706 Oct 25, 2023
ddd2f98
Merge branch 'Fix-CancelledItemEvent' into Exiled8.3
louis1706 Oct 25, 2023
583faa4
.
louis1706 Oct 25, 2023
2fade3e
Merge branch 'Fix-CancelledItemEvent' into Exiled8.3
louis1706 Oct 25, 2023
568d1b5
FixCanScp049SenseTutorial
louis1706 Oct 25, 2023
be1f5cd
Merge branch 'Scp106ReworkTranspiller' into Exiled8.3
louis1706 Oct 25, 2023
235174b
Merge branch 'dev' into Exiled8.3
louis1706 Oct 25, 2023
e148162
Merge branch 'dev' into ReworkingScp079Transpiller
louis1706 Oct 26, 2023
5eb154b
Hurt
louis1706 Oct 26, 2023
5712ed8
Merge branch 'HurtedEvent' into Exiled8.3
louis1706 Oct 26, 2023
79f7305
SCP:SL 13.3
louis1706 Oct 27, 2023
317a62d
Doc (#2177)
louis1706 Oct 27, 2023
74f72ae
Merge branch 'Exiled8.3' into halloween-2023
louis1706 Oct 27, 2023
067db4e
SCP:SL 13.3
louis1706 Oct 27, 2023
9e630ef
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 Oct 27, 2023
ac5cb61
Merge branch 'Exiled8.3' into halloween-2023
louis1706 Oct 27, 2023
99e836c
Merge branch 'halloween-2023' of https://github.com/Exiled-Team/EXILE…
louis1706 Oct 27, 2023
82f8148
Merge branch 'Fix-YamatoSkillIssue' into Exiled8.3
louis1706 Oct 27, 2023
a516ef8
Merge branch 'FixCrashShowHint(null)' into Exiled8.3
louis1706 Oct 27, 2023
0d3861c
Merge branch 'ReworkingScp079Transpiller' into Exiled8.3
louis1706 Oct 27, 2023
0b398e3
Merge branch 'Exiled8.3' into halloween-2023
louis1706 Oct 27, 2023
1efab6d
Fix DisruptorHitreg.ServerPerformShot Transpiler
louis1706 Oct 27, 2023
960f16b
Merge branch 'Fix-DisruptorHitreg.ServerPerformShot-Transpiler' into …
louis1706 Oct 27, 2023
169ee71
Fix Scp330Interobject transpiler
louis1706 Oct 27, 2023
d195478
Merge branch 'Fix-Scp330Interobject-Transpiler' into halloween-2023
louis1706 Oct 27, 2023
36ecbf5
Fix FirearmRequest Received - Transpiler
louis1706 Oct 27, 2023
cf1f99a
Merge branch 'Fix-FirearmRequest-Received---Transpiler' into hallowee…
louis1706 Oct 27, 2023
3be4a6b
New API for SCP Halloween
louis1706 Oct 27, 2023
f7587cf
Updating Documentation Again
louis1706 Oct 27, 2023
9f904df
Fixing some part of the code
louis1706 Oct 27, 2023
877b5fa
Update Exiled.Events/Patches/Events/Player/Hurting.cs
louis1706 Oct 27, 2023
e82129f
Bruh
louis1706 Oct 27, 2023
0aca732
Merge branch 'HurtedEvent' of https://github.com/louis1706/EXILED int…
louis1706 Oct 27, 2023
9697b51
Merge branch 'HurtedEvent' into Exiled8.3
louis1706 Oct 27, 2023
64cd760
Merge branch 'dev' into Scp049ReworkingTranspiler
louis1706 Oct 27, 2023
90a7dbb
Fix
louis1706 Oct 27, 2023
4a378cf
Merge branch 'HurtedEvent' into Exiled8.3
louis1706 Oct 27, 2023
480b409
1st try
louis1706 Oct 27, 2023
bf05f0c
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 Oct 27, 2023
b8a6008
Fixed crash
louis1706 Oct 27, 2023
8ab7a47
Callvirt & Fix yamato moment
louis1706 Oct 27, 2023
b74ac56
Merge branch 'ReworkingScp079Transpiller' into Exiled8.3
louis1706 Oct 27, 2023
e400ece
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 Oct 27, 2023
b63a27d
Merge branch 'Exiled8.3' into halloween-2023
louis1706 Oct 27, 2023
43194fd
oups
louis1706 Oct 27, 2023
0ad71d2
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 Oct 27, 2023
3815b1e
.
louis1706 Oct 27, 2023
5a92957
Merge branch 'Scp049ReworkingTranspiler' into Exiled8.3
louis1706 Oct 27, 2023
e50d6c7
Fuck
louis1706 Oct 27, 2023
96a4680
Fix
louis1706 Oct 27, 2023
44eefac
Merge branch 'somechanges' of https://github.com/IRacle1/EXILED into …
louis1706 Oct 27, 2023
5a763d1
Merge branch 'dev' into somechanges
louis1706 Oct 27, 2023
b8502d0
Merge branch 'somechanges' into Exiled8.3
louis1706 Oct 27, 2023
03ef26f
Merge branch 'Exiled8.3' into halloween-2023
louis1706 Oct 27, 2023
14149ce
Adding Scp3114 Subroutine
louis1706 Oct 27, 2023
d43ada7
.
louis1706 Oct 27, 2023
147472e
Merge branch 'Exiled8.3' into halloween-2023
louis1706 Oct 27, 2023
531a919
.
louis1706 Oct 27, 2023
6618206
Missing features for halloween
louis1706 Oct 27, 2023
7838133
Update Version
louis1706 Oct 28, 2023
2484381
Flashlight can now contain Lantern
louis1706 Oct 28, 2023
6d2f45d
ChaosTargetCounter
Misfiy Oct 28, 2023
a2d4540
Merge branch 'pr/2179' into halloween-2023
louis1706 Oct 28, 2023
7fe79e3
Map::PrismaticCloud
louis1706 Oct 28, 2023
9fc5eb3
Network_chaosTargetCount
Misfiy Oct 28, 2023
7745b36
Add Scp3114 to RoleExtensions
Thundermaker300 Oct 28, 2023
ce7742f
i fix this little doc
louis1706 Oct 28, 2023
8cc368c
DON'T MERGE it's not FINISH (#2180)
louis1706 Oct 28, 2023
c60f298
Merge branch 'pr/2179' into halloween-2023
louis1706 Oct 28, 2023
900902d
Fast fix light
louis1706 Oct 28, 2023
c65ca61
Bump Version
louis1706 Oct 28, 2023
9f4482a
fix playerstat (#2181)
IkaOverride Oct 28, 2023
87271cd
Update RoundEnd.cs
Misaka-ZeroTwo Oct 29, 2023
81cada5
Update EXILED.props
Misaka-ZeroTwo Oct 29, 2023
11e1a29
Update RoundEnd.cs
Misaka-ZeroTwo Oct 29, 2023
3bfda10
Update EXILED.props
Misaka-ZeroTwo Oct 29, 2023
3459d32
fix
IRacle1 Oct 29, 2023
233eaed
Fixes (#2184)
IRacle1 Oct 29, 2023
2ca9c4a
Bump Version
louis1706 Oct 29, 2023
8fc8231
`MaxHealth` fix (#2185)
IRacle1 Oct 29, 2023
bf67f0f
WTF How that fix duration effect ??!!??
louis1706 Oct 29, 2023
8ed4804
Fix KickingEvent idk why it's could be null
louis1706 Oct 29, 2023
304ea8b
Scp3114DamageHandler is not ScpDamage ???!!!??
louis1706 Oct 29, 2023
b087428
Bump Version 8.3.6
louis1706 Oct 29, 2023
37f3966
Update doc
louis1706 Oct 29, 2023
136788a
Someone forgot about the marshmallows >:( (#2189)
Misfiy Oct 30, 2023
2801667
Fix Marshmallow
louis1706 Oct 30, 2023
39a5f2f
Fix NRE
louis1706 Oct 30, 2023
9c1f6fd
Add SCP-3114 properties, fix documentation
Thundermaker300 Oct 30, 2023
37fe47b
Missing SilentDamage
louis1706 Oct 30, 2023
3a50b0d
Merge branch 'halloween-2023' of https://github.com/Exiled-Team/EXILE…
louis1706 Oct 30, 2023
e95cbf8
Fix kicking event
Misaka-ZeroTwo Oct 31, 2023
858ebae
Merge branch 'halloween-2023' of https://github.com/Exiled-Team/EXILE…
Misaka-ZeroTwo Oct 31, 2023
d6a805b
Version Bump
Misaka-ZeroTwo Oct 31, 2023
146b0d5
Fix thanks IRacle
louis1706 Oct 31, 2023
81aeb5b
Fix documentation
louis1706 Oct 31, 2023
27635db
Fix ChangingGroupEventArgs.NewGroup having no effect.
o5zereth Oct 31, 2023
c0618e3
Add Get & Sets for the warningTimeSeconds method & adding more proper…
SnivyFilms Nov 1, 2023
c5041e8
Fix Rpc and WriteExtensions dictionary (#2199)
sanyae2439 Nov 1, 2023
f21540e
code style
Misaka-ZeroTwo Nov 1, 2023
c0689f0
whut
louis1706 Nov 1, 2023
d9832ab
Merge branch 'halloween-2023' of https://github.com/Exiled-Team/EXILE…
louis1706 Nov 1, 2023
2df7739
Fix stamina bug
louis1706 Nov 1, 2023
a31d69d
No ArgumentOutOfRangeException for this
louis1706 Nov 1, 2023
d32fc89
fix Metal
louis1706 Nov 1, 2023
e01ff0b
Jailbird/firearm fix (#2187)
IRacle1 Nov 1, 2023
78a3c2e
Nw skill issue fixed jailbird crash (#2200)
louis1706 Nov 1, 2023
9acfb82
Documentation fix
Thundermaker300 Nov 2, 2023
2451f1f
Bump Version
louis1706 Nov 2, 2023
b5b3888
ok, lets save 3 opcodes worth of perfomance as if it actually matters…
o5zereth Nov 2, 2023
587e6bb
Fix Server.Host not being able to deal Damage with Grenade
louis1706 Nov 3, 2023
b315890
(there no change but it's will make it work when NW will make it corr…
louis1706 Nov 3, 2023
b03bbc4
Fix TryAddCandy
louis1706 Nov 3, 2023
c404084
Fix than ConfirmAcqusition need to be done after some tick
louis1706 Nov 3, 2023
b58705a
Bump Version
louis1706 Nov 3, 2023
476baa5
Map.IsHubertSky
louis1706 Nov 3, 2023
019760a
missing doc
louis1706 Nov 3, 2023
da06540
ItemType.AntiSCP207 was missing for Usable object
louis1706 Nov 3, 2023
006b1c8
Checking if player is connected
louis1706 Nov 3, 2023
11552a8
Fix TogglingFlashlight to work with Lantern
louis1706 Nov 5, 2023
cd645a8
Fixes (#2205)
IRacle1 Nov 8, 2023
156b4d5
Add Scp3114Role.VoiceLines and Scp3114Role.PlaySound()
Thundermaker300 Nov 9, 2023
f47aed9
Merge Dev To Halloween for reduce the number of change
louis1706 Nov 9, 2023
cdb2f26
Fix IndividualFriendlyFire
louis1706 Nov 10, 2023
28cd872
Bump Version
louis1706 Nov 10, 2023
36952ac
Fix Patch errors (#2218)
BoltonDev Nov 10, 2023
611e616
8.3.11
louis1706 Nov 10, 2023
7fe62a6
Trigger gh action
Misaka-ZeroTwo Nov 10, 2023
cc989f4
Fix IL error (#2221)
NotIntense Nov 10, 2023
842f9d7
Create halloween.yml
Misaka-ZeroTwo Nov 10, 2023
1dc057f
Merge branch 'halloween-2023' into halloween-2023
louis1706 Nov 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion EXILED.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<PropertyGroup>
<!-- This is the global version and is used for all projects that don't have a version -->
<Version Condition="$(Version) == ''">8.2.1</Version>
<Version Condition="$(Version) == ''">8.3.7</Version>
<!-- Enables public beta warning via the PUBLIC_BETA constant -->
<PublicBeta>false</PublicBeta>

Expand Down
18 changes: 18 additions & 0 deletions Exiled.API/Enums/DamageType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -234,5 +234,23 @@ public enum DamageType
/// Damage caused by <see cref="ItemType.GunA7"/>.
/// </summary>
A7,

/// <summary>
/// Damage caused by <see cref="RoleTypeId.Scp3114"/>.
/// </summary>
Scp3114,

/// <summary>
/// <see cref="EffectType.Strangled"/>.
/// </summary>
Strangled,

#pragma warning disable CS1591 // Commentaire XML manquant pour le type ou le membre visible publiquement
#pragma warning disable SA1602 // Enumeration items should be documented
MarshmallowMan,
Silent,
MetalPipe,
#pragma warning restore SA1602 // Enumeration items should be documented
#pragma warning restore CS1591 // Commentaire XML manquant pour le type ou le membre visible publiquement
}
}
60 changes: 60 additions & 0 deletions Exiled.API/Enums/DecontaminationState.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// -----------------------------------------------------------------------
// <copyright file="DecontaminationState.cs" company="Exiled Team">
// Copyright (c) Exiled Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
// </copyright>
// -----------------------------------------------------------------------

namespace Exiled.API.Enums
{
using System;

using Features;

/// <summary>
/// Represents the state of a <see cref="LightContainmentZoneDecontamination.DecontaminationController"/>.
/// </summary>
/// <seealso cref="Map.DecontaminationState"/>
public enum DecontaminationState
{
/// <summary>
/// Decontamination is disable.
/// </summary>
Disabled = -1,

/// <summary>
/// Decontamination has started.
/// </summary>
Start,

/// <summary>
/// It's remain 10 minutes.
/// </summary>
Remain10Minutes,

/// <summary>
/// It's remain 5 minutes.
/// </summary>
Remain5Minutes,

/// <summary>
/// It's remain 1 minutes.
/// </summary>
Remain1Minute,

/// <summary>
/// It's remain 30 seconds.
/// </summary>
Countdown,

/// <summary>
/// All doors is closed lock.
/// </summary>
Lockdown,

/// <summary>
/// The decontamination has been done.
/// </summary>
Finish,
}
}
24 changes: 24 additions & 0 deletions Exiled.API/Enums/EffectType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -199,5 +199,29 @@ public enum EffectType
/// Teleports the player to the pocket dimension and drains health until the player escapes or is killed.
/// </summary>
PocketCorroding,

/// <summary>
/// The effect permit player to go trough door like Scp-106.
/// </summary>
Ghostly,

/// <summary>
/// Effect given to player when being strangled by SCP-3114.
/// </summary>
Strangled,
#pragma warning disable CS1591 // Commentaire XML manquant pour le type ou le membre visible publiquement
#pragma warning disable SA1602 // Enumeration items should be documented
OrangeCandy,
Spicy,
SugarCrave,
SugarHigh,
SugarRush,
TraumatizedByEvil,
Metal,
Prismatic,
SlowMetabolism,
Marshmallow,
#pragma warning restore SA1602 // Enumeration items should be documented
#pragma warning restore CS1591 // Commentaire XML manquant pour le type ou le membre visible publiquement
}
}
2 changes: 1 addition & 1 deletion Exiled.API/Enums/Side.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public enum Side
/// <summary>
/// SCP team. Same as <see cref="Team.SCPs"/>.
/// Contains all SCP-related roles: <see cref="RoleTypeId.Scp049"/>, <see cref="RoleTypeId.Scp0492"/>, <see cref="RoleTypeId.Scp079"/>, <see cref="RoleTypeId.Scp096"/>,
/// <see cref="RoleTypeId.Scp106"/>, <see cref="RoleTypeId.Scp173"/>, and <see cref="RoleTypeId.Scp939"/>.
/// <see cref="RoleTypeId.Scp106"/>, <see cref="RoleTypeId.Scp173"/>, <see cref="RoleTypeId.Scp939"/>, and <see cref="RoleTypeId.Scp3114"/>.
/// </summary>
Scp,

Expand Down
17 changes: 16 additions & 1 deletion Exiled.API/Extensions/DamageTypeExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ namespace Exiled.API.Extensions
using Enums;

using Features;

using PlayerRoles.PlayableScps.Scp3114;
using PlayerRoles.PlayableScps.Scp939;
using PlayerStatsSystem;

/// <summary>
Expand Down Expand Up @@ -47,6 +48,7 @@ public static class DamageTypeExtensions
{ DeathTranslations.UsedAs106Bait.Id, DamageType.FemurBreaker },
{ DeathTranslations.MicroHID.Id, DamageType.MicroHid },
{ DeathTranslations.Hypothermia.Id, DamageType.Hypothermia },
{ DeathTranslations.MarshmallowMan.Id, DamageType.MarshmallowMan },
};

private static readonly Dictionary<DeathTranslation, DamageType> TranslationConversionInternal = new()
Expand Down Expand Up @@ -76,6 +78,7 @@ public static class DamageTypeExtensions
{ DeathTranslations.UsedAs106Bait, DamageType.FemurBreaker },
{ DeathTranslations.MicroHID, DamageType.MicroHid },
{ DeathTranslations.Hypothermia, DamageType.Hypothermia },
{ DeathTranslations.MarshmallowMan, DamageType.MarshmallowMan },
};

private static readonly Dictionary<ItemType, DamageType> ItemConversionInternal = new()
Expand Down Expand Up @@ -160,6 +163,10 @@ public static DamageType GetDamageType(DamageHandlerBase damageHandlerBase)
{
case CustomReasonDamageHandler:
return DamageType.Custom;
case SilentDamageHandler:
return DamageType.Silent;
case MetalPipeDamageHandler:
return DamageType.MetalPipe;
case WarheadDamageHandler:
return DamageType.Warhead;
case ExplosionDamageHandler:
Expand All @@ -170,6 +177,14 @@ public static DamageType GetDamageType(DamageHandlerBase damageHandlerBase)
return DamageType.Recontainment;
case Scp096DamageHandler:
return DamageType.Scp096;
case Scp3114DamageHandler scp3114DamageHandler:
return scp3114DamageHandler.Subtype switch
{
Scp3114DamageHandler.HandlerType.Strangulation => DamageType.Strangled,
Scp3114DamageHandler.HandlerType.SkinSteal => DamageType.Scp3114,
Scp3114DamageHandler.HandlerType.Slap => DamageType.Scp3114,
_ => DamageType.Unknown,
};
case MicroHidDamageHandler:
return DamageType.MicroHid;
case DisruptorDamageHandler:
Expand Down
29 changes: 27 additions & 2 deletions Exiled.API/Extensions/EffectTypeExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ namespace Exiled.API.Extensions

using Enums;

using InventorySystem.Items.MarshmallowMan;

using InventorySystem.Items.Usables.Scp244.Hypothermia;

using PlayerRoles.FirstPersonControl;
Expand Down Expand Up @@ -66,6 +68,18 @@ public static class EffectTypeExtension
EffectType.Traumatized => typeof(Traumatized),
EffectType.AntiScp207 => typeof(AntiScp207),
EffectType.Scanned => typeof(Scanned),
EffectType.Ghostly => typeof(Ghostly),
EffectType.Strangled => typeof(Strangled),
EffectType.OrangeCandy => typeof(OrangeCandy),
EffectType.Spicy => typeof(Spicy),
EffectType.SugarCrave => typeof(SugarCrave),
EffectType.SugarHigh => typeof(SugarHigh),
EffectType.SugarRush => typeof(SugarRush),
EffectType.TraumatizedByEvil => typeof(TraumatizedByEvil),
EffectType.Metal => typeof(Metal),
EffectType.Prismatic => typeof(Prismatic),
EffectType.SlowMetabolism => typeof(SlowMetabolism),
EffectType.Marshmallow => typeof(MarshmallowEffect),

// This should never happen
_ => throw new InvalidOperationException("Invalid effect enum provided"),
Expand Down Expand Up @@ -115,6 +129,17 @@ public static class EffectTypeExtension
Traumatized => EffectType.Traumatized,
AntiScp207 => EffectType.AntiScp207,
Scanned => EffectType.Scanned,
Ghostly => EffectType.Ghostly,
Strangled => EffectType.Strangled,
OrangeCandy => EffectType.OrangeCandy,
Spicy => EffectType.Spicy,
SugarCrave => EffectType.SugarCrave,
SugarHigh => EffectType.SugarHigh,
SugarRush => EffectType.SugarRush,
TraumatizedByEvil => EffectType.TraumatizedByEvil,
Prismatic => EffectType.Prismatic,
SlowMetabolism => EffectType.SlowMetabolism,
MarshmallowEffect => EffectType.Marshmallow,

// This should never happen
_ => throw new InvalidOperationException("Invalid effect status base provided"),
Expand All @@ -128,7 +153,7 @@ public static class EffectTypeExtension
/// <seealso cref="IsHealing(EffectType)"/>
public static bool IsHarmful(this EffectType effect) => effect is EffectType.Asphyxiated or EffectType.Bleeding
or EffectType.Corroding or EffectType.Decontaminating or EffectType.Hemorrhage or EffectType.Hypothermia
or EffectType.Poisoned or EffectType.Scp207 or EffectType.SeveredHands;
or EffectType.Poisoned or EffectType.Scp207 or EffectType.SeveredHands or EffectType.Strangled;

/// <summary>
/// Returns whether or not the provided <paramref name="effect"/> heals a player.
Expand Down Expand Up @@ -157,7 +182,7 @@ or EffectType.Disabled or EffectType.Ensnared or EffectType.Exhausted or EffectT
/// <seealso cref="IsHealing(EffectType)"/>
public static bool IsPositive(this EffectType effect) => effect is EffectType.BodyshotReduction or EffectType.DamageReduction
or EffectType.Invigorated or EffectType.Invisible or EffectType.MovementBoost or EffectType.RainbowTaste
or EffectType.Scp207 or EffectType.Scp1853 or EffectType.Vitality or EffectType.AntiScp207;
or EffectType.Scp207 or EffectType.Scp1853 or EffectType.Vitality or EffectType.AntiScp207 or EffectType.Ghostly;

/// <summary>
/// Returns whether or not the provided <paramref name="effect"/> affects the player's movement speed.
Expand Down
1 change: 1 addition & 0 deletions Exiled.API/Extensions/MirrorExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ public static void SetName(this Player target, Player player, string name)
/// <param name="room">Room to modify.</param>
/// <param name="target">Only this player can see room color.</param>
/// <param name="multiplier">Light intensity multiplier to set.</param>
[Obsolete("This features has been removed by NW", true)]
public static void SetRoomLightIntensityForTargetOnly(this Room room, Player target, float multiplier)
{
}
Expand Down
2 changes: 1 addition & 1 deletion Exiled.API/Extensions/RoleExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static class RoleExtensions
RoleTypeId.ChaosConscript or RoleTypeId.ChaosMarauder or RoleTypeId.ChaosRepressor or RoleTypeId.ChaosRifleman => Team.ChaosInsurgency,
RoleTypeId.Scientist => Team.Scientists,
RoleTypeId.ClassD => Team.ClassD,
RoleTypeId.Scp049 or RoleTypeId.Scp939 or RoleTypeId.Scp0492 or RoleTypeId.Scp079 or RoleTypeId.Scp096 or RoleTypeId.Scp106 or RoleTypeId.Scp173 => Team.SCPs,
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,
RoleTypeId.FacilityGuard or RoleTypeId.NtfCaptain or RoleTypeId.NtfPrivate or RoleTypeId.NtfSergeant or RoleTypeId.NtfSpecialist => Team.FoundationForces,
RoleTypeId.Tutorial => Team.OtherAlive,
_ => Team.Dead,
Expand Down
12 changes: 11 additions & 1 deletion Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Exiled.API.Features.DamageHandlers
using Enums;

using Extensions;

using PlayerRoles.PlayableScps.Scp3114;
using PlayerRoles.PlayableScps.Scp939;

using PlayerStatsSystem;
Expand Down Expand Up @@ -100,6 +100,8 @@ public virtual DamageType Type
{
case CustomReasonDamageHandler:
return DamageType.Custom;
case SilentDamageHandler:
return DamageType.Silent;
case WarheadDamageHandler:
return DamageType.Warhead;
case ExplosionDamageHandler:
Expand All @@ -116,6 +118,14 @@ public virtual DamageType Type
return DamageType.Scp939;
case JailbirdDamageHandler:
return DamageType.Jailbird;
case Scp3114DamageHandler scp3114DamageHandler:
return scp3114DamageHandler.Subtype switch
{
Scp3114DamageHandler.HandlerType.Strangulation => DamageType.Strangled,
Scp3114DamageHandler.HandlerType.SkinSteal => DamageType.Scp3114,
Scp3114DamageHandler.HandlerType.Slap => DamageType.Scp3114,
_ => DamageType.Unknown,
};
case Scp049DamageHandler scp049DamageHandler:
return scp049DamageHandler.DamageSubType switch
{
Expand Down
2 changes: 1 addition & 1 deletion Exiled.API/Features/DamageHandlers/ScpDamageHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Exiled.API.Features.DamageHandlers
using Enums;

using Extensions;

using PlayerRoles.PlayableScps.Scp3114;
using PlayerStatsSystem;

using BaseHandler = PlayerStatsSystem.DamageHandlerBase;
Expand Down
17 changes: 16 additions & 1 deletion Exiled.API/Features/Effect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ namespace Exiled.API.Features
{
using System.ComponentModel;

using CustomPlayerEffects;

using Exiled.API.Enums;
using Exiled.API.Extensions;

/// <summary>
/// Useful class to save hint configs in a cleaner way.
/// Useful class to save effect configs in a cleaner way.
/// </summary>
public class Effect
{
Expand All @@ -23,6 +26,18 @@ public Effect()
{
}

/// <summary>
/// Initializes a new instance of the <see cref="Effect"/> class.
/// </summary>
/// <param name="statusEffectBase">Get all the information of the effect>.</param>
public Effect(StatusEffectBase statusEffectBase)
{
Type = statusEffectBase.GetEffectType();
Duration = statusEffectBase.Duration;
Intensity = statusEffectBase.Intensity;
IsEnabled = statusEffectBase.IsEnabled;
}

/// <summary>
/// Initializes a new instance of the <see cref="Effect"/> class.
/// </summary>
Expand Down
46 changes: 46 additions & 0 deletions Exiled.API/Features/Hazards/PrismaticCloud.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// -----------------------------------------------------------------------
// <copyright file="PrismaticCloud.cs" company="Exiled Team">
// Copyright (c) Exiled Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
// </copyright>
// -----------------------------------------------------------------------

namespace Exiled.API.Features.Hazards
{
using global::Hazards;
using PlayerRoles;
using RelativePositioning;
using UnityEngine;

using PrismaticCloudHazard = global::Hazards.PrismaticCloud;

/// <summary>
/// A wrapper for <see cref="PrismaticCloudHazard"/>.
/// </summary>
public class PrismaticCloud : TemporaryHazard
{
/// <summary>
/// Initializes a new instance of the <see cref="PrismaticCloud"/> class.
/// </summary>
/// <param name="hazard">The <see cref="PrismaticCloudHazard"/> instance.</param>
public PrismaticCloud(PrismaticCloudHazard hazard)
: base(hazard)
{
Base = hazard;
}

/// <summary>
/// Gets the <see cref="PrismaticCloudHazard"/>.
/// </summary>
public new PrismaticCloudHazard Base { get; }

/// <summary>
/// Gets or sets the synced position.
/// </summary>
public RelativePosition SynchronisedPosition
{
get => Base.SynchronizedPosition;
set => Base.SynchronizedPosition = value;
}
}
}
Loading
Loading