css_peace / first warden mute #69

P250 · 2024-03-04T21:42:47Z

Added IEventService, see the class for more detail
Added css_peace that can only be run by warden
When first warden is assigned the mute is also invoked
removed unused imports

Currently there are no config stuff as I haven't look into that. There is an admin bypass for css_peace

MSWS · 2024-03-04T21:57:56Z

mod/Jailbreak.Warden/Commands/WardenPeaceCommandsBehavior.cs

Can you add a cooldown to the command?
Also, please add a message broadcasted to players that the warden issued peace.

MSWS · 2024-03-04T22:03:34Z

mod/Jailbreak.Warden/Global/WardenBehavior.cs

@@ -66,7 +70,23 @@ public bool TrySetWarden(CCSPlayerController controller)
 			.ToAllCenter();

 		_logs.Append( _logs.Player(_warden), "is now the warden.");
+
+		// makes sure the second person (and people thereafter) who claim warden are not labelled as "first warden"
+		if (_currentWardenIsFirst && _firstWarden) 


Confusing variable / if check here.

removed entirely :P idk why it's there!

MSWS · 2024-03-04T22:05:40Z

mod/Jailbreak.Warden/Global/WardenPeaceBehaviour.cs

+    private readonly ICoroutines _coroutines;
+    private readonly IEventsService _eventsService;
+
+    private readonly float _muteTime = 10.0f;


If possible distinguish this variable from https://github.com/edgegamers/Jailbreak/pull/69/files#diff-e81c196d0b0e42fe347b9e3ee80c463e42c9aa74b8baec3127ed11383c01feaeR16

MSWS · 2024-03-04T22:06:33Z

public/Jailbreak.Public/Mod/Warden/IWardenPeaceService.cs

+
+    // todo document saying that by default all admins SHOULD bypass this mute
+    // not implemented bypass yet
+    public void PeaceMute(float time, bool exemptWarden = false);


Warden should always be exempt.

MSWS · 2024-03-04T22:10:46Z

mod/Jailbreak.Warden/Commands/WardenPeaceCommandsBehavior.cs

+        if (warden == null) return;
+
+        // we only want the warden to be able to run this!
+        if (!invoker.Equals(warden)) return;


Not a fan of wrapping around already written logic for checking if activator is warden. Please use https://github.com/edgegamers/Jailbreak/blob/main/public/Jailbreak.Public/Mod/Warden/IWardenService.cs#L15

MSWS · 2024-03-04T22:11:57Z

mod/Jailbreak.Warden/Global/WardenPeaceBehaviour.cs

