git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@857 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 75 insertions, 57 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f10091a03..4e2ca8407 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -35,6 +35,8 @@ Other Ppl
 Date		Added
 ======
 12/29
+	* Translated npc/sample/npc_extend_shop.txt [MC Cameri]
+	* Translated npc/sample/bank_test.txt [MC Cameri]
         * Fixed respawn delay of Toad and Golden Thief Bug (it was the actual_delay/2). Mob placement files should be revised again [Lupus]
 
 12/27
diff --git a/npc/sample/bank_test.txt b/npc/sample/bank_test.txt
index 6a9bfe08d..84a5e599d 100644
--- a/npc/sample/bank_test.txt
+++ b/npc/sample/bank_test.txt
@@ -1,18 +1,18 @@
-// カプラ銀行サービス	テストスクリプト
-prontera.gat,162,188,1	script	銀行員カプラ	112,{
+// Bank Test
+prontera.gat,162,188,1	script	Bank Test	112,{
 	cutin "kafra_06",2;
 
-	mes"[銀行員カプラ]";
-	mes "カプラ銀行サービスです。";
-	mes "毎度ご利用ありがとうございます♪";
-	mes "1000zからでのご利用になります。";
+	mes "[Bank Test]";
+	mes "Welcome to Prontera's Bank Test.";
+	mes "You can only deposit a minimal of";
+	mes "1000z. What do you want to do?";
 	next;
-	menu "預ける",BANK_IN,"引き出す",BANK_OUT,"やっぱやめる",B_EXIT2;
+	menu "Deposit",BANK_IN,"Withdraw",BANK_OUT,"Exit",B_EXIT2;
 BANK_IN:
-	mes"[銀行員カプラ]";
-	mes "預ける金額を入力してください♪";
-	mes "ちなみに、手数料として";
-	mes "預かり金の1%頂きます。";
+	mes "[Bank Test]";
+	mes "You must deposit the same of less";
+	mes "amount of zeny that you carry.";
+	mes "How much do you want to deposit?";
 	next;
 	input @kafrabank;
 
@@ -21,15 +21,15 @@ BANK_IN:
 	if(@kafrabank+@kafrabank2>Zeny) goto BANK_F;
 	set Zeny,Zeny-@kafrabank-@kafrabank2;
 	set #kafrabank,#kafrabank+@kafrabank;
-	mes "手数料^135445" + @kafrabank2 + "z^000000頂きますね。";
+	mes "You now have: ^135445" + @kafrabank2 + "z^000000";
 
 	goto B_EXIT;
 BANK_OUT:
 	if(#kafrabank==0) goto BANK_F2;
-	mes"[銀行員カプラ]";
-	mes "現在あなたからお預かりしているのは";
-	mes "^135445" + #kafrabank + "^000000Zenyです。";
-	mes "引き出す金額を入力してください♪";
+	mes "[Bank Test]";
+	mes "You can only withdraw equally or below this quantity:";
+	mes "^135445" + #kafrabank + "^000000z";
+	mes "How much do you want to withdraw?";
 	next;
 	input @kafrabank;
 
@@ -41,19 +41,18 @@ BANK_OUT:
 	goto B_EXIT;
 
 BANK_F:
-	mes"[銀行員カプラ]";
-	mes "持ち金が足りないようですね。";
+	mes "[Bank Test]";
+	mes "You can't withdraw more than ^135445"+ #kafrabank + "^000000z.";
 	goto B_EXIT2;
 BANK_F2:
-	mes"[銀行員カプラ]";
-	mes "あなたからは、1zも";
-	mes "お預かりしていないですよ？";
+	mes "[Bank Test]";
+	mes "Your account is empty, you may not withdraw at this time.";
 	goto B_EXIT2;
 
 B_EXIT:
-	mes "無事に取り引きできました。";
+	mes "Thanks for using depositing";
 B_EXIT2:
-	mes "またのご利用をお待ちしています♪";
+	mes "Good bye!";
 	cutin "kafra_06",255;
 	close;
 }
diff --git a/npc/sample/npc_extend_shop.txt b/npc/sample/npc_extend_shop.txt
index d185ed121..41ea5c112 100644
--- a/npc/sample/npc_extend_shop.txt
+++ b/npc/sample/npc_extend_shop.txt
@@ -1,44 +1,60 @@
+//SuperNovice
+prontera.gat,182,213,3	shop	Super Novice Shop	716,1243:-1,2112:-1,2340:-1,2352:-1,2414:-1,2510:-1,2628:-1,5055:-1
+
 //Whips
 prontera.gat,149,139,5	shop	Whips Merchant	58,1951:-1,1953:-1,1955:-1,1957:-1,1959:-1,1961:-1,1962:-1,1963:-1,1964:-1
 
-
-// 装備　頭部（Ｓ付き）
+//Headgears
 prontera.gat,162,175,3	shop	Headgears Merchant 1	73,2209:-1,2210:-1,2211:-1,2221:-1,2223:-1,2217:-1,2227:-1,2231:-1,2225:-1,2229:-1
-// 装備　頭部（Ｓ無しその１）
+
+//Headgears
 prontera.gat,162,172,3	shop	Headgears Merchant 2	73,2203:-1,2212:-1,2218:-1,2239:-1,2241:-1,2242:-1,2243:-1,2263:-1,2265:-1,2276:-1,2288:-1,2291:-1,2297:-1
-// 装備　鎧
+
+//Armor
 prontera.gat,162,169,3	shop	Armours Merchant	73,2311:-1,2313:-1,2315:-1,2317:-1,2318:-1,2320:-1,2322:-1,2324:-1,2326:-1,2327:-1,2329:-1,2331:-1,2334:-1,2336:-1,2337:-1,2342:-1
-// 装備　盾
+
+//Shields
 prontera.gat,162,166,3	shop	Shields Merchant	73,2102:-1,2104:-1,2106:-1,2108:-1,2109:-1,2110:-1,2111:-1
-// 装備　靴
+
+//Boots
 prontera.gat,162,163,3	shop	Boots Merchant	73,2402:-1,2404:-1,2406:-1,2407:-1,2412:-1,2413:-1
-// 装備　外套
+
+//Robes
 prontera.gat,162,160,3	shop	Robes Merchant	73,2502:-1,2504:-1,2506:-1,2507:-1,2508:-1,2509:-1
-// 装備　アクセサリ
+
+//Accessory
 prontera.gat,162,157,3	shop	Accessory Merchant	73,2601:-1,2602:-1,2603:-1,2604:-1,2605:-1,2607:-1,2608:-1,2615:-1,2616:-1,2618:-1,2619:-1
-//arrows
+
+//Arrows
 prontera.gat,162,154,3	shop	Arrows Merchant	73,1750:-1,1751:-1,1752:-1,1753:-1,1754:-1,1755:-1,1756:-1,1757:-1,1758:-1,1759:-1,1760:-1,1761:-1,1762:-1,1763:-1,1764:-1,1765:-1,1766:-1,1767:-1,1768:-1,1769:-1
-//alchemist
+
+//Alchemist
 prontera.gat,162,151,3	shop	Alchemist Shop	73.7127:-1,7128:-1,7129:-1,7130:-1,7131:-1,7132:-1,7133:-1,7144:-1,7134:-1,1093:-1
-//pettamer
+
+//Taming Merchant
 prontera.gat,162,148,3	shop	Taming Merchant	73,619:-1,620:-1,621:-1,623:-1,624:-1,625:-1,626:-1,627:-1,628:-1,629:-1,630:-1,631:-1,632:-1,633:-1,634:-1,635:-1,636:-1,637:-1,638:-1,639:-1,640:-1,641:-1,642:-1,659:-1
-//TamingEquip
+
+//Pet Equipment
 prontera.gat,162,145,3	shop	Pet Equipment	73,10001:-1,10002:-1,10003:-1,10004:-1,10005:-1,10006:-1,10007:-1,10008:-1,10009:-1,10010:-1,10011:-1,10012:-1,10013:-1,10014:-1,10015:-1,10016:-1,10017:-1,10018:-1,10019:-1,10020:-1
 
-// 武器に刺すカード
-prontera.gat,148,234,5	shop	Weapon Card	80,4004:100000,4018:100000,4025:100000,4026:100000,4019:100000,4029:100000,4043:100000,4017:100000,4020:100000,4024:100000,4037:100000,4055:100000,4057:100000,4076:100000,4096:100000,4104:100000,4030:100000,4049:100000,4062:100000,4069:100000,4085:100000,4007:100000,4060:100000,4063:100000,4068:100000,4080:100000,4094:100000,4111:100000,4118:100000,4082:20700,4092:100000,4126:100000,4072:100000,4115:100000,4035:100000,4086:100000,4106:100000,4117:100000,4125:100000
-// 頭に挿すカード
-prontera.gat,148,231,5	shop	Headgear Card	80,4010:100000,4039:100000,4046:100000,4052:100000,4087:100000,4110:100000,4112:100000,4122:100000,4127:100000
-// 鎧に挿すカード
-prontera.gat,146,229,5	shop	Armor Card	80,4003:100000,4008:100000,4011:100000,4014:100000,4016:100000,4021:100000,4023:100000,4031:100000,4078:100000,4089:100000,4098:100000,4099:100000,4101:100000,4114:100000,4119:100000,4141:100000,4061:100000,4105:100000
-// 盾に挿すカード
-prontera.gat,144,227,5	shop	Shield Card	80,4013:100000,4032:100000,4058:100000,4059:100000,4066:100000,4074:100000,4083:100000,4120:100000,4124:100000,4136:100000,4138:100000,4045:100000,4067:100000,4075:100000,4090:100000
-// 肩にかけるものに挿すカード
-prontera.gat,142,225,5	shop	Robe Card	80,4056:100000,4071:100000,4081:100000,4095:100000,4108:100000,4109:100000,4113:100000,4116:100000,4133:100000,4015:100000,4088:100000,4102:100000,4129:100000
-// 靴に挿すカード
-prontera.gat,140,223,5	shop	Shoes Card	80,4009:100000,4038:100000,4050:100000,4070:100000,4097:100000,4100:100000,4107:100000
-// アクセサリーに挿すカード
-prontera.gat,138,221,5	shop	Acsessory Card	80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500
 
-//SuperNovice
-prontera.gat,182,213,3	shop	Super Novice Shop	716,1243:-1,2112:-1,2340:-1,2352:-1,2414:-1,2510:-1,2628:-1,5055:-1
\ No newline at end of file
+//Weapon Cards
+prontera.gat,148,234,5	shop	Weapon Card's Merchant	80,4004:100000,4018:100000,4025:100000,4026:100000,4019:100000,4029:100000,4043:100000,4017:100000,4020:100000,4024:100000,4037:100000,4055:100000,4057:100000,4076:100000,4096:100000,4104:100000,4030:100000,4049:100000,4062:100000,4069:100000,4085:100000,4007:100000,4060:100000,4063:100000,4068:100000,4080:100000,4094:100000,4111:100000,4118:100000,4082:20700,4092:100000,4126:100000,4072:100000,4115:100000,4035:100000,4086:100000,4106:100000,4117:100000,4125:100000
+
+//Headgear Cards
+prontera.gat,148,231,5	shop	Headgear Card's Merchant	80,4010:100000,4039:100000,4046:100000,4052:100000,4087:100000,4110:100000,4112:100000,4122:100000,4127:100000
+
+//Armor Cards
+prontera.gat,146,229,5	shop	Armor Card's Merchant	80,4003:100000,4008:100000,4011:100000,4014:100000,4016:100000,4021:100000,4023:100000,4031:100000,4078:100000,4089:100000,4098:100000,4099:100000,4101:100000,4114:100000,4119:100000,4141:100000,4061:100000,4105:100000
+
+//Shield Cards
+prontera.gat,144,227,5	shop	Shield Card's Merchant	80,4013:100000,4032:100000,4058:100000,4059:100000,4066:100000,4074:100000,4083:100000,4120:100000,4124:100000,4136:100000,4138:100000,4045:100000,4067:100000,4075:100000,4090:100000
+
+//Robe Cards
+prontera.gat,142,225,5	shop	Robe Card's Merchant	80,4056:100000,4071:100000,4081:100000,4095:100000,4108:100000,4109:100000,4113:100000,4116:100000,4133:100000,4015:100000,4088:100000,4102:100000,4129:100000
+
+//Shoe Cards
+prontera.gat,140,223,5	shop	Shoes Card's Merchant	80,4009:100000,4038:100000,4050:100000,4070:100000,4097:100000,4100:100000,4107:100000
+
+//Accessory Cards
+prontera.gat,138,221,5	shop	Accessory Card's Merchant	80,4022:100500,4027:100500,4028:100500,4034:100500,4051:100500,4064:100500,4091:100500,4079:100500,4033:100500,4040:100500,4044:100500,4048:100500,4053:100500,4073:100500,4077:100500,4084:100500,4093:100500,4103:100500,4139:100500
\ No newline at end of file
diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index 774b32619..f8e3be983 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -27,6 +27,7 @@
 #include "npc.h"
 #include "trade.h"
 #include "core.h"
+#include "showmsg.h"
 
 static char command_symbol = '#';
 
@@ -1079,16 +1080,16 @@ int charcommand_item(
 				clif_displaymessage(fd, msg_table[81]); // Your GM level don't authorise you to do this action on this player.
 				return -1;
 			}
-		} else if(strncasecmp(character,"all")==0 || strncasecmp(character,"everyone")==0){			// 名前がALLなら、接続者全員へ
+		} else if(/* from jA's @giveitem */strcmpi(character,"all")==0 || strcmpi(character,"everyone")==0){
 			for (i = 0; i < fd_max; i++) {
 				if (session[i] && (pl_sd = session[i]->session_data)){
-					atcommand_giveitem_sub(pl_sd,item_data,number);
-					snprintf(output, sizeof output, "You got %s %d.", item_name,number);
-					clif_displaymessage(pl_sd->fd, output);
+					charcommand_giveitem_sub(pl_sd,item_data,number);
+					snprintf(tmp_output, sizeof(tmp_output), "You got %s %d.", item_name,number);
+					clif_displaymessage(pl_sd->fd, tmp_output);
 				}
 			}
-			snprintf(output, sizeof output, "%s received %s %d.","Everyone",item_name,number);
-			clif_displaymessage(fd, output);
+			snprintf(tmp_output, sizeof(tmp_output), "%s received %s %d.","Everyone",item_name,number);
+			clif_displaymessage(fd, tmp_output);
 		} else {
 			clif_displaymessage(fd, msg_table[3]); // Character not found.
 			return -1;