Fix TNA's dying to roles they shouldnt #1471
Open
Conversation
This file contains 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
Tommy-XL
reviewed
Feb 13, 2025
Tommy-XL
reviewed
Feb 13, 2025
penguin cant even drag TNA's because OnCheckMurderAsTarget always returns false
Tommy-XL
reviewed
Feb 25, 2025
Roles/Neutral/Shocker.cs
Outdated
| @@ -189,7 +189,7 @@ private void OnFixedUpdateShocker(PlayerControl player, bool lowLoad, long nowTi | |||
| { | |||
| foreach (Collider2D collider in shockedRooms) | |||
| { | |||
| if (collider.IsTouching(player.Collider)) | |||
| if (collider.IsTouching(player.Collider) && !player.IsTransformedNeutralApocalypse()) | |||
There was a problem hiding this comment.
Why not do the check outside of foreach
Tommy-XL
reviewed
Feb 25, 2025
Roles/Neutral/Revolutionist.cs
Outdated
| @@ -234,7 +234,7 @@ private static void OnFixUpdateOthers(PlayerControl player, bool lowLoad, long n | |||
| SetDrawPlayerRPC(player, rv_target, true); | |||
| NotifyRoles(SpecifySeer: player, SpecifyTarget: rv_target); | |||
| ResetCurrentDrawTarget(playerId); | |||
| if (IRandom.Instance.Next(1, 100) <= RevolutionistKillProbability.GetInt()) | |||
| if (IRandom.Instance.Next(1, 100) <= RevolutionistKillProbability.GetInt() && rv_target.IsTransformedNeutralApocalypse()) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://discord.com/channels/1094344790910455908/1318662488962629632
in a very niche situation, if Penguin is on a ladder while dragging a TNA, the TNA will die because I don't know how the code works for that
everything else should be fixed
Hex Master, AbyssBringer, Kamikaze, and Witch all have the option to kill TNA's every other role does not (defaults to off)
Pirate will still get its win counted but the target wont die if TNA
Bodyguard will ignore the kill
Jailer's execution wont actually kill if TNA