Fixed Event StartingRecallEventArgs's IsAllowed issue. #2226

XKaguya · 2023-11-11T12:32:13Z

StartingRecallEventArgs's IsAllowed won't stop the event. Patch at RagdollAbilityBase could solve this.

* Added ChaosTargetCount * a * Updated * Fix build errors --------- Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> Co-authored-by: Nao <60253860+NaoUnderscore@users.noreply.github.com>

This reverts commit c3612c9.

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

Now the IsAllowed will work as what it should be.

XKaguya · 2023-11-11T13:26:15Z

The part of

                // base.CurRagdoll
                new(OpCodes.Ldarg_1),
                new(OpCodes.Callvirt, PropertyGetter(typeof(RagdollAbilityBase<Scp049Role>), nameof(RagdollAbilityBase<Scp049Role>.CurRagdoll))),

currently will lead into crash , dont merge before if i can fix this bug.Another option is to give up acquiring Target players, although I know this is not realistic, lol

louis1706 · 2023-11-11T15:49:23Z

this will also be call for Scp0492 'RagdollAbilityBase'

XKaguya · 2023-11-11T16:51:00Z

this will also be call for Scp0492 'RagdollAbilityBase'

yes , that is what the arg used for.Actually it will be call by Scp3114, but to doing limits on the Player , then it can be avoided.

XKaguya · 2023-11-11T17:32:48Z

The problem about previous patch's IsAllowed is not vailed is because NW using non-zero as error code.Meanwhile Transpiler can't modify the return value.
So the patch must use Prefix instead of Transpiler .
Things are all done now.This event can get Target, Player, Ragdoll and IsAllowed.

By using

using System;
using Exiled.API.Features;
using PlayerRoles;
using System.Linq;
using Exiled.Events.EventArgs.Scp049;
using LimitZombie.Events.EventArgs.Scp049;
using static PlayerRoles.PlayableScps.Scp049.Zombies.ZombieAudioPlayer;

namespace LimitZombie
{
    public class ResurrectHandler
    {
        public static void ShowMessageOnConsole(int playerCount, int zombieCount, bool IsAllowed, bool IsMaxed)
        {
            int Limit;
            
            if (IsMaxed)
            {
                CalcLimit(playerCount, out Limit);
                Log.Info($"SCP-049-2 count is {zombieCount}.Max {Limit} Event blocked.");
                Log.Info("Executed branch 2.");
                Log.Info($"Current Flag: {IsAllowed}");
            }
            else
            {
                CalcLimit(playerCount, out Limit);
                Log.Info($"SCP-049-2 count is {zombieCount}.Max {Limit} Event is not blocked.");
                Log.Info("Executed branch 1.");
                Log.Info($"Current Flag: {IsAllowed}");
            }
        }

        public static void CalcLimit(int count, out int limit)
        {
            limit = (int)Math.Round(count * 2.0 / 3.0);
        }
        
