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

5 files changed, 41 insertions, 60 deletions

diff --git a/Changelog.txt b/Changelog.txt
index fd3551864..54b4431b4 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,6 @@
 Date	Added
+12/8
+	* Updated the readme a little. [Mass Zero]
 12/7
 	* Added GUILDCACHE #define to int_guild.c for testing performance
 	  effects [MouseJstr]
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f1d819d65..a45bbcb8e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -30,6 +30,8 @@ Other Ppl
 
 Date		Added
 ======
+12/08
+	* Added translated shop names for the Extended Shop, I'unno who made it. o.O; [Mass Zero]
 12/07	
 	* Added npc/other/mc_cameri/heal.txt, a heal npc that is as simple as one click healing [MC Cameri]
 	* Fixed Al De Baran to Mjolnir warp in Al De Baran [MC Cameri]
diff --git a/npc/sample/npc_extend_shop.txt b/npc/sample/npc_extend_shop.txt
index 3f9f71c2d..d185ed121 100644
--- a/npc/sample/npc_extend_shop.txt
+++ b/npc/sample/npc_extend_shop.txt
@@ -1,68 +1,44 @@
-//レアアイテムＮＰＣショップ
-
-
-
-// アイテム系
-prontera.gat,163,170,3	shop	高級なアイテム屋	75,507:-1,508:-1,509:-1,510:-1,514:-1,518:-1,533:-1,607:-1,608:-1,529:-1,530:-1,603:-1,604:-1,616:-1,617:-1,644:-1,724:-1,718:-1,714:-1,756:-1,757:-1,984:-1,985:-1,1002:-1,998:-1,999:-1,1003:-1,989:-1,713:-1,970:-1,971:-1,972:-1,7026:-1,7027:-1701:-1,968:-1,1029:-1,1030:-1,7034:-1,7035:-1,7036:-1,7047:-1
-
-
-
-// 装備　片手剣
-prontera.gat,149,170,3	shop	究極の片手剣屋	76,1108:-1,1111:-1,1114:-1,1120:-1,1125:-1,1127:-1,1128:-1,1130:-1,1131:-1,1132:-1,1133:-1,1134:-1,1135:-1,1136:-1,1137:-1,1138:-1,1139:-1,1140:-1,1141:-1,1144:-1,1145:-1
-// 装備　両手剣
-prontera.gat,149,167,3	shop	究極の両手剣屋	76,1117:-1,1152:-1,1155:-1,1158:-1,1161:-1,1162:-1,1164:-1,1165:-1,1166:-1,1167:-1,1168:-1,1170:-1
-// 装備　短剣
-prontera.gat,149,164,3	shop	究極の短剣屋	76,1202:-1,1205:-1,1208:-1,1211:-1,1214:-1,1220:-1,1223:-1,1226:-1,1227:-1,1228:-1,1229:-1,1231:-1,1232:-1,1233:-1,1234:-1,1236:-1,1237:-1,1239:-1
-// 装備　カタール
-prontera.gat,149,161,3	shop	究極のカタール屋	76,1251:-1,1253:-1,1255:-1,1256:-1,1257:-1,1258:-1,1259:-1,1260:-1,1261:-1
-// 装備　斧
-prontera.gat,149,158,3	shop	究極の斧屋	76,1302:-1,1305:-1,1306:-1,1352:-1,1361:-1,1363:-1,1364:-1,1366:-1,1367:-1,1368:-1
-// 装備　槍
-prontera.gat,149,155,3	shop	究極の槍屋	76,1402:-1,1405:-1,1408:-1,1413:-1,1414:-1,1415:-1,1417:-1,1455:-1,1461:-1,1464:-1,1466:-1,1467:-1,1468:-1,1469:-1,1470:-1,1471:-1
-// 装備　鈍器
-prontera.gat,149,152,3	shop	究極の鈍器屋	76,1502:-1,1505:-1,1508:-1,1511:-1,1514:-1,1517:-1,1520:-1,1523:-1,1524:-1,1525:-1,1526:-1,1527:-1,1528:-1,1529:-1,1530:-1
-// 装備　本
-prontera.gat,149,149,3	shop	究極の本屋	76,1550:-1,1551:-1,1552:-1,1553:-1,1554:-1,1555:-1,1556:-1,1557:-1,1558:-1
-// 装備　杖
-prontera.gat,149,146,3	shop	究極の杖屋	76,1602:-1,1605:-1,1608:-1,1611:-1,1613:-1,1614:-1,1615:-1,1472:-1,1473:-1
-// 装備　弓
-prontera.gat,149,143,3	shop	究極の弓屋	76,1705:-1,1708:-1,1711:-1,1715:-1,1716:-1,1719:-1,1720:-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
 
 
 // 装備　頭部（Ｓ付き）
-prontera.gat,162,167,5	shop	至高のＳ兜屋	77,2202:-1,2204:-1,2209:-1,2217:-1,2221:-1,2223:-1,2225:-1,2227:-1,2229:-1,2231:-1,2233:-1
+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
 // 装備　頭部（Ｓ無しその１）
