Skip to content
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.

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

[Messages] Fix multiple errors in spell damage at death. #4264

Merged
merged 2 commits into from
Apr 28, 2024

Conversation

noudess
Copy link
Contributor

@noudess noudess commented Apr 16, 2024

Description

This fixes a few errors in messages that appeared, or were missing at the time of a death to spell damage.

  1. If a mob died to a proc (like poison or weapon proc) or to a damagjng discipline, the non-melee damage came out twice.
  2. If a mob died to spell damage (non-dot) the color message did not come out. (xyz has been poisoned, etc)
  3. If a mob died to DoT spell damage sometimes the color message did come out on the tic at which the mob died, which is incorrect.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Testing

Before and after examples:

1 Before:
[Wed Apr 10 09:42:59 2024] Noudess hit a skeletal monk for 117 points of non-melee damage.
[Wed Apr 10 09:42:59 2024] You strike a skeletal monk for 117 points of damage.
[Wed Apr 10 09:42:59 2024] You have slain a skeletal monk!

1 After:
[Wed Apr 10 20:27:05 2024] Noudess hit dry bone skeleton for 117 points of non-melee damage.
[Wed Apr 10 20:27:05 2024] Dry bone skeleton has been poisoned.
[Wed Apr 10 20:27:05 2024] You have slain dry bone skeleton!

2 Before:
[Tue Apr 16 10:34:33 2024] Nowdess hit a skeleton for 81 points of non-melee damage.
[Tue Apr 16 10:34:33 2024] You have slain a skeleton!

2 After:
[Tue Apr 16 10:53:13 2024] Nowdess hit a skeleton for 81 points of non-melee damage.
[Tue Apr 16 10:53:13 2024] A skeleton has been poisoned.
[Tue Apr 16 10:53:13 2024] You have slain a skeleton!

3 Before:
[Tue Apr 16 11:14:18 2024] Nowdess hit Bear for 6 points of non-melee damage.
[Tue Apr 16 11:14:18 2024] Nowdess has defeated Bear in a duel to the death!
[Tue Apr 16 11:14:18 2024] Bear has been poisoned.
[Tue Apr 16 11:14:18 2024] Your Poison Bolt spell has worn off of Bear.
[Tue Apr 16 11:14:18 2024] You have slain Bear!

3 After:
[Tue Apr 16 11:05:20 2024] Nowdess hit a skeleton for 10 points of non-melee damage.
[Tue Apr 16 11:05:20 2024] Your Poison Bolt spell has worn off of a skeleton.
[Tue Apr 16 11:05:20 2024] You have slain a skeleton!

Clients tested: RoF2

Checklist

  • I have tested my changes
  • I have performed a self-review of my code. Ensuring variables, functions and methods are named in a human-readable way, comments are added only where naming of variables, functions and methods can't give enough context.
  • I own the changes of my code and take responsibility for the potential issues that occur

@joligario
Copy link
Contributor

I think it is supposed to show "You hit..." on your client and "Noudess hit..." on other clients. However, logically correct doesn't necessarily mean literally correct. I don't have any reference other than I could check current Live.

@noudess
Copy link
Contributor Author

noudess commented Apr 20, 2024

I think it is supposed to show "You hit..." on your client and "Noudess hit..." on other clients. However, logically correct doesn't necessarily mean literally correct. I don't have any reference other than I could check current Live.

I don't think this changes any of that?

@joligario
Copy link
Contributor

I'm just reading your comments in the PR. Before/after.

@noudess
Copy link
Contributor Author

noudess commented Apr 20, 2024

I'm just reading your comments in the PR. Before/after.

All of the non-melee messages use the name instead of You. I agree this is inconsistant, but it is not in the scope of this fix. If you want this fixed, I'd prefer we create an issue and I can spend some time looking at it seperately. I did check live, and we match live for the non-melee message (uses name instead of You).

That ok? This fix only removes duplicate damage messages on death and adds color messages on death whem missing.

@noudess noudess requested a review from KayenEQ April 25, 2024 11:55
zone/attack.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@Kinglykrab Kinglykrab left a comment

Choose a reason for hiding this comment

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

Small comment, looks good otherwise.

@Kinglykrab Kinglykrab merged commit e268ab1 into EQEmu:master Apr 28, 2024
1 check passed
@Akkadius Akkadius mentioned this pull request May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants