11namespace BetterDoggie
22{
33 using System ;
4- using UnityEngine ;
54 using Exiled . API . Features ;
65 using Exiled . Events . EventArgs ;
76 using Interactables . Interobjects ;
@@ -13,15 +12,16 @@ public static class EventHandlers
1312 {
1413 public static void OnChangingRoles ( ChangingRoleEventArgs ev )
1514 {
16- if ( ev . Player . Role == RoleType . Scp93953 || ev . Player . Role == RoleType . Scp93989 )
17- ev . Player . Scale = new Vector3 ( 1 , 1 , 1 ) ;
18-
19- if ( ev . NewRole != RoleType . Scp93953 && ev . NewRole != RoleType . Scp93989 )
15+ // Not sure why that was there. Probably me being stupid or I didnt comment something that said it was there for a reason lmao
16+ /*if (Is939(ev.Player.Role))
17+ ev.Player.Scale = new Vector3(1, 1, 1);*/
18+
19+ if ( ! ev . NewRole . Is939 ( ) )
2020 return ;
2121
2222 Timing . CallDelayed ( 2f , ( ) =>
2323 {
24- if ( ev . Player == null || ( ev . Player . Role != RoleType . Scp93953 && ev . Player . Role != RoleType . Scp93989 ) ) return ;
24+ if ( ev . Player == null || ! Is939 ( ev . Player . Role ) ) return ;
2525
2626 ev . Player . Broadcast ( BetterDoggie . Singleton . Config . SpawnBroadcast ) ;
2727
@@ -40,16 +40,16 @@ public static void OnChangingRoles(ChangingRoleEventArgs ev)
4040
4141 public static void OnHurtingPlayer ( HurtingEventArgs ev )
4242 {
43- if ( ev . Attacker == null || ev . Target == null || ev . Attacker == ev . Target || ( ev . Attacker . Role != RoleType . Scp93953 && ev . Attacker . Role != RoleType . Scp93989 ) )
43+ if ( ev . Attacker == null || ev . Target == null || ev . Attacker == ev . Target || ! Is939 ( ev . Attacker . Role ) )
4444 return ;
4545
46- // Original damage + percentage of hume shield gone * max damage (40 + .50 * 150)
46+ // Original damage + percentage of hume shield gone * max damage | ex. (40 + .50 * 150)
4747 var maxHume = BetterDoggie . Singleton . Config . DoggieAhp ;
4848 ev . Amount = BetterDoggie . Singleton . Config . BaseDamage +
4949 Math . Abs ( ev . Attacker . ArtificialHealth - maxHume ) /
5050 ( maxHume * BetterDoggie . Singleton . Config . MaxDamageBoost ) ;
5151
52- ev . Attacker . EnableEffect < SinkHole > ( 3f , true ) ;
52+ ev . Attacker . EnableEffect < SinkHole > ( BetterDoggie . Singleton . Config . SlowdownDuration , BetterDoggie . Singleton . Config . ShouldSlowdownStack ) ;
5353 ev . Attacker . ChangeEffectIntensity < SinkHole > ( 2 ) ;
5454 }
5555
@@ -58,7 +58,7 @@ public static void OnInteractingDoor(InteractingDoorEventArgs ev)
5858 if ( ! BetterDoggie . Singleton . Config . EnableDogDoorBusting )
5959 return ;
6060
61- if ( ( ev . Player . Role != RoleType . Scp93953 && ev . Player . Role != RoleType . Scp93989 )
61+ if ( ! Is939 ( ev . Player . Role )
6262 || ( ev . Door . Base is IDamageableDoor door && door . IsDestroyed )
6363 || ( ev . Door . Base is PryableDoor gate && gate . IsConsideredOpen ( ) ) )
6464 return ;
@@ -91,5 +91,16 @@ private static void BustDoor(DoorVariant door, Player ply, bool speedBoost)
9191 ply . ChangeEffectIntensity < MovementBoost > ( BetterDoggie . Singleton . Config . BustBoostAmount ) ;
9292 Timing . CallDelayed ( 2f , ( ) => ply . ChangeEffectIntensity < MovementBoost > ( BetterDoggie . Singleton . Config . ColaSpeedBoost ) ) ;
9393 }
94+
95+
96+ /// <summary>
97+ /// Check if player is 939
98+ /// </summary>
99+ /// <param name="role"></param>
100+ /// <returns></returns>
101+ private static bool Is939 ( RoleType role )
102+ {
103+ return role == RoleType . Scp93953 || role == RoleType . Scp93989 ;
104+ }
94105 }
95106}
0 commit comments