Skip to content

Commit

Permalink
Merge dev to master (Exiled-Team#2416)
Browse files Browse the repository at this point in the history
* Fix CI

* Added PrimitiveSettings + 3 overloads to Primitive::Create method

* Light::Create overload + Signature fix

* Ops

* Make `Server.RunCommand` return response (Exiled-Team#2105)

* Make `Server.RunCommand` return response

* Make obsolute

* Fix

* Update Exiled.API/Features/Toys/Light.cs

Co-authored-by: Thunder <[email protected]>

* Update Exiled.API/Features/Toys/Primitive.cs

Co-authored-by: Thunder <[email protected]>

* Update Primitive.cs

* Changes for Shooting and Shot events (Exiled-Team#2101)

* fixed event for buckshot and railgun and added firearm in args

* Added firearm

* Update Shot.cs

* Use .Cast<Firearm>() in Shot.cs

* ShotEventArgs extends IFirearmEvent, added Item and changed order of properties

* Changed order of CanHurt in ShotEventArgs

* Make ShootingEventArgs extends IFirearmEvent instead of IItemEvent

* Fix Nao Skill Issue (Exiled-Team#2112)

Co-authored-by: Nao <[email protected]>

* AnimationCurve (Exiled-Team#2098)

* AnimationCurve

* Bad documentation

* Removing     'Exiled.Updater',

* Revert "Removing     'Exiled.Updater',"

This reverts commit b8d4e7c.

* Fix dumb door (Exiled-Team#2111)

Co-authored-by: Nao <[email protected]>

* SpawningTeamVehicle event addition (Exiled-Team#2108)

* Ability use hint changes (Exiled-Team#2113)

* Make these better.

* Remove this

* Fix dev build errors

* Make it non-breaking

* Mark obsolete

* Smol fucky wucky

* yes

* Erm, Am I dumb?

* Better responses

* Exiled Component System Overhaul, DynamicEvents & StateMachine APIs, `Exiled::Updater` rework. (Exiled-Team#2085)

* `Exiled.Updater` rework

* Removed old `Exiled.Updater`

* Fix `nuspec` build

* Prevent Exiled from being loaded if out to date and no releases are available yet.

* Added `StateMachine` API.
Added `DynamicEvents` API.
Added `EBehaviour` component.
Fixed docs in `ManagedObjectTypeAttribute`.
Fixed typos in `CustomRoles::API::Extensions`.

* Fix typo

* Not finish

* Some fixes to `Exiled::Updater`.
Now it actually runs on a different thread without blocking the normal server exec/startup.

* Don't care

* Updater's logs are now debugs

* Fix typo

Co-authored-by: VALERA771 <[email protected]>

* Fix Exiled.nuspec

* use ternary op

Co-authored-by: Yamato <[email protected]>

* Fix Yamato's commit

* Fixed `StaticActor` structure

---------

Co-authored-by: Nao <[email protected]>
Co-authored-by: louis1706 <[email protected]>
Co-authored-by: Yamato <[email protected]>
Co-authored-by: VALERA771 <[email protected]>

* Fix Error GetBefore() (Exiled-Team#2121)

* Fix MessageTranslated (Exiled-Team#2122)

* Keep dev branch up to date (Exiled-Team#2125)

* Add ChangeLightsColor and ResetLightsColor  (Exiled-Team#2126)

* ChangeLightsColor and ResetLightsColor addition.

* Fix for player being null (skipping this null check causes Npc.Destroy() to throw exceptions) (Exiled-Team#2129)

* Someone didn't know how unity works. (Exiled-Team#2132)

* Small change to CustomRole.KeepInventoryOnSpawn (Exiled-Team#2130)

* Yes

* Yamato fix

* There

* Switches are better

* Add RotationTime, DoorOpenTime, DoorCloseTime and MoveTime to Lift.cs (Exiled-Team#2117)

* Add RotationTime, DoorOpenTime, DoorCloseTime and MoveTime

* Update Lift.cs

---------

Co-authored-by: Yamato <[email protected]>

* Fixed crashing issue caused by changing appearance of a disconnected … (Exiled-Team#2139)

* Fixed crashing issue caused by changing appearance of a disconnected player

* Update MirrorExtensions.cs

---------

Co-authored-by: Nao <[email protected]>

* Fix SetAmmo(AmmoType.None) crash (Exiled-Team#2138)

* Fix SetAmmo(AmmoType.None) crash

* 100% sure no error with this

* EventList (Exiled-Team#2137)

* EventList

* Update Event.cs

* FixPickupPreviousOwner (Exiled-Team#2141)

* Deprecated the setter of ItemsToDrop (Exiled-Team#2144)

* EndRoundTranspiler (Exiled-Team#2120)

* EndRoundTranspiler

* not needed

* SCPSL-experimental Update (Exiled-Team#2152)

* experimental

* Prevent breakingChange

* Error

* last fix

* Update Doc

* Haven't found a better way to make it

* FUCK Version

* StaminaUsage Patch now use Postfix instead of Transpiler & KickingEvent Transpiler (Exiled-Team#2143)

* StaminaUsage

* Kicking Patch

* Fix error

* Fix for Experymental

* Fix stupidity

* Optimise

---------

Co-authored-by: Nao <[email protected]>
Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Respawn::TimeUntilNextPhase (Exiled-Team#2150)

* Respawn::TimeUntilNextPhase

* .

* is or

* Update dependencies URL

* Unnecessary set accessor

* Update dep link

* Fix UserId (Exiled-Team#2158)

* Fix IL ERROR (Exiled-Team#2166)

* Fix ILError

* Fix Skill Issue from someone else

- /* */ will need to be removed when the other method will be deleted

* Fix round end transpiler (Exiled-Team#2167)

* Update RoundEnd.cs

* Update RoundEnd.cs

* Update RoundEnd.cs

* Full Fix

* Fix UsedItem event not being called (Exiled-Team#2163)

* UsedItemFixNotCall

* In case it's don't work

* Update UsedItemFixNotCall.cs

---------

Co-authored-by: Nao <[email protected]>

* Fix `Scp0492.ConsumingCorpse` event was called with `Scp049` (Exiled-Team#2142)

* bruh

* better patch method

* L bracing

---------

Co-authored-by: Nao <[email protected]>
Co-authored-by: Yamato <[email protected]>

* Fix SpawingEventArgs::HorizontalRotation (Exiled-Team#2162)

* Fix Crash null string (Exiled-Team#2161)

* Add Whitelist && update ReservedSlot extensions (Exiled-Team#2160)

* Make `Server.RunCommand` return response

* Make obsolute

* Fix

* Add WhiteList extension

* Add `isPermanent` argument

* Update `ReservedSlot`

* Update docs

* Fixes

* Make better

* Always true

* SendingAdminChatMessageEvent (Exiled-Team#2159)

* SendingAdminChatMessage

* oh 'lol

Co-authored-by: VALERA771 <[email protected]>

* Update SendingAdminChatMessageEventsArgs.cs

---------

Co-authored-by: VALERA771 <[email protected]>
Co-authored-by: Nao <[email protected]>

* Fix ClearInventory (Exiled-Team#2140)

* Fix ClearInventory

* Update Exiled.API/Features/Player.cs

Co-authored-by: IRacle <[email protected]>

* Apply suggestions from code review

Co-authored-by: Thunder <[email protected]>

---------

Co-authored-by: IRacle <[email protected]>
Co-authored-by: Thunder <[email protected]>
Co-authored-by: Nao <[email protected]>

* We are not going to miss this (Remove Old Exiled.Updater) (Exiled-Team#2151)

* We are not going to miss this

* Update Loader.cs

* Fix Yamato's skill issue

---------

Co-authored-by: Nao <[email protected]>

* ModifyToken (Exiled-Team#2148)

* ModifyToken

* PreventException

* New

* modify

* Tickets

* Some Scp914 QoL additions (Exiled-Team#2149)

* Scp914

* Update Exiled.API/Features/Scp914.cs

Co-authored-by: Thunder <[email protected]>

* Update Exiled.API/Features/Scp914.cs

Co-authored-by: Thunder <[email protected]>

* Update Exiled.API/Features/Scp914.cs

Co-authored-by: Thunder <[email protected]>

* Update Scp914.cs

* Update Scp914.cs

---------

Co-authored-by: Thunder <[email protected]>

* Update dev.yml workflow (Exiled-Team#2170)

* Update main.yml (Exiled-Team#2169)

* GetAmmoLimitFix (Exiled-Team#2157)

* GetAmmoLimitFix

* look nicer

* .

* Update GetAmmoLimitFix.cs

---------

Co-authored-by: Nao <[email protected]>

* Add Player.AdminChatAccess

* Revert "Fix UsedItem event not being called (Exiled-Team#2163)" (Exiled-Team#2173)

This reverts commit 58007bc.

* `Scp173::BlinkingRequest` event (Exiled-Team#2077)

* test

* у

* e

---------

Co-authored-by: Nao <[email protected]>
Co-authored-by: Yamato <[email protected]>

* NullCheck (Exiled-Team#2175)

* SCP:SL 13.3 (Exiled-Team#2178)

Co-authored-by: Thunder <[email protected]>

* ChaosTargetCounter (Exiled-Team#2179)

* ChaosTargetCounter

* Network_chaosTargetCount

---------

Co-authored-by: Thunder <[email protected]>

* merge Master To Dev (Exiled-Team#2203)

* Fix CI

* Added ChaosTargetCount (Exiled-Team#2106)

* Added ChaosTargetCount

* a

* Updated

* Fix build errors

---------

Co-authored-by: Yamato <[email protected]>
Co-authored-by: Nao <[email protected]>

* Revert "Added ChaosTargetCount (Exiled-Team#2106)" (Exiled-Team#2110)

This reverts commit c3612c9.

* Woah more proper English (Exiled-Team#2196)

Grammar fixes. This includes fixing multiple it's to its, removal of unnecessary commas, and removal of redundancies.

---------

Co-authored-by: Nao <[email protected]>
Co-authored-by: Nameless <[email protected]>
Co-authored-by: Thunder <[email protected]>
Co-authored-by: Snivy FIlms <[email protected]>

* Update RoundEnd.cs (Exiled-Team#2193)

Co-authored-by: Yamato <[email protected]>

* Fix Rpc and WriterExtensions dict (Exiled-Team#2198)

* Fix Rpc and WriterExtensions dict

* stylecop

* Intercom.DisplayText fix (Exiled-Team#2209)

* Update CommentsObjectGraphVisitor.cs (Exiled-Team#2210)

* EnableEffect should have intensity argument (Exiled-Team#2134)

* EnableEffect should have intensity argument

* Preventing Error + add a new ctor for Effect class

* Fix NW

* FUCK that so dumb

* Fix typos

* Fix doc

---------

Co-authored-by: Nao <[email protected]>

* Add two item props: IsLightEmitter, IsDisarmer

* DecontaminationFeatures (Exiled-Team#2145)

* DecontaminationFeatures

* it's also global when final

* Fix

* Update DecontaminationState.cs

* .

* Add Warhead.Kills

* same to dev (Exiled-Team#2206)

* fix `IAcquisitionConfirmationTrigger` logic

* final 330 fix

* Stupid manual bool fix (Exiled-Team#2211)

* all candies (Exiled-Team#2214)

* Add Broadcast.Show check to CustomItems (Exiled-Team#2212)

* Add Broadcast.Show check to CustomItems

* Random optimization

* Revert "Random optimization"

This reverts commit 6c7f910.

---------

Co-authored-by: Yamato <[email protected]>

* Rework EffectType (Exiled-Team#2190)

* Rework

* Update EffectTypeExtension.cs

* Update EffectTypeExtension.cs

* Update dev.yml (Exiled-Team#2227)

* Updating EXILED to 13.3.1 (Exiled-Team#2223)

* Item fix (Exiled-Team#2228)

* Fix doc version (Exiled-Team#2230)

* Simplification

* Patch fix (Exiled-Team#2229)

* Update ChangingGroup.cs (Exiled-Team#2232)

* Fix transpiler (Exiled-Team#2234)

* Fix CancelledItemUse::Item always being null (Exiled-Team#2174)

* Fix Item always being null

* .

* Is it a flashlight? (Exiled-Team#2225)

* is it a flashlight?

* new logic

* edit xml

* another xml update

* no more breaking changes

* huh

* get and create methods fix

* fuux

* New Hurt Event (Exiled-Team#2176)

Co-authored-by: IRacle <[email protected]>

* Reworking Scp079Transpiller (Exiled-Team#2017)

* Scp106ReworkTranspiller (Exiled-Team#1984)

* Rework Scp049 Event (Exiled-Team#1978)

* Send staff message (Exiled-Team#2172)

* SendStaffMessage

* Idk if this is needed

* .

---------

Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Scp079Role method fix (Exiled-Team#1983)

* Fix Bug than Grenade do not make damage correctly (Exiled-Team#2119)

* Fix Various Transpiler and Update StatModule (Exiled-Team#2171)

* Big PickupAPI changes (Breaking) (Exiled-Team#2147)

* Updated a LOT of summaries. (Exiled-Team#2231)

* Added proper grammar or some more details P1 (Contains Exiled.API to Exiled.CustomRoles

* Up to Exiled Events Patches for working on the summaries

* The last of the summary fixes and modifications

* Reverted the /// <inheritdoc/> changes

* Im not perfect with grammar

* Added Thundermaker's suggested changes

* Part 2

* Part 3

* Said hasta la pasta to a comment

---------

Co-authored-by: Nikki Gardiner <[email protected]>
Co-authored-by: Misaka-ZeroTwo <[email protected]>

* stylecop some women

* oh good heavens

* New effects (Exiled-Team#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 <[email protected]>

* Update Exiled.API/Extensions/EffectTypeExtension.cs

Co-authored-by: Thunder <[email protected]>

* Update Exiled.API/Enums/EffectType.cs

Co-authored-by: Thunder <[email protected]>

* 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 <[email protected]>
Co-authored-by: Thunder <[email protected]>
Co-authored-by: Misaka-ZeroTwo <[email protected]>

* stop complaining

* the skeleton lives on (Exiled-Team#2233)

* Add 3114

* Add 3114

* Add 3114

* Squashed commit of the following:

commit ef803b0
Author: VALERA771 <[email protected]>
Date:   Mon Nov 13 05:57:25 2023 +0300

    New effects (Exiled-Team#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 <[email protected]>

    * Update Exiled.API/Extensions/EffectTypeExtension.cs

    Co-authored-by: Thunder <[email protected]>

    * Update Exiled.API/Enums/EffectType.cs

    Co-authored-by: Thunder <[email protected]>

    * 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 <[email protected]>
    Co-authored-by: Thunder <[email protected]>
    Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Squashed commit of the following:

commit f35fdf9
Author: Thunder <[email protected]>
Date:   Sun Nov 12 22:00:20 2023 -0500

    stop complaining

commit ef803b0
Author: VALERA771 <[email protected]>
Date:   Mon Nov 13 05:57:25 2023 +0300

    New effects (Exiled-Team#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 <[email protected]>

    * Update Exiled.API/Extensions/EffectTypeExtension.cs

    Co-authored-by: Thunder <[email protected]>

    * Update Exiled.API/Enums/EffectType.cs

    Co-authored-by: Thunder <[email protected]>

    * 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 <[email protected]>
    Co-authored-by: Thunder <[email protected]>
    Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Fixes

* Add 3114

* Fixed Event StartingRecallEventArgs's IsAllowed issue. (Exiled-Team#2235)

* Fix Ctor (Exiled-Team#2240)

* Lazy fix (Exiled-Team#2146)

Co-authored-by: Misaka-ZeroTwo <[email protected]>

* More Fix (Exiled-Team#2244)

Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Version bump to 8.4.0

* FastFix (Exiled-Team#2251)

* Update push_nuget.yml

* FixInfiniteSprint (Exiled-Team#2255)

* Version bump to 8.4.1

* Workflow (Exiled-Team#2258)

* Create moveFile.ps1

* Update dev.yml

* Update dev.yml

* Update dev.yml

* Update dev.yml

* Update dev.yml

* Update dev.yml

* Update dev.yml

* Update moveFile.ps1

* Update dev.yml

* Update dev.yml

* Update dev.yml

* Update dev.yml

* Rename moveFile.ps1 to packaging.ps1

* Update dev.yml

* Update dev.yml

* Revert "Workflow (Exiled-Team#2258)"

This reverts commit d757764.

* Change default value of flashbang affect thrower

* Better workflow (Exiled-Team#2259)

* Create moveFile.ps1

* Update dev.yml

* Update moveFile.ps1

* Update dev.yml

* Rename moveFile.ps1 to packaging.ps1

* Update dev.yml

* fix (Exiled-Team#2262)

Co-authored-by: Yamato <[email protected]>

* Improved Stamina API (Exiled-Team#2237)

Co-authored-by: Thunder <[email protected]>
Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Update DestroyingEventArgs.cs (Exiled-Team#2272)

* FixRoundEnd (Exiled-Team#2278)

* Remove Breaking Change from Exiled-Team#2237 (Exiled-Team#2283)

* MaxAmmo Setter && NightVision should also be true when NightVision (Exiled-Team#2164)

Co-authored-by: Thunder <[email protected]>
Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Ending round event fix (Exiled-Team#2280)

Co-authored-by: Yamato <[email protected]>

* CanScp049SenseTutorial Fix bool logic (Exiled-Team#2275)

Co-authored-by: Bolton <[email protected]>

* Version bump to 8.4.2

* Fix TogglingFlashlightEventArgs Cast (Exiled-Team#2295)

Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Fix Player.Get(ServerHostPlayer) (Exiled-Team#1863)

* Added ItemRemoved Event (Exiled-Team#2263)

Co-authored-by: Misaka-ZeroTwo <[email protected]>

* who wrote this? (Exiled-Team#2298)

* Fix MaxAmmo and CustomItem Weapon (Exiled-Team#2302)

* Update EXILED.props

* Update EXILED.props

* SpawningTeamVehicle Transpiler (Exiled-Team#2265)

* Spawning transpiler (Exiled-Team#2241)

* Add to DropItem(Item item, bool isThrown) (Exiled-Team#2268)

* Bump to 8.4.3-rc.2

* Revert "Spawning transpiler (Exiled-Team#2241)" (Exiled-Team#2306)

This reverts commit caaa732.

* EffectType.None + More TryGet method for EffectType extension (Exiled-Team#2292)

* Rework and Fix Shooting Transpiler (Exiled-Team#2309)

* is that a new ev of 87? (Exiled-Team#2308)

* Inroducing... "Async" events (Exiled-Team#2303)

* huh?

* oops

* another one

* Revert "another one"

This reverts commit 0bae3ad.

* y've never seen last commit

* Update Exiled.Events/Features/Event{T}.cs

* fux

---------

Co-authored-by: Yamato <[email protected]>

* ValidatingVisibility Event (Exiled-Team#2299)

* ValidatingVisibility Event

* text

* fix again

* build error fixes

* docs fix

* Update Exiled.Events/EventArgs/Scp939/ValidatingVisibilityEventArgs.cs

Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Update Exiled.Events/Handlers/Scp939.cs

* Update Exiled.Events/Handlers/Scp939.cs

* Update Exiled.Events/EventArgs/Scp939/ValidatingVisibilityEventArgs.cs

* Update Exiled.Events/EventArgs/Scp939/ValidatingVisibilityEventArgs.cs

---------

Co-authored-by: Misaka-ZeroTwo <[email protected]>
Co-authored-by: Nao <[email protected]>

* Patch Rework DoorList (Exiled-Team#2270)

* Patch Rework

* Update Exiled.Events/Patches/Generic/DoorList.cs

* uhmmmm

* Add voicelines SCP-3114 (Exiled-Team#2269)

* Add Door EVent

* Add to DropItem isThrown

* Door

* Add voicelines SCP-3114

* Update Player.cs

* Oops

* Oops v3

* Convert bool Prefix to Transpiler

* Update Exiled.Events/Handlers/Scp3114.cs

* Update Exiled.Events/Handlers/Scp3114.cs

---------

Co-authored-by: BoltonII <[email protected]>
Co-authored-by: Yamato <[email protected]>
Co-authored-by: Nao <[email protected]>

* Add ```ChangeItemOwner``` (Exiled-Team#2249)

* Add files via upload

Added a public method for change item's owner.
By encapsulating ChangeOwner method.

* Fixed issue about extra tab

* Fixed reference issue.

* Update Exiled.API/Features/Items/Item.cs

---------

Co-authored-by: Misaka-ZeroTwo <[email protected]>
Co-authored-by: Nao <[email protected]>

* Fixing up spelling errors and XML formatting. (Exiled-Team#2317)

* v8.4.3 (Exiled-Team#2305)

* Fixed SCP-3114 spelling errors and stylecop XML formatting.

---------

Co-authored-by: Misaka-ZeroTwo <[email protected]>
Co-authored-by: Nao <[email protected]>

* rawr (Exiled-Team#2322)

* Fixed Room.Blackout not turning off lights (Exiled-Team#2319)

Co-authored-by: Yamato <[email protected]>
Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Some Scp914 changes (Exiled-Team#2290)

* Documentation about async events (Exiled-Team#2332)

* Update Events.md

* Update Events.md

* Update docs/docs/Plugins/Events.md

Co-authored-by: Nao <[email protected]>

* Update docs/docs/Plugins/Events.md

Co-authored-by: Nao <[email protected]>

---------

Co-authored-by: Nao <[email protected]>

* Scp244MoreAPI (Exiled-Team#2323)

* Scp244MoreAPI

* Apply suggestions from code review

Co-authored-by: Misaka-ZeroTwo <[email protected]>

---------

Co-authored-by: Misaka-ZeroTwo <[email protected]>

* Fix UsingBreakneckSpeeds not being call (Exiled-Team#2318)

* Round.IgnoredPlayers  fix (Exiled-Team#2307)

* Round.IgnoredPlayers  fix

* Update Exiled.Events/Patches/Events/Server/RoundEnd.cs

* Update Exiled.Events/Patches/Events/Server/RoundEnd.cs

* Update Exiled.Events/Patches/Events/Server/RoundEnd.cs

* Update Exiled.Events/Patches/Events/Server/RoundEnd.cs

---------

Co-authored-by: Nao <[email protected]>

* SelectingRespawnTeamEventArgs (Exiled-Team#2315)

* SelectingRespawnTeamEventArgs

* Apply suggestions from code review

Co-authored-by: Nao <[email protected]>

* Update Exiled.Events/Patches/Events/Server/SelectingRespawnTeam.cs

---------

Co-authored-by: Nao <[email protected]>

* Landing Fix + few doc change (Exiled-Team#2314)

* Update Documentation (Exiled-Team#2336)

* Update Documentation

* Spacing

* Scp3114 Transpiler (Exiled-Team#2266)

* TryUseBody Transpiler + fix

* Disguising Transpiler

* Revealing + RevealingKey Transpiler

* Fix

* Edit doc

---------

Co-authored-by: Yamato <[email protected]>

* Fix Transmitting event (Exiled-Team#2273)

* Fix TransmittingEvent

* :)

* Prevent breaking plugin

* :)

* Remove warning

* I'm dumb

* Fixing up XML Formatting

---------

Co-authored-by: Yamato <[email protected]>

* Scp173BeingLooked Transpiler (Exiled-Team#2276)

* Scp173BeingLooked Transpiler

* Fix

---------

Co-authored-by: Yamato <[email protected]>

* Scp3114AttackAhpFix (Exiled-Team#2320)

* Scp3114AttackAhpFix

* Update Scp3114AttackAhpFix.cs

* Update Scp3114AttackAhpFix.cs

* Adding event TogglingRadio(Player, RadioItem, bool, bool) (Exiled-Team#2329)

* Add Door EVent

* Add Door Event

* Add Door Event

* Fix

* Oops

* Oops v2

* Oops

* Delete Door Event

* Create DamagingDoorEventArgs.cs

* Create DamagingDoor.cs

* Adding event Toggling Radio

* Delete DamagingDoorEventArgs.cs

* Create DamagingDoorEventArgs.cs

* Convert prefix to transpiler + fix docs

* Update TogglingRadio.cs

* Update TogglingRadioEventArgs.cs

* Update Exiled.Events/Patches/Events/Player/TogglingRadio.cs

Co-authored-by: Bolton <[email protected]>

---------

Co-authored-by: Yamato <[email protected]>
Co-authored-by: BoltonDev <[email protected]>
Co-authored-by: Nao <[email protected]>
Co-authored-by: Bolton <[email protected]>

* Fix Gate IsFullyOpen and IsFullyClosed (Exiled-Team#2337)

* Update Player.cs (Exiled-Team#2347)

* Update for PostXMAS (Exiled-Team#2383)

* Update for PostXMAS

* WeaponFixFromXMAS

* remove var

* Fix RegisteringEvent

* more var remove

* 8.7.0

* 8.7.1

* Fix build errors

---------

Co-authored-by: SmusiJarviss <[email protected]>
Co-authored-by: Artem Košilinskis <[email protected]>
Co-authored-by: Thunder <[email protected]>
Co-authored-by: Ika <[email protected]>
Co-authored-by: Yamato <[email protected]>
Co-authored-by: warden161 <[email protected]>
Co-authored-by: joker-119 <[email protected]>
Co-authored-by: Nao <[email protected]>
Co-authored-by: louis1706 <[email protected]>
Co-authored-by: VALERA771 <[email protected]>
Co-authored-by: Bolton <[email protected]>
Co-authored-by: Claudio <[email protected]>
Co-authored-by: TtroubleTT <[email protected]>
Co-authored-by: Misaka-ZeroTwo <[email protected]>
Co-authored-by: IRacle <[email protected]>
Co-authored-by: Nameless <[email protected]>
Co-authored-by: Snivy FIlms <[email protected]>
Co-authored-by: sanyae2439 <[email protected]>
Co-authored-by: FUTURE <[email protected]>
Co-authored-by: Rue <[email protected]>
Co-authored-by: NotIntense <[email protected]>
Co-authored-by: Nikki Gardiner <[email protected]>
Co-authored-by: 白泽 <[email protected]>
Co-authored-by: BoltonII <[email protected]>
Co-authored-by: Artyomus1337 <[email protected]>
Co-authored-by: Rysik5318 <[email protected]>
Co-authored-by: 白泽 <[email protected]>
Co-authored-by: Miki_hero <[email protected]>
  • Loading branch information
1 parent 9e94a54 commit 471b4bb
Show file tree
Hide file tree
Showing 388 changed files with 3,666 additions and 2,842 deletions.
567 changes: 5 additions & 562 deletions .editorconfig

Large diffs are not rendered by default.

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.4.3</Version>
<Version Condition="$(Version) == ''">8.7.1</Version>
<!-- Enables public beta warning via the PUBLIC_BETA constant -->
<PublicBeta>false</PublicBeta>

Expand Down
8 changes: 7 additions & 1 deletion Exiled.API/Enums/EffectType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,15 @@ namespace Exiled.API.Enums
/// <summary>
/// Status effects as enum.
/// </summary>
/// <seealso cref="EffectTypeExtension.Type(EffectType)"/>
/// <seealso cref="EffectTypeExtension.TryGetEffectType(CustomPlayerEffects.StatusEffectBase, out EffectType)"/>
/// <seealso cref="EffectTypeExtension.TryGetType(EffectType, out Type)"/>
public enum EffectType
{
/// <summary>
/// This EffectType do not exist it's only use when not found or error.
/// </summary>
None = -1, // TODO: remove = -1

/// <summary>
/// The player isn't able to open their inventory or reload a weapon.
/// </summary>
Expand Down
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
4 changes: 2 additions & 2 deletions Exiled.API/Extensions/CommonExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static class CommonExtensions
/// <returns>The new modfied curve.</returns>
public static AnimationCurve Multiply(this AnimationCurve curve, float amount)
{
for (var i = 0; i < curve.length; i++)
for (int i = 0; i < curve.length; i++)
curve.keys[i].value *= amount;

return curve;
Expand All @@ -56,7 +56,7 @@ public static AnimationCurve Multiply(this AnimationCurve curve, float amount)
/// <returns>The new modfied curve.</returns>
public static AnimationCurve Add(this AnimationCurve curve, float amount)
{
for (var i = 0; i < curve.length; i++)
for (int i = 0; i < curve.length; i++)
curve.keys[i].value += amount;

return curve;
Expand Down
32 changes: 29 additions & 3 deletions Exiled.API/Extensions/EffectTypeExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ public static class EffectTypeExtension
public static Type Type(this EffectType effect)
=> EffectTypeToType.TryGetValue(effect, out Type type) ? type : throw new InvalidOperationException("Invalid effect enum provided");

/// <summary>
/// Gets an instance of <see cref="System.Type"/> points to an effect.
/// </summary>
/// <param name="effect">The <see cref="EffectType"/> enum.</param>
/// <param name="type">The type found with the corresponding EffecType.</param>
/// <returns>Whether or not the effectType has been found.</returns>
public static bool TryGetType(this EffectType effect, out Type type)
=> EffectTypeToType.TryGetValue(effect, out type);

/// <summary>
/// Gets the <see cref="EffectType"/> of the specified <see cref="StatusEffectBase"/>.
/// </summary>
Expand All @@ -93,6 +102,23 @@ public static Type Type(this EffectType effect)
public static EffectType GetEffectType(this StatusEffectBase statusEffectBase)
=> TypeToEffectType.TryGetValue(statusEffectBase.GetType(), out EffectType effect) ? effect : throw new InvalidOperationException("Invalid effect status base provided");

/// <summary>
/// Gets the <see cref="EffectType"/> of the specified <see cref="StatusEffectBase"/>.
/// </summary>
/// <param name="statusEffectBase">The <see cref="StatusEffectBase"/> enum.</param>
/// <param name="effect">The effect found.</param>
/// <returns>Whether or not the effect has been found.</returns>
public static bool TryGetEffectType(this StatusEffectBase statusEffectBase, out EffectType effect)
{
if (statusEffectBase == null || !TypeToEffectType.TryGetValue(statusEffectBase.GetType(), out effect))
{
effect = EffectType.None;
return false;
}

return true;
}

/// <summary>
/// Returns whether or not the provided <paramref name="effect"/> drains health over time.
/// </summary>
Expand All @@ -109,7 +135,7 @@ or EffectType.Corroding or EffectType.Decontaminating or EffectType.Hemorrhage o
/// <param name="effect">The <see cref="EffectType"/>.</param>
/// <returns>Whether or not the effect heals.</returns>
/// <seealso cref="IsHarmful(EffectType)"/>
public static bool IsHealing(this EffectType effect) => typeof(IHealablePlayerEffect).IsAssignableFrom(effect.Type());
public static bool IsHealing(this EffectType effect) => effect.TryGetType(out Type type) && typeof(IHealablePlayerEffect).IsAssignableFrom(type);

/// <summary>
/// Returns whether or not the provided <paramref name="effect"/> is a negative effect.
Expand Down Expand Up @@ -137,14 +163,14 @@ or EffectType.Invigorated or EffectType.Invisible or EffectType.MovementBoost or
/// </summary>
/// <param name="effect">The <see cref="EffectType"/>.</param>
/// <returns>Whether or not the effect modifies the player's movement speed.</returns>
public static bool IsMovement(this EffectType effect) => typeof(IMovementSpeedModifier).IsAssignableFrom(effect.Type());
public static bool IsMovement(this EffectType effect) => effect.TryGetType(out Type type) && typeof(IMovementSpeedModifier).IsAssignableFrom(type);

/// <summary>
/// Returns whether or not the provided <paramref name="effect"/> is displayed to spectators as text.
/// </summary>
/// <param name="effect">The <see cref="EffectType"/>.</param>
/// <returns>Whether or not the effect is displayed to spectators as text.</returns>
public static bool IsDisplayed(this EffectType effect) => typeof(ISpectatorDataPlayerEffect).IsAssignableFrom(effect.Type());
public static bool IsDisplayed(this EffectType effect) => effect.TryGetType(out Type type) && typeof(ISpectatorDataPlayerEffect).IsAssignableFrom(type);

/// <summary>
/// Returns the <see cref="EffectCategory"/> of the given <paramref name="effect"/>.
Expand Down
9 changes: 8 additions & 1 deletion Exiled.API/Extensions/ItemExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Exiled.API.Extensions
using InventorySystem;
using InventorySystem.Items;
using InventorySystem.Items.Firearms.Attachments;

using InventorySystem.Items.Pickups;
using Structs;

/// <summary>
Expand Down Expand Up @@ -96,6 +96,13 @@ public static ItemBase GetItemBase(this ItemType type)
return itemBase;
}

/// <summary>
/// Given an <see cref="ItemType"/>, returns the matching <see cref="ItemPickupBase"/>.
/// </summary>
/// <param name="type">The <see cref="ItemType"/>.</param>
/// <returns>The <see cref="ItemPickupBase"/>, or <see langword="null"/> if not found.</returns>
public static ItemPickupBase GetPickupBase(this ItemType type) => GetItemBase(type)?.PickupDropModel;

/// <summary>
/// Given an <see cref="ItemType"/>, returns the matching <see cref="ItemBase"/>, casted to <typeparamref name="T"/>.
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions Exiled.API/Extensions/ReflectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public static void InvokeStaticMethod(this Type type, string methodName, object[
/// <param name="param">The event arguments.</param>
public static void InvokeStaticEvent(this Type type, string eventName, object[] param)
{
var eventDelegate = (MulticastDelegate)type.GetField(eventName, AccessTools.all).GetValue(null);
MulticastDelegate eventDelegate = (MulticastDelegate)type.GetField(eventName, AccessTools.all).GetValue(null);
if (eventDelegate != null)
{
foreach (var handler in eventDelegate.GetInvocationList())
foreach (Delegate handler in eventDelegate.GetInvocationList())
{
handler.Method.Invoke(handler.Target, param);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public override void ProcessDamage(Player player)

if ((player != Attacker) && !ForceFullFriendlyFire)
{
if (HitboxIdentity.CheckFriendlyFire(AttackerFootprint.Role, player.Role, true))
if (HitboxIdentity.IsEnemy(AttackerFootprint.Role, player.Role))
return;

Damage *= PlayerStatsSystem.AttackerDamageHandler._ffMultiplier;
Expand Down
6 changes: 3 additions & 3 deletions Exiled.API/Features/Doors/CheckpointDoor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public float Health
{
float health = value / Subdoors.Count;

foreach (var door in Subdoors)
foreach (BreakableDoor door in Subdoors)
{
door.Health = health;
}
Expand All @@ -108,7 +108,7 @@ public float MaxHealth
{
float health = value / Subdoors.Count;

foreach (var door in Subdoors)
foreach (BreakableDoor door in Subdoors)
{
door.MaxHealth = health;
}
Expand All @@ -121,7 +121,7 @@ public DoorDamageType IgnoredDamage
get => Subdoors.Aggregate(DoorDamageType.None, (current, door) => current | door.IgnoredDamage);
set
{
foreach (var door in Subdoors)
foreach (BreakableDoor door in Subdoors)
{
door.IgnoredDamage = value;
}
Expand Down
6 changes: 3 additions & 3 deletions Exiled.API/Features/Doors/Gate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ public Gate(PryableDoor door, List<Room> room)
/// <summary>
/// Gets a value indicating whether or not the door is fully closed.
/// </summary>
public override bool IsFullyClosed => base.IsFullyClosed && RemainingPryCooldown > 0;
public override bool IsFullyClosed => base.IsFullyClosed && RemainingPryCooldown <= 0;

/// <summary>
/// Gets a value indicating whether the door is fully open.
/// </summary>
public override bool IsFullyOpen => base.IsFullyOpen && RemainingPryCooldown <= 0;
public override bool IsFullyOpen => base.IsFullyOpen;

/// <summary>
/// Gets a value indicating whether or not the door is currently moving.
/// </summary>
public override bool IsMoving => base.IsMoving && RemainingPryCooldown > 0;
public override bool IsMoving => base.IsMoving || RemainingPryCooldown > 0;

/// <summary>
/// Gets or sets remaining cooldown for prying.
Expand Down
4 changes: 3 additions & 1 deletion Exiled.API/Features/Effect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public Effect()
/// <param name="statusEffectBase">Get all the information of the effect>.</param>
public Effect(StatusEffectBase statusEffectBase)
{
Type = statusEffectBase.GetEffectType();
if (!statusEffectBase.TryGetEffectType(out EffectType effect))
Log.Error($"EffectType not found please report to Exiled BugReport : {statusEffectBase}");
Type = effect;
Duration = statusEffectBase.Duration;
Intensity = statusEffectBase.Intensity;
IsEnabled = statusEffectBase.IsEnabled;
Expand Down
2 changes: 1 addition & 1 deletion Exiled.API/Features/Generator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public bool IsActivating
public bool IsOpen
{
get => Base.HasFlag(Base.Network_flags, Scp079Generator.GeneratorFlags.Open);
set => Base.ServerSetFlag(Scp079Generator.GeneratorFlags.Unlocked, value);
set => Base.ServerSetFlag(Scp079Generator.GeneratorFlags.Open, value);
}

/// <summary>
Expand Down
13 changes: 13 additions & 0 deletions Exiled.API/Features/Items/Item.cs
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,19 @@ public virtual Pickup CreatePickup(Vector3 position, Quaternion rotation = defau
/// <returns>A string containing Item-related data.</returns>
public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}* ={Owner}=";

/// <summary>
/// Changes the owner of the <see cref="Item"/>.
/// </summary>
/// <param name="oldOwner">Old <see cref="Item"/> owner.</param>
/// <param name="newOwner">New <see cref="Item"/> owner.</param>
public void ChangeItemOwner(Player oldOwner, Player newOwner)
{
if (oldOwner != null && newOwner != null)
{
ChangeOwner(oldOwner, newOwner);
}
}

/// <summary>
/// Change the owner of the <see cref="Item"/>.
/// </summary>
Expand Down
36 changes: 36 additions & 0 deletions Exiled.API/Features/Items/Scp244.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

namespace Exiled.API.Features.Items
{
using Exiled.API.Extensions;
using Exiled.API.Features.Pickups;
using Exiled.API.Interfaces;

Expand All @@ -29,6 +30,10 @@ public Scp244(Scp244Item itemBase)
: base(itemBase)
{
Base = itemBase;
Scp244DeployablePickup scp244Pickup = (Scp244DeployablePickup)Type.GetPickupBase();
Health = scp244Pickup._health;
ActivationDot = scp244Pickup._activationDot;
MaxDiameter = scp244Pickup.MaxDiameter;
}

/// <summary>
Expand All @@ -54,6 +59,22 @@ public bool Primed
set => Base._primed = value;
}

/// <summary>
/// Gets or sets the Scp244's remaining health.
/// </summary>
public float Health { get; set; }

/// <summary>
/// Gets or sets the activation angle, where 1 is the minimum and -1 is the maximum activation angle.
/// </summary>
public float ActivationDot { get; set; }

/// <summary>
/// Gets or sets the maximum diameter within which SCP-244's hypothermia effect is dealt.
/// </summary>
/// <remarks>This does not prevent visual effects.</remarks>
public float MaxDiameter { get; set; }

/// <summary>
/// Creates the <see cref="Pickup"/> that based on this <see cref="Item"/>.
/// </summary>
Expand Down Expand Up @@ -86,12 +107,27 @@ public override Pickup CreatePickup(Vector3 position, Quaternion rotation = defa
public override Item Clone() => new Scp244(Type)
{
Primed = Primed,
MaxDiameter = MaxDiameter,
Health = Health,
ActivationDot = ActivationDot,
};

/// <summary>
/// Returns the SCP-244 in a human readable format.
/// </summary>
/// <returns>A string containing SCP-244 related data.</returns>
public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}* -{Primed}-";

/// <inheritdoc/>
internal override void ReadPickupInfo(Pickup pickup)
{
base.ReadPickupInfo(pickup);
if (pickup is Scp244Pickup scp244)
{
Health = scp244.Health;
ActivationDot = scp244.ActivationDot;
MaxDiameter = scp244.MaxDiameter;
}
}
}
}
4 changes: 2 additions & 2 deletions Exiled.API/Features/Log.cs
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ public static void Send(string message, Discord.LogLevel level, ConsoleColor col
/// Sends an <see cref="Error(object)"/> with the provided message if the condition is false and stops the execution.
/// <example> For example:
/// <code>
/// Player ply = Player.Get(2);
/// Log.Assert(ply is not null, "The player with the id 2 is null");
/// Player ply = Player.Get(2);
/// Log.Assert(ply is not null, "The player with the id 2 is null");
/// </code>
/// results in it logging an error if the player is null and not continuing.
/// </example>
Expand Down
25 changes: 24 additions & 1 deletion Exiled.API/Features/Pickups/Scp244Pickup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ namespace Exiled.API.Features.Pickups
using System;

using Exiled.API.Features.DamageHandlers;
using Exiled.API.Features.Items;
using Exiled.API.Interfaces;

using InventorySystem.Items;
using InventorySystem.Items.Usables.Scp244;

using UnityEngine;
Expand Down Expand Up @@ -75,6 +76,16 @@ public float CurrentSizePercent
set => Base.CurrentSizePercent = value;
}

/// <summary>
/// Gets or sets the maximum diameter within which SCP-244's hypothermia effect is dealt.
/// </summary>
/// <remarks>This does not prevent visual effects.</remarks>
public float MaxDiameter
{
get => Base.MaxDiameter;
set => Base.MaxDiameter = value;
}

/// <summary>
/// Gets or sets the Scp244's remaining health.
/// </summary>
Expand Down Expand Up @@ -124,5 +135,17 @@ public float ActivationDot
/// </summary>
/// <returns>A string containing Scp244Pickup related data.</returns>
public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}* |{Health}| -{State}- ={CurrentSizePercent}=";

/// <inheritdoc/>
internal override void ReadItemInfo(Item item)
{
base.ReadItemInfo(item);
if (item is Scp244 scp244)
{
ActivationDot = scp244.ActivationDot;
MaxDiameter = scp244.MaxDiameter;
Health = scp244.Health;
}
}
}
}
Loading

0 comments on commit 471b4bb

Please sign in to comment.