- Relocated 'Maseph' npc to moc_fild07. (bugreport:2749)

- Removed duplicate text from hellion quest. (bugreport:2738)
- Starting to translate any Japanese text I find in eAthena.

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

7 files changed, 54 insertions, 52 deletions

diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index 2540eb907..c708b011a 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Aegis - amichan
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= Any eAthena Version;
 //===== Description: =========================================
@@ -12,6 +12,7 @@
 //= 1.0 by Aegis 1.1 by aichan 1.2 by x[tsk] 1.3 by Darkchild
 //= 1.5 Fixed Exploit [Lupus]
 //= 1.6 Fixed Exploit [KarLaeda]
+//= 1.7 Relocated 'Maseph' to moc_fild07. [Kisuka]
 //============================================================
 
 // quest will reset it self after 1 pair of Slotted Sunglasses is made. 
@@ -60,7 +61,7 @@ L_SG_1_Check:
 	mes "Great. Now, listen carefully.";
 	next;
 	mes "[Sunglasses Trader]";
-	mes "Look for someone name Maseph somewhere in the east of Morroc.";
+	mes "Look for someone named Maseph somewhere north of Morroc.";
 	mes "I will send her a message to let her know that you are coming.";
 	close;
 L_SG_Diamond:
@@ -80,7 +81,7 @@ L_SG_Q1_Done:
 	mes "There is nothing more I can tell you.";
 	next;
 	mes "[Sunglasses Trader]";
-	mes "Go see Maseph. She is somewhere east of Morroc.";
+	mes "Go see Maseph. She is somewhere north of Morroc.";
 	close;
 L_SG_No:
 	mes "[Sunglasses Trader]";
@@ -90,7 +91,7 @@ L_SG_No:
  
 // 2nd part of the quest
 
