Skip to content

Scp3144 severed hands fix #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
louis1706 merged 4 commits into from
Nov 27, 2024
Merged

Scp3144 severed hands fix #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75c39fa
Probably works
Undid-Iridium Nov 27, 2024
ec1feb5
On vacation, rushed it
Undid-Iridium Nov 27, 2024
d4ced49
Yamato cleanup req
Undid-Iridium Nov 27, 2024
0c3529e
Stylecop?
Undid-Iridium Nov 27, 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
12 changes: 6 additions & 6 deletions EXILED/Exiled.API/Enums/DamageType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ public enum DamageType
/// </summary>
SeveredHands,

/// <summary>
/// Damage caused by severed eyes.
/// </summary>
SeveredEyes,

Comment on lines +123 to +127
Copy link
Copy Markdown

@louis1706 louis1706 Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace the Scp1344 with this one

Copy link
Copy Markdown
Author

@Undid-Iridium Undid-Iridium Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double check me

Copy link
Copy Markdown

@louis1706 louis1706 Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry i meaned than Scp1344 damage is not more used so replace the name of damagetype with the new one you made

Copy link
Copy Markdown
Author

@Undid-Iridium Undid-Iridium Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So good?

Copy link
Copy Markdown

@louis1706 louis1706 Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just removed line 261 no ?

Copy link
Copy Markdown
Author

@Undid-Iridium Undid-Iridium Nov 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

/// <summary>
/// Damage caused by a custom source.
/// </summary>
Expand Down Expand Up @@ -249,10 +254,5 @@ public enum DamageType
/// Damage caused by the marshmallow man.
/// </summary>
Marshmallow,

/// <summary>
/// Damage caused by <see cref="ItemType.SCP1344"/>.
/// </summary>
Scp1344,
}
}
}
4 changes: 2 additions & 2 deletions EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static class DamageTypeExtensions
{ DeathTranslations.MicroHID.Id, DamageType.MicroHid },
{ DeathTranslations.Hypothermia.Id, DamageType.Hypothermia },
{ DeathTranslations.MarshmallowMan.Id, DamageType.Marshmallow },
{ DeathTranslations.Scp1344.Id, DamageType.Scp1344 },
{ DeathTranslations.Scp1344.Id, DamageType.SeveredEyes },
};

private static readonly Dictionary<DeathTranslation, DamageType> TranslationConversionInternal = new()
Expand Down Expand Up @@ -81,7 +81,7 @@ public static class DamageTypeExtensions
{ DeathTranslations.MicroHID, DamageType.MicroHid },
{ DeathTranslations.Hypothermia, DamageType.Hypothermia },
{ DeathTranslations.MarshmallowMan, DamageType.Marshmallow },
{ DeathTranslations.Scp1344, DamageType.Scp1344 },
{ DeathTranslations.Scp1344, DamageType.SeveredEyes },
};

private static readonly Dictionary<ItemType, DamageType> ItemConversionInternal = new()
Expand Down
3 changes: 3 additions & 0 deletions EXILED/Exiled.API/Features/DamageHandlers/GenericDamageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ public GenericDamageHandler(Player player, Player attacker, float damage, Damage
case DamageType.SeveredHands:
Base = new UniversalDamageHandler(damage, DeathTranslations.SeveredHands, cassieAnnouncement);
break;
case DamageType.SeveredEyes:
Base = new UniversalDamageHandler(damage, DeathTranslations.Scp1344, cassieAnnouncement);
break;
case DamageType.Warhead:
Base = new WarheadDamageHandler();
break;
Expand Down