diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-29 08:39:36 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-29 08:39:36 +0000 |
commit | 294444a04be5fa2737bb3594edb76ae8679408c4 (patch) | |
tree | 61aa996d7862fbb42d27ed879308c2ebc532a4cc /npc/merchants | |
parent | 07fb6e91789cb65e66d6d539c401a9cab78e6b2e (diff) | |
download | hercules-294444a04be5fa2737bb3594edb76ae8679408c4.tar.gz hercules-294444a04be5fa2737bb3594edb76ae8679408c4.tar.bz2 hercules-294444a04be5fa2737bb3594edb76ae8679408c4.tar.xz hercules-294444a04be5fa2737bb3594edb76ae8679408c4.zip |
More eof eols (followup to r10401); skipping /npc/custom and /npc/samples
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10402 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
-rw-r--r-- | npc/merchants/alchemist.txt | 2 | ||||
-rw-r--r-- | npc/merchants/ammo_boxes.txt | 2 | ||||
-rw-r--r-- | npc/merchants/ammo_dealer.txt | 2 | ||||
-rw-r--r-- | npc/merchants/clothes_dyer.txt | 2 | ||||
-rw-r--r-- | npc/merchants/dye_maker.txt | 2 | ||||
-rw-r--r-- | npc/merchants/grandpa_pharmacist.txt | 2 | ||||
-rw-r--r-- | npc/merchants/hair_style.txt | 2 | ||||
-rw-r--r-- | npc/merchants/icecream.txt | 2 | ||||
-rw-r--r-- | npc/merchants/inn.txt | 2 | ||||
-rw-r--r-- | npc/merchants/milk_trader.txt | 2 | ||||
-rw-r--r-- | npc/merchants/novice_exchange.txt | 2 | ||||
-rw-r--r-- | npc/merchants/quivers.txt | 2 | ||||
-rw-r--r-- | npc/merchants/renters.txt | 2 | ||||
-rw-r--r-- | npc/merchants/scrolls_arrows.txt | 2 | ||||
-rw-r--r-- | npc/merchants/shops.txt | 2 | ||||
-rw-r--r-- | npc/merchants/socket_enchant.txt | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index a0c4f1556..f94c35c50 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -126,4 +126,4 @@ alde_alche,24,188,3 script Gever AI Sharp 740,{ mes "[Gever AI Sharp]"; mes "Then come again next time."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index 38093662b..8ca5554e3 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -151,4 +151,4 @@ L_Cancel: mes "something else I can help"; mes "you with, please tell me."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index a83950878..77c3f64bf 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -110,4 +110,4 @@ function script Bullet_Trade { mes "Prepare again and come back."; close; } -}
\ No newline at end of file +} diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 1472a50de..6fa1c4fdf 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -385,4 +385,4 @@ L_End: mes "[Dyer Ginedin Rephere]"; mes "Make yourself at home. Even though I don't have time for you."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt index 4fbf1bae4..e34367421 100644 --- a/npc/merchants/dye_maker.txt +++ b/npc/merchants/dye_maker.txt @@ -274,4 +274,4 @@ morocc_in,146,99,2 script Dye Maker JavaDullihan 122,{ close; M_End: close; -}
\ No newline at end of file +} diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt index 94ca91176..5894499a3 100644 --- a/npc/merchants/grandpa_pharmacist.txt +++ b/npc/merchants/grandpa_pharmacist.txt @@ -159,4 +159,4 @@ sF_Make: mes "[Grampa Pharmacist]"; mes "What?! That's not a valid amount!"; return; -}
\ No newline at end of file +} diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index 07ae4d592..0937891e9 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -2051,4 +2051,4 @@ Cancel: mes "I wish you can find your hair style which fits on you well~"; mes "I really do~"; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index 633ce689a..eec7b0171 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -58,4 +58,4 @@ alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{ moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85 //MORROC -//morocc,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 85
\ No newline at end of file +//morocc,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 85 diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index 0bafa2e35..8209f836e 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -135,4 +135,4 @@ function script F_InnMaid { mes getarg(0); mes "I am waiting for a job to do."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt index 454886e11..a1d0c67fe 100644 --- a/npc/merchants/milk_trader.txt +++ b/npc/merchants/milk_trader.txt @@ -58,4 +58,4 @@ prontera,71,131,7 script Milk Trader 86,{ mes "[Milk Trader]"; mes "You need more zeny."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index dbaee49e6..204204389 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -156,4 +156,4 @@ aldebaran,152,63,5 script Merchant#4 85,{ payon,200,134,5 script Merchant#5 85,{ //we remove 3rd item, by adding 0,0 callfunc "F_NMerch","Merchant",902,6,909,10,0,0; -}
\ No newline at end of file +} diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index 409513966..168520ff4 100644 --- a/npc/merchants/quivers.txt +++ b/npc/merchants/quivers.txt @@ -148,4 +148,4 @@ M_End: mes "Sure, no problem."; mes "Come back any time."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index 218bd2270..a4c62fd59 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -179,4 +179,4 @@ hu_in01,375,318,5 script Falcon Master 59,{ mes "[Falcon Master]"; mes "Have a nice day."; close; -}
\ No newline at end of file +} diff --git a/npc/merchants/scrolls_arrows.txt b/npc/merchants/scrolls_arrows.txt index 7f70056b7..afb939c3a 100644 --- a/npc/merchants/scrolls_arrows.txt +++ b/npc/merchants/scrolls_arrows.txt @@ -35,4 +35,4 @@ geffen,125,91,2 shop Magic Scrolls 735, 686:650, 687:1300, 688:500, 689:1000, 69 //======================================================= //payon_in03,159,10,4 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1 //geffen,123,107,4 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1 -//prt_in,163,141,5 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
\ No newline at end of file +//prt_in,163,141,5 shop Arrow Quivers 727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1 diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 2fb01d09e..54826d1f5 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -346,4 +346,4 @@ prt_monk,135,263,3 shop Blacksmith 726,1801:-1,1803:-1,1805:-1 //= 1.21 Added another weapon dealer to Einbroch, thanks to Muad_Dib [MasterOfMuppets] //= - Fixed up the missing sprites for you Lupus :) //= - Guys, I suggest we crop these comments and put them at the bottom soon -//============================================================
\ No newline at end of file +//============================================================ diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index d046e7227..830e210eb 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -842,4 +842,4 @@ function script f_armor_s2 { prt_in,33,70,5 duplicate(Socket Enchant) Socket Enchant#2 84 payon,140,151,5 duplicate(Socket Enchant) Socket Enchant#3 84 -morocc,51,41,5 duplicate(Socket Enchant) Socket Enchant#4 84
\ No newline at end of file +morocc,51,41,5 duplicate(Socket Enchant) Socket Enchant#4 84 |