-moc_fild09,209,128,5	script	Maseph	702,{
+moc_fild07,334,186,5	script	Maseph	702,{
 	if(SG_QUEST1 == 1) goto L_SG_2;
 	mes "[Maseph]";
 	mes "Lovely Day, isn't it ?";
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index ccc6dfa28..2e393efc2 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.8
+//= 1.9
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -20,6 +20,7 @@
 //= 1.6 Fixed issue with #prt_key-1-1. [L0ne_W0lf]
 //= 1.7 Corrected reminants from aegis conversion. [L0en_w0lf]
 //= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.9 Removed duplicate text. [Kisuka]
 //============================================================
 
 morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
@@ -2206,7 +2207,6 @@ geffen,110,200,3	script	Sage Welshyun#hellion	754,3,3,{
 			mes "There's a map on the back";
 			mes "of the tablet. Although the gem";
 			mes "is already embedded within the";
-			mes "is already embedded within the";
 			mes "tablet, who knows where this map may lead? Perhaps Hellion Revenant?";
 			next;
 			mes "[Welshyun]";
diff --git a/npc/sample/npc_shop_test.txt b/npc/sample/npc_shop_test.txt
index 7d8caa451..865bd0c13 100644
--- a/npc/sample/npc_shop_test.txt
+++ b/npc/sample/npc_shop_test.txt
@@ -1,31 +1,32 @@
-// プロンテラ噴水周辺
-prontera,156,192,3	shop	カードショップ1	95,4001:100,4002:100,4003:100,4004:100,4005:100,4006:100,4007:100,4008:100,4009:100,4010:100,4011:100,4012:100,4013:100,4014:100,4015:100,4016:100,4017:100,4018:100,4019:100,4020:100,4021:100,4022:100,4023:100,4024:100,4025:100,4026:100,4027:100,4028:100,4029:100,4030:100,4031:100,4032:100,4033:100,4034:100,4035:100,4036:100,4037:100,4038:100,4039:100,4040:100,4041:100,4042:100,4043:100,4044:100,4045:100,4046:100,4047:100,4048:100,4049:100,4050:100
-prontera,154,192,1	shop	カードショップ2	123,4051:100,4052:100,4053:100,4054:100,4055:100,4056:100,4057:100,4058:100,4059:100,4060:100,4061:100,4062:100,4063:100,4064:100,4065:100,4066:100,4067:100,4068:100,4069:100,4070:100,4071:100,4072:100,4073:100,4074:100,4075:100,4076:100,4077:100,4078:100,4079:100,4080:100,4081:100,4082:100,4083:100,4084:100,4085:100,4086:100,4087:100,4088:100,4089:100,4090:100,4091:100,4092:100,4093:100,4094:100,4095:100,4096:100,4097:100,4098:100,4099:100,4100:100
-prontera,158,192,1	shop	カードショップ3	67,4101:100,4102:100,4103:100,4104:100,4105:100,4106:100,4107:100,4108:100,4109:100,4110:100,4111:100,4112:100,4113:100,4114:100,4115:100,4116:100,4117:100,4118:100,4119:100,4120:100,4121:100,4122:100,4123:100,4124:100,4125:100,4126:100,4127:100,4128:100,4129:100,4130:100,4131:100,4132:100,4133:100,4134:100,4135:100,4136:100,4137:100,4138:100,4139:100,4140:100,4141:100,4142:100,4143:100,4144:100,4145:100,4146:100,4147:100,4148:100
-prontera,144,205,1	shop	頭装備屋1	71,2201:100,2202:100,2203:100,2204:100,2205:100,2206:100,2207:100,2208:100,2209:100,2210:100,2211:100,2212:100,2213:100,2214:100,2215:100,2216:100,2217:100,2218:100,2219:100,2220:100,2221:100,2222:100,2223:100,2224:100,2225:100,2226:100,2227:100,2228:100,2229:100,2230:100,2231:100,2232:100,2233:100,2234:100,2235:100,2236:100,2237:100,2239:100,2240:100,2241:100,2242:100,2243:100,2244:100,2245:100,2246:100,2247:100,2248:100,2249:100,2250:100
-prontera,144,203,3	shop	頭装備屋2	101,2251:100,2252:100,2253:100,2254:100,2255:100,2256:100,2257:100,2258:100,2259:100,2260:100,2261:100,2262:100,2263:100,2264:100,2265:100,2266:100,2267:100,2268:100,2269:100,2270:100,2271:100,2272:100,2273:100,2274:100,2275:100,2276:100,2277:100,2278:100,2279:100,2280:100,2281:100,2282:100,2283:100,2284:100,2285:100,2286:100,2287:100,2288:100,2289:100,2290:100,2291:100,2292:100,2293:100,2294:100,2295:100,2296:100,2297:100,2298:100,2299:100
-prontera,144,201,3	shop	頭装備屋3	69,5001:100,5002:100,5003:100,5004:100,5005:100,5006:100,5007:100,5008:100,5009:100,5010:100,5011:100,5012:100,5013:100,5014:100,5015:100,5016:100,5017:100,5018:100,5019:100
-prontera,167,202,5	shop	アクセサリーショップ	102,2601:100,2602:100,2603:100,2604:100,2605:100,2607:100,2608:100,2609:100,2610:100,2611:100,2612:100,2613:100,2614:100,2615:100,2616:100,2617:100,2618:100,2619:100,2620:100,2621:100,2622:100,2623:100,2624:100,2625:100,2626:100,2627:100,2628:100
-prontera,167,204,6	shop	雑貨屋	96,501:100,502:100,503:100,504:100,505:100,506:100,507:100,508:100,509:100,510:100,511:100,512:100,513:100,514:100,515:100,516:100,517:100,518:100,519:100,520:100,521:100,522:100,523:100,525:100,526:100,528:100,529:100,530:100,531:100,532:100,533:100,534:100,535:100,536:100,537:100,538:100,539:100,601:100,602:100,603:100,604:100,605:100,606:100,607:100,608:100,609:100,610:100
-prontera,167,206,6	shop	鍛冶屋専門店	90,714:100,715:100,716:100,717:100,718:100,719:100,720:100,721:100,722:100,723:100,724:100,725:100,726:100,727:100,728:100,729:100,730:100,731:100,732:100,733:100,756:100,757:100,984:100,985:100,990:100,991:100,992:100,993:100,994:100,995:100,996:100,997:100,1010:100,1011:100,998:100,999:100,1000:100,1001:100,1002:100,1003:100,913:100,920:100,718:100,958:100,957:100,922:100,963:100,923:100,968:100,1005:100,612:100,615:100,989:100
-prontera,164,204,5	shop	日本限定品店	81,542:100,543:100,1766:100
-// プロンテラ中央南
-prontera,141,175,5	shop	弓屋	102,1705:100,1711:100,1716:100,1719:100,1720:100,1750:1,1751:1,1752:1,1753:1,1754:1,1755:1,1756:1,1766:1,1065:1
-prontera,141,173,5	shop	剣屋	102,1117:100,1125:100,1155:100,1162:100,1130:100,1131:100,1132:100,1133:100,1134:100,1135:100,1136:100,1137:100,1138:100,1139:100,1140:100,1141:100,1161:100,1162:100,1163:100,1164:100,1165:100,1166:100,1167:100,1168:100,1169:100,1170:100
-prontera,141,171,5	shop	槍屋	102,1408:100,1461:100,1464:100,1413:100,1414:100,1415:100,1416:100,1466:100,1467:100,1468:100,1469:100,1470:100,1471:100
-prontera,141,169,5	shop	斧屋	102,1352:100,1355:100,1361:100,1363:100,1364:100,1365:100,1366:100,1367:100,1368:100,1369:100
-prontera,141,167,5	shop	短剣屋	102,1208:100,1220:100,1223:100,1224:100,1225:100,1226:100,1227:100,1228:100,1229:100,1230:100,1231:100,1232:100,1233:100,1234:100,1235:100,1236:100,1237:100
-prontera,141,165,5	shop	鈍器屋	102,1505:100,1520:100,1514:100,1517:100,1522:100,1523:100,1524:100,1525:100,1526:100,1527:100,1528:100
-prontera,141,163,5	shop	カタール屋	102,1251:100,1253:100,1255:100,1256:100,1257:100,1258:100,1259:100,1260:100,1261:100
-prontera,141,161,5	shop	杖屋	102,1602:100,1608:100,1611:100,1613:100,1614:100,1615:100
-prontera,141,159,5	shop	本屋	102,1550:100,1551:100,1552:100,1553:100,1554:100,1555:100,1556:100,1557:100,1558:100
-prontera,141,177,5	shop	防具屋	102,2306:100,2339:100,2311:100,2331:100,2336:100,2337:100,2326:100,2327:100,2315:100,2317:100,2102:100,2104:100,2106:100,2108:100,2402:100,2404:100,2406:100,2407:100,2408:100,2409:100,2502:100,2504:100,2506:100,2507:100,2508:100
+// Near fountain in Prontera
+prontera,156,192,3	shop	Card Shop1	95,4001:100,4002:100,4003:100,4004:100,4005:100,4006:100,4007:100,4008:100,4009:100,4010:100,4011:100,4012:100,4013:100,4014:100,4015:100,4016:100,4017:100,4018:100,4019:100,4020:100,4021:100,4022:100,4023:100,4024:100,4025:100,4026:100,4027:100,4028:100,4029:100,4030:100,4031:100,4032:100,4033:100,4034:100,4035:100,4036:100,4037:100,4038:100,4039:100,4040:100,4041:100,4042:100,4043:100,4044:100,4045:100,4046:100,4047:100,4048:100,4049:100,4050:100
+prontera,154,192,1	shop	Card Shop2	123,4051:100,4052:100,4053:100,4054:100,4055:100,4056:100,4057:100,4058:100,4059:100,4060:100,4061:100,4062:100,4063:100,4064:100,4065:100,4066:100,4067:100,4068:100,4069:100,4070:100,4071:100,4072:100,4073:100,4074:100,4075:100,4076:100,4077:100,4078:100,4079:100,4080:100,4081:100,4082:100,4083:100,4084:100,4085:100,4086:100,4087:100,4088:100,4089:100,4090:100,4091:100,4092:100,4093:100,4094:100,4095:100,4096:100,4097:100,4098:100,4099:100,4100:100
+prontera,158,192,1	shop	Card Shop3	67,4101:100,4102:100,4103:100,4104:100,4105:100,4106:100,4107:100,4108:100,4109:100,4110:100,4111:100,4112:100,4113:100,4114:100,4115:100,4116:100,4117:100,4118:100,4119:100,4120:100,4121:100,4122:100,4123:100,4124:100,4125:100,4126:100,4127:100,4128:100,4129:100,4130:100,4131:100,4132:100,4133:100,4134:100,4135:100,4136:100,4137:100,4138:100,4139:100,4140:100,4141:100,4142:100,4143:100,4144:100,4145:100,4146:100,4147:100,4148:100
+prontera,144,205,1	shop	Headgear Shop1	71,2201:100,2202:100,2203:100,2204:100,2205:100,2206:100,2207:100,2208:100,2209:100,2210:100,2211:100,2212:100,2213:100,2214:100,2215:100,2216:100,2217:100,2218:100,2219:100,2220:100,2221:100,2222:100,2223:100,2224:100,2225:100,2226:100,2227:100,2228:100,2229:100,2230:100,2231:100,2232:100,2233:100,2234:100,2235:100,2236:100,2237:100,2239:100,2240:100,2241:100,2242:100,2243:100,2244:100,2245:100,2246:100,2247:100,2248:100,2249:100,2250:100
+prontera,144,203,3	shop	Headgear Shop2	101,2251:100,2252:100,2253:100,2254:100,2255:100,2256:100,2257:100,2258:100,2259:100,2260:100,2261:100,2262:100,2263:100,2264:100,2265:100,2266:100,2267:100,2268:100,2269:100,2270:100,2271:100,2272:100,2273:100,2274:100,2275:100,2276:100,2277:100,2278:100,2279:100,2280:100,2281:100,2282:100,2283:100,2284:100,2285:100,2286:100,2287:100,2288:100,2289:100,2290:100,2291:100,2292:100,2293:100,2294:100,2295:100,2296:100,2297:100,2298:100,2299:100
+prontera,144,201,3	shop	Headgear Shop3	69,5001:100,5002:100,5003:100,5004:100,5005:100,5006:100,5007:100,5008:100,5009:100,5010:100,5011:100,5012:100,5013:100,5014:100,5015:100,5016:100,5017:100,5018:100,5019:100
+prontera,167,202,5	shop	Accessories Shop	102,2601:100,2602:100,2603:100,2604:100,2605:100,2607:100,2608:100,2609:100,2610:100,2611:100,2612:100,2613:100,2614:100,2615:100,2616:100,2617:100,2618:100,2619:100,2620:100,2621:100,2622:100,2623:100,2624:100,2625:100,2626:100,2627:100,2628:100
+prontera,167,204,6	shop	General Store	96,501:100,502:100,503:100,504:100,505:100,506:100,507:100,508:100,509:100,510:100,511:100,512:100,513:100,514:100,515:100,516:100,517:100,518:100,519:100,520:100,521:100,522:100,523:100,525:100,526:100,528:100,529:100,530:100,531:100,532:100,533:100,534:100,535:100,536:100,537:100,538:100,539:100,601:100,602:100,603:100,604:100,605:100,606:100,607:100,608:100,609:100,610:100
+prontera,167,206,6	shop	Blacksmith Shop	90,714:100,715:100,716:100,717:100,718:100,719:100,720:100,721:100,722:100,723:100,724:100,725:100,726:100,727:100,728:100,729:100,730:100,731:100,732:100,733:100,756:100,757:100,984:100,985:100,990:100,991:100,992:100,993:100,994:100,995:100,996:100,997:100,1010:100,1011:100,998:100,999:100,1000:100,1001:100,1002:100,1003:100,913:100,920:100,718:100,958:100,957:100,922:100,963:100,923:100,968:100,1005:100,612:100,615:100,989:100
+prontera,164,204,5	shop	Japan Store Limited	81,542:100,543:100,1766:100
 
-// テイミング商人
-prontera,218,211,4	shop	テイミング商人	125,537:2500,643:3000,10013:1500,10014:2000
-izlude,164,138,4	shop	テイミング商人	124,537:2500,643:3000,10013:1500,10014:2000
-morocc,269,167,4	shop	テイミング商人	125,537:2500,643:3000,10013:1500,10014:2000
-geffen,193,152,4	shop	テイミング商人	124,537:2500,643:3000,10013:1500,10014:2000
-payon,142,104,4	shop	テイミング商人	124,537:2500,643:3000,10013:1500,10014:2000
+// South-central Prontera
+prontera,141,175,5	shop	Bow man		102,1705:100,1711:100,1716:100,1719:100,1720:100,1750:1,1751:1,1752:1,1753:1,1754:1,1755:1,1756:1,1766:1,1065:1
+prontera,141,173,5	shop	Sword shop	102,1117:100,1125:100,1155:100,1162:100,1130:100,1131:100,1132:100,1133:100,1134:100,1135:100,1136:100,1137:100,1138:100,1139:100,1140:100,1141:100,1161:100,1162:100,1163:100,1164:100,1165:100,1166:100,1167:100,1168:100,1169:100,1170:100
+prontera,141,171,5	shop	Spear man	102,1408:100,1461:100,1464:100,1413:100,1414:100,1415:100,1416:100,1466:100,1467:100,1468:100,1469:100,1470:100,1471:100
+prontera,141,169,5	shop	Axe man		102,1352:100,1355:100,1361:100,1363:100,1364:100,1365:100,1366:100,1367:100,1368:100,1369:100
+prontera,141,167,5	shop	Dagger man	102,1208:100,1220:100,1223:100,1224:100,1225:100,1226:100,1227:100,1228:100,1229:100,1230:100,1231:100,1232:100,1233:100,1234:100,1235:100,1236:100,1237:100
+prontera,141,165,5	shop	Mace shop	102,1505:100,1520:100,1514:100,1517:100,1522:100,1523:100,1524:100,1525:100,1526:100,1527:100,1528:100
+prontera,141,163,5	shop	Katar shop	102,1251:100,1253:100,1255:100,1256:100,1257:100,1258:100,1259:100,1260:100,1261:100
+prontera,141,161,5	shop	Rod man		102,1602:100,1608:100,1611:100,1613:100,1614:100,1615:100
+prontera,141,159,5	shop	Bookstore	102,1550:100,1551:100,1552:100,1553:100,1554:100,1555:100,1556:100,1557:100,1558:100
+prontera,141,177,5	shop	Armor shop	102,2306:100,2339:100,2311:100,2331:100,2336:100,2337:100,2326:100,2327:100,2315:100,2317:100,2102:100,2104:100,2106:100,2108:100,2402:100,2404:100,2406:100,2407:100,2408:100,2409:100,2502:100,2504:100,2506:100,2507:100,2508:100
+
+// Pet Groomer Merchant
+prontera,218,211,4	shop	Pet Groomer	125,537:2500,643:3000,10013:1500,10014:2000
+izlude,164,138,4	shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
+morocc,269,167,4	shop	Pet Groomer	125,537:2500,643:3000,10013:1500,10014:2000
+geffen,193,152,4	shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
+payon,142,104,4		shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
 
 // EOF //
\ No newline at end of file
diff --git a/npc/sample/npc_test_array.txt b/npc/sample/npc_test_array.txt
index 0cb04fa27..de0a80ef2 100644
--- a/npc/sample/npc_test_array.txt
+++ b/npc/sample/npc_test_array.txt
@@ -1,8 +1,8 @@
-// 配列のテスト
-prontera,164,190,1	script	配列テスト	112,{
+// Array Test
+prontera,164,190,1	script	Array Test	112,{
 	set @hoge[0],1;
 	set @hoge[1],5;
-	mes "hoge[2]を入力してください";
+	mes "Please enter a value for hoge[2].";
 	next;
 	input @hoge[2];
 	mes "hoge   => " + @hoge;
diff --git a/npc/sample/npc_test_chat.txt b/npc/sample/npc_test_chat.txt
index 8d51bd80f..f593490cb 100644
--- a/npc/sample/npc_test_chat.txt
+++ b/npc/sample/npc_test_chat.txt
@@ -1,9 +1,9 @@
 
 
-prontera,158,182,0	script	chatテスト::test0001	116,{
-	mes "トリガー人数" + getwaitingroomstate(2);
-	mes "トリガー状態" + getwaitingroomstate(3);
-	menu "有効化",L_ENA,"無効化",L_DISA,"削除",L_DEL,"作成",L_MAKE;
+prontera,158,182,0	script	Chat Test::test0001	116,{
+	mes "Trigger Number" + getwaitingroomstate(2);
+	mes "Trigger State" + getwaitingroomstate(3);
+	menu "Enable",L_ENA,"Disable",L_DISA,"Delete",L_DEL,"Create",L_MAKE;
 	close;
 L_ENA:
 	enablewaitingroomevent;
@@ -15,10 +15,10 @@ L_DEL:
 	delwaitingroom;
 	close;
 L_MAKE:
-	waitingroom "テスト",15,"test0001::OnChatEvent",1;
+	waitingroom "Test",15,"test0001::OnChatEvent",1;
 	close;
 OnInit:
-	waitingroom "テスト",15,"test0001::OnChatEvent",1;
+	waitingroom "Test",15,"test0001::OnChatEvent",1;
 	end;
 OnChatEvent:
 	disablewaitingroomevent;
diff --git a/npc/sample/npc_test_npctimer.txt b/npc/sample/npc_test_npctimer.txt
index bfe1a93db..1787202e0 100644
--- a/npc/sample/npc_test_npctimer.txt
+++ b/npc/sample/npc_test_npctimer.txt
@@ -1,9 +1,9 @@
 
-prontera,156,183,0	script	NPCtimerテスト::npctimerX0000	116,{
-	mes "タイマー値" + getnpctimer(0);
-	mes "タイマー状態" + getnpctimer(1,"npctimerX0000");
-	mes "イベント個数" + getnpctimer(2);
-	menu "初期化",L_INIT,"停止",L_STOP,"再開",L_START,"設定",L_SET;
+prontera,156,183,0	script	NPCtimerTest::npctimerX0000	116,{
+	mes "Timer value" + getnpctimer(0);
+	mes "State timer" + getnpctimer(1,"npctimerX0000");
+	mes "Number of events" + getnpctimer(2);
+	menu "Initialization",L_INIT,"Stop",L_STOP,"Start",L_START,"Settings",L_SET;
 	close;
 L_INIT:
 	initnpctimer;
@@ -20,14 +20,14 @@ L_SET:
 	close;
 
 OnTimer1000:
-	announce "1秒経過",0;
+	announce "After a second",0;
 	end;
 
 OnTimer5000:
-	announce "5秒経過",0;
+	announce "After 5 seconds",0;
 	end;
 
 OnTimer10000:
-	announce "10秒経過",0;
+	announce "After 10 seconds",0;
 	end;
 }
\ No newline at end of file
diff --git a/npc/sample/npc_test_npctimer2.txt b/npc/sample/npc_test_npctimer2.txt
index 484232726..8ff8be575 100644
--- a/npc/sample/npc_test_npctimer2.txt
+++ b/npc/sample/npc_test_npctimer2.txt
@@ -1,4 +1,4 @@
-prontera,156,183,0	script	NPCtimerテスト::npctimerX0000	116,{
+prontera,156,183,0	script	NPCtimerTest::npctimerX0000	116,{
 L_INIT:
 	mes "What would you like to know?";
 	menu "Tell me my level",L_WAIT;