forked from Exiled-Official/EXILED
-
Notifications
You must be signed in to change notification settings - Fork 110
A lot of breaking changes #303
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
36620d2
A lot of breaking changes
ITeMbI4 5f0d9be
Delete old stuff
ITeMbI4 b1e34c1
Few more changes
ITeMbI4 eb63613
Merge branch 'scpsl14' into DoingBacklog
ITeMbI4 f09f702
Fix conflict
ITeMbI4 af3cd1c
Merge branch 'DoingBacklog' of https://github.com/ITeMbI4/EXILED into…
ITeMbI4 9711c85
Merge branch 'scpsl14' into DoingBacklog
ITeMbI4 e23e6e1
Review change
ITeMbI4 5e89dd3
Revert KillPlayer
ITeMbI4 b13be39
Update before conflicts fix
ITeMbI4 4d52de2
Fix conflicts
ITeMbI4 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -210,12 +210,6 @@ private set | |
| /// </summary> | ||
| public bool HasHint => CurrentHint != null; | ||
|
|
||
| /// <summary> | ||
| /// Gets the <see cref="ReferenceHub"/>'s <see cref="VoiceModule"/>, can be null. | ||
| /// </summary> | ||
| [Obsolete("Use IVoiceRole::VoiceModule instead.")] | ||
| public VoiceModuleBase VoiceModule => Role is Roles.IVoiceRole voiceRole ? voiceRole.VoiceModule : null; | ||
|
|
||
| /// <summary> | ||
| /// Gets the <see cref="ReferenceHub"/>'s <see cref="PersonalRadioPlayback"/>, can be null. | ||
| /// </summary> | ||
|
|
@@ -678,12 +672,17 @@ public ScpSpawnPreferences.SpawnPreferences ScpPreferences | |
| /// </summary> | ||
| public bool IsDead => Role?.IsDead ?? false; | ||
|
|
||
| /// <summary> | ||
| /// Gets a value indicating whether the player's <see cref="RoleTypeId"/> is any Foundation Forces. | ||
| /// Equivalent to checking the player's <see cref="Team"/>. | ||
| /// </summary> | ||
| public bool IsFoundationForces => Role?.Team is Team.FoundationForces; | ||
|
|
||
| /// <summary> | ||
| /// Gets a value indicating whether the player's <see cref="RoleTypeId"/> is any NTF rank. | ||
| /// Equivalent to checking the player's <see cref="Team"/>. | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. also this line
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What is wrong there? |
||
| /// </summary> | ||
| // TODO: Change logic for FacilityGuard in next major update | ||
| public bool IsNTF => Role?.Team is Team.FoundationForces; | ||
| public bool IsNTF => Role?.Team is Team.FoundationForces && Role?.Type is not RoleTypeId.FacilityGuard; | ||
|
|
||
| /// <summary> | ||
| /// Gets a value indicating whether the player's <see cref="RoleTypeId"/> is any Chaos rank. | ||
|
|
@@ -1469,16 +1468,6 @@ public static Player Get(string args) | |
| /// <returns>An <see cref="IEnumerable{Player}"/> representing the processed players.</returns> | ||
| public static IEnumerable<Player> GetProcessedData(ArraySegment<string> args, int startIndex = 0) => GetProcessedData(args, startIndex, out string[] _); | ||
|
|
||
| /// <summary> | ||
| /// Adds a player's UserId to the list of reserved slots. | ||
| /// </summary> | ||
| /// <remarks>This method does not permanently give a user a reserved slot. The slot will be removed if the reserved slots are reloaded.</remarks> | ||
| /// <param name="userId">The UserId of the player to add.</param> | ||
| /// <returns><see langword="true"/> if the slot was successfully added, or <see langword="false"/> if the provided UserId already has a reserved slot.</returns> | ||
| /// <seealso cref="GiveReservedSlot()"/> | ||
| // TODO: Remove this method | ||
| public static bool AddReservedSlot(string userId) => ReservedSlot.Users.Add(userId); | ||
|
|
||
| /// <summary> | ||
| /// Adds a player's UserId to the list of reserved slots. | ||
| /// </summary> | ||
|
|
@@ -1531,15 +1520,6 @@ public static bool AddToWhitelist(string userId, bool isPermanent) | |
| /// </summary> | ||
| public static void ReloadWhitelist() => WhiteList.Reload(); | ||
|
|
||
| /// <summary> | ||
| /// Adds the player's UserId to the list of reserved slots. | ||
| /// </summary> | ||
| /// <remarks>This method does not permanently give a user a reserved slot. The slot will be removed if the reserved slots are reloaded.</remarks> | ||
| /// <returns><see langword="true"/> if the slot was successfully added, or <see langword="false"/> if the player already has a reserved slot.</returns> | ||
| /// <seealso cref="AddReservedSlot(string)"/> | ||
| // TODO: Remove this method | ||
| public bool GiveReservedSlot() => AddReservedSlot(UserId); | ||
|
|
||
| /// <summary> | ||
| /// Adds a player's UserId to the list of reserved slots. | ||
| /// </summary> | ||
|
|
@@ -3224,13 +3204,6 @@ public void EnableEffect(EffectType type, float duration = 0f, bool addDurationI | |
| public bool EnableEffect(EffectType type, byte intensity, float duration = 0f, bool addDurationIfActive = false) | ||
| => TryGetEffect(type, out StatusEffectBase statusEffect) && EnableEffect(statusEffect, intensity, duration, addDurationIfActive); | ||
|
|
||
| /// <summary> | ||
| /// Enables a <see cref="Effect">status effect</see> on the player. | ||
| /// </summary> | ||
| /// <param name="effect">The <see cref="Effect"/> to enable.</param> | ||
| [Obsolete("Use SyncEffect(Effect) instead of this")] | ||
| public void EnableEffect(Effect effect) => SyncEffect(effect); | ||
|
|
||
| /// <summary> | ||
| /// Syncs the <see cref="Effect">status effect</see> on the player. | ||
| /// </summary> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.