+        foreach (CCSPlayerController player in Utilities.GetPlayers())
+        {
+
+            if (player.Equals(_wardenService.Warden) && exemptWarden)


Same issue here, use the interface instead of lower level logic.

MSWS · 2024-03-04T22:13:33Z

mod/Jailbreak.Warden/Global/WardenPeaceBehaviour.cs

+    public void PeaceMute(float time, bool exemptWarden = false)
+    {
+
+        List<CCSPlayerController> alreadyMuted = new List<CCSPlayerController>();


Why keep track of already muted players?

Good point 😆

…heck (for muted players) which does nothing if not set by admin\nadded notification support for whole peace system\ncleanup some random code\nhandled most edge cases I can think of\n TODO handle unmuting players after warmup ends

P250 · 2024-03-05T19:38:06Z

mod/Jailbreak.Rebel/RebelManager.cs

 using Jailbreak.Public.Mod.Rebel;

 namespace Jailbreak.Rebel;

 public class RebelManager : IPluginBehavior, IRebelService
 {
-    private IRebelNotifications notifs;
+    //private IRebelNotifications notifs;


Unused variable? :)

P250 · 2024-03-05T19:38:27Z

lang/Jailbreak.English/Generic/GenericCommandNotifications.cs

@@ -10,7 +9,7 @@ namespace Jailbreak.English.Generic;

 public class GenericCommandNotifications : IGenericCommandNotifications, ILanguage<Formatting.Languages.English>
 {
-	public static FormatObject PREFIX =
+	public static FormatObject GENERIC_PREFIX =


Renamed all prefix's so I can statically include them in my Notification implementation

P250 · 2024-03-05T19:38:52Z

lang/Jailbreak.English/Warden/WardenNotifications.cs

@@ -11,7 +10,7 @@ namespace Jailbreak.English.Warden;

 public class WardenNotifications : IWardenNotifications, ILanguage<Formatting.Languages.English>
 {
-	public static FormatObject PREFIX = new HiddenFormatObject($" {ChatColors.Lime}[{ChatColors.Green}WARDEN{ChatColors.Lime}]")
+	public static readonly FormatObject WARDEN_PREFIX = new HiddenFormatObject($" {ChatColors.Lime}[{ChatColors.Green}WARDEN{ChatColors.Lime}]")


I should make make it readonly for all of them :P

P250 · 2024-03-06T00:59:02Z

An important comment is I need to add support for warmup...

Fixed lots of logic errors Added listeners for when players leave/join server to handle muting of those players Please read todo comments (note to self)

P250 · 2024-03-06T14:09:59Z

mod/Jailbreak.Warden/Global/WardenPeaceBehaviour.cs

@@ -23,6 +23,8 @@ namespace Jailbreak.Warden.Global;
 /// Any unmute functions also try to respect this.
 /// There are a number of event listeners to handle edge cases, such as removing peace-mute when the round ends, or more general things such as 
 /// enabling peace-mute for Terrorists when the round begins.
+/// If a player is alive they should either be able to speak unless peace-mute is active or an admin-mute is active.
+/// If a player is dead they should never be able to speak to alive players, and their admin-mute status should be respected.


todo clarify if this is true or not

separated logic for unmuting dead and alive players added ability for admins to run css_peace as well as warden

…mute-system

P250 · 2024-03-07T13:27:10Z

mod/Jailbreak.Warden/Global/WardenPeaceBehaviour.cs

@@ -308,6 +297,19 @@ public void UnmutePrevMutedPlayers(MuteReason reason, params CsTeam[] targets)

    }

+    public void UnmutePrevMutedDeadPlayers()
+    {
+        if (_roundEnd)


todo I should remove this check from inside the function and have the method that calls this UnmutePrevMutedDeadPlayers() function check for round end instead.

MSWS and others added 2 commits February 10, 2024 14:29

Add team switch listener, fix log assignment (#40) (#41)

01d159a

css_peace / first warden assigned mute

decf532

MSWS requested changes Mar 4, 2024

View reviewed changes

MSWS reviewed Mar 4, 2024

View reviewed changes

BuildTools added 2 commits March 4, 2024 22:51

added css_peace command cooldown / code cleanup

f666467

P250 commented Mar 5, 2024

View reviewed changes

BuildTools added 2 commits March 5, 2024 20:14

API documentation

2fa50af

readonly on notification classes prefixes

4c5d809

MSWS changed the base branch from main to dev March 5, 2024 23:53

BuildTools added 4 commits March 6, 2024 13:50

Code overhaul

1981bfa

Fixed lots of logic errors Added listeners for when players leave/join server to handle muting of those players Please read todo comments (note to self)

remove code repetition

b048cf4

fix

535ccdf

more logic fixes..

fa4c17d

P250 commented Mar 6, 2024

View reviewed changes

BuildTools and others added 4 commits March 6, 2024 15:18

tweaks

a523859

Merge branch 'dev' into mute-system

e9b9fad

logic fixes

fffe439

separated logic for unmuting dead and alive players added ability for admins to run css_peace as well as warden

Merge branch 'mute-system' of https://github.com/P250/Jailbreak into …

bf043bd

…mute-system

P250 commented Mar 7, 2024

View reviewed changes

BuildTools added 2 commits March 7, 2024 18:39

admins can speak over peacemute

eff7b35

tiny thing?

2dda935

Mooshua added this to the 1.1 milestone Mar 8, 2024

MSWS deleted the branch edgegamers:dev March 29, 2024 08:58

MSWS closed this Mar 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

css_peace / first warden mute #69

css_peace / first warden mute #69

P250 commented Mar 4, 2024 •

edited

Loading

MSWS Mar 4, 2024 •

edited

Loading

MSWS Mar 4, 2024

P250 Mar 4, 2024

MSWS Mar 4, 2024

P250 Mar 5, 2024

MSWS Mar 4, 2024

P250 Mar 5, 2024

MSWS Mar 4, 2024

P250 Mar 5, 2024

MSWS Mar 4, 2024

MSWS Mar 4, 2024

P250 Mar 4, 2024

P250 Mar 5, 2024

P250 Mar 5, 2024

P250 Mar 5, 2024

P250 commented Mar 6, 2024

P250 Mar 6, 2024

P250 Mar 7, 2024

css_peace / first warden mute #69

css_peace / first warden mute #69

Conversation

P250 commented Mar 4, 2024 • edited Loading

MSWS Mar 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

P250 commented Mar 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

P250 commented Mar 4, 2024 •

edited

Loading

MSWS Mar 4, 2024 •

edited

Loading