Skip to content

Conversation

@darrensapalo
Copy link
Contributor

@darrensapalo darrensapalo commented Dec 22, 2018

Based on data from iRO on Mora Village, there were missing equipment for guillotine cross, ranger, and rune knight.

I simply added the item IDs for the items, and the menu paths to get the said items.

Not sure if I should replace the item IDs with their Aegis names, or if that is not necessary.

Pull Request Prelude

Changes Proposed

Issues addressed:

Based on data from [iRO on Mora Village](https://irowiki.org/wiki/Mora_Village), there were missing equipment for guillotine cross, ranger, and rune knight.

I simply added the item IDs for the items, and the menu paths to get the said items.

Not sure if I should replace the item IDs with their Aegis names, or if that is not necessary.
@HerculesWSAPI
Copy link
Contributor

This change is Reviewable

setarray .@items[0],2475,2476,2574,2575;
.@i = select("Cancel", "Ur's Greaves (Shoes)", "Peuz's Greaves (Shoes)", "Ur's Manteau (Garment)", "Peuz's Manteau (Garment)")-2;
setarray .@items[0],2475,2476,2574,2575,15036,15037,2883,2884;
.@i = select("Cancel", "Ur's Greaves (Shoes)", "Peuz's Greaves (Shoes)", "Ur's Manteau (Garment)", "Peuz's Manteau (Garment)", "Ur's Plate (Armor", "Peuz's Plate (Armor)", "Ur's Seal (Accessory)", "Peuz's Seal (Accessory)")-2;
Copy link
Contributor

Choose a reason for hiding this comment

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

You're missing a ) after Ur's Plate (Armor

also please add these in the correct order Ur's set then Peuz's, this is the list from kRO for reference

"우르의그리브", "우르의망토", "우르의인장", "우르의플레이트", "페오즈의그리브", "페오즈의망토", "페오즈의인장", "페오즈의플레이트"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do the changes. Thank you for reviewing.

Do you mean that I should enumerate Ur's set first, then Peuz's set next? And not to use the korean translation? Clarifying to make sure.

Copy link
Contributor

Choose a reason for hiding this comment

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

What I meant is: make it in the same order as in the list I gave :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay. Will do. :D

Copy link
Member

Choose a reason for hiding this comment

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

instead of hardcode the menu, maybe just let it generate based on the name in item_db?

replace

	switch(.@job) {
	case 0: // Rune Knight
		setarray .@items[0],2475,2574,2883,15036,2575,2476,2884,15037;
		.@i = select("Cancel", "Ur's Greaves (Shoes)",  "Ur's Manteau (Garment)", "Ur's Seal (Accessory)",  "Ur's Plate (Armor)", "Peuz's Greaves (Shoes)", "Peuz's Manteau (Garment)",  "Peuz's Seal (Accessory)", "Peuz's Plate (Armor)" )-2;
		break;
	case 1: // Guillotine Cross
		setarray .@items[0],2477,2577,2886,15038,2478,2578,2887,15039;
		.@i = select("Cancel", "Sapha Shoes (Shoes)",  "Sapha Hood (Garment)",  "Sapha Ring (Accessory)", "Sapha's Cloth (Armor)", "Nab Shoes (Shoes)", "Nab Hood (Garment)", "Nab Ring (Accessory)", "Nab's Cloth (Armor)" )-2;
		break;
	case 2: // Ranger
		setarray .@items[0],2479,2580,2890,15042,2480,2581,2891,15043;
        .@i = select("Cancel", "White Wing Boots (Shoes)",  "White Wing Manteau (Garment)", "White Wing Brooch (Accessory)", "White Wing Suit (Armor)", "Black Wing Boots (Shoes)","Black Wing Manteau (Garment)",  "Black Wing Brooch (Accessory)", "Black Wing Suit (Armor)" )-2;
		break;
	}

with

	switch(.@job) {
	case 0: // Rune Knight
		setarray .@items[0],2475,2574,2883,15036,2575,2476,2884,15037;
		break;
	case 1: // Guillotine Cross
		setarray .@items[0],2477,2577,2886,15038,2478,2578,2887,15039;
		break;
	case 2: // Ranger
		setarray .@items[0],2479,2580,2890,15042,2480,2581,2891,15043;
		break;
	}
	.@menu$ = "Cancel";
	for (.@items_size = getarraysize(.@items); .@i < .@items_size; .@i++)
		.@menu$ = .@menu$ + ":" + getitemname(.@items[.@i]) + "("+F_GetArmorType(.@items[.@i])+")";
	.@i = select(.@menu$) - 2;

Copy link
Contributor Author

@darrensapalo darrensapalo Jan 8, 2019

Choose a reason for hiding this comment

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

@Emistry that looks a lot better.

I'm not familiar, would you happen to know if F_GetArmorType is an existing function or will it need to be coded?

Copy link
Member

Choose a reason for hiding this comment

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

setarray .@items[0],2477,2478,2577,2578;
.@i = select("Cancel", "Sapha Shoes (Shoes)", "Nab Shoes (Shoes)", "Sapha Hood (Garment)", "Nab Hood (Garment)")-2;
setarray .@items[0],2477,2478,2577,2578,15038,15039,2886,2887;
.@i = select("Cancel", "Sapha Shoes (Shoes)", "Nab Shoes (Shoes)", "Sapha Hood (Garment)", "Nab Hood (Garment)", "Sapha's Cloth (Armor)", "Nab's Cloth (Armor)", "Sapha Ring (Accessory)", "Nab Ring (Accessory)")-2;
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above with the order of items

"사바흐의슈즈", "사바흐의후드", "사바흐의링", "사바흐의클로스", "나브의슈즈", "나브의후드", "나브의링", "나브의클로스"

setarray .@items[0],2479,2480,2580,2581;
.@i = select("Cancel", "White Wing Boots (Shoes)", "Black Wing Boots (Shoes)", "White Wing Manteau (Garment)", "Black Wing Manteau (Garment)")-2;
setarray .@items[0],2479,2480,2580,2581,15042,15043,2890,2891;
.@i = select("Cancel", "White Wing Boots (Shoes)", "Black Wing Boots (Shoes)", "White Wing Manteau (Garment)", "Black Wing Manteau (Garment)", "White Wing Suit (Armor)", "Black Wing Suit (Armor)", "White Wing Brooch (Accessory)", "Black Wing Brooch (Accessory)")-2;
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above with the order of items

"흰날개의부츠", "흰날개의망토", "흰날개의브로치", "흰날개의슈츠", "검은날개의부츠", "검은날개의망토", "검은날개의브로치", "검은날개의슈츠"

Based on kRO reference, the order to be followed is: greaves, cloak, seal, plate.
Followed kRO reference: greaves, garment, accessory, armor.
@Emistry Emistry added component:scripts Affecting the scripts and NPCs mode:renewal For strictly Renewal issues labels Jan 8, 2019
@MishimaHaruna MishimaHaruna added this to the Release v2019.06.30 milestone Jun 30, 2019
@MishimaHaruna MishimaHaruna changed the base branch from stable to master June 30, 2019 18:33
@MishimaHaruna MishimaHaruna merged commit bb46b50 into HerculesWS:master Jun 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component:scripts Affecting the scripts and NPCs mode:renewal For strictly Renewal issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants