summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorscript-z3r0 <script-z3r0@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-11 22:01:06 +0000
committerscript-z3r0 <script-z3r0@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-11 22:01:06 +0000
commit1018e671c083285bb926fd22cca727afd8bcbc7c (patch)
tree5c324413bdb34359dabdee68eb95b776f9a24796 /npc/merchants
parent0974fb3b2176db1d66b63e7de7903b6986a40291 (diff)
downloadhercules-1018e671c083285bb926fd22cca727afd8bcbc7c.tar.gz
hercules-1018e671c083285bb926fd22cca727afd8bcbc7c.tar.bz2
hercules-1018e671c083285bb926fd22cca727afd8bcbc7c.tar.xz
hercules-1018e671c083285bb926fd22cca727afd8bcbc7c.zip
Added Version History
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15429 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/diamond.txt17
1 files changed, 11 insertions, 6 deletions
diff --git a/npc/merchants/diamond.txt b/npc/merchants/diamond.txt
index 6c1440c84..4da143470 100644
--- a/npc/merchants/diamond.txt
+++ b/npc/merchants/diamond.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Z3R0
//===== Current Version: =====================================
-//= 1.0
+//= 1.5
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -11,6 +11,11 @@
//= 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)
//============================================================
prontera,165,89,6 script Rare Diamond Merchant#1 58,{
@@ -248,9 +253,9 @@ prontera,165,89,6 script Rare Diamond Merchant#1 58,{
}
}
-geffen,106,63,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#2 58
-morocc,146,100,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#3 58
-alberta,129,60,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#4 58
+geffen,106,63,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#2 58
+morocc,146,100,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#3 58
+alberta,129,60,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#4 58
lighthalzen,163,65,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#5 58
-rachel,106,142,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#6 58
-payon,180,130,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#7 58
+rachel,106,142,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#6 58
+payon,180,130,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#7 58