Various changes I have needed #2153

joker-119 · 2023-10-19T12:59:36Z

Simple enough changes, feel free to keep em, or don't.

…ctly

# Conflicts: # Exiled.CustomRoles/API/Features/CustomRole.cs

…ctly

This reverts commit 522b587.

HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT HUBERT

* npcs fix * fix `IAcquisitionConfirmationTrigger` logic * final 330 fix

louis1706

Update Branch with Dev

# Conflicts: # EXILED.props # Exiled.API/Enums/DamageType.cs # Exiled.API/Enums/EffectType.cs # Exiled.API/Extensions/DamageTypeExtensions.cs # Exiled.API/Extensions/EffectTypeExtension.cs # Exiled.API/Features/Effect.cs # Exiled.API/Features/Items/Flashlight.cs # Exiled.API/Features/Items/Item.cs # Exiled.API/Features/Pickups/BodyArmorPickup.cs # Exiled.API/Features/Pickups/Pickup.cs # Exiled.API/Features/Player.cs # Exiled.API/Features/Roles/Scp3114Role.cs # Exiled.Events/EventArgs/Player/TogglingFlashlightEventArgs.cs # Exiled.Events/EventArgs/Scp049/StartingRecallEventArgs.cs # Exiled.Events/Handlers/Scp3114.cs # Exiled.Events/Patches/Events/Player/Hurting.cs # Exiled.Events/Patches/Events/Player/SendingAdminChatMessage.cs # Exiled.Events/Patches/Events/Player/UsingAndCancellingItemUse.cs # Exiled.Events/Patches/Events/Scp049/ActivatingSense.cs # Exiled.Events/Patches/Events/Scp049/SendingCall.cs # Exiled.Events/Patches/Events/Scp0492/Consumed.cs # Exiled.Events/Patches/Events/Scp079/ChangingCamera.cs # Exiled.Events/Patches/Events/Scp079/Pinging.cs # Exiled.Events/Patches/Events/Scp079/RoomBlackout.cs # Exiled.Events/Patches/Events/Scp079/ZoneBlackout.cs # Exiled.Events/Patches/Events/Scp3114/Disguising.cs # Exiled.Events/Patches/Events/Scp3114/Revealing.cs # Exiled.Events/Patches/Events/Scp3114/TryUseBody.cs # Exiled.Events/Patches/Generic/PickupControlPatch.cs # Exiled.Events/Patches/Generic/Scp049API/CallAbilityDuration.cs # Exiled.Events/Patches/Generic/Scp049API/SenseAbilityBaseCooldown.cs # Exiled.Events/Patches/Generic/Scp049API/SenseAbilityReducedCooldown.cs # Exiled.Events/Patches/Generic/Scp106API/CooldownReductionReward.cs # Exiled.Events/Patches/Generic/Scp106API/CustomAttack.cs # Exiled.Events/Patches/Generic/Scp106API/HunterAtlastCostPerMetter.cs # Exiled.Events/Patches/Generic/Scp106API/SinkholeAbilityCooldown.cs # Exiled.Events/Patches/Generic/Scp106API/StalkVigorUse.cs # Exiled.Events/Patches/Generic/Scp106API/VigorRegeneration.cs # Exiled.Loader/AutoUpdateFiles.cs # docs/docs/Resources/Intro.md

# Conflicts: # EXILED.props # Exiled.API/Features/Effect.cs # Exiled.API/Features/Pickups/BodyArmorPickup.cs # Exiled.API/Features/Pickups/Pickup.cs # Exiled.API/Features/Player.cs # Exiled.Events/EventArgs/Scp049/StartingRecallEventArgs.cs # Exiled.Events/Handlers/Scp3114.cs # Exiled.Events/Patches/Events/Player/Hurting.cs # Exiled.Events/Patches/Events/Player/SendingAdminChatMessage.cs # Exiled.Events/Patches/Events/Player/UsingAndCancellingItemUse.cs # Exiled.Events/Patches/Generic/PickupControlPatch.cs # Exiled.Events/Patches/Generic/Scp106API/HunterAtlastCostPerMetter.cs # Exiled.Events/Patches/Generic/Scp106API/SinkholeAbilityCooldown.cs # Exiled.Events/Patches/Generic/Scp106API/StalkVigorUse.cs # Exiled.Events/Patches/Generic/Scp106API/VigorRegeneration.cs # Exiled.Loader/AutoUpdateFiles.cs # docs/docs/Resources/Intro.md

# Conflicts: # Exiled.API/Extensions/MirrorExtensions.cs # Exiled.API/Features/Pickups/BodyArmorPickup.cs # Exiled.Events/Patches/Events/Item/JailbirdPatch.cs

louis1706 · 2023-11-22T20:54:38Z

Exiled.API/Features/Pickups/Pickup.cs

