summaryrefslogtreecommitdiff
path: root/world/map/npc/009-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/009-2')
-rw-r--r--world/map/npc/009-2/trader.txt29
-rw-r--r--world/map/npc/009-2/wyara.txt6
2 files changed, 34 insertions, 1 deletions
diff --git a/world/map/npc/009-2/trader.txt b/world/map/npc/009-2/trader.txt
index 46ccafac..d66968e0 100644
--- a/world/map/npc/009-2/trader.txt
+++ b/world/map/npc/009-2/trader.txt
@@ -62,6 +62,7 @@ L_Trademenu:
"Do you have Iron Powder?", L_Iron,
"How about Sulphur Powder?", L_Sulphur,
"I need Medium Healing Potions.", L_Healpots,
+ "I'd like to acquire an Enchanter's Amulet.", L_Eamulet,
"I think I have everything I need, thanks.", L_Close;
L_Iron:
@@ -85,6 +86,13 @@ L_Healpots:
"Alright.", L_Pots,
"Whoa, that's way too much.", L_Close;
+L_Eamulet:
+ mes "[Trader]";
+ mes "\"These amulets are quite rare. Two times as rare as a Magic Ring, they say. I do have one though and would trade it off for two Magic Rings and thirteen Blood Stones. I've had a hard time finding those stones.\"";
+ menu
+ "Alright.", L_GetEamuletConfirm,
+ "I'd better check the shops out first.", L_Close;
+
L_Ipowder:
if (countitem("IronOre") < 1) goto L_Missing;
if (Zeny < @Ironprice) goto L_NotEnoughMoney;
@@ -127,6 +135,27 @@ L_Pots:
"Yes.", L_Trademenu,
"No.", L_No;
+L_GetEamuletConfirm:
+ mes "[Trader]";
+ mes "\"Are you sure you wish to trade for the Enchanter's Amulet? All trades are final.\"";
+ menu
+ "No, I'd better think this over a bit more.", L_No,
+ "No thanks. I've changed my mind. What else do you trade, again?", L_Trademenu,
+ "Yes, I'm positive.", L_GetEamulet;
+
+L_GetEamulet:
+ if (countitem("MagicRing") < 2) goto L_Missing;
+ if (countitem("Bloodstone") < 13) goto L_Missing;
+ delitem "MagicRing", 1;
+ delitem "MagicRing", 1;
+ delitem "Bloodstone", 13;
+ getitem "EnchantersAmulet", 1;
+ mes "[Trader]";
+ mes "\"Make good use of your new amulet. Would you like to trade anything else?\"";
+ menu
+ "Yes.", L_Trademenu,
+ "No.", L_No;
+
L_Full:
mes "[Trader]";
mes "\"You must have been making a lot of trades...your bag is completely full! Come back after you've made some room.\"";
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index 1b912019..51e2ada6 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -1,7 +1,7 @@
// ----------------------------------------
// Wyara the Hurnscald witch
// ----------------------------------------
-009-2,121,26,0|script|Wyara#_M|103
+009-2,121,26,0|script|Wyara|103
{
set @Q_MASK, NIBBLE_2_MASK;
set @Q_SHIFT, NIBBLE_2_SHIFT;
@@ -554,4 +554,8 @@ L_Close:
S_update_var:
set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
return;
+
+OnInit:
+ set .IS_MAGIC, 1;
+ end;
}