-prontera.gat,162,164,5	shop	至高の変装品屋１	77,2207:-1,2210:-1,2213:-1,2214:-1,2215:-1,2230:-1,2234:-1,2235:-1,2236:-1,2244:-1,2245:-1,2246:-1,2247:-1,2248:-1,2249:-1,2250:-1,2251:-1,2252:-1,2253:-1,2254:-1,2255:-1,2256:-1,2257:-1,2258:-1,2259:-1,2260:-1,2261:-1,2262:-1,2263:-1,2264:-1,2271:-1,2272:-1,2273:-1,2274:-1,2275:-1,2277:-1,2279:-1,2280:-1,2282:-1,2283:-1,2284:-1,2285:-1,2287:-1,2289:-1,2290:-1,2293:-1,2294:-1,2298:-1,2299:-1
-// 装備　頭部（Ｓ無しその２）
-prontera.gat,162,161,5	shop	至高の変装品屋２	77,5001:-1,5002:-1,5003:-1,5006:-1,5007:-1,5008:-1,5009:-1,5010:-1,5011:-1,5012:-1,5013:-1,5014:-1,5015:-1,5016:-1,5017:-1,5018:-1,5019:-1,5020:-1,5021:-1,5022:-1,5023:-1,5024:-1,5025:-1,5026:-1,5027:-1,5028:-1,5029:-1,5030:-1,5031:-1,5032:-1,5033:-1,5034:-1,5035:-1,5036:-1,5037:-1,5038:-1,5039:-1,5040:-1,5041:-1,5042:-1,5043:-1,5045:-1,5046:-1,5047:-1,5048:-1,5049:-1,5050:-1,5052:-1,5053:-1
-// 装備　頭部（中段＆下段）
-prontera.gat,162,158,5	shop	至高の変装品屋３	77,2276:-1,2281:-1,2286:-1,2288:-1,2291:-1,2292:-1,2295:-1,2296:-1,2297:-1,5004:-1,5005:-1,5054:-1,2265:-1,2266:-1,2267:-1,2268:-1,2269:-1,2270:-1,5051:-1
+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
 // 装備　鎧
-prontera.gat,162,155,5	shop	至高の鎧屋	77,2311:-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
+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
 // 装備　盾
-prontera.gat,162,152,5	shop	至高の盾屋	77,2102:-1,2104:-1,2106:-1,2108:-1,2109:-1
+prontera.gat,162,166,3	shop	Shields Merchant	73,2102:-1,2104:-1,2106:-1,2108:-1,2109:-1,2110:-1,2111:-1
 // 装備　靴
-prontera.gat,162,149,5	shop	至高の靴屋	77,2402:-1,2404:-1,2406:-1,2407:-1,2410:-1,2412:-1
+prontera.gat,162,163,3	shop	Boots Merchant	73,2402:-1,2404:-1,2406:-1,2407:-1,2412:-1,2413:-1
 // 装備　外套
-prontera.gat,162,146,5	shop	至高の外套屋	77,2502:-1,2504:-1,2506:-1,2507:-1,2508:-1,2509:-1
+prontera.gat,162,160,3	shop	Robes Merchant	73,2502:-1,2504:-1,2506:-1,2507:-1,2508:-1,2509:-1
 // 装備　アクセサリ
-prontera.gat,162,143,5	shop	至高のアクセサリ屋	77,2601:-1,2602:-1,2603:-1,2604:-1,2605:-1,2607:-1,2610:-1,2615:-1,2616:-1,2617:-1,2618:-1,2619:-1,2620:-1,2621:-1,2622:-1,2623:-1,2624:-1,2625:-1,2626:-1,2629:-1,2631:-1
-
-
+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
+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
+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
+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
+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,162,235,5	shop	最強の武器カード屋	80,4002:-1,4004:-1,4006:-1,4018:-1,4025:-1,4026:-1,4019:-1,4029:-1,4043:-1,4017:-1,4020:-1,4024:-1,4037:-1,4055:-1,4057:-1,4076:-1,4096:-1,4104:-1,4005:-1,4030:-1,4049:-1,4062:-1,4065:-1,4069:-1,4085:-1,4130:-1,4007:-1,4035:-1,4060:-1,4063:-1,4068:-1,4080:-1,4094:-1,4111:-1,4118:-1,4140:-1,4082:-1,4092:-1,4126:-1,4072:-1,4086:-1,4106:-1,4115:-1,4117:-1,4121:-1,4125:-1,4134:-1,4137:-1,4142:-1,4147:-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,149,235,3	shop	最強の頭カード屋	80,4010:-1,4039:-1,4041:-1,4046:-1,4052:-1,4087:-1,4110:-1,4112:-1,4122:-1,4127:-1,4132:-1,4143:-1,4148:-1
+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,162,238,5	shop	最強の鎧カード屋	80,4001:-1,4003:-1,4008:-1,4011:-1,4014:-1,4016:-1,4021:-1,4023:-1,4031:-1,4078:-1,4047:-1,4054:-1,4089:-1,4098:-1,4099:-1,4101:-1,4114:-1,4119:-1,4141:-1,4042:-1,4061:-1,4105:-1,4135:-1
+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,149,238,3	shop	最強の盾カード屋	80,4012:-1,4013:-1,4032:-1,4058:-1,4059:-1,4066:-1,4074:-1,4083:-1,4120:-1,4124:-1,4136:-1,4138:-1,4045:-1,4067:-1,4075:-1,4090:-1,4128:-1,4146:-1
+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,162,241,5	shop	最強の外套カード屋	80,4056:-1,4071:-1,4081:-1,4095:-1,4108:-1,4109:-1,4113:-1,4116:-1,4133:-1,4015:-1,4088:-1,4102:-1,4129:-1
+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,149,241,3	shop	最強の靴カード屋	80,4009:-1,4038:-1,4050:-1,4070:-1,4097:-1,4100:-1,4107:-1,4123:-1,4131:-1
+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,162,244,5	shop	最強のアクセサリカード屋	80,4022:-1,4027:-1,4028:-1,4034:-1,4051:-1,4064:-1,4091:-1,4079:-1,4033:-1,4040:-1,4044:-1,4048:-1,4053:-1,4073:-1,4084:-1,4093:-1,4103:-1,4139:-1,4036:-1,4077:-1,4144:-1,4145:-1
+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
diff --git a/readme.html b/readme.html
index dfee8504c..49d00aacc 100644
--- a/readme.html
+++ b/readme.html
@@ -93,8 +93,8 @@ eAthena is an emulator for Ragnarok Online servers.
 It's written in C, and is
 cross-platform. The officially supported platforms are Win32 and Linux.
 <p>We hope you enjoy using it!</p>
