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

Fixed argument order on luaDoAreaCombat #4212

Merged
merged 1 commit into from
Oct 28, 2022

Conversation

EPuncker
Copy link
Contributor

@EPuncker EPuncker commented Sep 21, 2022

Co-Authored-By: Zbizu Zbizu@users.noreply.github.com

Pull Request Prelude

Changes Proposed

Fixed argument order from doAreaCombat script command:

doAreaCombat(cid = 1, type = 2, pos = 3, area = 4, min = 5, max = 6, effect = 7, origin = 8, blockArmor = 9, blockShield = 10, ignoreResistances = 11)

as you can check above, blockedByArmor, min and max were wrong

Co-Authored-By: Zbizu <Zbizu@users.noreply.github.com>
@ranisalt
Copy link
Member

If nobody noticed that before, is anyone even using this function? Can we move it to compat and use a Combat instance instead?

@EPuncker
Copy link
Contributor Author

If nobody noticed that before, is anyone even using this function? Can we move it to compat and use a Combat instance instead?

blockedByArmor was added quite recently by @nekiro, and the order of min and max doesn't make any difference at all I suppose

params.blockedByArmor = getBoolean(L, 8, false);
params.blockedByShield = getBoolean(L, 9, false);
params.ignoreResistances = getBoolean(L, 10, false);

Copy link
Contributor

@ramon-bernardo ramon-bernardo Oct 22, 2022

Choose a reason for hiding this comment

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

Suggested change
// CombatOrigin origin = getNumber<CombatOrigin>(L, 8, ORIGIN_SPELL);

@ramon-bernardo ramon-bernardo merged commit 52f135f into otland:master Oct 28, 2022
EPuncker added a commit to EPuncker/forgottenserver that referenced this pull request May 23, 2023
Co-Authored-By: Zbizu <Zbizu@users.noreply.github.com>
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