        public static void OnResurrect(StartingRecallEventArgsMod ev)
        {
            Log.Info($"ev type: {ev.GetType().FullName}");

            Log.Info($"ev.IsAllowed: {ev?.IsAllowed}");
            Log.Info($"ev.Player: {ev?.Player}");
            Log.Info($"ev.Ragdoll: {ev?.Ragdoll}");

            Player player = ev.Player;
            Player target = ev.Ragdoll.Owner ?? null;

            Log.Info($"Executed Player: {player}");
            Log.Info($"Target Player: {target}");

            Log.Info($"Entering OnResurrect. Initial IsAllowed: {ev.IsAllowed}");

            if (player.Role.Type == RoleTypeId.Scp049)
            {
                bool Test = true;
                if (Test)
                {
                    int scp0492Count = Player.List.Count(player => player.Role == RoleTypeId.Scp0492);
                    int playerList = Player.List.Count;
                    int scpList = Player.List.Count(player => player.Role.Type == RoleTypeId.Scp049 || player.Role.Type == RoleTypeId.Scp096 || player.Role.Type == RoleTypeId.Scp106 || player.Role.Type == RoleTypeId.Scp3114 || player.Role.Type == RoleTypeId.Scp173 || player.Role.Type == RoleTypeId.Scp939 || player.Role.Type == RoleTypeId.Scp096);
                    int playerCount = playerList - scpList;
                    int Limit;

                    CalcLimit(playerCount, out Limit);
                    string msg = $"本局非SCP人数：{playerCount}，本局最多可同时存在{Limit}个小僵尸。目前小僵尸数量：{scp0492Count}。";

                    Log.Info($"Entering Method OnResurrect");
                    if (scp0492Count == Limit)
                    {
                        Log.Info("Event is now Blocked.");
                        player.Broadcast(5, msg, Broadcast.BroadcastFlags.Normal, true);
                        ShowMessageOnConsole(playerCount, scp0492Count, ev.IsAllowed, true);
                        ev.IsAllowed = false;
                    }
                    else
                    {
                        Log.Info("Event is not Blocked.");
                        player.Broadcast(5, msg, Broadcast.BroadcastFlags.Normal, true);
                        ShowMessageOnConsole(playerCount, scp0492Count, ev.IsAllowed, false);
                        ev.IsAllowed = true;
                    }
                }
                else
                {
                    int scp0492Count = Player.List.Count(player => player.Role == RoleTypeId.Scp0492);
                    int playerList = Player.List.Count;
                    int scpList = Player.List.Count(player => player.Role.Type == RoleTypeId.Scp049 || player.Role.Type == RoleTypeId.Scp096 || player.Role.Type == RoleTypeId.Scp106 || player.Role.Type == RoleTypeId.Scp3114 || player.Role.Type == RoleTypeId.Scp173 || player.Role.Type == RoleTypeId.Scp939 || player.Role.Type == RoleTypeId.Scp096);
                    int playerCount = playerList - scpList;
                    int Limit;

                    CalcLimit(playerCount, out Limit);
                    string msg = $"本局非SCP人数：{playerCount}，本局最多可同时存在{Limit}个小僵尸。目前小僵尸数量：{scp0492Count}。";

                    player.Broadcast(5, msg, Broadcast.BroadcastFlags.Normal, true);
                    ShowMessageOnConsole(playerCount, scp0492Count, ev.IsAllowed, false);
                    ev.IsAllowed = true;
                }
            }
            Log.Info($"Exiting OnResurrect. Final IsAllowed: {ev.IsAllowed}");
        }
    }
}

The event written by myself.I can get such info:

[2023-11-12 01:26:07.933 +08:00] [INFO] [LimitZombie] ev type: LimitZombie.Events.EventArgs.Scp049.StartingRecallEventArgsMod
[2023-11-12 01:26:07.945 +08:00] [INFO] [LimitZombie] ev.IsAllowed: True
[2023-11-12 01:26:07.956 +08:00] [INFO] [LimitZombie] ev.Player: 2 (辉夜) [76561198372680760@steam] *Scp SCPs Scp049 True*
[2023-11-12 01:26:07.968 +08:00] [INFO] [LimitZombie] ev.Ragdoll: 4 (Dummy) [Dummy@localhost] *None Dead Spectator True* (Ragdoll_1(Clone)) [Killed directly by SCP-049 (辉夜).] *ClassD* |12/11/2023 01:26:07| =False=
[2023-11-12 01:26:07.979 +08:00] [INFO] [LimitZombie] Executed Player: 2 (辉夜) [76561198372680760@steam] *Scp SCPs Scp049 True*
[2023-11-12 01:26:07.992 +08:00] [INFO] [LimitZombie] Target Player: 4 (Dummy) [Dummy@localhost] *None Dead Spectator True*
[2023-11-12 01:26:08.005 +08:00] [INFO] [LimitZombie] Entering OnResurrect. Initial IsAllowed: True
[2023-11-12 01:26:08.016 +08:00] [INFO] [LimitZombie] Entering Method OnResurrect
[2023-11-12 01:26:08.027 +08:00] [INFO] [LimitZombie] Event is now Blocked.
[2023-11-12 01:26:08.039 +08:00] [INFO] [LimitZombie] SCP-049-2 count is 1.Max 1 Event blocked.
[2023-11-12 01:26:08.051 +08:00] [INFO] [LimitZombie] Executed branch 2.
[2023-11-12 01:26:08.063 +08:00] [INFO] [LimitZombie] Current Flag: True
[2023-11-12 01:26:08.074 +08:00] [INFO] [LimitZombie] Exiting OnResurrect. Final IsAllowed: False

louis1706 · 2023-11-11T17:59:37Z

IsAllowed

Transpiler can modify return value ???

XKaguya · 2023-11-11T18:00:29Z

IsAllowed

Transpiler can modify return value ???

uh , letme try that lol , forget its just stack

XKaguya · 2023-11-11T18:41:47Z

IsAllowed

Transpiler can modify return value ???

Alright. now i've rewritten as Transpiler.And tested.

Misaka-ZeroTwo · 2023-11-11T23:44:19Z

