From c36713f883a9526c2eb985e89b840ba1deff8fe2 Mon Sep 17 00:00:00 2001 From: Darren Date: Sat, 22 Dec 2018 23:36:38 +0800 Subject: Added missing equipment 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. --- npc/re/merchants/enchan_mora.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 46979c82b..faefeb01c 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -580,16 +580,16 @@ mora,152,97,5 script Guardian of Power#pa082 4_F_DOGTRAVELER,{ next; switch(.@job) { case 0: // Rune Knight - 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; break; case 1: // Guillotine Cross - 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; break; case 2: // Ranger - 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; break; } if (.@i == -1) { -- cgit v1.2.3-60-g2f50 From 9469b72361a8891311b8f38d7d938da27a767579 Mon Sep 17 00:00:00 2001 From: Darren Date: Tue, 8 Jan 2019 16:29:27 +0800 Subject: Updated order of Rune Knight equipment Based on kRO reference, the order to be followed is: greaves, cloak, seal, plate. --- npc/re/merchants/enchan_mora.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index faefeb01c..a353d3db4 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -580,8 +580,8 @@ mora,152,97,5 script Guardian of Power#pa082 4_F_DOGTRAVELER,{ next; switch(.@job) { case 0: // Rune Knight - 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; + 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,2478,2577,2578,15038,15039,2886,2887; -- cgit v1.2.3-60-g2f50 From 396a268aa89dab0a60f75a678e0f0e95238e2dbf Mon Sep 17 00:00:00 2001 From: Darren Date: Tue, 8 Jan 2019 16:34:12 +0800 Subject: Updated order for guillotine cross equipment Followed kRO reference: greaves, garment, accessory, armor. --- npc/re/merchants/enchan_mora.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index a353d3db4..63413e11a 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -584,8 +584,8 @@ mora,152,97,5 script Guardian of Power#pa082 4_F_DOGTRAVELER,{ .@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,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; + 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,2480,2580,2581,15042,15043,2890,2891; -- cgit v1.2.3-60-g2f50 From fd409814323168be987ce31d305f0ac290e56ddf Mon Sep 17 00:00:00 2001 From: Darren Date: Tue, 8 Jan 2019 16:38:54 +0800 Subject: Properly ordered the ranger equipment --- npc/re/merchants/enchan_mora.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 63413e11a..d114a3b61 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -588,8 +588,8 @@ mora,152,97,5 script Guardian of Power#pa082 4_F_DOGTRAVELER,{ .@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,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; + 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; } if (.@i == -1) { -- cgit v1.2.3-60-g2f50