summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-08-27 09:01:53 +0200
committerHaru <haru@dotalux.com>2013-09-16 11:52:16 +0200
commitfe2f840e5d6cb4230ba02c47132790d067b3814d (patch)
tree4124a9b379bbad4352fe1254114b93ecbd2d856c /npc/merchants
parentf1a594db1b40a5a20ec5a4af093b27c58266cba0 (diff)
downloadhercules-fe2f840e5d6cb4230ba02c47132790d067b3814d.tar.gz
hercules-fe2f840e5d6cb4230ba02c47132790d067b3814d.tar.bz2
hercules-fe2f840e5d6cb4230ba02c47132790d067b3814d.tar.xz
hercules-fe2f840e5d6cb4230ba02c47132790d067b3814d.zip
Corrected line endings and BOM issues with several files
- Ensured final end-of-line character in every file. - Corrected cases of mixed line endings (mostly CR and CRLF within the same file.) - Removed extra BOM from some scripts, since it causes a parsing error. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/cashheadgear_dye.txt2
-rw-r--r--npc/merchants/clothes_dyer.txt4
-rw-r--r--npc/merchants/coin_exchange.txt2
-rw-r--r--npc/merchants/elemental_trader.txt2
-rw-r--r--npc/merchants/enchan_arm.txt2
-rw-r--r--npc/merchants/hd_refine.txt2
-rw-r--r--npc/merchants/renters.txt2
7 files changed, 8 insertions, 8 deletions
diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt
index 49003e18b..3d9fd89d8 100644
--- a/npc/merchants/cashheadgear_dye.txt
+++ b/npc/merchants/cashheadgear_dye.txt
@@ -114,4 +114,4 @@ prt_in,253,168,4 script Alora 862,{
delitem .@myHG,1; // Your headgear
getitem .@dyHG,1; // Dyed headgear
close;
-} \ No newline at end of file
+}
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 38e44d3cb..253e849a7 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -1,4 +1,4 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= Clothes Dyer
//===== By: ==================================================
//= Usnul
@@ -171,4 +171,4 @@ function Dyes {
mes "Your clothes have been dyed "+((.@s)?.@DyeName$[getarg((.@s-1)*2)]:.@DyeName$[0])+".";
close;
}
-} \ No newline at end of file
+}
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index c52db9787..04c4f793c 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -84,4 +84,4 @@
}
}
man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 454
-spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 439 \ No newline at end of file
+spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 439
diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index 2d120d190..10dcec3e4 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -155,4 +155,4 @@ ama_in02,61,27,7 script Alchemist#ama 749,{
mes "Bring me stones! You said you are going to help me!";
mes "Keep your promises! Kehehehkehkeh...";
close;
-} \ No newline at end of file
+}
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index a9ad383b8..5bb9a7d7d 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -150,4 +150,4 @@ S_EnchantArmor:
mes "Please come back with just ONE equipment to be enchanted.";
close;
}
-} \ No newline at end of file
+}
diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt
index f944d34ba..dd7b0a813 100644
--- a/npc/merchants/hd_refine.txt
+++ b/npc/merchants/hd_refine.txt
@@ -315,4 +315,4 @@ payon,148,174,3 duplicate(Basta) Basta#payon 826
alberta_in,18,56,3 duplicate(Basta) Basta#alberta 826
yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 826
ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 826
-lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 826 \ No newline at end of file
+lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 826
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index 02afc4059..8f9410eda 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -224,4 +224,4 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 105,{
mes "...Heh heh, jealous?";
close;
}
-} \ No newline at end of file
+}