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

Add constants and MERCINFO_GID to *getmercinfo script command #2397

Merged
merged 2 commits into from
Mar 10, 2019

Conversation

AnnieRuru
Copy link
Contributor

Pull Request Prelude

Issues addressed

while fixing #2395 and I need a script command to return mercenary GID,
so I copy existing code from rAthena

Changes Proposed

Add constants and MERCINFO_GID to *getmercinfo script command

Tested with

prontera,155,185,5	script	kjdshfksdf	1_F_MARIA,{
	getitem Bow_Mercenary_Scroll1, 1;
	
	for ( .@i = 0; .@i <= 8; ++.@i )
		mes getmercinfo(.@i) +"";
	
	mes rid2name(getmercinfo(MERCINFO_GID));
	mes getunitname(getmercinfo(MERCINFO_GID)); // return nullpo
	close;
}

Affected Branches

  • Master

Known Issues and TODO List

none

@HerculesWSAPI
Copy link
Contributor

This change is Reviewable

src/map/script.c Outdated Show resolved Hide resolved
src/map/script.c Outdated Show resolved Hide resolved
@Asheraf Asheraf added this to the Release v2019.03.10 milestone Mar 1, 2019
@Asheraf Asheraf added type:enhancement Issue describes an enhancement or feature that should be implemented component:core:scriptengine Affecting the script engine or the script commands labels Mar 1, 2019
@AnnieRuru AnnieRuru force-pushed the 68-getmercinfo branch 2 times, most recently from 973e203 to 9395a69 Compare March 1, 2019 22:00
@AnnieRuru
Copy link
Contributor Author

fix line break coding style in switch cases

@MishimaHaruna MishimaHaruna merged commit 47cfee4 into HerculesWS:master Mar 10, 2019
@AnnieRuru AnnieRuru deleted the 68-getmercinfo branch March 11, 2019 00:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:core:scriptengine Affecting the script engine or the script commands type:enhancement Issue describes an enhancement or feature that should be implemented
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants