- Set svn:eol-style=native property for recently added text files.

- Removed trailing spaces/tabs.
- Changed duplicate() to use a floating source npc.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15430 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2012-01-11 22:15:23 +00:00
parent 64c9226a4c
commit 30b6766d2c

View File

@ -18,7 +18,7 @@
//= v1.5 Added This Version History (#15429) //= v1.5 Added This Version History (#15429)
//============================================================ //============================================================
prontera,165,89,6 script Rare Diamond Merchant#1 58,{ - script RareDiamondMerchant 58,{
set .@npc$, "[Rare Diamond Merchant]"; set .@npc$, "[Rare Diamond Merchant]";
@ -253,9 +253,10 @@ prontera,165,89,6 script Rare Diamond Merchant#1 58,{
} }
} }
geffen,106,63,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#2 58 prontera,165,89,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#1 58
morocc,146,100,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#3 58 geffen,106,63,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#2 58
alberta,129,60,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#4 58 morocc,146,100,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#3 58
lighthalzen,163,65,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#5 58 alberta,129,60,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#4 58
rachel,106,142,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#6 58 lighthalzen,163,65,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#5 58
payon,180,130,6 duplicate(Rare Diamond Merchant#1) Rare Diamond Merchant#7 58 rachel,106,142,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#6 58
payon,180,130,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#7 58