@@ -571,6 +572,7 @@ public void UnSpawn()
        {
            if (IsSpawned)
            {
+                IsSpawned = false;


Suggested change

IsSpawned = false;

louis1706 · 2023-11-22T20:54:44Z

Exiled.API/Features/Pickups/Pickup.cs

@@ -541,6 +541,7 @@ public void Spawn()
            if (!IsSpawned)
            {
                NetworkServer.Spawn(GameObject);
+                IsSpawned = true;


Suggested change

IsSpawned = true;

louis1706 · 2023-11-22T20:55:01Z

Exiled.API/Features/Pickups/Pickup.cs

@@ -291,7 +291,7 @@ public Quaternion Rotation
        /// <summary>
        /// Gets a value indicating whether this pickup is spawned.
        /// </summary>
-        public bool IsSpawned => NetworkServer.spawned.ContainsValue(Base.netIdentity);
+        public bool IsSpawned { get; internal set; }


Suggested change

public bool IsSpawned { get; internal set; }

public bool IsSpawned => NetworkServer.spawned.ContainsValue(Base.netIdentity);

louis1706 · 2023-11-22T20:55:30Z

docs/docs/Resources/Intro.md

Remove Change

louis1706 · 2023-11-22T20:58:41Z

Exiled.Loader/Loader.cs

Remove Change

louis1706 · 2023-11-22T21:00:13Z

Exiled.Events/Patches/Generic/Scp079Scan.cs

Remove change

louis1706 · 2023-11-22T21:00:31Z

Exiled.Events/Patches/Fixes/FixJailbirdHitWindowsCrash.cs

Remove change

louis1706 · 2023-11-22T21:00:44Z

Exiled.Events/Patches/Events/Scp330/DroppingCandy.cs

Remove change

louis1706 · 2023-11-22T21:01:44Z

Exiled.Events/Patches/Events/Player/Verified.cs

Remove change

louis1706 · 2023-11-22T21:04:55Z

Exiled.Events/EventArgs/Scp3114/StranglingEventArgs.cs

+            set
+            {
+                target = value;
+                switch (target is null)
+                {
+                    case true:
+                        StrangleTarget = default(Scp3114Strangle.StrangleTarget);
+                        break;
+                    case false:
+                        StrangleTarget = new(target.ReferenceHub, strangle.GetStranglePosition(target.ReferenceHub.roleManager.CurrentRole as HumanRole), Player.Position);
+                        break;
+                }
+            }


There Problem with it Player is not Target

louis1706 · 2023-12-04T09:29:33Z

#2311 #2312 #2313 #2314 #2315

PR has been separated

louis1706 and others added 30 commits October 8, 2023 17:30

Fix NW

a87cf97

FUCK that so dumb

99bfa79

nah, cringe logic

90bcaff

:)

73d622f

Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…

4474c5d

…ctly

Merge branch 'dev' into Fix-DroppingScp330Event-Desync-client-candy

458f533

Update Consuming.cs

c5b7d1a

fix

b7cafa7

Update

80d4a78

Merge branch 'more-ability-extensions' into dev

5a493ed

# Conflicts: # Exiled.CustomRoles/API/Features/CustomRole.cs

Merge branch 'fix-room-position-methods' into dev

d308d09

Merge branch 'small-inventory-fix' into dev

d203b28

Merge branch 'make-npcs-not-show-on-player-count' into dev

c08c16d

u

564b6a4

Merge branch 'dev' into Fix-Bug-than-Grenade-do-not-make-damage-corre…

fed2fac

…ctly

Merge branch 'dev' into EnableEffect-should-have-intensity-argument

8ccc2ed

Fix

73141ac

I will re add setter later when i found a good way to do them

3ffbd53

Merge branch 'dev' into Scp079Role-fix

d02f8f9

Merge branch 'dev' into ReworkingScp079Transpiller

528b425

Merge branch 'dev' into Scp106ReworkTranspiller

24bd5e8

Revert "NetherCode"

dd3d535

This reverts commit 522b587.

will add this later

0cd64fe

RemoveError

e427dec

Remove Error

d4cfa93

Update ZoneBlackoutEventArgs.cs

2042b37

Fix error

d2908b4

Space

68a0b25

Bruh

d5a6008

No Fix

7116059

louis1706 and others added 11 commits November 3, 2023 11:34

Fix TryAddCandy

b03bbc4

Fix than ConfirmAcqusition need to be done after some tick

c404084

Bump Version

b58705a

missing doc

019760a

ItemType.AntiSCP207 was missing for Usable object

da06540

Checking if player is connected

006b1c8

Fix TogglingFlashlight to work with Lantern

11552a8

Fixes (Exiled-Team#2205)

cd645a8

* npcs fix * fix `IAcquisitionConfirmationTrigger` logic * final 330 fix

Add Scp3114Role.VoiceLines and Scp3114Role.PlaySound()

156b4d5

Merge branch 'halloween-2023' into dev

b9a3edd

louis1706 requested changes Nov 11, 2023

View reviewed changes

Merge branch 'dev' into dev

834faf7

louis1706 approved these changes Nov 13, 2023

View reviewed changes

joker-119 added 10 commits November 13, 2023 03:05

yes

fa1e061

ok

f850a87

???

2f36afd

yes

6119f36

Merge branch 'dev' into dev-joker

b8a3213

# Conflicts: # Exiled.API/Extensions/MirrorExtensions.cs # Exiled.API/Features/Pickups/BodyArmorPickup.cs # Exiled.Events/Patches/Events/Item/JailbirdPatch.cs

Someone's an idiot

e7e717d

Someone else is also retarded

0e8cd78

louis1706 reviewed Nov 22, 2023

View reviewed changes

louis1706 added the Do not merge Don't merge this PR label Nov 22, 2023

louis1706 mentioned this pull request Nov 22, 2023

Add StranglingEventArgs. #2294

Closed

louis1706 closed this Dec 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various changes I have needed #2153

Various changes I have needed #2153

joker-119 commented Oct 19, 2023

louis1706 left a comment

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 Nov 22, 2023

louis1706 commented Dec 4, 2023

	public bool IsSpawned { get; internal set; }
	public bool IsSpawned => NetworkServer.spawned.ContainsValue(Base.netIdentity);

Various changes I have needed #2153

Various changes I have needed #2153

Conversation

joker-119 commented Oct 19, 2023

louis1706 left a 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

louis1706 commented Dec 4, 2023