Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a8999ca
Merge pull request #2 from ExMod-Team/master
louis1706 Aug 16, 2024
a4348e0
Merge pull request #3 from ExMod-Team/dev
louis1706 Sep 1, 2024
c425509
Merge pull request #5 from ExMod-Team/dev
louis1706 Sep 12, 2024
cede6c2
SL version bump
Misaka-ZeroTwo Oct 22, 2024
698037e
new effects
Misaka-ZeroTwo Oct 22, 2024
135020c
Merge branch 'dev' into halloween-effects
Misaka-ZeroTwo Oct 22, 2024
bbac21d
docs
Misaka-ZeroTwo Oct 22, 2024
55fb04f
Merge branches 'halloween-effects' and 'halloween-effects' of https:/…
Misaka-ZeroTwo Oct 22, 2024
d0e14ad
Merge pull request #7 from ExMod-Team/dev
louis1706 Oct 23, 2024
6009890
Map.IsHubertSky
louis1706 Nov 3, 2023
95049de
missing doc
louis1706 Nov 3, 2023
0c0fb4e
halloween!!!
VALERA771 Oct 23, 2024
e8e6a1f
Merge pull request #8 from Misaka-SL-Project/halloween-effects
louis1706 Oct 23, 2024
46ffeb3
NotFinish
louis1706 Oct 23, 2024
1316589
Merge branch 'hallowen-2024' of https://github.com/louis1706/EXILED i…
louis1706 Oct 23, 2024
225376d
Fix
louis1706 Oct 23, 2024
7b27b0c
New DamageType
louis1706 Oct 23, 2024
8177a4d
SilentDamageHandler
louis1706 Oct 23, 2024
349a9e4
ShakeCamera
louis1706 Oct 23, 2024
fa25cee
MetalPipe and fix health bug
louis1706 Oct 23, 2024
11e2b73
Merge branch 'halloween-2024' into halloween-2024
louis1706 Oct 23, 2024
af1a506
Merge branch 'halloween-2024' into hallowen-2024
louis1706 Oct 23, 2024
80e191f
Merge branch 'halloween-2024' into hallowen-2024
louis1706 Oct 23, 2024
a348abd
Merge branch 'halloween-2024' into halloween-2024
VALERA771 Oct 23, 2024
91f1393
Merge branch 'pr/142' into halloween-2024
VALERA771 Oct 23, 2024
f60b3b3
Merge remote-tracking branch 'origin/halloween-2024' into halloween-2024
VALERA771 Oct 23, 2024
bfd6c8d
changes
VALERA771 Oct 23, 2024
daa7ff6
docs + metal pipe
VALERA771 Oct 23, 2024
1dd4970
some updates
VALERA771 Oct 23, 2024
a62ec3b
*metal pipe sounds*
VALERA771 Oct 23, 2024
9d6c955
rename
VALERA771 Oct 23, 2024
c2bd45b
spawn chance for skeletron
VALERA771 Oct 23, 2024
70c7cae
fix 1
VALERA771 Oct 24, 2024
edec0ba
Merge branch 'halloween-2024' into halloween-2024
VALERA771 Oct 24, 2024
3a6792f
Merge branch 'ExMod-Team:halloween-2024' into halloween-2024
VALERA771 Oct 25, 2024
311ad62
simplifying ywy
VALERA771 Oct 25, 2024
ec2906c
fixing fix
VALERA771 Oct 25, 2024
18fd0c4
fixing fix part 2
VALERA771 Oct 25, 2024
e7ff213
moving metal
VALERA771 Oct 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions EXILED/Exiled.API/Enums/EffectType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,6 @@ public enum EffectType
/// </summary>
Marshmallow,

/// <summary>
/// Makes you metal.
/// </summary>
Metal,

/// <summary>
/// The effect that is given to the player when getting attacked by SCP-3114's Strangle ability.
/// </summary>
Expand Down Expand Up @@ -293,5 +288,10 @@ public enum EffectType
/// <see cref="CustomPlayerEffects.OrangeWitness"/>
/// </summary>
OrangeWitness,

/// <summary>
/// Makes you metal.
/// </summary>
Metal,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
Label returnLabel = generator.DefineLabel();
Label continueLabel = generator.DefineLabel();
Label jmp = generator.DefineLabel();
Label skip = generator.DefineLabel();

LocalBuilder changingRoleEventArgs = generator.DeclareLocal(typeof(ChangingRoleEventArgs));
LocalBuilder player = generator.DeclareLocal(typeof(API.Features.Player));
Expand Down Expand Up @@ -154,15 +153,13 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi

newInstructions.InsertRange(
newInstructions.Count - 1,
new[]
new CodeInstruction[]
{
// if (player.ReferenceHub == ReferenceHub.LocalHub)
// goto skip;
new(OpCodes.Ldloc_S, player.LocalIndex),
new(OpCodes.Callvirt, PropertyGetter(typeof(API.Features.Player), nameof(API.Features.Player.ReferenceHub))),
new(OpCodes.Callvirt, PropertyGetter(typeof(ReferenceHub), nameof(ReferenceHub.LocalHub))),
new(OpCodes.Call, Method(typeof(ReferenceHub), "op_Equality")),
new(OpCodes.Brtrue_S, skip),
// if (this.isLocalPlayer)
// return;
new(OpCodes.Ldarg_0),
new(OpCodes.Callvirt, PropertyGetter(typeof(PlayerRoleManager), nameof(PlayerRoleManager.isLocalPlayer))),
new(OpCodes.Brtrue_S, returnLabel),

// player
new(OpCodes.Ldloc_S, player.LocalIndex),
Expand All @@ -175,8 +172,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi

// Handlers.Player.OnSpawned(spawnedEventArgs)
new(OpCodes.Call, Method(typeof(Player), nameof(Player.OnSpawned))),

new CodeInstruction(OpCodes.Nop).WithLabels(skip),
});

newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);
Expand Down