summaryrefslogtreecommitdiff
path: root/npc/re/merchants/diamond.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/merchants/diamond.txt')
-rw-r--r--npc/re/merchants/diamond.txt36
1 files changed, 17 insertions, 19 deletions
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt
index fa19f372d..eda1740ca 100644
--- a/npc/re/merchants/diamond.txt
+++ b/npc/re/merchants/diamond.txt
@@ -4,21 +4,19 @@
//= Z3R0
//===== Current Version: =====================================
//= 1.5
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
//= Exchanges 17 Carat Diamond
//===== Additional Comments: =================================
-//= v1.0 First / Optimized Version
-//= v1.1 Adjusted for Missing ; on Line #271 (#15425)
-//= v1.2 Removed Comments per Request (#15426)
-//= v1.3 Changed Emotion # to Const Definition (#15427)
-//= v1.4 Removed Double Space on Line #148 (#15428)
-//= v1.5 Added This Version History (#15429)
+//= 1.0 First / Optimized Version
+//= 1.1 Adjusted for Missing ; on Line #271 (#15425)
+//= 1.2 Removed Comments per Request (#15426)
+//= 1.3 Changed Emotion # to Const Definition (#15427)
+//= 1.4 Removed Double Space on Line #148 (#15428)
+//= 1.5 Added This Version History (#15429)
//============================================================
-- script RareDiamondMerchant 58,{
+- script RareDiamondMerchant 1_M_MERCHANT,{
set .@npc$, "[Rare Diamond Merchant]";
@@ -142,7 +140,7 @@
mes "501,000,000 zeny.";
mes "Amount has been confirmed.";
emotion e_loud;
- set Zeny, Zeny - 501000000;
+ Zeny -= 501000000;
getitem 6024, 1;
next;
@@ -222,7 +220,7 @@
mes "come back anytime with 500 million zeny.";
emotion e_thx;
delitem 6024, 1;
- set Zeny, Zeny + 499000000;
+ Zeny += 499000000;
close;
}
else {
@@ -235,10 +233,10 @@
}
}
-prontera,165,89,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#1 58
-geffen,106,63,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#2 58
-morocc,146,100,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#3 58
-alberta,129,60,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#4 58
-lighthalzen,163,65,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#5 58
-rachel,106,142,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#6 58
-payon,180,130,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#7 58
+prontera,165,89,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#1 1_M_MERCHANT
+geffen,106,63,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#2 1_M_MERCHANT
+morocc,146,100,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#3 1_M_MERCHANT
+alberta,129,60,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#4 1_M_MERCHANT
+lighthalzen,163,65,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#5 1_M_MERCHANT
+rachel,106,142,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#6 1_M_MERCHANT
+payon,180,130,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#7 1_M_MERCHANT