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

[Feature] Change mana_used to int32, This will allow higher mana costs to function correctly #2321

Merged
merged 7 commits into from
Jul 30, 2022

Conversation

Aeadoin
Copy link
Contributor

@Aeadoin Aeadoin commented Jul 21, 2022

mana_cost already uses Int32
mana_used is already Int32 under other functions - CastSpell

to match int32 mana_cost
This will allow higher mana costs to function
@Aeadoin Aeadoin marked this pull request as draft July 21, 2022 21:09
@Aeadoin Aeadoin marked this pull request as ready for review July 21, 2022 21:12
@mackal
Copy link
Member

mackal commented Jul 21, 2022

inline uint16 GetMana(uint32 spell_id) { return( spells[spell_id].mana); }

Can you nuke this line? It doesn't appear to be called, otherwise I'd ask you to update it.

@Aeadoin
Copy link
Contributor Author

Aeadoin commented Jul 21, 2022

@mackal Done.

Copy link
Member

@mackal mackal left a comment

Choose a reason for hiding this comment

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

ahh why did you delete mob.cpp :P

@Aeadoin
Copy link
Contributor Author

Aeadoin commented Jul 22, 2022

ahh why did you delete mob.cpp :P

Sorry, I meant to commit those changes to a new PR, how do I go about fixing?

@mackal
Copy link
Member

mackal commented Jul 22, 2022

ahh why did you delete mob.cpp :P

Sorry, I meant to commit those changes to a new PR, how do I go about fixing?

git revert 3db8bf04d13d7263632b06da4f95bacfcfcfd60c should do it

@mackal mackal closed this Jul 22, 2022
@mackal mackal reopened this Jul 22, 2022
This reverts commit 3db8bf0.
… which uses function is Int32)"

This reverts commit cf5dbc9.
@Aeadoin Aeadoin requested a review from mackal July 26, 2022 14:47
@Kinglykrab Kinglykrab changed the title Change mana_used to int32, This will allow higher mana costs to function correctly [Feature] Change mana_used to int32, This will allow higher mana costs to function correctly Jul 30, 2022
@Akkadius Akkadius merged commit 2570587 into EQEmu:master Jul 30, 2022
mackal pushed a commit that referenced this pull request Sep 3, 2022
* Changed mana_used to use int32,
to match int32 mana_cost
This will allow higher mana costs to function

* Corrected DoHPToManaCovert to Int32

* Removed unused uint16 GetMana function call from Server/zone/questmgr.h

* Change GetSkillDmgAmt from Int16 to Int32 (SkillDamageAmount2 which uses function is Int32)

* Delete mob.cpp

* Revert "Delete mob.cpp"

This reverts commit 3db8bf0.

* Revert "Change GetSkillDmgAmt from Int16 to Int32 (SkillDamageAmount2 which uses function is Int32)"

This reverts commit cf5dbc9.

Co-authored-by: dmcintosh-BCT <dan@blackcreektechnologies.com>
catapultam-habeo pushed a commit to catapultam-habeo/pyrelight-server that referenced this pull request Mar 27, 2023
* Changed mana_used to use int32,
to match int32 mana_cost
This will allow higher mana costs to function

* Corrected DoHPToManaCovert to Int32

* Removed unused uint16 GetMana function call from Server/zone/questmgr.h

* Change GetSkillDmgAmt from Int16 to Int32 (SkillDamageAmount2 which uses function is Int32)

* Delete mob.cpp

* Revert "Delete mob.cpp"

This reverts commit 3db8bf0.

* Revert "Change GetSkillDmgAmt from Int16 to Int32 (SkillDamageAmount2 which uses function is Int32)"

This reverts commit cf5dbc9.

Co-authored-by: dmcintosh-BCT <dan@blackcreektechnologies.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.

5 participants