Please target dev branch.

Misaka-ZeroTwo · 2023-11-12T01:42:55Z

Exiled.Events/EventArgs/Scp049/StartingRecallEventArgs.cs

+        /// <param name="isAllowed">
+        ///     <inheritdoc cref="IsAllowed" />
+        /// </param>
+        public StartingRecallEventArgsMod(Player player, Ragdoll ragdoll, bool isAllowed = true)


Suggested change

public StartingRecallEventArgsMod(Player player, Ragdoll ragdoll, bool isAllowed = true)

public StartingRecallEventArgs(Player player, Ragdoll ragdoll, bool isAllowed = true)

XKaguya · 2023-11-12T04:38:07Z

Please target dev branch.

OK I'll do it after i get up

Misaka-ZeroTwo · 2023-11-12T04:59:15Z

You will need to create a separate PR to prevent conflicts.

NaoUnderscore and others added 12 commits September 10, 2023 16:22

v8.2.1 (#2103)

2ee5cd2

Fix CI

081a8dd

Added ChaosTargetCount (#2106)

c3612c9

* Added ChaosTargetCount * a * Updated * Fix build errors --------- Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> Co-authored-by: Nao <60253860+NaoUnderscore@users.noreply.github.com>

Revert "Added ChaosTargetCount (#2106)" (#2110)

c71e070

This reverts commit c3612c9.

Woah more proper English (#2196)

b0ccc53

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

Create halloween.yml

e4c3b6f

Create halloween.yml (#2220)

a605251

Update halloween.yml

99a18d5

Update halloween.yml (#2222) second try

ea74b3e

Fixed IsAllowed issue.

4bad8e4

Now the IsAllowed will work as what it should be.

Fixed IsAllowed Issue.

a51eacc

Fixed crash issue.

4a94fe3

XKaguya added 2 commits November 12, 2023 01:30

Fixed all issue.

71c6363

Fixed Issue.

c135197

louis1706 assigned XKaguya Nov 11, 2023

louis1706 added regarding-events regarding-transpiler labels Nov 11, 2023

Using Transpiler instead of Prefix

cde3c8a

XKaguya added 2 commits November 12, 2023 02:43

Uploaded correct file

240a691

Fixed some little issue on desc

f346dc8

Misaka-ZeroTwo requested changes Nov 12, 2023

View reviewed changes

Fixed Issue.

f8d4cb1

XKaguya changed the base branch from master to dev November 12, 2023 04:56

XKaguya closed this by deleting the head repository Nov 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed Event StartingRecallEventArgs's IsAllowed issue. #2226

Fixed Event StartingRecallEventArgs's IsAllowed issue. #2226

XKaguya commented Nov 11, 2023

XKaguya commented Nov 11, 2023 •

edited

Loading

louis1706 commented Nov 11, 2023 •

edited

Loading

XKaguya commented Nov 11, 2023

XKaguya commented Nov 11, 2023 •

edited

Loading

louis1706 commented Nov 11, 2023

XKaguya commented Nov 11, 2023

XKaguya commented Nov 11, 2023

Misaka-ZeroTwo commented Nov 11, 2023

Misaka-ZeroTwo Nov 12, 2023

XKaguya commented Nov 12, 2023

Misaka-ZeroTwo commented Nov 12, 2023

	public StartingRecallEventArgsMod(Player player, Ragdoll ragdoll, bool isAllowed = true)
	public StartingRecallEventArgs(Player player, Ragdoll ragdoll, bool isAllowed = true)

Fixed Event StartingRecallEventArgs's IsAllowed issue. #2226

Fixed Event StartingRecallEventArgs's IsAllowed issue. #2226

Conversation

XKaguya commented Nov 11, 2023

XKaguya commented Nov 11, 2023 • edited Loading

louis1706 commented Nov 11, 2023 • edited Loading

XKaguya commented Nov 11, 2023

XKaguya commented Nov 11, 2023 • edited Loading

louis1706 commented Nov 11, 2023

XKaguya commented Nov 11, 2023

XKaguya commented Nov 11, 2023

Misaka-ZeroTwo commented Nov 11, 2023

Misaka-ZeroTwo Nov 12, 2023

Choose a reason for hiding this comment

XKaguya commented Nov 12, 2023

Misaka-ZeroTwo commented Nov 12, 2023

XKaguya commented Nov 11, 2023 •

edited

Loading

louis1706 commented Nov 11, 2023 •

edited

Loading

XKaguya commented Nov 11, 2023 •

edited

Loading