diff -ruN hengband/lib/edit/m_info.txt hengband-tmp/lib/edit/m_info.txt --- hengband/lib/edit/m_info.txt 2004-07-04 16:13:04.000000000 +0900 +++ hengband-tmp/lib/edit/m_info.txt 2007-02-13 21:46:27.354975678 +0900 @@ -3703,3 +3703,36 @@ # Crusade R:9:0 + +### Merchant ### +N:27 +I:NONE:STR:0x00:0:99:0 +# Life +R:0:0 + +# Sorcery +R:1:0 + +# Neture +R:2:0 + +# Chaos +R:3:0 + +# Death +R:4:0 + +# Trump +R:5:0 + +# Arcane +R:6:0 + +# Craft +R:7:0 + +# Deamon +R:8:0 + +# Crusade +R:9:0 diff -ruN hengband/lib/edit/s_info.txt hengband-tmp/lib/edit/s_info.txt --- hengband/lib/edit/s_info.txt 2002-11-15 23:24:13.000000000 +0900 +++ hengband-tmp/lib/edit/s_info.txt 2007-02-13 21:47:03.802244994 +0900 @@ -8967,3 +8967,336 @@ S:0:0:7000 # SUDE S:1:4000:8000 # NITOURYU S:2:0:0 # RIDING + + +### Merchant ### +N:27 +# Bow +W:0:0:0:1 # 0 +W:0:1:0:1 # +W:0:2:1:2 # SLING +W:0:3:0:1 # +W:0:4:0:1 # +W:0:5:0:1 # +W:0:6:0:1 # +W:0:7:0:1 # +W:0:8:0:1 # +W:0:9:0:1 # +W:0:10:0:1 # 10 +W:0:11:0:1 # +W:0:12:0:1 # SHORT_BOW +W:0:13:0:1 # LONG_BOW +W:0:14:0:1 # +W:0:15:0:1 # +W:0:16:0:1 # +W:0:17:0:1 # +W:0:18:0:1 # +W:0:19:0:1 # +W:0:20:0:1 # 20 +W:0:21:0:1 # +W:0:22:0:1 # +W:0:23:0:1 # LIGHT_XBOW +W:0:24:0:1 # HEAVY_XBOW +W:0:25:0:1 # +W:0:26:0:1 # +W:0:27:0:1 # +W:0:28:0:1 # +W:0:29:0:1 # +W:0:30:0:1 # 30 +W:0:31:0:1 # +W:0:32:0:1 # +W:0:33:0:1 # +W:0:34:0:1 # +W:0:35:0:1 # +W:0:36:0:1 # +W:0:37:0:1 # +W:0:38:0:1 # +W:0:39:0:1 # +W:0:40:0:1 # 40 +W:0:41:0:1 # +W:0:42:0:1 # +W:0:43:0:1 # +W:0:44:0:1 # +W:0:45:0:1 # +W:0:46:0:1 # +W:0:47:0:1 # +W:0:48:0:1 # +W:0:49:0:1 # +W:0:50:0:1 # 50 +W:0:51:0:1 # +W:0:52:0:1 # +W:0:53:0:1 # +W:0:54:0:1 # +W:0:55:0:1 # +W:0:56:0:1 # +W:0:57:0:1 # +W:0:58:0:1 # +W:0:59:0:1 # +W:0:60:0:1 # 60 +W:0:61:0:1 # +W:0:62:0:1 # +W:0:63:0:4 # NAMAKE +# Digging +W:1:0:0:1 # 0 +W:1:1:0:1 # SHOVEL +W:1:2:0:1 # GNOMISH_SHOVEL +W:1:3:0:1 # DWARVEN_SHOVEL +W:1:4:0:1 # PICK +W:1:5:0:1 # ORCISH_PICK +W:1:6:0:1 # DWARVEN_PICK +W:1:7:0:1 # MATTOCK +W:1:8:0:1 # +W:1:9:0:1 # +W:1:10:0:1 # 10 +W:1:11:0:1 # +W:1:12:0:1 # +W:1:13:0:1 # +W:1:14:0:1 # +W:1:15:0:1 # +W:1:16:0:1 # +W:1:17:0:1 # +W:1:18:0:1 # +W:1:19:0:1 # +W:1:20:0:1 # 20 +W:1:21:0:1 # +W:1:22:0:1 # +W:1:23:0:1 # +W:1:24:0:1 # +W:1:25:0:1 # +W:1:26:0:1 # +W:1:27:0:1 # +W:1:28:0:1 # +W:1:29:0:1 # +W:1:30:0:1 # 30 +W:1:31:0:1 # +W:1:32:0:1 # +W:1:33:0:1 # +W:1:34:0:1 # +W:1:35:0:1 # +W:1:36:0:1 # +W:1:37:0:1 # +W:1:38:0:1 # +W:1:39:0:1 # +W:1:40:0:1 # 40 +W:1:41:0:1 # +W:1:42:0:1 # +W:1:43:0:1 # +W:1:44:0:1 # +W:1:45:0:1 # +W:1:46:0:1 # +W:1:47:0:1 # +W:1:48:0:1 # +W:1:49:0:1 # +W:1:50:0:1 # 50 +W:1:51:0:1 # +W:1:52:0:1 # +W:1:53:0:1 # +W:1:54:0:1 # +W:1:55:0:1 # +W:1:56:0:1 # +W:1:57:0:1 # +W:1:58:0:1 # +W:1:59:0:1 # +W:1:60:0:1 # 60 +W:1:61:0:1 # +W:1:62:0:1 # +W:1:63:0:1 # +# Hafted +W:2:0:0:1 # 0 +W:2:1:0:1 # CLUB +W:2:2:0:1 # WHIP +W:2:3:1:2 # QUARTERSTAFF +W:2:4:0:0 # NUNCHAKU +W:2:5:0:1 # MACE +W:2:6:0:1 # BALL_AND_CHAIN +W:2:7:0:1 # JO_STAFF +W:2:8:0:1 # WAR_HAMMER +W:2:9:0:1 # +W:2:10:0:1 # 10 +W:2:11:0:1 # THREE_PIECE_ROD +W:2:12:0:1 # MORNING_STAR +W:2:13:0:1 # FLAIL +W:2:14:0:1 # BO_STAFF +W:2:15:0:1 # LEAD_FILLED_MACE +W:2:16:0:1 # TETSUBO +W:2:17:0:1 # +W:2:18:0:1 # TWO_HANDED_FLAIL +W:2:19:0:1 # GREAT_HAMMER +W:2:20:0:1 # MACE_OF_DISRUPTION +W:2:21:1:1 # WIZSTAFF +W:2:22:0:1 # +W:2:23:0:1 # +W:2:24:0:1 # +W:2:25:0:1 # +W:2:26:0:1 # +W:2:27:0:1 # +W:2:28:0:1 # +W:2:29:0:1 # +W:2:30:0:1 # 30 +W:2:31:0:1 # +W:2:32:0:1 # +W:2:33:0:1 # +W:2:34:0:1 # +W:2:35:0:1 # +W:2:36:0:1 # +W:2:37:0:1 # +W:2:38:0:1 # +W:2:39:0:1 # +W:2:40:0:0 # TSURIZAO +W:2:41:0:1 # +W:2:42:0:1 # +W:2:43:0:1 # +W:2:44:0:1 # +W:2:45:0:1 # +W:2:46:0:1 # +W:2:47:0:1 # +W:2:48:0:1 # +W:2:49:0:1 # +W:2:50:0:1 # GROND +W:2:51:0:1 # +W:2:52:0:1 # +W:2:53:0:1 # +W:2:54:0:1 # +W:2:55:0:1 # +W:2:56:0:1 # +W:2:57:0:1 # +W:2:58:0:1 # +W:2:59:0:1 # +W:2:60:0:1 # 60 +W:2:61:0:1 # +W:2:62:0:1 # +W:2:63:0:4 # NAMAKE +# Polearm +W:3:0:0:1 # 0 +W:3:1:0:1 # HATCHET +W:3:2:0:1 # SPEAR +W:3:3:0:1 # SICKLE +W:3:4:0:1 # AWL_PIKE +W:3:5:0:1 # TRIDENT +W:3:6:0:1 # FAUCHARD +W:3:7:0:1 # BROAD_SPEAR +W:3:8:0:1 # PIKE +W:3:9:0:1 # NAGINATA +W:3:10:0:1 # BEAKED_AXE +W:3:11:0:1 # BROAD_AXE +W:3:12:0:1 # LUCERNE_HAMMER +W:3:13:0:1 # GLAIVE +W:3:14:0:1 # LAJATANG +W:3:15:0:1 # HALBERD +W:3:16:0:1 # GUISARME +W:3:17:0:1 # SCYTHE +W:3:18:0:1 # +W:3:19:0:1 # +W:3:20:0:1 # LANCE +W:3:21:0:1 # +W:3:22:0:1 # BATTLE_AXE +W:3:23:0:1 # +W:3:24:0:1 # +W:3:25:0:1 # GREAT_AXE +W:3:26:0:1 # TRIFURCATE_SPEAR +W:3:27:0:1 # +W:3:28:0:1 # LOCHABER_AXE +W:3:29:0:1 # HEAVY_LANCE +W:3:30:0:1 # SCYTHE_OF_SLICING +W:3:31:0:1 # +W:3:32:0:1 # +W:3:33:0:1 # +W:3:34:0:1 # +W:3:35:0:1 # +W:3:36:0:1 # +W:3:37:0:1 # +W:3:38:0:1 # +W:3:39:0:1 # +W:3:40:0:1 # 40 +W:3:41:0:1 # +W:3:42:0:1 # +W:3:43:0:1 # +W:3:44:0:1 # +W:3:45:0:1 # +W:3:46:0:1 # +W:3:47:0:1 # +W:3:48:0:1 # +W:3:49:0:1 # +W:3:50:0:1 # DEATH_SCYTHE +W:3:51:0:1 # +W:3:52:0:1 # +W:3:53:0:1 # +W:3:54:0:1 # +W:3:55:0:1 # +W:3:56:0:1 # +W:3:57:0:1 # +W:3:58:0:1 # +W:3:59:0:1 # +W:3:60:0:1 # 60 +W:3:61:0:1 # +W:3:62:0:1 # +W:3:63:0:1 # +# Sword +W:4:0:0:1 # 0 +W:4:1:0:1 # BROKEN_DAGGER +W:4:2:0:1 # BROKEN_SWORD +W:4:3:0:1 # +W:4:4:1:4 # DAGGER +W:4:5:0:1 # MAIN_GAUCHE +W:4:6:0:2 # TANTO +W:4:7:0:1 # RAPIER +W:4:8:0:1 # SMALL_SWORD +W:4:9:0:1 # BASILLARD +W:4:10:0:1 # SHORT_SWORD +W:4:11:0:1 # SABRE +W:4:12:0:1 # CUTLASS +W:4:13:0:1 # WAKIZASHI +W:4:14:0:1 # KHOPESH +W:4:15:0:1 # TULWAR +W:4:16:0:1 # BROAD_SWORD +W:4:17:0:1 # LONG_SWORD +W:4:18:0:1 # SCIMITAR +W:4:19:0:1 # NINJATO +W:4:20:0:1 # KATANA +W:4:21:0:1 # BASTARD_SWORD +W:4:22:0:1 # GREAT_SCIMITAR +W:4:23:0:1 # CLAYMORE +W:4:24:0:1 # ESPADON +W:4:25:0:1 # TWO_HANDED_SWORD +W:4:26:0:1 # FLAMBERGE +W:4:27:0:1 # NO_DACHI +W:4:28:0:1 # EXECUTIOERS_SWORD +W:4:29:0:1 # ZWEIHANDER +W:4:30:0:1 # BLADE_OF_CHAOS +W:4:31:0:1 # DIAMOND_EDGE +W:4:32:0:1 # DOKUBARI +W:4:33:0:1 # +W:4:34:0:1 # +W:4:35:0:1 # +W:4:36:0:1 # +W:4:37:0:1 # +W:4:38:0:1 # +W:4:39:0:1 # +W:4:40:0:1 # 40 +W:4:41:0:1 # +W:4:42:0:1 # +W:4:43:0:1 # +W:4:44:0:1 # +W:4:45:0:1 # +W:4:46:0:1 # +W:4:47:0:1 # +W:4:48:0:1 # +W:4:49:0:1 # +W:4:50:0:1 # 50 +W:4:51:0:1 # +W:4:52:0:1 # +W:4:53:0:1 # +W:4:54:0:1 # +W:4:55:0:1 # +W:4:56:0:1 # +W:4:57:0:1 # +W:4:58:0:1 # +W:4:59:0:1 # +W:4:60:0:1 # 60 +W:4:61:0:1 # +W:4:62:0:1 # +W:4:63:0:1 # +# Skill +S:0:0:4000 # SUDE +S:1:0:0 # NITOURYU +S:2:0:0 # RIDING diff -ruN hengband/lib/edit/t0000002.txt hengband-tmp/lib/edit/t0000002.txt --- hengband/lib/edit/t0000002.txt 2003-11-30 06:06:29.000000000 +0900 +++ hengband-tmp/lib/edit/t0000002.txt 2007-02-13 21:47:40.162527866 +0900 @@ -336,8 +336,8 @@ B:7:A:0:武器を強化する:400:800:w:23:0 B:$7:A:1:Enchant armor:300:600:a:24:0 B:7:A:1:防具を強化する:300:600:a:24:0 -B:$7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0 -B:7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0 +B:$7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:2 +B:7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:2 B:$9:N:Temple of Life:Crysania:Human B:9:N:生命魔術の塔:クリサニア:人間 @@ -354,8 +354,8 @@ B:10:A:1:一泊する:0:100:r:17:0 B:$10:A:2:Identify possessions:100:2000:i:26:0 B:10:A:2:持ち物全てを鑑定:100:2000:i:26:0 -B:$10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 -B:10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 +B:$10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 +B:10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 B:$11:N:Archers Guild:Trallin:Half-elf B:11:N:アーチャーのギルド:トゥラリン:ハーフエルフ @@ -363,8 +363,8 @@ B:11:A:0:矢や石等を強化する:20:40:a:30:0 B:$11:A:1:Enchant bow:400:800:b:31:0 B:11:A:1:弓を強化する:400:800:b:31:0 -B:$11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0 -B:11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0 +B:$11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:2 +B:11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:2 B:$12:N:Paladins Guild:Langordathur:Human B:12:N:パラディンのギルド:ランゴルダスール:人間 @@ -372,8 +372,8 @@ B:12:A:0:防具を強化する:300:600:a:24:0 B:$12:A:1:See Healers:0:150:h:28:0 B:12:A:1:治療家に会う:0:150:h:28:0 -B:$12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 -B:12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 +B:$12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 +B:12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 D:###################################################################################################################################################################################################### D:#---------------------TTTT-------------------------------------------------------------TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT# diff -ruN hengband/lib/edit/t0000003.txt hengband-tmp/lib/edit/t0000003.txt --- hengband/lib/edit/t0000003.txt 2003-11-30 06:06:29.000000000 +0900 +++ hengband-tmp/lib/edit/t0000003.txt 2007-02-13 21:48:01.686143523 +0900 @@ -287,8 +287,8 @@ B:7:A:1:防具を強化する:300:600:a:24:0 B:$7:A:2:Request quest:0:0:q:6:0 B:7:A:2:クエスト:0:0:q:6:0 -B:$7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:0 -B:7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:0 +B:$7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:0:2 +B:7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:0:2 B:$8:N:Tower of Sorcery:Tanistil:Elf B:8:N:賢者の塔:タニスティル:エルフ @@ -319,8 +319,8 @@ B:10:A:2:持ち物全てを鑑定:100:600:i:26:0 B:$10:A:3:request Quest:0:0:q:6:0 B:10:A:3:クエスト:0:0:q:6:0 -B:$10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 -B:10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 +B:$10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 +B:10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 B:$11:N:Archers Guild:Angros:Elf B:11:N:アーチャーのギルド:アングロス:エルフ @@ -328,8 +328,8 @@ B:11:A:0:矢や石等を強化する:20:40:a:30:0 B:$11:A:1:Enchant bow:400:800:b:31:0 B:11:A:1:弓を強化する:400:800:b:31:0 -B:$11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0 -B:11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0 +B:$11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:2 +B:11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:2 B:$12:N:Paladins Guild:Vilios:Human B:12:N:パラディンのギルド:ヴィリオス:人間 @@ -337,8 +337,8 @@ B:12:A:0:防具を強化する:400:1000:a:24:0 B:$12:A:1:See Healers:0:150:h:28:0 B:12:A:1:治療家に会う:0:150:h:28:0 -B:$12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 -B:12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 +B:$12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 +B:12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 B:$13:N:Trump Tower:Pelloi:Amberite B:13:N:トランプ魔術の塔:ペロイ:アンバライト diff -ruN hengband/lib/edit/t0000004.txt hengband-tmp/lib/edit/t0000004.txt --- hengband/lib/edit/t0000004.txt 2003-11-30 06:06:29.000000000 +0900 +++ hengband-tmp/lib/edit/t0000004.txt 2007-02-13 21:48:24.315585256 +0900 @@ -194,8 +194,8 @@ B:7:A:1:防具を強化する:200:500:a:24:0 B:$7:A:2:Request quest:0:0:q:6:0 B:7:A:2:クエスト:0:0:q:6:0 -B:$7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0 -B:7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0 +B:$7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:2 +B:7:C:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2:0:0:2:2:2:0:0:2 B:$8:N:Wizards Tower:Valceronwe:Sprite B:8:N:賢者の塔:ヴァルセロン:妖精 @@ -205,8 +205,8 @@ B:8:A:1:全てのアイテムを再充填:0:0:a:45:0 B:$8:A:2:Identify posessions:200:1000:i:26:0 B:8:A:2:持ち物全てを鑑定:200:1000:i:26:0 -B:$8:C:0:2:0:0:1:0:1:0:0:0:2:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0 -B:8:C:0:2:0:0:1:0:1:0:0:0:2:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0 +B:$8:C:0:2:0:0:1:0:1:0:0:0:2:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:2 +B:8:C:0:2:0:0:1:0:1:0:0:0:2:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:2 B:$9:N:Inner Temple:Kabir:Dwarf B:9:N:寺院:カビー:ドワーフ @@ -214,8 +214,8 @@ B:9:A:0:治療の祈祷:0:100:h:28:0 B:$9:A:1:Restoration:300:1000:r:29:0 B:9:A:1:能力回復:300:1000:r:29:0 -B:$9:C:0:0:2:0:0:1:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 -B:9:C:0:0:2:0:0:1:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 +B:$9:C:0:0:2:0:0:1:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 +B:9:C:0:0:2:0:0:1:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 B:$10:N:Thieves Den:Molvrae:Dark Elf B:10:N:盗賊のアジト:モルブラエ:ダーク・エルフ @@ -223,8 +223,8 @@ B:10:A:1:一泊する:0:50:r:17:0 B:$10:A:2:Identify possessions:175:800:i:26:0 B:10:A:2:持ち物全てを鑑定:175:800:i:26:0 -B:$10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 -B:10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 +B:$10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 +B:10:C:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 B:$11:N:Archers Tavern:Celegail:Elf B:11:N:アーチャーの酒場:ケレガイル:エルフ @@ -232,8 +232,8 @@ B:11:A:0:矢や石等を強化する:22:44:a:30:0 B:$11:A:1:Enchant bow:400:500:b:31:0 B:11:A:1:弓を強化する:400:500:b:31:0 -B:$11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0 -B:11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0 +B:$11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:2 +B:11:C:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:2 B:$12:N:Paladins Sanctum:Calpirosse:Half-Elf B:12:N:パラディンの聖所:カルパイロス:ハーフエルフ @@ -241,8 +241,8 @@ B:12:A:0:防具を強化する:240:440:a:24:0 B:$12:A:1:See Healers:0:100:h:28:0 B:12:A:1:治療家に会う:0:100:h:28:0 -B:$12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 -B:12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0 +B:$12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 +B:12:C:0:0:0:0:0:2:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:2 B:$13:N:Trump Tower:Colleuse:Amberite B:13:N:トランプ魔術の塔:コレウス:アンバライト diff -ruN hengband/lib/help/jraceclas.txt hengband-tmp/lib/help/jraceclas.txt --- hengband/lib/help/jraceclas.txt 2003-11-16 23:42:05.000000000 +0900 +++ hengband-tmp/lib/help/jraceclas.txt 2007-02-13 21:50:10.557879045 +0900 @@ -911,6 +911,21 @@ かに速く走る事ができます。 +***** +--- 商人 --- + + 商人は魔法のアイテムを売買することを目的とした職業です。 + HPが低く打撃能力はメイジ並みで、肉弾戦には向いていません。そのうえ + 射撃も下手ですし、魔法を使うこともできません。唯一得意なのは魔法の + アイテムを使用することで、本職のメイジなみの技能を持っています。 + + しかし、基礎能力の低さを補う長所が一つあります。店頭に並んでいない + 商品をブラックマーケットから仕入れることができることです。あらゆる + 武器防具、PDSMでさえも!、を*買う*ことができますので、装備品が足り + なくて困ることはないでしょう。また魔法の道具も鑑定済みのものならば + 幾らでも*買う*ことができます。 + 商人に必要なものは何よりもお金です。クラスパワーとして「ミダスの手」 + を持っており、不必要なアイテムをお金に変えることができます。 ***** === 性格 === diff -ruN hengband/lib/help/raceclas.txt hengband-tmp/lib/help/raceclas.txt --- hengband/lib/help/raceclas.txt 2004-03-24 19:09:41.000000000 +0900 +++ hengband-tmp/lib/help/raceclas.txt 2007-02-13 21:49:32.278898389 +0900 @@ -988,6 +988,23 @@ extremely fast. +***** +--- Merchant --- + + Merchants are a class to aim to buy and sell the magic item. They + have poor HPs and fighting power at the Mage level, not to suite + the close combat. Moreover, they cannot shoot the enemies well + and cannot conjure the spells. They have only the skill in using + the magic devices, being up with the professional Mages. + + However, there is one merit that supplements the low degree of a + basic ability. They can stock with the commodity that doesn't + line up in the store front of the black-marcket. All equipments, + such as PDSM!, can be *bought*. They will not get in the bind for + the absence of equipments. Moreover, any number of the magic + devices which they are aware of can be *bought*. + Money is necessary for Merchants above all. They have the 'Midas + touch' as class power and can turn needless items to gold. ***** === The Personality === diff -ruN hengband/lib/pref/pref-opt.prf hengband-tmp/lib/pref/pref-opt.prf --- hengband/lib/pref/pref-opt.prf 2003-12-17 04:41:47.000000000 +0900 +++ hengband-tmp/lib/pref/pref-opt.prf 2007-02-13 22:08:26.990423583 +0900 @@ -76,7 +76,7 @@ Y:empty_levels X:bound_walls_perm Y:last_words -Y:send_score +#Y:send_score X:allow_debug_opts ##### Disturbance ##### diff -ruN hengband/lib/pref/xtra-new.prf hengband-tmp/lib/pref/xtra-new.prf --- hengband/lib/pref/xtra-new.prf 2002-02-22 01:58:49.000000000 +0900 +++ hengband-tmp/lib/pref/xtra-new.prf 2007-02-13 21:50:43.237740056 +0900 @@ -112,7 +112,6 @@ R:0:0x9B/0 ?:[EQU $CLASS High-Mage] R:0:0x9C/0 - ?:[EQU $CLASS Tourist] R:0:0x98/0 ?:[EQU $CLASS Imitator] @@ -145,4 +144,5 @@ R:0:0x93/0 ?:[EQU $CLASS Ninja] R:0:0x95/0 - +?:[EQU $CLASS Merchant] +R:0:0x98/0 diff -ruN hengband/lib/pref/xtra-xxx.prf hengband-tmp/lib/pref/xtra-xxx.prf --- hengband/lib/pref/xtra-xxx.prf 2002-02-01 21:57:43.000000000 +0900 +++ hengband-tmp/lib/pref/xtra-xxx.prf 2007-02-13 21:51:07.894862597 +0900 @@ -138,3 +138,5 @@ R:0:0xAD/0 ?:[EQU $CLASS Ninja] R:0:0xAA/0 +?:[EQU $CLASS Merchant] +R:0:0xAC/0 diff -ruN hengband/src/artifact.c hengband-tmp/src/artifact.c --- hengband/src/artifact.c 2005-01-05 19:13:59.000000000 +0900 +++ hengband-tmp/src/artifact.c 2007-02-13 21:45:43.461876923 +0900 @@ -1704,6 +1704,7 @@ if (randint1(5) > 2) artifact_bias = BIAS_PRIESTLY; break; case CLASS_TOURIST: + case CLASS_MERCHANT: if (randint1(5) > 2) artifact_bias = BIAS_WARRIOR; break; case CLASS_IMITATOR: diff -ruN hengband/src/avatar.c hengband-tmp/src/avatar.c --- hengband/src/avatar.c 2004-01-04 14:46:48.000000000 +0900 +++ hengband-tmp/src/avatar.c 2007-02-13 21:45:43.464876452 +0900 @@ -303,6 +303,10 @@ p_ptr->vir_types[i++] = V_FAITH; p_ptr->vir_types[i++] = V_UNLIFE; break; + case CLASS_MERCHANT: + p_ptr->vir_types[i++] = V_ENCHANT; + p_ptr->vir_types[i++] = V_KNOWLEDGE; + break; }; /* Get one virtue based on race */ diff -ruN hengband/src/birth.c hengband-tmp/src/birth.c --- hengband/src/birth.c 2004-08-11 23:49:28.000000000 +0900 +++ hengband-tmp/src/birth.c 2007-02-13 21:52:17.268952885 +0900 @@ -1821,8 +1821,9 @@ "鏡使いは、魔力の込められた鏡を作り出して、それを触媒として攻撃を行なうことができる鏡魔法を使います。鏡使いは鏡の上で実力を発揮し、鏡の上では素早いテレポートが可能となります。魔法の鏡は、レベルによって一度に制御できる数が制限されます。鏡魔法に必要な能力は知能です。", -"忍者は暗闇に潜む恐るべき暗殺者であり、光源を持たずに行動し、相手の不意をつき一撃で息の根を止めます。また、相手を惑わすための忍術も身につけます。罠やドアを見つける能力に優れ、罠の解除や鍵開けに熟達しています。軽装を好み、重い鎧や武器を装備すると著しく動きが制限され、また、盾を装備しようとはしません。軽装ならば、レベルが上がるにつれより速くより静かに行動できます。さらに忍者は恐怖せず、成長すれば毒がほとんど効かなくなり、透明なものを見ることができるようになります。忍術に必要な能力は器用さです。" +"忍者は暗闇に潜む恐るべき暗殺者であり、光源を持たずに行動し、相手の不意をつき一撃で息の根を止めます。また、相手を惑わすための忍術も身につけます。罠やドアを見つける能力に優れ、罠の解除や鍵開けに熟達しています。軽装を好み、重い鎧や武器を装備すると著しく動きが制限され、また、盾を装備しようとはしません。軽装ならば、レベルが上がるにつれより速くより静かに行動できます。さらに忍者は恐怖せず、成長すれば毒がほとんど効かなくなり、透明なものを見ることができるようになります。忍術に必要な能力は器用さです。", +"商人は貴重なアイテムを仕入れるためにダンジョンに潜ります。戦闘力が低く肉弾戦には向かないうえに魔法を使うこともできません。その代わりに商人はブラックマーケットから店頭に並んでいない品を仕入れることができます。生き延びるためには手に入れた魔法の道具をうまく使わなければなりません。", #else "A Warrior is a hack-and-slash character, who solves most of his problems by cutting them to pieces, but will occasionally fall back on the help of a magical device. Unfortunately, many high-level devices may be forever beyond their use.", @@ -1877,7 +1878,9 @@ "Mirror-Masters are spell casters; like other mages, they must live by their wits. They can create magical mirrors, and employ them in the casting of Mirror-Magic spells. A Mirror-Master standing on a mirror has greater ability and, for example, can perform quick teleports. The maximum number of Magical Mirrors which can be controlled simultaneously depends on the level. Intelligence determines a Mirror-Master's spell casting ability.", -"A Ninja is a fearful assassin lurking in darkness. He or she can navigate effectively with no light source, catch enemies unawares, and kill with a single blow. Ninjas can use Ninjutsu, and are good at locating hidden traps and doors, disarming traps and picking locks. Since heavy armors, heavy weapons, or shields will restrict their motion greatly, they prefer light clothes, and become faster and more stealthy as they gain levels. A Ninja knows no fear and, at high level, becomes almost immune to poison and able to see invisible things. Dexterity determines a Ninja's ability to use Ninjutsu." +"A Ninja is a fearful assassin lurking in darkness. He or she can navigate effectively with no light source, catch enemies unawares, and kill with a single blow. Ninjas can use Ninjutsu, and are good at locating hidden traps and doors, disarming traps and picking locks. Since heavy armors, heavy weapons, or shields will restrict their motion greatly, they prefer light clothes, and become faster and more stealthy as they gain levels. A Ninja knows no fear and, at high level, becomes almost immune to poison and able to see invisible things. Dexterity determines a Ninja's ability to use Ninjutsu.", + +"The merchants dives in the dungeon to stock with valuable items. They don't have the fighting power for the close combat and cannot conjure the spells. The merchants can stock with goods that do not line up in the shop from the black marckets. It is necessary to use the magic devices to survive.", #endif }; @@ -3089,7 +3092,7 @@ /* Social Class determines starting gold */ gold = (p_ptr->sc * 6) + randint1(100) + 300; - if (p_ptr->pclass == CLASS_TOURIST) + if (p_ptr->pclass == CLASS_TOURIST || p_ptr->pclass == CLASS_MERCHANT) gold += 2000; /* Process the stats */ @@ -3722,6 +3725,12 @@ { TV_SOFT_ARMOR, SV_SOFT_LEATHER_ARMOR }, { TV_SWORD, SV_DAGGER } }, + { + /* Merchant */ + { TV_POTION, SV_POTION_SPEED }, + { TV_SOFT_ARMOR, SV_SOFT_LEATHER_ARMOR }, + { TV_SWORD, SV_DAGGER }, + }, }; diff -ruN hengband/src/defines.h hengband-tmp/src/defines.h --- hengband/src/defines.h 2005-05-12 21:01:00.000000000 +0900 +++ hengband-tmp/src/defines.h 2007-02-13 21:58:55.334345609 +0900 @@ -176,7 +176,7 @@ #define STORE_HOME 7 #define STORE_BOOK 8 #define STORE_MUSEUM 9 - +#define STORE_CONTRA 10 #define BUILDING_NON_MEMBER 0 #define BUILDING_MEMBER 1 @@ -195,7 +195,7 @@ /* * Maximum number of player "class" types (see "table.c", etc) */ -#define MAX_CLASS 27 +#define MAX_CLASS 28 #define MAX_SEIKAKU 12 @@ -904,6 +904,7 @@ #define CLASS_SMITH 24 #define CLASS_MIRROR_MASTER 25 #define CLASS_NINJA 26 +#define CLASS_MERCHANT 27 #define SEIKAKU_FUTUU 0 #define SEIKAKU_CHIKARA 1 diff -ruN hengband/src/dungeon.c hengband-tmp/src/dungeon.c --- hengband/src/dungeon.c 2005-01-05 19:13:59.000000000 +0900 +++ hengband-tmp/src/dungeon.c 2007-02-13 21:45:44.130771756 +0900 @@ -369,6 +369,7 @@ } case CLASS_TOURIST: + case CLASS_MERCHANT: { /* Good sensing */ if (0 != randint0(20000L / ((plev+50)*(plev+50)))) return; @@ -534,6 +535,7 @@ } case CLASS_TOURIST: + case CLASS_MERCHANT: { /* Good sensing */ if (0 != randint0(20000L / ((plev+50)*(plev+50)))) return; diff -ruN hengband/src/racial.c hengband-tmp/src/racial.c --- hengband/src/racial.c 2005-01-05 19:13:59.000000000 +0900 +++ hengband-tmp/src/racial.c 2007-02-13 21:45:44.311743302 +0900 @@ -1725,6 +1725,7 @@ case CLASS_IMITATOR: case CLASS_ARCHER: case CLASS_SMITH: + case CLASS_MERCHANT: if (one_in_(3)) { Type = GF_MISSILE; @@ -2643,6 +2644,22 @@ power_desc[num++].number = -3; break; } + // TEST + case CLASS_MERCHANT: + { +#ifdef JP +strcpy(power_desc[num].name, "ミダスの手"); +#else + strcpy(power_desc[num].name, "Midas Touch"); +#endif + + power_desc[num].level = 1; + power_desc[num].cost = 5; + power_desc[num].stat = A_INT; + power_desc[num].fail = 12; + power_desc[num++].number = MUT1_MIDAS_TCH; + break; + } default: #ifdef JP strcpy(power_desc[0].name, "(なし)"); diff -ruN hengband/src/store.c hengband-tmp/src/store.c --- hengband/src/store.c 2004-08-17 08:11:56.000000000 +0900 +++ hengband-tmp/src/store.c 2007-02-13 22:00:42.424500423 +0900 @@ -917,7 +917,7 @@ /* Get the value of one of the items */ price = object_value(o_ptr); - + /* Worthless items */ if (price <= 0) return (0L); @@ -959,6 +959,8 @@ /* Mega-Hack -- Black market sucks */ if (cur_store_num == STORE_BLACK) price = price * 2; + else if (cur_store_num == STORE_CONTRA) + price = price * 20; /* Compute the final price (with rounding) */ /* Hack -- prevent overflow */ @@ -967,7 +969,7 @@ /* Note -- Never become "free" */ if (price <= 0L) return (1L); - + /* Return the price */ return (price); } @@ -3777,7 +3779,185 @@ return; } +extern int wiz_create_itemtype(void); +/* + * Buy a contraband from a store (only merchant) + */ +static void store_purchase_merchant(void) +{ + int item_new, choice; + int old_store_num; + + object_type forge; + + object_type *j_ptr; + + int k_idx; + s32b price; + + char o_name[MAX_NLEN]; + + /* Save the screen */ + screen_save(); + /* Get object base type */ + k_idx = wiz_create_itemtype(); + + /* Restore the screen */ + screen_load(); + + /* Return if failed */ + if ((!k_idx) || (k_info[k_idx].gen_flags & TRG_INSTA_ART)) + { +#ifdef JP + msg_print("そのアイテムを買うことはできない。"); +#else + msg_print("You cannot buy that item."); +#endif + return; + } + + /* Get local object */ + j_ptr = &forge; + + do + { + /* Create the item */ + object_prep(j_ptr, k_idx); + + /* Apply magic */ + apply_magic(j_ptr, dun_level, AM_NO_FIXED_ART); + } + while (j_ptr->art_name || object_is_fixed_artifact(j_ptr)); + + if((j_ptr->tval==TV_AMULET || j_ptr->tval==TV_RING || + j_ptr->tval==TV_STAFF || j_ptr->tval==TV_WAND || j_ptr->tval==TV_ROD + || j_ptr->tval==TV_SCROLL || j_ptr->tval==TV_POTION) + && !object_is_aware(j_ptr)) + { +#ifdef JP + msg_print("そんなアイテムは知らない。"); +#else + msg_print("You do not know that item."); +#endif + return; + } + + /* Mark it storebought */ + //j_ptr->ident |= IDENT_STORE; + + /* Hack -- require room in pack */ + if (!inven_carry_okay(j_ptr)) + { +#ifdef JP + msg_print("ザックにそのアイテムを入れる隙間がない。"); +#else + msg_print("You cannot carry that many items."); +#endif + return; + } + + /* Describe the transaction */ + object_desc(o_name, j_ptr, 0); + + /* Message */ +#ifdef JP + msg_format("%sを購入する。", o_name); +#else + msg_format("Buying %s.", o_name); +#endif + msg_print(NULL); + + /* Haggle for a final price */ + /* Giga-Hack */ + old_store_num = cur_store_num; + cur_store_num = STORE_CONTRA; + choice = purchase_haggle(j_ptr, &price); + cur_store_num = old_store_num; + + /* Player wants it */ + if (choice == 0) + { + /* Message */ + /* Player can afford it */ + if (p_ptr->au >= price) + { + /* Say "okay" */ + say_comment_1(); + + chg_virtue(V_JUSTICE, -1); + + /* Make a sound */ + sound(SOUND_BUY); + + /* Be happy */ + decrease_insults(); + + /* Spend the money */ + p_ptr->au -= price; + + /* Update the display */ + store_prt_gold(); + + /* Hack -- buying an item makes you aware of it */ + object_aware(j_ptr); + + /* Hack -- clear the "fixed" flag from the item */ + j_ptr->ident &= ~(IDENT_FIXED); + + /* Message */ +#ifdef JP + msg_format("%sを $%ldで購入しました。", o_name, (long)price); +#else + msg_format("You bought %s for %ld gold.", o_name, (long)price); +#endif + + strcpy(record_o_name, o_name); + record_turn = turn; + + // TEMP + if (record_buy) do_cmd_write_nikki(NIKKI_BUY, 0, o_name); + object_desc(o_name, j_ptr, OD_NAME_ONLY); + if(record_rand_art && j_ptr->art_name) + do_cmd_write_nikki(NIKKI_ART, 0, o_name); + + /* Erase the inscription */ + j_ptr->inscription = 0; + + /* Erase the "feeling" */ + j_ptr->feeling = FEEL_NONE; + j_ptr->ident &= ~(IDENT_STORE); + /* Give it to the player */ + item_new = inven_carry(j_ptr); + + /* Describe the final result */ + object_desc(o_name, &inventory[item_new], 0); + + /* Message */ +#ifdef JP + msg_format("%s(%c)を手に入れた。", o_name, index_to_label(item_new)); +#else + msg_format("You have %s (%c).", o_name, index_to_label(item_new)); +#endif + + /* Auto-inscription */ + autopick_alter_item(item_new, FALSE); + + handle_stuff(); + } + else + { + /* Simple message (no insult) */ +#ifdef JP + msg_print("お金が足りません。"); +#else + msg_print("You do not have enough gold."); +#endif + } + } + return; +} + /* * Sell an item to the store (or home) */ @@ -4391,7 +4571,7 @@ { command_cmd = 'x'; /* hack! */ } - + /* Parse the command */ switch (command_cmd) { @@ -4477,6 +4657,18 @@ break; } + // TEST + case 'c': + { + if (cur_store_num == STORE_BLACK + && p_ptr->pclass == CLASS_MERCHANT) + { + store_purchase_merchant(); + } + break; + } + + /* Drop (Sell) */ case 'd': { @@ -4954,6 +5146,10 @@ { prt("w/t) 装備する/はずす", 22, 56); } + // TEST + if (cur_store_num == STORE_BLACK + && p_ptr->pclass == CLASS_MERCHANT) + prt("c) 密売品を買う", 23,56); #else prt("i/e) Inventry/Equipment list", 21, 56); @@ -4965,6 +5161,10 @@ { prt("w/t) Wear/Take off equipment", 22, 56); } + // TEST + if (cur_store_num == STORE_BLACK + && p_ptr->pclass == CLASS_MERCHANT) + prt("c) Purchase a contraband.", 23, 56); #endif /* Prompt */ #ifdef JP diff -ruN hengband/src/tables.c hengband-tmp/src/tables.c --- hengband/src/tables.c 2004-07-04 16:13:05.000000000 +0900 +++ hengband-tmp/src/tables.c 2007-02-13 21:59:02.374238267 +0900 @@ -1134,6 +1134,7 @@ * ForceTrainer num = 4; mul = 2; div = MAX(60, weapon_weight); * Mirror Master num = 3; mul = 3; div = MAX(100, weapon_weight); * Ninja num = 4; mul = 1; div = MAX(20, weapon_weight); + * Merchant num = 4; mul = 3; div = MAX(100, weapon_weight); * * To get "P", we look up the relevant "adj_str_blow[]" (see above), * multiply it by "mul", and then divide it by "div". @@ -3714,6 +3715,16 @@ 15, 10, 10, 0, 0, 0, 25,18, 2, 20, 40 }, + { +#ifdef JP + "商人", +#endif + "Merchant", + { -1, +1,-1, -2, -1, +5}, + 15, 40, 28, 1, 12, 2, 40, 20, + 5, 15, 9, 0, 0, 0, 11, 11, + 0, 50, 40 + }, }; player_seikaku seikaku_info[MAX_SEIKAKU] = @@ -4041,6 +4052,7 @@ (CH_NONE), /* Weaponsmith */ (CH_NONE), /* Mirror-master */ (CH_NONE), /* Ninja */ + (CH_NONE), /* Merchant */ }; @@ -4083,6 +4095,7 @@ (CH_NONE), /* Weaponsmith */ (CH_NONE), /* Mirror-master */ (CH_NONE), /* Ninja */ + (CH_NONE), /* Merchant */ }; @@ -4607,6 +4620,18 @@ "暗殺者", "死の長き腕", }, + /* Merchant */ + { + "丁稚", + "奉公人", + "手代", + "小番頭", + "中番頭", + "大番頭", + "連雀", + "別家", + "旦那", + "大棚", }, }; #else @@ -4989,6 +5014,19 @@ "Assassinator", "Death Lord", }, + /* Merchant */ + { + "Novice", + "Apprentice", + "Assistant", + "Little Manager", + "Manager", + "Great Manager", + "Peddler", + "Branch Chief", + "Boss", + "Great Boss", + }, }; #endif diff -ruN hengband/src/wizard2.c hengband-tmp/src/wizard2.c --- hengband/src/wizard2.c 2004-07-31 01:54:53.000000000 +0900 +++ hengband-tmp/src/wizard2.c 2007-02-13 21:45:44.746674919 +0900 @@ -709,7 +709,7 @@ * * List up to 50 choices in three columns */ -static int wiz_create_itemtype(void) +int wiz_create_itemtype(void) { int i, num, max_num; int col, row; diff -ruN hengband/src/xtra1.c hengband-tmp/src/xtra1.c --- hengband/src/xtra1.c 2004-07-11 20:53:22.000000000 +0900 +++ hengband-tmp/src/xtra1.c 2007-02-13 21:54:53.354405504 +0900 @@ -4874,6 +4874,10 @@ /* Ninja */ case CLASS_NINJA: num = 4; wgt = 20; mul = 1; break; + + /* Merchant */ + case CLASS_MERCHANT: + num = 4; wgt = 100; mul = 3; break; } /* Enforce a minimum "weight" (tenth pounds) */ diff -ruN hengband/src/z-config.h hengband-tmp/src/z-config.h --- hengband/src/z-config.h 2004-07-21 22:51:17.000000000 +0900 +++ hengband-tmp/src/z-config.h 2007-02-13 22:08:45.902448477 +0900 @@ -601,6 +601,7 @@ * Use world score server */ #define WORLD_SCORE +#undef WORLD_SCORE #endif #endif /* HAVE_CONFIG_H */