getiteminfo() / setiteminfo() fixes #1902
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replacements are as follows:
0 => ITEMINFO_BUYPRICE
1 => ITEMINFO_SELLPRICE
2 => ITEMINFO_TYPE
3 => ITEMINFO_MAXCHANCE
4 => ITEMINFO_SEX
5 => ITEMINFO_LOC
6 => ITEMINFO_WEIGHT
7 => ITEMINFO_ATK
8 => ITEMINFO_DEF
9 => ITEMINFO_RANGE
10 => ITEMINFO_SLOTS
11 (Subtype, for weapons and ammunitions) => ITEMINFO_SUBTYPE
11 (ViewSprite, for other item types) => ITEMINFO_VIEWSPRITE (NOT AVAILABLE YET)
12 => ITEMINFO_ELV
13 => ITEMINFO_WLV
14 => ITEMINFO_VIEWID
15 => ITEMINFO_MATK (NOT AVAILABLE YET - this was documented but never implemented)
Calls to getiteminfo() and setiteminfo() have been replaced with the
newly introduced constants. Other constants (such as W_ weapon subtypes)
in related code have been replaced as well, to improve code readability.
This fixes an issue in the Eden Tutorial script "Tutorial Goal", where
ITEMINFO_ATK was accidentally used instead of ITEMINFO_WEIGHT.
Note: calls to getiteminfo or setiteminfo with numeric type arguments in
third party scripts must be replaced with the respective constants. The
use of numeric literals is no longer recommended, and those values may
change in the future without notice. See the getiteminfo documentation
for details.
Signed-off-by: Haru <[email protected]>
This item info type was documented in commit 315d632, but never implemented. Signed-off-by: Haru <[email protected]>
Adds the ability to query an item's view sprite, lost with HerculesWS#1828 Fixes HerculesWS#1895 Signed-off-by: Haru <[email protected]>
… ammunitions Both functions have now been updated to only check the subtype if the item type is correct (IT_AMMO for F_GetAmmoType, IT_WEAPON for F_GetWeaponType) Signed-off-by: Haru <[email protected]>
…a bitmask The function now handles multi-slot headgears and other uncommon cases better. Signed-off-by: Haru <[email protected]>
MishimaHaruna
added
component:core:scriptengine
ghost
added
the
status:inprogress
Contributor
|
This change is |
MishimaHaruna
added
status:code-review
Asheraf
approved these changes
Nov 12, 2017
4144
approved these changes
Nov 12, 2017
dastgirp
reviewed
Nov 13, 2017
| ITEMINFO_RANGE - Range | ||
| ITEMINFO_SLOTS - Slots | ||
| ITEMINFO_SUBTYPE - Item subtype | ||
| ITEMINFO_ELV - Equip min. level |
Member
There was a problem hiding this comment.
What about equip max level? Maybe we should bring that under this command too.
Member
Author
There was a problem hiding this comment.
I agree. I opened a separate ticket, #1906, so that we can merge this PR (since it contains fixes for a regression that already landed in the stable branch)
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Prelude
Changes Proposed
This PR provides constants to be used with the
getiteminfo()andsetiteminfo()buildins, to replace the unsafe literal numeric values used in the past (and in fact, there was one case of incorrect value used in a script).The functions are also extended with support for
ITEMINFO_MATK(which was previously documented but never implemented) as well asITEMINFO_VIEWSPRITE(which was no longer available since #1828 was merged).This also includes an updated version of the global functions
F_GetWeaponType()andF_GetArmorType(), and the new functionF_GetAmmoType().The complete list of replacements for the previously used numeric literals is the following:
Affected Branches:
Issues addressed:
Known Issues and TODO List
N/A