-<p>eAthena is licensed under the GPL, meaning it's open source :) There
-is no public CVS provided, however.</p>
+<p>eAthena is licensed under the GPL, meaning it's open source.<br>
+Anonymous eAthena SVN access is available at http://dev.deltaanime.net:8080/svnroot/eathena, we do <b>not</b> support it though.</p>
 		</td>
 	</tr>
 	<tr>
@@ -111,11 +111,8 @@ Athena, by the
 Japanese Development Team.<br>
 A big thanks to them for working hard on Athena.<br>
             <br>
-Valaris<br>
-Mugendai<br>
-fritz<br>
 Wizputer<br>
-Aria<br>
+Mugendai<br>
 Nana<br>
 Shinigami<br>
 Darkchild<br>
@@ -128,7 +125,8 @@ Davidsiaw<br>
 Mass Zero<br>
 MC_Cameri<br>
 Spira<br>
-Lord<br>
+Nasedo<br>
+Celest<br>
 		</td>
 	</tr>
 	<tr>
@@ -155,9 +153,11 @@ of eAthena! Thanks!<br>
             <br>
 AppleGirl, now ex-developer, previously lead the team and contributed alot of work.<br>
             <br>
-yor, for his work he did on login and char servers, not to mention
+Yor, for his work he did on login and char servers, not to mention
 ladmin.<br>
             <br>
+Aria, for making this wonderful readme layout.<br>
+	    <br>
 Gravity, for making Ragnarok Online. eAthena wouldn't even
 exist if it wasn't for them!<br>
             <br>
diff --git a/readme/npcfeatures.html b/readme/npcfeatures.html
index be16c2e66..11d8eb1aa 100644
--- a/readme/npcfeatures.html
+++ b/readme/npcfeatures.html
@@ -90,20 +90,21 @@
 	<tr>
 		<td colspan="18" bgcolor="#FCFCFC" class="content">
 <ul>
-<li>Town Npcs (11/13)</li>
+<li>Town Npcs (11/14)</li>
 <ul><li>&nbsp;Prontera - 100%</li></ul>
 <ul><li>&nbsp;Morocc - 100%</li></ul>
 <ul><li>&nbsp;Geffen - 100%</li></ul>
 <ul><li>&nbsp;Izlude - 100%</li></ul>
 <ul><li>&nbsp;Alberta - 100%</li></ul>
 <ul><li>&nbsp;Al de Baran - 100%</li></ul>
+<ul><li>&nbsp;Lou Yang - 10%</li></ul>
 <ul><li>&nbsp;Lutie - 100%</li></ul>
 <ul><li>&nbsp;Amatsu - 100%</li></ul>
 <ul><li>&nbsp;Comodo - 100%</li></ul>
 <ul><li>&nbsp;Niflheim - 100%</li></ul>
 <ul><li>&nbsp;Umbala - 100%</li></ul>
 <ul><li>&nbsp;Gonryun - 60%</li></ul>
-<ul><li>&nbsp;Payon(New Maps) - 50%</li></ul>
+<ul><li>&nbsp;Payon(New Maps) - 99%</li></ul>
 <li>Job Quests (16/33)</li>
 <ul><li>&nbsp;Novice Class (2/2)</li></ul>
 <ul><ul><li>&nbsp;Novice - 100%</li></ul></ul>