summaryrefslogtreecommitdiff
path: root/npc/merchants
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-05-13 18:15:14 +0200
committerHaru <haru@dotalux.com>2014-05-13 18:15:14 +0200
commitc03094034f5338016221775bce4b39a0e9b75ee6 (patch)
tree559e52c5207911190ea336eb82a933ce37305065 /npc/merchants
parent3bd57cf4858696b2586543098bc9eeac70a1854e (diff)
downloadhercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.gz
hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.bz2
hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.xz
hercules-c03094034f5338016221775bce4b39a0e9b75ee6.zip
Removed trailing whitespace (scripts)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/merchants')
-rw-r--r--npc/merchants/clothes_dyer.txt2
-rw-r--r--npc/merchants/coin_exchange.txt2
-rw-r--r--npc/merchants/dye_maker.txt4
-rw-r--r--npc/merchants/gemstone.txt2
-rw-r--r--npc/merchants/inn.txt6
-rw-r--r--npc/merchants/kunai_maker.txt2
-rw-r--r--npc/merchants/old_pharmacist.txt4
-rw-r--r--npc/merchants/refine.txt18
-rw-r--r--npc/merchants/wander_pet_food.txt2
9 files changed, 21 insertions, 21 deletions
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 0251d7884..94fab1d5c 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -105,7 +105,7 @@ function Dyes;
if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3);
case Job_SuperNovice:
if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
- default:
+ default:
mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it.";
close;
}
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index 1e929bf86..160a7e5bc 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -8,7 +8,7 @@
//= [Official Conversion]
//= Coin redemption NPCs.
//===== Additional Comments: =================================
-//= 1.0 First version
+//= 1.0 First version
//= 1.1 Fixed checkweight. [Gepard]
//= 1.2 Optimized and merged into one file. [Euphy]
//============================================================
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index 4434c5c39..b8ca80d06 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -9,7 +9,7 @@
//= Quests to create the eight colored Dyestuffs.
//===== Additional Comments: =================================
//= 1.0 Fully working [kobra_k88]
-//= 1.1 Spell Checked [Nexon]
+//= 1.1 Spell Checked [Nexon]
//= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
//= 1.2b Fixed typos in variable names [ultramage]
//= 1.3 Made the checks more dynamic [ultramage]
@@ -146,7 +146,7 @@ S_MakeDye:
case 7:
mes "Mmm... I need 30 White Herbs, 1 Counteragent, and 1 Empty bottle to make White Dyestuffs. The fee will be 3000 zeny.";
setarray .@item[0], 509, 973, 713;
- setarray .@count[0], 30, 1, 1;
+ setarray .@count[0], 30, 1, 1;
set .@cost,3000;
set .@dyestuff,982;
break;
diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt
index 1d8837f28..126dbeba4 100644
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -13,7 +13,7 @@
//= in the cities/payon.txt
//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.2 Updated input with min/max values. [L0ne_W0lf]
-//= Added a checkweight.
+//= Added a checkweight.
//= 1.3 Fixed checks. [Euphy]
//============================================================
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 56d8533cf..8b3a34420 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -17,7 +17,7 @@
//===== Additional Comments: =================================
//= 1.1 Blind Effect By Kobra_k88 (Taken from his old script)
//= I added it to all of them though [Darkchild]
-//= 1.1a Minor bug fixes and optimizations. Switched from @variables
+//= 1.1a Minor bug fixes and optimizations. Switched from @variables
//= to arguments.[kobra_k88]
//= 1.2 Rewrote inn script [Playtester]
//= 1.3 Added (finally) Rachel Inn Maid. Official warp
@@ -28,8 +28,8 @@
//= - Removed the Cancel dialog.
//= 1.6 More fixes, changed progression of "Rest"ing.
//= - Corrected Morroc NPCs. [L0ne_W0lf]
-//= 1.7 Corrected Payon NPC. [L0ne_W0lf]
-//= 1.8 Corrected Geffen NPC. [L0ne_W0lf]
+//= 1.7 Corrected Payon NPC. [L0ne_W0lf]
+//= 1.8 Corrected Geffen NPC. [L0ne_W0lf]
//= 1.9 Added the Inn for Al De baran. [L0ne_W0lf]
//= 2.0 Added Inn for the Town of Veins. [L0ne_W0lf]
//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index b2c624bb0..d3b70f35b 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -7,7 +7,7 @@
//===== Description: =========================================
//= Trades a few shurikens + ninja stones for elemental kunai.
//===== Additional Comments: =================================
-//= 1.0 Added the npc. It uses a function that sends the item
+//= 1.0 Added the npc. It uses a function that sends the item
//= id of the 2 required items plus the amount. Can trade
//= up to 500 units (5,000 kunais) at once. [erKURITA]
//= 1.1 Officialized script [Playtester]
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index b866aa0db..d74b3287d 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -212,7 +212,7 @@ L_Making:
Zeny -= (.@max*getarg(1));
delitem getarg(0),.@max*2;
delitem 713,.@max; //Empty_Bottle
- getitem getarg(2),.@max;
+ getitem getarg(2),.@max;
break;
case 2:
next;
@@ -238,7 +238,7 @@ L_Making:
Zeny -= (.@amount*getarg(1));
delitem getarg(0),.@amount*2;
delitem 713,.@amount; //Empty_Bottle
- getitem getarg(2),.@amount;
+ getitem getarg(2),.@amount;
break;
case 3:
next;
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index d417c6ba1..823fbea66 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -24,9 +24,9 @@
//= hacker that can change item [dafide18]
//= 1.5 Fixed crashing due to badly used callfunc's [Skotlex]
//= Lupus, don't rollback this important fix again! >.<
-//= 1.5a Corrected an unneeded callfunc, fixed the anti-bot
+//= 1.5a Corrected an unneeded callfunc, fixed the anti-bot
//= exploit ruining the safe refine loop. [Skotlex]
-//= 1.5b Fixed Spelling mistakes. [Nexon]
+//= 1.5b Fixed Spelling mistakes. [Nexon]
//= 1.6 Replaced all breaks for ends as per the new script engine [Skotlex]
//= 1.7 Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3]
//= 1.8 Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3]
@@ -661,27 +661,27 @@ function script refinemain {
case 1: //Refine Level 1 Weapon
set .@price,50;
set .@material,1010;
- set .@safe,7;
+ set .@safe,7;
break;
case 2: //Refine Level 2 Weapon
set .@price,200;
set .@material,1011;
- set .@safe,6;
+ set .@safe,6;
break;
case 3: //Refine Level 3 Weapon
set .@price,5000;
set .@material,984;
- set .@safe,5;
+ set .@safe,5;
break;
case 4: //Refine Level 4 Weapon
set .@price,20000;
set .@material,984;
- set .@safe,4;
+ set .@safe,4;
break;
case 5: //Refine other stuff?
set .@price,2000;
set .@material,985;
- set .@safe,4;
+ set .@safe,4;
break;
}
if(.@features != 1) {
@@ -809,7 +809,7 @@ function script refinemain {
} else
set .@menu2,2;
switch(.@menu2){
- case 1:
+ case 1:
set .@refinecnt,.@safe - getequiprefinerycnt(.@part);
break;
case 2:
@@ -870,7 +870,7 @@ function script refinemain {
mes "You changed it...";
mes "Get out before I stun you with my Hammer!!";
close;
- }
+ }
mes "Clang, clang!!!";
if(.@menu2 == 2 && getequippercentrefinery(.@part) <= rand(100)) {
failedrefitem .@part;
diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt
index 6fb0b41f7..42aba081d 100644
--- a/npc/merchants/wander_pet_food.txt
+++ b/npc/merchants/wander_pet_food.txt
@@ -9,7 +9,7 @@
//= Trade Broken Liquor Jars and alcohol for wanderer
//= pet food, 'Spirit Liquor'
//===== Additional Comments: =================================
-//= 1.0 First version
+//= 1.0 First version
//============================================================
prontera,218,218,3 script Pet Enthusiast 4W_KID,{